diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-09 20:30:12 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-09 20:30:12 +0000 |
commit | 1a2fec7a210bd41778d39fb544944b2dff98bc47 (patch) | |
tree | 95cd6aee22f25c16d3757c7f608c1bc035f506a8 /src/core | |
parent | e5b54d9cb7d9bbf9932032800d469667f1c2af9f (diff) | |
download | gnunet-1a2fec7a210bd41778d39fb544944b2dff98bc47.tar.gz gnunet-1a2fec7a210bd41778d39fb544944b2dff98bc47.zip |
-fix logging, revert to break instead of assert
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_api.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index f1cb2e835..616528b5d 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -917,9 +917,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
917 | continue; | 917 | continue; |
918 | if ((mh->expected_size != ntohs (em->size)) && (mh->expected_size != 0)) | 918 | if ((mh->expected_size != ntohs (em->size)) && (mh->expected_size != 0)) |
919 | { | 919 | { |
920 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 920 | LOG (GNUNET_ERROR_TYPE_ERROR, |
921 | "Unexpected message size %u for message of type %u from peer `%4s'\n", | 921 | "Unexpected message size %u for message of type %u from peer `%4s'\n", |
922 | htons (em->size), mh->type, GNUNET_i2s (&ntm->peer)); | 922 | htons (em->size), mh->type, GNUNET_i2s (&ntm->peer)); |
923 | GNUNET_break_op (0); | 923 | GNUNET_break_op (0); |
924 | continue; | 924 | continue; |
925 | } | 925 | } |
@@ -1285,10 +1285,10 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork, | |||
1285 | struct GNUNET_CORE_TransmitHandle *th; | 1285 | struct GNUNET_CORE_TransmitHandle *th; |
1286 | 1286 | ||
1287 | GNUNET_assert (NULL != notify); | 1287 | GNUNET_assert (NULL != notify); |
1288 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1288 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1289 | "Asking core for transmission of %u bytes to `%s'\n", | 1289 | "Asking core for transmission of %u bytes to `%s'\n", |
1290 | (unsigned int) notify_size, | 1290 | (unsigned int) notify_size, |
1291 | GNUNET_i2s (target)); | 1291 | GNUNET_i2s (target)); |
1292 | pr = GNUNET_CONTAINER_multihashmap_get (handle->peers, &target->hashPubKey); | 1292 | pr = GNUNET_CONTAINER_multihashmap_get (handle->peers, &target->hashPubKey); |
1293 | if (NULL == pr) | 1293 | if (NULL == pr) |
1294 | { | 1294 | { |
@@ -1299,7 +1299,7 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork, | |||
1299 | if (NULL != pr->th.peer) | 1299 | if (NULL != pr->th.peer) |
1300 | { | 1300 | { |
1301 | /* attempting to queue a second request for the same destination */ | 1301 | /* attempting to queue a second request for the same destination */ |
1302 | GNUNET_assert (0); | 1302 | GNUNET_break (0); |
1303 | return NULL; | 1303 | return NULL; |
1304 | } | 1304 | } |
1305 | GNUNET_assert (notify_size + sizeof (struct SendMessage) < | 1305 | GNUNET_assert (notify_size + sizeof (struct SendMessage) < |
@@ -1332,10 +1332,10 @@ GNUNET_CORE_notify_transmit_ready_cancel (struct GNUNET_CORE_TransmitHandle *th) | |||
1332 | struct GNUNET_CORE_Handle *h; | 1332 | struct GNUNET_CORE_Handle *h; |
1333 | 1333 | ||
1334 | GNUNET_assert (NULL != pr); | 1334 | GNUNET_assert (NULL != pr); |
1335 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1335 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1336 | "Aborting transmission request to core for %u bytes to `%s'\n", | 1336 | "Aborting transmission request to core for %u bytes to `%s'\n", |
1337 | (unsigned int) th->msize, | 1337 | (unsigned int) th->msize, |
1338 | GNUNET_i2s (&pr->peer)); | 1338 | GNUNET_i2s (&pr->peer)); |
1339 | th->peer = NULL; | 1339 | th->peer = NULL; |
1340 | h = pr->ch; | 1340 | h = pr->ch; |
1341 | if (NULL != th->cm) | 1341 | if (NULL != th->cm) |