[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16695 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16695 - gnunet/src/mesh |
Date: |
Fri, 2 Sep 2011 22:03:13 +0200 |
Author: bartpolot
Date: 2011-09-02 22:03:13 +0200 (Fri, 02 Sep 2011)
New Revision: 16695
Modified:
gnunet/src/mesh/mesh_api_new.c
Log:
Fixed bad merge
Modified: gnunet/src/mesh/mesh_api_new.c
===================================================================
--- gnunet/src/mesh/mesh_api_new.c 2011-09-02 19:59:58 UTC (rev 16694)
+++ gnunet/src/mesh/mesh_api_new.c 2011-09-02 20:03:13 UTC (rev 16695)
@@ -406,24 +406,8 @@
GNUNET_free (t->peers);
GNUNET_free (t);
return;
- }
- GNUNET_CONTAINER_DLL_remove (h->tunnels_head, h->tunnels_tail, t);
- for (i = 0; i < t->npeers; i++)
- {
- GNUNET_PEER_resolve (t->peers[i]->id, &pi);
- t->disconnect_handler (t->cls, &pi);
- GNUNET_PEER_change_rc (t->peers[i]->id, -1);
- GNUNET_free (t->peers[i]);
- }
- h->cleaner (h->cls, t, NULL); /* FIXME ctx? */
- if (0 != t->owner)
- GNUNET_PEER_change_rc (t->owner, -1);
- GNUNET_free (t->peers);
- GNUNET_free (t);
- return;
}
-
/**
* Get the peer descriptor for the peer with id from the given tunnel
* @param t Tunnel handle
@@ -1173,8 +1157,8 @@
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
- msg.tunnel_id = htonl (t->tid);
- destroy_tunnel (h, t->tid);
+ msg.tunnel_id = htonl (tun->tid);
+ destroy_tunnel (h, tun->tid);
send_packet (h, &msg.header);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16695 - gnunet/src/mesh,
gnunet <=