diff options
author | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
---|---|---|
committer | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
commit | aa98f144e6db0da5a0a4cad83fe64a80bbab6692 (patch) | |
tree | 5a072b4e1b689bf4330b2a412bdadc705d33ff75 /src/multicast/gnunet-service-multicast.c | |
parent | caeeec6cacaa5354883494cb64b0a38e5c75da5d (diff) | |
parent | b424335cc632a11bd76bad5791cef10e8c985720 (diff) | |
download | gnunet-aa98f144e6db0da5a0a4cad83fe64a80bbab6692.tar.gz gnunet-aa98f144e6db0da5a0a4cad83fe64a80bbab6692.zip |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'src/multicast/gnunet-service-multicast.c')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 3f356af83..9683efcff 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -1302,7 +1302,7 @@ cadet_channel_create (struct Group *grp, struct GNUNET_PeerIdentity *peer) | |||
1302 | GNUNET_MQ_handler_end () | 1302 | GNUNET_MQ_handler_end () |
1303 | }; | 1303 | }; |
1304 | 1304 | ||
1305 | chn->channel = GNUNET_CADET_channel_creatE (cadet, chn, &chn->peer, | 1305 | chn->channel = GNUNET_CADET_channel_create (cadet, chn, &chn->peer, |
1306 | &grp->cadet_port_hash, | 1306 | &grp->cadet_port_hash, |
1307 | GNUNET_CADET_OPTION_RELIABLE, | 1307 | GNUNET_CADET_OPTION_RELIABLE, |
1308 | cadet_notify_window_change, | 1308 | cadet_notify_window_change, |
@@ -1392,7 +1392,7 @@ handle_client_origin_start (void *cls, | |||
1392 | }; | 1392 | }; |
1393 | 1393 | ||
1394 | 1394 | ||
1395 | orig->cadet_port = GNUNET_CADET_open_porT (cadet, | 1395 | orig->cadet_port = GNUNET_CADET_open_port (cadet, |
1396 | &grp->cadet_port_hash, | 1396 | &grp->cadet_port_hash, |
1397 | cadet_notify_connect, | 1397 | cadet_notify_connect, |
1398 | NULL, | 1398 | NULL, |
@@ -2085,7 +2085,7 @@ run (void *cls, | |||
2085 | replay_req_cadet = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); | 2085 | replay_req_cadet = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); |
2086 | replay_req_client = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); | 2086 | replay_req_client = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); |
2087 | 2087 | ||
2088 | cadet = GNUNET_CADET_connecT (cfg); | 2088 | cadet = GNUNET_CADET_connect (cfg); |
2089 | 2089 | ||
2090 | GNUNET_assert (NULL != cadet); | 2090 | GNUNET_assert (NULL != cadet); |
2091 | 2091 | ||