From 90c70e8315c4a366996da379f839dc84d21d5f38 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 20 Jul 2016 17:13:26 +0000 Subject: - fix CADET-using services --- src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 6 ++---- src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 13 +++++-------- src/scalarproduct/gnunet-service-scalarproduct_alice.c | 6 ++---- src/scalarproduct/gnunet-service-scalarproduct_bob.c | 13 +++++-------- 4 files changed, 14 insertions(+), 24 deletions(-) (limited to 'src/scalarproduct') diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c index c9f4811e2..43a25a08d 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c @@ -858,7 +858,7 @@ client_request_complete_alice (struct AliceServiceSession *s) = GNUNET_CADET_channel_create (my_cadet, s, &s->peer, - GNUNET_APPLICATION_TYPE_SCALARPRODUCT_ECC, + GC_u2h (GNUNET_APPLICATION_TYPE_SCALARPRODUCT_ECC), GNUNET_CADET_OPTION_RELIABLE); if (NULL == s->channel) { @@ -1184,10 +1184,8 @@ run (void *cls, &handle_client_disconnect, NULL); my_cadet = GNUNET_CADET_connect (cfg, NULL, - NULL /* no incoming supported */, &cb_channel_destruction, - cadet_handlers, - NULL); + cadet_handlers); if (NULL == my_cadet) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index fbdf62192..7246fa6a0 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c @@ -891,7 +891,7 @@ static void * cb_channel_incoming (void *cls, struct GNUNET_CADET_Channel *channel, const struct GNUNET_PeerIdentity *initiator, - uint32_t port, + const struct GNUNET_HashCode *port, enum GNUNET_CADET_ChannelOption options) { struct CadetIncomingSession *in; @@ -1221,10 +1221,6 @@ run (void *cls, 0}, { NULL, 0, 0} }; - static const uint32_t ports[] = { - GNUNET_APPLICATION_TYPE_SCALARPRODUCT_ECC, - 0 - }; cfg = c; /* We don't really do DLOG, so we can setup with very minimal resources */ @@ -1241,10 +1237,8 @@ run (void *cls, cadet_sessions = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_YES); my_cadet = GNUNET_CADET_connect (cfg, NULL, - &cb_channel_incoming, &cb_channel_destruction, - cadet_handlers, - ports); + cadet_handlers); if (NULL == my_cadet) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -1252,6 +1246,9 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } + GNUNET_CADET_open_port (my_cadet, + GC_u2h (GNUNET_APPLICATION_TYPE_SCALARPRODUCT_ECC), + &cb_channel_incoming, NULL); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); } diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index 5478a85a7..8c3b1ed24 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c @@ -1081,7 +1081,7 @@ client_request_complete_alice (struct AliceServiceSession *s) = GNUNET_CADET_channel_create (my_cadet, s, &s->peer, - GNUNET_APPLICATION_TYPE_SCALARPRODUCT, + GC_u2h (GNUNET_APPLICATION_TYPE_SCALARPRODUCT), GNUNET_CADET_OPTION_RELIABLE); if (NULL == s->channel) { @@ -1409,10 +1409,8 @@ run (void *cls, &handle_client_disconnect, NULL); my_cadet = GNUNET_CADET_connect (cfg, NULL, - NULL /* no incoming supported */, &cb_channel_destruction, - cadet_handlers, - NULL); + cadet_handlers); if (NULL == my_cadet) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 5be0a85d1..84c831c82 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c @@ -1187,7 +1187,7 @@ static void * cb_channel_incoming (void *cls, struct GNUNET_CADET_Channel *channel, const struct GNUNET_PeerIdentity *initiator, - uint32_t port, + const struct GNUNET_HashCode *port, enum GNUNET_CADET_ChannelOption options) { struct CadetIncomingSession *in; @@ -1512,10 +1512,6 @@ run (void *cls, 0}, { NULL, 0, 0} }; - static const uint32_t ports[] = { - GNUNET_APPLICATION_TYPE_SCALARPRODUCT, - 0 - }; cfg = c; /* @@ -1538,10 +1534,8 @@ run (void *cls, cadet_sessions = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_YES); my_cadet = GNUNET_CADET_connect (cfg, NULL, - &cb_channel_incoming, &cb_channel_destruction, - cadet_handlers, - ports); + cadet_handlers); if (NULL == my_cadet) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -1549,6 +1543,9 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } + GNUNET_CADET_open_port (my_cadet, + GC_u2h (GNUNET_APPLICATION_TYPE_SCALARPRODUCT), + &cb_channel_incoming, NULL); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); } -- cgit v1.2.3