aboutsummaryrefslogtreecommitdiff
path: root/src/exit
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2016-07-20 17:13:26 +0000
committerBart Polot <bart@net.in.tum.de>2016-07-20 17:13:26 +0000
commit90c70e8315c4a366996da379f839dc84d21d5f38 (patch)
tree0bfd73d2da8b8efb8de888c09ea4dd5bfc4cdb0f /src/exit
parent3aab63d5c50db0eb784d3b65b2bd989d3458c960 (diff)
downloadgnunet-90c70e8315c4a366996da379f839dc84d21d5f38.tar.gz
gnunet-90c70e8315c4a366996da379f839dc84d21d5f38.zip
- fix CADET-using services
Diffstat (limited to 'src/exit')
-rw-r--r--src/exit/gnunet-daemon-exit.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 9f3d05c77..2b9ddc722 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3036,7 +3036,7 @@ static void *
3036new_channel (void *cls, 3036new_channel (void *cls,
3037 struct GNUNET_CADET_Channel *channel, 3037 struct GNUNET_CADET_Channel *channel,
3038 const struct GNUNET_PeerIdentity *initiator, 3038 const struct GNUNET_PeerIdentity *initiator,
3039 uint32_t port, 3039 const struct GNUNET_HashCode *port,
3040 enum GNUNET_CADET_ChannelOption options) 3040 enum GNUNET_CADET_ChannelOption options)
3041{ 3041{
3042 struct ChannelState *s = GNUNET_new (struct ChannelState); 3042 struct ChannelState *s = GNUNET_new (struct ChannelState);
@@ -3760,16 +3760,20 @@ run (void *cls,
3760 GNUNET_SCHEDULER_shutdown (); 3760 GNUNET_SCHEDULER_shutdown ();
3761 return; 3761 return;
3762 } 3762 }
3763 cadet_handle 3763 cadet_handle = GNUNET_CADET_connect (cfg, NULL, &clean_channel, handlers);
3764 = GNUNET_CADET_connect (cfg, NULL,
3765 &new_channel,
3766 &clean_channel, handlers,
3767 apptypes);
3768 if (NULL == cadet_handle) 3764 if (NULL == cadet_handle)
3769 { 3765 {
3770 GNUNET_SCHEDULER_shutdown (); 3766 GNUNET_SCHEDULER_shutdown ();
3771 return; 3767 return;
3772 } 3768 }
3769 for (int i = 0;
3770 GNUNET_APPLICATION_TYPE_END != apptypes[i]
3771 && i < sizeof (apptypes)/sizeof (*apptypes);
3772 i++)
3773 {
3774 GNUNET_CADET_open_port (cadet_handle, GC_u2h (apptypes[i]),
3775 &new_channel, NULL);
3776 }
3773 3777
3774 /* Cadet handle acquired, now announce regular expressions matching our exit */ 3778 /* Cadet handle acquired, now announce regular expressions matching our exit */
3775 if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) ) 3779 if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) )