diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-11-05 20:27:20 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-11-05 20:27:20 +0000 |
commit | 397e1f62dd12312e34f0950b4b8b2b83aa95401e (patch) | |
tree | 1e9891c0230cb13ebfc1d209c191044ee5b4ce6f /src | |
parent | b62fcaac921f41b9917dbc215f96f14755982316 (diff) | |
download | gnunet-397e1f62dd12312e34f0950b4b8b2b83aa95401e.tar.gz gnunet-397e1f62dd12312e34f0950b4b8b2b83aa95401e.zip |
- fix stream
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 1035445b3..d0a085f5f 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -2987,7 +2987,7 @@ tunnel_poll (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
2987 | GNUNET_PEER_resolve (t->id.oid, &msg.oid); | 2987 | GNUNET_PEER_resolve (t->id.oid, &msg.oid); |
2988 | msg.last_ack = htonl (cinfo->fwd_ack); | 2988 | msg.last_ack = htonl (cinfo->fwd_ack); |
2989 | 2989 | ||
2990 | GNUNET_PEER_resolve (tree_get_predecessor(cinfo->t->tree), &id); | 2990 | GNUNET_PEER_resolve (cinfo->id, &id); |
2991 | send_prebuilt_message (&msg.header, &id, cinfo->t); | 2991 | send_prebuilt_message (&msg.header, &id, cinfo->t); |
2992 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, | 2992 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, |
2993 | &tunnel_poll, cinfo); | 2993 | &tunnel_poll, cinfo); |
@@ -5024,6 +5024,7 @@ queue_send (void *cls, size_t size, void *buf) | |||
5024 | { | 5024 | { |
5025 | case 0: | 5025 | case 0: |
5026 | case GNUNET_MESSAGE_TYPE_MESH_ACK: | 5026 | case GNUNET_MESSAGE_TYPE_MESH_ACK: |
5027 | case GNUNET_MESSAGE_TYPE_MESH_POLL: | ||
5027 | case GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN: | 5028 | case GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN: |
5028 | case GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY: | 5029 | case GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY: |
5029 | case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY: | 5030 | case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY: |
@@ -5159,7 +5160,7 @@ queue_send (void *cls, size_t size, void *buf) | |||
5159 | if (NULL == cinfo) | 5160 | if (NULL == cinfo) |
5160 | cinfo = tunnel_get_neighbor_fc (t, &dst_id); | 5161 | cinfo = tunnel_get_neighbor_fc (t, &dst_id); |
5161 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, | 5162 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, |
5162 | &tunnel_poll, cinfo); | 5163 | &tunnel_poll, cinfo); |
5163 | } | 5164 | } |
5164 | } | 5165 | } |
5165 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size); | 5166 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size); |
@@ -5982,7 +5983,6 @@ handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5982 | { | 5983 | { |
5983 | /* TODO notify that we dont know this tunnel (whom)? */ | 5984 | /* TODO notify that we dont know this tunnel (whom)? */ |
5984 | GNUNET_STATISTICS_update (stats, "# ack on unknown tunnel", 1, GNUNET_NO); | 5985 | GNUNET_STATISTICS_update (stats, "# ack on unknown tunnel", 1, GNUNET_NO); |
5985 | GNUNET_break_op (0); | ||
5986 | return GNUNET_OK; | 5986 | return GNUNET_OK; |
5987 | } | 5987 | } |
5988 | ack = ntohl (msg->pid); | 5988 | ack = ntohl (msg->pid); |