summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-11-12 00:47:35 +0000
committerBart Polot <bart@net.in.tum.de>2011-11-12 00:47:35 +0000
commit14c3c77ea2bbac38dc30e1505600d1a41a1c7605 (patch)
tree04b8db3b2446cc8a161c8864ac00029490432e12 /src
parent4acf4de35680033d0a05463a7478bbfb4b407a94 (diff)
Fixed mantis #1896: check whether incoming tunnel is new before notifying clients
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 7665909e6..ef1ba1f8a 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -2572,20 +2572,31 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
if (own_pos == size - 1)
{
/* It is for us! Send ack. */
- struct GNUNET_MESH_TunnelNotification cmsg;
struct MeshDataDescriptor *info;
unsigned int j;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: It's for us!\n");
peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO);
if (NULL == t->peers)
+ {
+ /* New tunnel! Notify clients! */
+ struct GNUNET_MESH_TunnelNotification cmsg;
+
+ cmsg.header.size = htons (sizeof (cmsg));
+ cmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
+ GNUNET_PEER_resolve (t->id.oid, &cmsg.peer);
+ cmsg.tunnel_id = htonl (t->local_tid);
+ GNUNET_SERVER_notification_context_broadcast (nc, &cmsg.header,
+ GNUNET_NO);
+
t->peers = GNUNET_CONTAINER_multihashmap_create (4);
+ }
GNUNET_break (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (t->peers,
&my_full_id.hashPubKey,
peer_info_get
(&my_full_id),
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE));
/* FIXME use send_message */
info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
info->origin = &t->id;
@@ -2600,11 +2611,6 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
GNUNET_TIME_UNIT_FOREVER_REL, peer,
sizeof (struct GNUNET_MESH_PathACK),
&send_core_path_ack, info);
- cmsg.header.size = htons (sizeof (cmsg));
- cmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
- GNUNET_PEER_resolve (t->id.oid, &cmsg.peer);
- cmsg.tunnel_id = htonl (t->local_tid);
- GNUNET_SERVER_notification_context_broadcast (nc, &cmsg.header, GNUNET_NO);
}
else
{