diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-05-14 16:50:31 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-05-14 16:50:31 +0000 |
commit | 5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae (patch) | |
tree | 04f25e47ea152300815684de13489846708cb028 /src/cadet/gnunet-service-cadet_channel.c | |
parent | 9aaa554470dbff968c6cab7a2850a15318c1f15b (diff) | |
download | gnunet-5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae.tar.gz gnunet-5c0ab6d4fc351e7924f609a1f3bd3ba24f9230ae.zip |
- stop using CadetTunnel3 and go back to CadetTunnel
Diffstat (limited to 'src/cadet/gnunet-service-cadet_channel.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index c85900456..b5fa02868 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -69,7 +69,7 @@ struct CadetChannelQueue | |||
69 | /** | 69 | /** |
70 | * Tunnel Queue. | 70 | * Tunnel Queue. |
71 | */ | 71 | */ |
72 | struct CadetTunnel3Queue *tq; | 72 | struct CadetTunnelQueue *tq; |
73 | 73 | ||
74 | /** | 74 | /** |
75 | * Message type (DATA/DATA_ACK) | 75 | * Message type (DATA/DATA_ACK) |
@@ -205,7 +205,7 @@ struct CadetChannel | |||
205 | /** | 205 | /** |
206 | * Tunnel this channel is in. | 206 | * Tunnel this channel is in. |
207 | */ | 207 | */ |
208 | struct CadetTunnel3 *t; | 208 | struct CadetTunnel *t; |
209 | 209 | ||
210 | /** | 210 | /** |
211 | * Destination port of the channel. | 211 | * Destination port of the channel. |
@@ -789,8 +789,8 @@ channel_recreate (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
789 | */ | 789 | */ |
790 | static void | 790 | static void |
791 | ch_message_sent (void *cls, | 791 | ch_message_sent (void *cls, |
792 | struct CadetTunnel3 *t, | 792 | struct CadetTunnel *t, |
793 | struct CadetTunnel3Queue *q, | 793 | struct CadetTunnelQueue *q, |
794 | uint16_t type, size_t size) | 794 | uint16_t type, size_t size) |
795 | { | 795 | { |
796 | struct CadetChannelQueue *chq = cls; | 796 | struct CadetChannelQueue *chq = cls; |
@@ -1248,7 +1248,7 @@ channel_save_copy (struct CadetChannel *ch, | |||
1248 | * @return A new initialized channel. NULL on error. | 1248 | * @return A new initialized channel. NULL on error. |
1249 | */ | 1249 | */ |
1250 | static struct CadetChannel * | 1250 | static struct CadetChannel * |
1251 | channel_new (struct CadetTunnel3 *t, | 1251 | channel_new (struct CadetTunnel *t, |
1252 | struct CadetClient *owner, | 1252 | struct CadetClient *owner, |
1253 | CADET_ChannelNumber lid_root) | 1253 | CADET_ChannelNumber lid_root) |
1254 | { | 1254 | { |
@@ -1348,7 +1348,7 @@ void | |||
1348 | GCCH_destroy (struct CadetChannel *ch) | 1348 | GCCH_destroy (struct CadetChannel *ch) |
1349 | { | 1349 | { |
1350 | struct CadetClient *c; | 1350 | struct CadetClient *c; |
1351 | struct CadetTunnel3 *t; | 1351 | struct CadetTunnel *t; |
1352 | 1352 | ||
1353 | if (NULL == ch) | 1353 | if (NULL == ch) |
1354 | return; | 1354 | return; |
@@ -1405,7 +1405,7 @@ GCCH_get_id (const struct CadetChannel *ch) | |||
1405 | * | 1405 | * |
1406 | * @return tunnel of the channel. | 1406 | * @return tunnel of the channel. |
1407 | */ | 1407 | */ |
1408 | struct CadetTunnel3 * | 1408 | struct CadetTunnel * |
1409 | GCCH_get_tunnel (const struct CadetChannel *ch) | 1409 | GCCH_get_tunnel (const struct CadetChannel *ch) |
1410 | { | 1410 | { |
1411 | return ch->t; | 1411 | return ch->t; |
@@ -1827,7 +1827,7 @@ GCCH_handle_local_create (struct CadetClient *c, | |||
1827 | struct GNUNET_CADET_ChannelMessage *msg) | 1827 | struct GNUNET_CADET_ChannelMessage *msg) |
1828 | { | 1828 | { |
1829 | struct CadetChannel *ch; | 1829 | struct CadetChannel *ch; |
1830 | struct CadetTunnel3 *t; | 1830 | struct CadetTunnel *t; |
1831 | struct CadetPeer *peer; | 1831 | struct CadetPeer *peer; |
1832 | CADET_ChannelNumber chid; | 1832 | CADET_ChannelNumber chid; |
1833 | 1833 | ||
@@ -2096,7 +2096,7 @@ GCCH_handle_data_ack (struct CadetChannel *ch, | |||
2096 | * @param msg Channel crate message. | 2096 | * @param msg Channel crate message. |
2097 | */ | 2097 | */ |
2098 | struct CadetChannel * | 2098 | struct CadetChannel * |
2099 | GCCH_handle_create (struct CadetTunnel3 *t, | 2099 | GCCH_handle_create (struct CadetTunnel *t, |
2100 | const struct GNUNET_CADET_ChannelCreate *msg) | 2100 | const struct GNUNET_CADET_ChannelCreate *msg) |
2101 | { | 2101 | { |
2102 | CADET_ChannelNumber chid; | 2102 | CADET_ChannelNumber chid; |