diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-01-09 18:04:32 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-01-09 18:04:32 +0000 |
commit | 4daaef35ba5fa174d07e680fc06932abc7791140 (patch) | |
tree | 4c48e72123b99088f2c1f9406c96687e614c3dbd /src/cadet | |
parent | 207f6b76fb16f13e159340ef16778be15a6fdfa2 (diff) | |
download | gnunet-4daaef35ba5fa174d07e680fc06932abc7791140.tar.gz gnunet-4daaef35ba5fa174d07e680fc06932abc7791140.zip |
- minor changes: tabs, logs, reorder
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/cadet_api.c | 4 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_local.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 00e15bc4c..058f3fa87 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -1349,12 +1349,12 @@ send_callback (void *cls, size_t size, void *buf) | |||
1349 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) <= psize); | 1349 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) <= psize); |
1350 | psize += DATA_OVERHEAD; | 1350 | psize += DATA_OVERHEAD; |
1351 | GNUNET_assert (size >= psize); | 1351 | GNUNET_assert (size >= psize); |
1352 | dmsg->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA); | ||
1352 | dmsg->header.size = htons (psize); | 1353 | dmsg->header.size = htons (psize); |
1353 | dmsg->id = htonl (ch->chid); | 1354 | dmsg->id = htonl (ch->chid); |
1354 | dmsg->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA); | ||
1355 | LOG (GNUNET_ERROR_TYPE_DEBUG, "# payload type %s\n", | 1355 | LOG (GNUNET_ERROR_TYPE_DEBUG, "# payload type %s\n", |
1356 | GC_m2s (ntohs (mh->type))); | 1356 | GC_m2s (ntohs (mh->type))); |
1357 | ch->allow_send = GNUNET_NO; | 1357 | ch->allow_send = GNUNET_NO; |
1358 | } | 1358 | } |
1359 | else | 1359 | else |
1360 | { | 1360 | { |
diff --git a/src/cadet/gnunet-service-cadet_local.c b/src/cadet/gnunet-service-cadet_local.c index 97eba2903..f9c7152ed 100644 --- a/src/cadet/gnunet-service-cadet_local.c +++ b/src/cadet/gnunet-service-cadet_local.c | |||
@@ -523,7 +523,8 @@ handle_data (void *cls, struct GNUNET_SERVER_Client *client, | |||
523 | } | 523 | } |
524 | 524 | ||
525 | chid = ntohl (msg->id); | 525 | chid = ntohl (msg->id); |
526 | LOG (GNUNET_ERROR_TYPE_DEBUG, " by client %u\n", c->id); | 526 | LOG (GNUNET_ERROR_TYPE_DEBUG, " %u bytes (%u payload) by client %u\n", |
527 | payload_size, payload_claimed_size, c->id); | ||
527 | 528 | ||
528 | /* Channel exists? */ | 529 | /* Channel exists? */ |
529 | fwd = chid < GNUNET_CADET_LOCAL_CHANNEL_ID_SERV; | 530 | fwd = chid < GNUNET_CADET_LOCAL_CHANNEL_ID_SERV; |