diff options
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 9 | ||||
-rw-r--r-- | src/mesh/mesh_api_new.c | 2 | ||||
-rw-r--r-- | src/mesh/test_mesh_small.conf | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 9f302dcda..c1a35b37f 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -1221,7 +1221,10 @@ send_core_create_path (void *cls, size_t size, void *buf) | |||
1221 | 1221 | ||
1222 | if (size < size_needed || NULL == buf) | 1222 | if (size < size_needed || NULL == buf) |
1223 | { | 1223 | { |
1224 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Retransmitting create path\n"); | 1224 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: create path retransmit!\n"); |
1225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: buf: %p\n", buf); | ||
1226 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: size: (%u/%u)\n", | ||
1227 | size, size_needed); | ||
1225 | GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, | 1228 | GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, |
1226 | GNUNET_TIME_UNIT_FOREVER_REL, | 1229 | GNUNET_TIME_UNIT_FOREVER_REL, |
1227 | path_get_first_hop (t->tree, peer->id), | 1230 | path_get_first_hop (t->tree, peer->id), |
@@ -1639,11 +1642,11 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1639 | path_add_to_origin (orig_peer_info, path); /* inverts path! */ | 1642 | path_add_to_origin (orig_peer_info, path); /* inverts path! */ |
1640 | info = GNUNET_malloc (sizeof (struct MeshDataDescriptor)); | 1643 | info = GNUNET_malloc (sizeof (struct MeshDataDescriptor)); |
1641 | info->origin = &t->id; | 1644 | info->origin = &t->id; |
1642 | info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &id.hashPubKey); | 1645 | info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); |
1643 | GNUNET_assert (NULL != info->peer); | 1646 | GNUNET_assert (NULL != info->peer); |
1644 | for (j = 0; info->peer->core_transmit[j]; j++) | 1647 | for (j = 0; info->peer->core_transmit[j]; j++) |
1645 | { | 1648 | { |
1646 | if (j == 9) | 1649 | if (j == (CORE_QUEUE_SIZE - 1)) |
1647 | { | 1650 | { |
1648 | GNUNET_break (0); | 1651 | GNUNET_break (0); |
1649 | return GNUNET_OK; | 1652 | return GNUNET_OK; |
diff --git a/src/mesh/mesh_api_new.c b/src/mesh/mesh_api_new.c index 658696df6..8ddeecff0 100644 --- a/src/mesh/mesh_api_new.c +++ b/src/mesh/mesh_api_new.c | |||
@@ -105,7 +105,7 @@ struct GNUNET_MESH_TransmitHandle | |||
105 | uint32_t priority; | 105 | uint32_t priority; |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * Target of the message, 0 for broadcast. This field | 108 | * Target of the message, 0 for multicast. This field |
109 | * is only valid if 'notify' is non-NULL. | 109 | * is only valid if 'notify' is non-NULL. |
110 | */ | 110 | */ |
111 | GNUNET_PEER_Id target; | 111 | GNUNET_PEER_Id target; |
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 84e281bd1..0c7485c20 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf | |||
@@ -76,6 +76,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75 | |||
76 | DELETE_FILES = YES | 76 | DELETE_FILES = YES |
77 | 77 | ||
78 | [test_mesh_small] | 78 | [test_mesh_small] |
79 | WAIT_TIME = 60 | 79 | WAIT_TIME = 70 |
80 | CONNECTION_LIMIT = 10 | 80 | CONNECTION_LIMIT = 10 |
81 | DATA_OUTPUT_FILE=data_output | 81 | DATA_OUTPUT_FILE=data_output |