diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-05-07 10:42:44 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-05-07 10:42:44 +0000 |
commit | 4ef6d2d4498d015bec1e2375acfd7caefccbfe1a (patch) | |
tree | 157d97afc3f8199317782c9e2058f565db7f8169 /src/mesh | |
parent | 8a2d1e6aedbf1bc95052e63ac67093b89385b0a1 (diff) | |
download | gnunet-4ef6d2d4498d015bec1e2375acfd7caefccbfe1a.tar.gz gnunet-4ef6d2d4498d015bec1e2375acfd7caefccbfe1a.zip |
- log
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/gnunet-service-mesh_peer.c | 14 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh_tunnel.c | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c index 8bd4b6567..99f8eb07d 100644 --- a/src/mesh/gnunet-service-mesh_peer.c +++ b/src/mesh/gnunet-service-mesh_peer.c | |||
@@ -232,16 +232,16 @@ queue_debug (struct MeshPeer *peer) | |||
232 | { | 232 | { |
233 | struct MeshPeerQueue *q; | 233 | struct MeshPeerQueue *q; |
234 | 234 | ||
235 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Messages queued towards %s\n", GMP_2s (peer)); | 235 | LOG (GNUNET_ERROR_TYPE_DEBUG, "QQQ Messages queued towards %s\n", GMP_2s (peer)); |
236 | LOG (GNUNET_ERROR_TYPE_DEBUG, " core tmt rdy: %p\n", peer->core_transmit); | 236 | LOG (GNUNET_ERROR_TYPE_DEBUG, "QQQ core tmt rdy: %p\n", peer->core_transmit); |
237 | 237 | ||
238 | for (q = peer->queue_head; NULL != q; q = q->next) | 238 | for (q = peer->queue_head; NULL != q; q = q->next) |
239 | { | 239 | { |
240 | LOG (GNUNET_ERROR_TYPE_DEBUG, " - %s %s on %s\n", | 240 | LOG (GNUNET_ERROR_TYPE_DEBUG, "QQQ - %s %s on %s\n", |
241 | GM_m2s (q->type), GM_f2s (q->fwd), GMC_2s (q->c)); | 241 | GM_m2s (q->type), GM_f2s (q->fwd), GMC_2s (q->c)); |
242 | } | 242 | } |
243 | 243 | ||
244 | LOG (GNUNET_ERROR_TYPE_DEBUG, "End queued towards %s\n", GMP_2s (peer)); | 244 | LOG (GNUNET_ERROR_TYPE_DEBUG, "QQQ End queued towards %s\n", GMP_2s (peer)); |
245 | } | 245 | } |
246 | 246 | ||
247 | 247 | ||
@@ -926,7 +926,7 @@ queue_send (void *cls, size_t size, void *buf) | |||
926 | c = queue->c; | 926 | c = queue->c; |
927 | 927 | ||
928 | dst_id = GNUNET_PEER_resolve2 (peer->id); | 928 | dst_id = GNUNET_PEER_resolve2 (peer->id); |
929 | LOG (GNUNET_ERROR_TYPE_DEBUG, "* on connection %s\n", GMC_2s (c)); | 929 | LOG (GNUNET_ERROR_TYPE_DEBUG, " on connection %s\n", GMC_2s (c)); |
930 | /* Check if buffer size is enough for the message */ | 930 | /* Check if buffer size is enough for the message */ |
931 | if (queue->size > size) | 931 | if (queue->size > size) |
932 | { | 932 | { |
@@ -1006,7 +1006,7 @@ queue_send (void *cls, size_t size, void *buf) | |||
1006 | queue = peer_get_first_message (peer); | 1006 | queue = peer_get_first_message (peer); |
1007 | if (NULL != queue) | 1007 | if (NULL != queue) |
1008 | { | 1008 | { |
1009 | LOG (GNUNET_ERROR_TYPE_DEBUG, "* more data!\n"); | 1009 | LOG (GNUNET_ERROR_TYPE_DEBUG, " more data!\n"); |
1010 | if (NULL == peer->core_transmit) | 1010 | if (NULL == peer->core_transmit) |
1011 | { | 1011 | { |
1012 | peer->core_transmit = | 1012 | peer->core_transmit = |
@@ -1031,7 +1031,7 @@ queue_send (void *cls, size_t size, void *buf) | |||
1031 | // GMC_stop_poll(); FIXME needed? | 1031 | // GMC_stop_poll(); FIXME needed? |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | LOG (GNUNET_ERROR_TYPE_DEBUG, "* Return %d\n", data_size); | 1034 | LOG (GNUNET_ERROR_TYPE_DEBUG, " return %d\n", data_size); |
1035 | queue_debug (peer); | 1035 | queue_debug (peer); |
1036 | return data_size; | 1036 | return data_size; |
1037 | } | 1037 | } |
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index fbb28f53d..ea7a80e87 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c | |||
@@ -872,9 +872,9 @@ send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
872 | msg->ttl = htonl (default_ttl); | 872 | msg->ttl = htonl (default_ttl); |
873 | break; | 873 | break; |
874 | default: | 874 | default: |
875 | LOG (GNUNET_ERROR_TYPE_DEBUG, "unkown type %s\n", GM_m2s (type)); | ||
876 | GNUNET_break (0); | 875 | GNUNET_break (0); |
877 | } | 876 | } |
877 | LOG (GNUNET_ERROR_TYPE_DEBUG, "type %s\n", GM_m2s (type)); | ||
878 | 878 | ||
879 | fwd = GMC_is_origin (c, GNUNET_YES); | 879 | fwd = GMC_is_origin (c, GNUNET_YES); |
880 | 880 | ||
@@ -2797,25 +2797,25 @@ GMT_debug (const struct MeshTunnel3 *t) | |||
2797 | struct MeshTChannel *iterch; | 2797 | struct MeshTChannel *iterch; |
2798 | struct MeshTConnection *iterc; | 2798 | struct MeshTConnection *iterc; |
2799 | 2799 | ||
2800 | LOG (GNUNET_ERROR_TYPE_DEBUG, "DEBUG TUNNEL TOWARDS %s\n", GMT_2s (t)); | 2800 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT DEBUG TUNNEL TOWARDS %s\n", GMT_2s (t)); |
2801 | LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate %s, estate %s\n", | 2801 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT cstate %s, estate %s\n", |
2802 | cstate2s (t->cstate), estate2s (t->estate)); | 2802 | cstate2s (t->cstate), estate2s (t->estate)); |
2803 | LOG (GNUNET_ERROR_TYPE_DEBUG, " kx_ctx %p, rekey_task %u\n", | 2803 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT kx_ctx %p, rekey_task %u\n", |
2804 | t->kx_ctx, t->rekey_task); | 2804 | t->kx_ctx, t->rekey_task); |
2805 | LOG (GNUNET_ERROR_TYPE_DEBUG, " tq_head %p, tq_tail %p\n", | 2805 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT tq_head %p, tq_tail %p\n", |
2806 | t->tq_head, t->tq_tail); | 2806 | t->tq_head, t->tq_tail); |
2807 | LOG (GNUNET_ERROR_TYPE_DEBUG, " destroy %u\n", t->destroy_task); | 2807 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT destroy %u\n", t->destroy_task); |
2808 | 2808 | ||
2809 | LOG (GNUNET_ERROR_TYPE_DEBUG, " channels:\n"); | 2809 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT channels:\n"); |
2810 | for (iterch = t->channel_head; NULL != iterch; iterch = iterch->next) | 2810 | for (iterch = t->channel_head; NULL != iterch; iterch = iterch->next) |
2811 | { | 2811 | { |
2812 | LOG (GNUNET_ERROR_TYPE_DEBUG, " - %s\n", GMCH_2s (iterch->ch)); | 2812 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT - %s\n", GMCH_2s (iterch->ch)); |
2813 | } | 2813 | } |
2814 | 2814 | ||
2815 | LOG (GNUNET_ERROR_TYPE_DEBUG, " connections:\n"); | 2815 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT connections:\n"); |
2816 | for (iterc = t->connection_head; NULL != iterc; iterc = iterc->next) | 2816 | for (iterc = t->connection_head; NULL != iterc; iterc = iterc->next) |
2817 | { | 2817 | { |
2818 | LOG (GNUNET_ERROR_TYPE_DEBUG, " - %s [%u] buf: %u/%u (qn %u/%u)\n", | 2818 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT - %s [%u] buf: %u/%u (qn %u/%u)\n", |
2819 | GMC_2s (iterc->c), GMC_get_state (iterc->c), | 2819 | GMC_2s (iterc->c), GMC_get_state (iterc->c), |
2820 | GMC_get_buffer (iterc->c, GNUNET_YES), | 2820 | GMC_get_buffer (iterc->c, GNUNET_YES), |
2821 | GMC_get_buffer (iterc->c, GNUNET_NO), | 2821 | GMC_get_buffer (iterc->c, GNUNET_NO), |
@@ -2823,7 +2823,7 @@ GMT_debug (const struct MeshTunnel3 *t) | |||
2823 | GMC_get_qn (iterc->c, GNUNET_NO)); | 2823 | GMC_get_qn (iterc->c, GNUNET_NO)); |
2824 | } | 2824 | } |
2825 | 2825 | ||
2826 | LOG (GNUNET_ERROR_TYPE_DEBUG, "DEBUG TUNNEL END\n"); | 2826 | LOG (GNUNET_ERROR_TYPE_DEBUG, "TTT DEBUG TUNNEL END\n"); |
2827 | } | 2827 | } |
2828 | 2828 | ||
2829 | 2829 | ||