diff options
author | Bart Polot <bart@net.in.tum.de> | 2016-07-20 17:13:26 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2016-07-20 17:13:26 +0000 |
commit | 90c70e8315c4a366996da379f839dc84d21d5f38 (patch) | |
tree | 0bfd73d2da8b8efb8de888c09ea4dd5bfc4cdb0f /src/vpn | |
parent | 3aab63d5c50db0eb784d3b65b2bd989d3458c960 (diff) | |
download | gnunet-90c70e8315c4a366996da379f839dc84d21d5f38.tar.gz gnunet-90c70e8315c4a366996da379f839dc84d21d5f38.zip |
- fix CADET-using services
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index ae7cb57cc..812016205 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -758,7 +758,7 @@ handle_regex_result (void *cls, | |||
758 | ts->channel = GNUNET_CADET_channel_create (cadet_handle, | 758 | ts->channel = GNUNET_CADET_channel_create (cadet_handle, |
759 | ts, | 759 | ts, |
760 | id, | 760 | id, |
761 | apptype, | 761 | GC_u2h (apptype), |
762 | GNUNET_CADET_OPTION_DEFAULT); | 762 | GNUNET_CADET_OPTION_DEFAULT); |
763 | } | 763 | } |
764 | 764 | ||
@@ -801,7 +801,7 @@ create_channel_to_destination (struct DestinationChannel *dt, | |||
801 | ts->channel = GNUNET_CADET_channel_create (cadet_handle, | 801 | ts->channel = GNUNET_CADET_channel_create (cadet_handle, |
802 | ts, | 802 | ts, |
803 | &dt->destination->details.service_destination.target, | 803 | &dt->destination->details.service_destination.target, |
804 | apptype, | 804 | GC_u2h (apptype), |
805 | GNUNET_CADET_OPTION_DEFAULT); | 805 | GNUNET_CADET_OPTION_DEFAULT); |
806 | if (NULL == ts->channel) | 806 | if (NULL == ts->channel) |
807 | { | 807 | { |
@@ -3090,10 +3090,9 @@ run (void *cls, | |||
3090 | 3090 | ||
3091 | cadet_handle = | 3091 | cadet_handle = |
3092 | GNUNET_CADET_connect (cfg_, NULL, | 3092 | GNUNET_CADET_connect (cfg_, NULL, |
3093 | NULL, | ||
3094 | &channel_cleaner, | 3093 | &channel_cleaner, |
3095 | cadet_handlers, | 3094 | cadet_handlers); |
3096 | NULL); | 3095 | // FIXME never opens ports??? |
3097 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, | 3096 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, |
3098 | "gnunet-helper-vpn", vpn_argv, | 3097 | "gnunet-helper-vpn", vpn_argv, |
3099 | &message_token, NULL, NULL); | 3098 | &message_token, NULL, NULL); |