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 | |
parent | e990039b4ddf89d37a8771dc5aca791e52df45ed (diff) | |
download | gnunet-f5a9bac85b73508da6794e1171b857e2582c8216.tar.gz gnunet-f5a9bac85b73508da6794e1171b857e2582c8216.zip |
psyc fixes
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 15 | ||||
-rw-r--r-- | src/multicast/multicast_api.c | 10 |
2 files changed, 12 insertions, 13 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 | ||
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index c437b71c9..aa6dd3d98 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -1033,12 +1033,19 @@ GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *mem, | |||
1033 | GNUNET_ContinuationCallback part_cb, | 1033 | GNUNET_ContinuationCallback part_cb, |
1034 | void *part_cls) | 1034 | void *part_cls) |
1035 | { | 1035 | { |
1036 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Member parting.\n", mem); | ||
1036 | struct GNUNET_MULTICAST_Group *grp = &mem->grp; | 1037 | struct GNUNET_MULTICAST_Group *grp = &mem->grp; |
1037 | 1038 | ||
1038 | grp->is_disconnecting = GNUNET_YES; | 1039 | grp->is_disconnecting = GNUNET_YES; |
1039 | grp->disconnect_cb = part_cb; | 1040 | grp->disconnect_cb = part_cb; |
1040 | grp->disconnect_cls = part_cls; | 1041 | grp->disconnect_cls = part_cls; |
1041 | 1042 | ||
1043 | mem->join_dcsn_cb = NULL; | ||
1044 | grp->join_req_cb = NULL; | ||
1045 | grp->message_cb = NULL; | ||
1046 | grp->replay_msg_cb = NULL; | ||
1047 | grp->replay_frag_cb = NULL; | ||
1048 | |||
1042 | GNUNET_CLIENT_MANAGER_disconnect (mem->grp.client, GNUNET_YES, | 1049 | GNUNET_CLIENT_MANAGER_disconnect (mem->grp.client, GNUNET_YES, |
1043 | member_cleanup, mem); | 1050 | member_cleanup, mem); |
1044 | } | 1051 | } |
@@ -1157,7 +1164,8 @@ member_to_origin (struct GNUNET_MULTICAST_Member *mem) | |||
1157 | || GNUNET_MULTICAST_FRAGMENT_MAX_SIZE < buf_size) | 1164 | || GNUNET_MULTICAST_FRAGMENT_MAX_SIZE < buf_size) |
1158 | { | 1165 | { |
1159 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1166 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1160 | "MemberTransmitNotify() returned error or invalid message size.\n"); | 1167 | "MemberTransmitNotify() returned error or invalid message size. " |
1168 | "ret=%d, buf_size=%u\n", ret, buf_size); | ||
1161 | /* FIXME: handle error */ | 1169 | /* FIXME: handle error */ |
1162 | GNUNET_free (req); | 1170 | GNUNET_free (req); |
1163 | return; | 1171 | return; |