diff options
Diffstat (limited to 'src/multicast/multicast_api.c')
-rw-r--r-- | src/multicast/multicast_api.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 774a8bf70..e50711060 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -163,7 +163,7 @@ struct GNUNET_MULTICAST_JoinHandle | |||
163 | /** | 163 | /** |
164 | * Public key of the member requesting join. | 164 | * Public key of the member requesting join. |
165 | */ | 165 | */ |
166 | struct GNUNET_CRYPTO_EcdsaPublicKey member_key; | 166 | struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key; |
167 | 167 | ||
168 | /** | 168 | /** |
169 | * Peer identity of the member requesting join. | 169 | * Peer identity of the member requesting join. |
@@ -254,9 +254,9 @@ group_recv_join_request (void *cls, | |||
254 | jmsg = NULL; | 254 | jmsg = NULL; |
255 | jh = GNUNET_malloc (sizeof (*jh)); | 255 | jh = GNUNET_malloc (sizeof (*jh)); |
256 | jh->group = grp; | 256 | jh->group = grp; |
257 | jh->member_key = jreq->member_key; | 257 | jh->member_pub_key = jreq->member_pub_key; |
258 | jh->peer = jreq->peer; | 258 | jh->peer = jreq->peer; |
259 | grp->join_req_cb (grp->cb_cls, &jreq->member_key, jmsg, jh); | 259 | grp->join_req_cb (grp->cb_cls, &jreq->member_pub_key, jmsg, jh); |
260 | } | 260 | } |
261 | 261 | ||
262 | 262 | ||
@@ -366,7 +366,7 @@ group_recv_replay_request (void *cls, | |||
366 | struct GNUNET_MULTICAST_ReplayHandle * rh = GNUNET_malloc (sizeof (*rh)); | 366 | struct GNUNET_MULTICAST_ReplayHandle * rh = GNUNET_malloc (sizeof (*rh)); |
367 | rh->grp = grp; | 367 | rh->grp = grp; |
368 | rh->req = *rep; | 368 | rh->req = *rep; |
369 | grp->replay_frag_cb (grp->cb_cls, &rep->member_key, | 369 | grp->replay_frag_cb (grp->cb_cls, &rep->member_pub_key, |
370 | GNUNET_ntohll (rep->fragment_id), | 370 | GNUNET_ntohll (rep->fragment_id), |
371 | GNUNET_ntohll (rep->flags), rh); | 371 | GNUNET_ntohll (rep->flags), rh); |
372 | } | 372 | } |
@@ -378,7 +378,7 @@ group_recv_replay_request (void *cls, | |||
378 | struct GNUNET_MULTICAST_ReplayHandle * rh = GNUNET_malloc (sizeof (*rh)); | 378 | struct GNUNET_MULTICAST_ReplayHandle * rh = GNUNET_malloc (sizeof (*rh)); |
379 | rh->grp = grp; | 379 | rh->grp = grp; |
380 | rh->req = *rep; | 380 | rh->req = *rep; |
381 | grp->replay_msg_cb (grp->cb_cls, &rep->member_key, | 381 | grp->replay_msg_cb (grp->cb_cls, &rep->member_pub_key, |
382 | GNUNET_ntohll (rep->message_id), | 382 | GNUNET_ntohll (rep->message_id), |
383 | GNUNET_ntohll (rep->fragment_offset), | 383 | GNUNET_ntohll (rep->fragment_offset), |
384 | GNUNET_ntohll (rep->flags), rh); | 384 | GNUNET_ntohll (rep->flags), rh); |
@@ -615,7 +615,7 @@ GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *join, | |||
615 | hdcsn->header.size = htons (sizeof (*hdcsn) + sizeof (*dcsn) | 615 | hdcsn->header.size = htons (sizeof (*hdcsn) + sizeof (*dcsn) |
616 | + relay_size + join_resp_size); | 616 | + relay_size + join_resp_size); |
617 | hdcsn->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION); | 617 | hdcsn->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION); |
618 | hdcsn->member_key = join->member_key; | 618 | hdcsn->member_pub_key = join->member_pub_key; |
619 | hdcsn->peer = join->peer; | 619 | hdcsn->peer = join->peer; |
620 | 620 | ||
621 | dcsn = (struct MulticastJoinDecisionMessage *) &hdcsn[1]; | 621 | dcsn = (struct MulticastJoinDecisionMessage *) &hdcsn[1]; |
@@ -995,7 +995,7 @@ GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginTransmitHan | |||
995 | */ | 995 | */ |
996 | struct GNUNET_MULTICAST_Member * | 996 | struct GNUNET_MULTICAST_Member * |
997 | GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | 997 | GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, |
998 | const struct GNUNET_CRYPTO_EddsaPublicKey *group_key, | 998 | const struct GNUNET_CRYPTO_EddsaPublicKey *group_pub_key, |
999 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key, | 999 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key, |
1000 | const struct GNUNET_PeerIdentity *origin, | 1000 | const struct GNUNET_PeerIdentity *origin, |
1001 | uint16_t relay_count, | 1001 | uint16_t relay_count, |
@@ -1017,7 +1017,7 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1017 | join = GNUNET_malloc (sizeof (*join) + relay_size + join_msg_size); | 1017 | join = GNUNET_malloc (sizeof (*join) + relay_size + join_msg_size); |
1018 | join->header.size = htons (sizeof (*join) + relay_size + join_msg_size); | 1018 | join->header.size = htons (sizeof (*join) + relay_size + join_msg_size); |
1019 | join->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_MEMBER_JOIN); | 1019 | join->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_MEMBER_JOIN); |
1020 | join->group_key = *group_key; | 1020 | join->group_pub_key = *group_pub_key; |
1021 | join->member_key = *member_key; | 1021 | join->member_key = *member_key; |
1022 | join->origin = *origin; | 1022 | join->origin = *origin; |
1023 | join->relay_count = ntohl (relay_count); | 1023 | join->relay_count = ntohl (relay_count); |
@@ -1122,6 +1122,7 @@ GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member *mem, | |||
1122 | uint64_t flags) | 1122 | uint64_t flags) |
1123 | { | 1123 | { |
1124 | member_replay_request (mem, fragment_id, 0, 0, flags); | 1124 | member_replay_request (mem, fragment_id, 0, 0, flags); |
1125 | // FIXME: return | ||
1125 | } | 1126 | } |
1126 | 1127 | ||
1127 | 1128 | ||
@@ -1150,6 +1151,7 @@ GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *mem, | |||
1150 | uint64_t flags) | 1151 | uint64_t flags) |
1151 | { | 1152 | { |
1152 | member_replay_request (mem, 0, message_id, fragment_offset, flags); | 1153 | member_replay_request (mem, 0, message_id, fragment_offset, flags); |
1154 | // FIXME: return | ||
1153 | } | 1155 | } |
1154 | 1156 | ||
1155 | 1157 | ||