diff options
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/multicast_api.c | 99 |
1 files changed, 44 insertions, 55 deletions
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index ad9929dca..7cfe70835 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -762,32 +762,27 @@ origin_connect (struct GNUNET_MULTICAST_Origin *orig) | |||
762 | { | 762 | { |
763 | struct GNUNET_MULTICAST_Group *grp = &orig->grp; | 763 | struct GNUNET_MULTICAST_Group *grp = &orig->grp; |
764 | 764 | ||
765 | GNUNET_MQ_hd_var_size (group_message, | ||
766 | GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE, | ||
767 | struct GNUNET_MULTICAST_MessageHeader); | ||
768 | |||
769 | GNUNET_MQ_hd_var_size (origin_request, | ||
770 | GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST, | ||
771 | struct GNUNET_MULTICAST_RequestHeader); | ||
772 | |||
773 | GNUNET_MQ_hd_fixed_size (group_fragment_ack, | ||
774 | GNUNET_MESSAGE_TYPE_MULTICAST_FRAGMENT_ACK, | ||
775 | struct GNUNET_MessageHeader); | ||
776 | |||
777 | GNUNET_MQ_hd_var_size (group_join_request, | ||
778 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST, | ||
779 | struct MulticastJoinRequestMessage); | ||
780 | |||
781 | GNUNET_MQ_hd_fixed_size (group_replay_request, | ||
782 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, | ||
783 | struct MulticastReplayRequestMessage); | ||
784 | |||
785 | struct GNUNET_MQ_MessageHandler handlers[] = { | 765 | struct GNUNET_MQ_MessageHandler handlers[] = { |
786 | make_group_message_handler (grp), | 766 | GNUNET_MQ_hd_var_size (group_message, |
787 | make_origin_request_handler (orig), | 767 | GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE, |
788 | make_group_fragment_ack_handler (grp), | 768 | struct GNUNET_MULTICAST_MessageHeader, |
789 | make_group_join_request_handler (grp), | 769 | grp), |
790 | make_group_replay_request_handler (grp), | 770 | GNUNET_MQ_hd_var_size (origin_request, |
771 | GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST, | ||
772 | struct GNUNET_MULTICAST_RequestHeader, | ||
773 | orig), | ||
774 | GNUNET_MQ_hd_fixed_size (group_fragment_ack, | ||
775 | GNUNET_MESSAGE_TYPE_MULTICAST_FRAGMENT_ACK, | ||
776 | struct GNUNET_MessageHeader, | ||
777 | grp), | ||
778 | GNUNET_MQ_hd_var_size (group_join_request, | ||
779 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST, | ||
780 | struct MulticastJoinRequestMessage, | ||
781 | grp), | ||
782 | GNUNET_MQ_hd_fixed_size (group_replay_request, | ||
783 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, | ||
784 | struct MulticastReplayRequestMessage, | ||
785 | grp), | ||
791 | GNUNET_MQ_handler_end () | 786 | GNUNET_MQ_handler_end () |
792 | }; | 787 | }; |
793 | 788 | ||
@@ -1053,37 +1048,31 @@ member_connect (struct GNUNET_MULTICAST_Member *mem) | |||
1053 | { | 1048 | { |
1054 | struct GNUNET_MULTICAST_Group *grp = &mem->grp; | 1049 | struct GNUNET_MULTICAST_Group *grp = &mem->grp; |
1055 | 1050 | ||
1056 | GNUNET_MQ_hd_var_size (group_message, | ||
1057 | GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE, | ||
1058 | struct GNUNET_MULTICAST_MessageHeader); | ||
1059 | |||
1060 | GNUNET_MQ_hd_fixed_size (group_fragment_ack, | ||
1061 | GNUNET_MESSAGE_TYPE_MULTICAST_FRAGMENT_ACK, | ||
1062 | struct GNUNET_MessageHeader); | ||
1063 | |||
1064 | GNUNET_MQ_hd_var_size (group_join_request, | ||
1065 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST, | ||
1066 | struct MulticastJoinRequestMessage); | ||
1067 | |||
1068 | GNUNET_MQ_hd_var_size (member_join_decision, | ||
1069 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION, | ||
1070 | struct MulticastJoinDecisionMessageHeader); | ||
1071 | |||
1072 | GNUNET_MQ_hd_fixed_size (group_replay_request, | ||
1073 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, | ||
1074 | struct MulticastReplayRequestMessage); | ||
1075 | |||
1076 | GNUNET_MQ_hd_var_size (member_replay_response, | ||
1077 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_RESPONSE, | ||
1078 | struct MulticastReplayResponseMessage); | ||
1079 | |||
1080 | struct GNUNET_MQ_MessageHandler handlers[] = { | 1051 | struct GNUNET_MQ_MessageHandler handlers[] = { |
1081 | make_group_message_handler (grp), | 1052 | GNUNET_MQ_hd_var_size (group_message, |
1082 | make_group_fragment_ack_handler (grp), | 1053 | GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE, |
1083 | make_group_join_request_handler (grp), | 1054 | struct GNUNET_MULTICAST_MessageHeader, |
1084 | make_member_join_decision_handler (mem), | 1055 | grp), |
1085 | make_group_replay_request_handler (grp), | 1056 | GNUNET_MQ_hd_fixed_size (group_fragment_ack, |
1086 | make_member_replay_response_handler (mem), | 1057 | GNUNET_MESSAGE_TYPE_MULTICAST_FRAGMENT_ACK, |
1058 | struct GNUNET_MessageHeader, | ||
1059 | grp), | ||
1060 | GNUNET_MQ_hd_var_size (group_join_request, | ||
1061 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST, | ||
1062 | struct MulticastJoinRequestMessage, | ||
1063 | grp), | ||
1064 | GNUNET_MQ_hd_var_size (member_join_decision, | ||
1065 | GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION, | ||
1066 | struct MulticastJoinDecisionMessageHeader, | ||
1067 | mem), | ||
1068 | GNUNET_MQ_hd_fixed_size (group_replay_request, | ||
1069 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, | ||
1070 | struct MulticastReplayRequestMessage, | ||
1071 | grp), | ||
1072 | GNUNET_MQ_hd_var_size (member_replay_response, | ||
1073 | GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_RESPONSE, | ||
1074 | struct MulticastReplayResponseMessage, | ||
1075 | mem), | ||
1087 | GNUNET_MQ_handler_end () | 1076 | GNUNET_MQ_handler_end () |
1088 | }; | 1077 | }; |
1089 | 1078 | ||