diff options
author | Gabor X Toth <*@tg-x.net> | 2015-09-26 17:10:10 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2015-09-26 17:10:10 +0000 |
commit | f5a9bac85b73508da6794e1171b857e2582c8216 (patch) | |
tree | d754f5e560f85e80b2dca3ea73ff76ff2a1b8de4 /src/multicast/gnunet-service-multicast.c | |
parent | e990039b4ddf89d37a8771dc5aca791e52df45ed (diff) | |
download | gnunet-f5a9bac85b73508da6794e1171b857e2582c8216.tar.gz gnunet-f5a9bac85b73508da6794e1171b857e2582c8216.zip |
psyc fixes
Diffstat (limited to 'src/multicast/gnunet-service-multicast.c')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index e7ee92cdf..d197a3ef0 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -509,7 +509,7 @@ client_notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | |||
509 | { | 509 | { |
510 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 510 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
511 | "%p User context is NULL in client_disconnect()\n", grp); | 511 | "%p User context is NULL in client_disconnect()\n", grp); |
512 | GNUNET_assert (0); | 512 | GNUNET_break (0); |
513 | return; | 513 | return; |
514 | } | 514 | } |
515 | 515 | ||
@@ -969,7 +969,7 @@ client_recv_member_join (void *cls, struct GNUNET_SERVER_Client *client, | |||
969 | mem->join_dcsn, | 969 | mem->join_dcsn, |
970 | GNUNET_NO); | 970 | GNUNET_NO); |
971 | } | 971 | } |
972 | else if (grp->clients_head == grp->clients_tail) | 972 | else |
973 | { /* First client of the group, send join request. */ | 973 | { /* First client of the group, send join request. */ |
974 | struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1]; | 974 | struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1]; |
975 | uint32_t relay_count = ntohl (msg->relay_count); | 975 | uint32_t relay_count = ntohl (msg->relay_count); |
@@ -1042,16 +1042,7 @@ client_send_join_decision (struct Member *mem, | |||
1042 | memcpy (mem->join_dcsn, dcsn, dcsn_size); | 1042 | memcpy (mem->join_dcsn, dcsn, dcsn_size); |
1043 | } | 1043 | } |
1044 | else | 1044 | else |
1045 | { /* Refused entry, disconnect clients. */ | 1045 | { /* Refused entry, but replay would be still possible for past members. */ |
1046 | #if FIXME | ||
1047 | struct ClientList *cl = mem->grp.clients_head; | ||
1048 | while (NULL != cl) | ||
1049 | { | ||
1050 | struct GNUNET_SERVER_Client *client = cl->client; | ||
1051 | cl = cl->next; | ||
1052 | GNUNET_SERVER_client_disconnect (client); | ||
1053 | } | ||
1054 | #endif | ||
1055 | } | 1046 | } |
1056 | } | 1047 | } |
1057 | 1048 | ||