diff options
author | Gabor X Toth <*@tg-x.net> | 2014-07-25 10:27:43 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2014-07-25 10:27:43 +0000 |
commit | 98638edc1f1013173895fde63443a667525c58be (patch) | |
tree | 6fb4db5defa2d4d6339681203824b9ec0d93b157 /src/psyc | |
parent | 6f414d77767065df447f9c223874cb9af5a48ea6 (diff) | |
download | gnunet-98638edc1f1013173895fde63443a667525c58be.tar.gz gnunet-98638edc1f1013173895fde63443a667525c58be.zip |
multicast: use cadet to contact remote peers
Diffstat (limited to 'src/psyc')
-rw-r--r-- | src/psyc/gnunet-service-psyc.c | 10 | ||||
-rw-r--r-- | src/psyc/test_psyc.conf | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 35579fcfc..285bd9f73 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c | |||
@@ -676,10 +676,10 @@ mcast_recv_join_request (void *cls, | |||
676 | */ | 676 | */ |
677 | static void | 677 | static void |
678 | mcast_recv_join_decision (void *cls, int is_admitted, | 678 | mcast_recv_join_decision (void *cls, int is_admitted, |
679 | const struct GNUNET_PeerIdentity *peer, | 679 | const struct GNUNET_PeerIdentity *peer, |
680 | uint16_t relay_count, | 680 | uint16_t relay_count, |
681 | const struct GNUNET_PeerIdentity *relays, | 681 | const struct GNUNET_PeerIdentity *relays, |
682 | const struct GNUNET_MessageHeader *join_resp) | 682 | const struct GNUNET_MessageHeader *join_resp) |
683 | { | 683 | { |
684 | struct Slave *slv = cls; | 684 | struct Slave *slv = cls; |
685 | struct Channel *chn = &slv->chn; | 685 | struct Channel *chn = &slv->chn; |
@@ -1526,7 +1526,7 @@ client_recv_slave_join (void *cls, struct GNUNET_SERVER_Client *client, | |||
1526 | { | 1526 | { |
1527 | chn_slv = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); | 1527 | chn_slv = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); |
1528 | GNUNET_CONTAINER_multihashmap_put (channel_slaves, &chn->pub_key_hash, chn_slv, | 1528 | GNUNET_CONTAINER_multihashmap_put (channel_slaves, &chn->pub_key_hash, chn_slv, |
1529 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | 1529 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); |
1530 | } | 1530 | } |
1531 | GNUNET_CONTAINER_multihashmap_put (chn_slv, &slv->pub_key_hash, chn, | 1531 | GNUNET_CONTAINER_multihashmap_put (chn_slv, &slv->pub_key_hash, chn, |
1532 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); | 1532 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); |
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf index 8eb0019a9..43a5adb75 100644 --- a/src/psyc/test_psyc.conf +++ b/src/psyc/test_psyc.conf | |||
@@ -1,2 +1,2 @@ | |||
1 | [arm] | 1 | [arm] |
2 | DEFAULTSERVICES = multicast psycstore psyc | 2 | DEFAULTSERVICES = statistics core transport dht cadet multicast psycstore psyc |