aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2012-10-05 11:47:01 +0000
committerBart Polot <bart@net.in.tum.de>2012-10-05 11:47:01 +0000
commitae006a7ff8003fde7749b8a2e76f578977ea8db9 (patch)
treea72ee254e9ae5f8dc0281b2e780d5fbd691319ec /src
parent4b692d9768874874121b55697ecf7599b010be73 (diff)
downloadgnunet-ae006a7ff8003fde7749b8a2e76f578977ea8db9.tar.gz
gnunet-ae006a7ff8003fde7749b8a2e76f578977ea8db9.zip
- fix #2580
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh.c6
-rw-r--r--src/mesh/mesh_protocol.h7
2 files changed, 8 insertions, 5 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index f6645f2fd..6d9b16c90 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -4664,8 +4664,12 @@ queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
4664 case GNUNET_MESSAGE_TYPE_MESH_UNICAST: 4664 case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
4665 case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: 4665 case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
4666 case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: 4666 case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
4667 case GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE:
4668 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
4669 " prebuilt message\n");
4667 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 4670 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
4668 " type prebuilt (payload, tunnel destroy)\n"); 4671 " type %s\n",
4672 GNUNET_MESH_DEBUG_M2S(queue->type));
4669 dd = queue->cls; 4673 dd = queue->cls;
4670 data_descriptor_decrement_rc (dd->mesh_data); 4674 data_descriptor_decrement_rc (dd->mesh_data);
4671 break; 4675 break;
diff --git a/src/mesh/mesh_protocol.h b/src/mesh/mesh_protocol.h
index e83542944..01f7f3487 100644
--- a/src/mesh/mesh_protocol.h
+++ b/src/mesh/mesh_protocol.h
@@ -235,22 +235,21 @@ struct GNUNET_MESH_Poll
235 * Type: GNUNET_MESSAGE_TYPE_MESH_POLL 235 * Type: GNUNET_MESSAGE_TYPE_MESH_POLL
236 */ 236 */
237 struct GNUNET_MessageHeader header; 237 struct GNUNET_MessageHeader header;
238 238
239 /** 239 /**
240 * TID of the tunnel 240 * TID of the tunnel
241 */ 241 */
242 uint32_t tid GNUNET_PACKED; 242 uint32_t tid GNUNET_PACKED;
243 243
244 /** 244 /**
245 * OID of the tunnel 245 * OID of the tunnel
246 */ 246 */
247 struct GNUNET_PeerIdentity oid; 247 struct GNUNET_PeerIdentity oid;
248 248
249 /** 249 /**
250 * Last ACK received. 250 * Last ACK received.
251 */ 251 */
252 uint32_t last_ack; 252 uint32_t last_ack;
253
254}; 253};
255 254
256/** 255/**