aboutsummaryrefslogtreecommitdiff
path: root/src/cadet/gnunet-service-cadet_peer.c
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-05-14 16:50:31 +0000
committerBart Polot <bart@net.in.tum.de>2014-05-14 16:50:31 +0000
commit5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae (patch)
tree04f25e47ea152300815684de13489846708cb028 /src/cadet/gnunet-service-cadet_peer.c
parent9aaa554470dbff968c6cab7a2850a15318c1f15b (diff)
downloadgnunet-5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae.tar.gz
gnunet-5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae.zip
- stop using CadetTunnel3 and go back to CadetTunnel
Diffstat (limited to 'src/cadet/gnunet-service-cadet_peer.c')
-rw-r--r--src/cadet/gnunet-service-cadet_peer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 716165374..6d2402631 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -144,7 +144,7 @@ struct CadetPeer
144 /** 144 /**
145 * Tunnel to this peer, if any. 145 * Tunnel to this peer, if any.
146 */ 146 */
147 struct CadetTunnel3 *tunnel; 147 struct CadetTunnel *tunnel;
148 148
149 /** 149 /**
150 * Connections that go through this peer, indexed by tid; 150 * Connections that go through this peer, indexed by tid;
@@ -613,7 +613,7 @@ shutdown_tunnel (void *cls,
613 void *value) 613 void *value)
614{ 614{
615 struct CadetPeer *p = value; 615 struct CadetPeer *p = value;
616 struct CadetTunnel3 *t = p->tunnel; 616 struct CadetTunnel *t = p->tunnel;
617 617
618 if (NULL != t) 618 if (NULL != t)
619 GCT_destroy (t); 619 GCT_destroy (t);
@@ -1552,7 +1552,7 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1552void 1552void
1553GCP_connect (struct CadetPeer *peer) 1553GCP_connect (struct CadetPeer *peer)
1554{ 1554{
1555 struct CadetTunnel3 *t; 1555 struct CadetTunnel *t;
1556 struct CadetPeerPath *p; 1556 struct CadetPeerPath *p;
1557 struct CadetConnection *c; 1557 struct CadetConnection *c;
1558 int rerun_search; 1558 int rerun_search;
@@ -2010,7 +2010,7 @@ GCP_get_short_id (const struct CadetPeer *peer)
2010 * @param t Tunnel. 2010 * @param t Tunnel.
2011 */ 2011 */
2012void 2012void
2013GCP_set_tunnel (struct CadetPeer *peer, struct CadetTunnel3 *t) 2013GCP_set_tunnel (struct CadetPeer *peer, struct CadetTunnel *t)
2014{ 2014{
2015 peer->tunnel = t; 2015 peer->tunnel = t;
2016 if (NULL == t && NULL != peer->search_h) 2016 if (NULL == t && NULL != peer->search_h)
@@ -2027,7 +2027,7 @@ GCP_set_tunnel (struct CadetPeer *peer, struct CadetTunnel3 *t)
2027 * 2027 *
2028 * @return Tunnel towards peer. 2028 * @return Tunnel towards peer.
2029 */ 2029 */
2030struct CadetTunnel3 * 2030struct CadetTunnel *
2031GCP_get_tunnel (const struct CadetPeer *peer) 2031GCP_get_tunnel (const struct CadetPeer *peer)
2032{ 2032{
2033 return peer->tunnel; 2033 return peer->tunnel;