diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-16 05:33:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-16 05:33:01 +0100 |
commit | d23a815951413af100c74b38cdd09a01ca1c280a (patch) | |
tree | 5fd6a3eae1cd4497dc728917362067a8aded3151 /src/transport/plugin_transport_udp_broadcasting.c | |
parent | a3acd27f0acf30a6c4803ec933c4fe7650bc296c (diff) | |
download | gnunet-d23a815951413af100c74b38cdd09a01ca1c280a.tar.gz gnunet-d23a815951413af100c74b38cdd09a01ca1c280a.zip |
removing dead/legacy server/connection logic, except for in tcp/wlan/bt plugins (which will be updated 'later')
Diffstat (limited to 'src/transport/plugin_transport_udp_broadcasting.c')
-rw-r--r-- | src/transport/plugin_transport_udp_broadcasting.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index a440830fd..c6ddbce9b 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c | |||
@@ -133,11 +133,10 @@ struct MstContext | |||
133 | */ | 133 | */ |
134 | static int | 134 | static int |
135 | broadcast_mst_cb (void *cls, | 135 | broadcast_mst_cb (void *cls, |
136 | void *client, | ||
137 | const struct GNUNET_MessageHeader *message) | 136 | const struct GNUNET_MessageHeader *message) |
138 | { | 137 | { |
139 | struct Plugin *plugin = cls; | 138 | struct MstContext *mc = cls; |
140 | struct MstContext *mc = client; | 139 | struct Plugin *plugin = mc->plugin; |
141 | struct GNUNET_HELLO_Address *address; | 140 | struct GNUNET_HELLO_Address *address; |
142 | const struct GNUNET_MessageHeader *hello; | 141 | const struct GNUNET_MessageHeader *hello; |
143 | const struct UDP_Beacon_Message *msg; | 142 | const struct UDP_Beacon_Message *msg; |
@@ -191,16 +190,20 @@ udp_broadcast_receive (struct Plugin *plugin, | |||
191 | size_t udp_addr_len, | 190 | size_t udp_addr_len, |
192 | enum GNUNET_ATS_Network_Type network_type) | 191 | enum GNUNET_ATS_Network_Type network_type) |
193 | { | 192 | { |
193 | struct GNUNET_MessageStreamTokenizer *broadcast_mst; | ||
194 | struct MstContext mc; | 194 | struct MstContext mc; |
195 | 195 | ||
196 | broadcast_mst = GNUNET_MST_create (&broadcast_mst_cb, | ||
197 | &mc); | ||
198 | mc.plugin = plugin; | ||
196 | mc.udp_addr = udp_addr; | 199 | mc.udp_addr = udp_addr; |
197 | mc.udp_addr_len = udp_addr_len; | 200 | mc.udp_addr_len = udp_addr_len; |
198 | mc.ats_address_network_type = network_type; | 201 | mc.ats_address_network_type = network_type; |
199 | GNUNET_SERVER_mst_receive (plugin->broadcast_mst, | 202 | GNUNET_MST_from_buffer (broadcast_mst, |
200 | &mc, | 203 | buf, size, |
201 | buf, size, | 204 | GNUNET_NO, |
202 | GNUNET_NO, | 205 | GNUNET_NO); |
203 | GNUNET_NO); | 206 | GNUNET_MST_destroy (broadcast_mst); |
204 | } | 207 | } |
205 | 208 | ||
206 | 209 | ||
@@ -546,10 +549,6 @@ setup_broadcast (struct Plugin *plugin, | |||
546 | return; | 549 | return; |
547 | } | 550 | } |
548 | 551 | ||
549 | /* always create tokenizers */ | ||
550 | plugin->broadcast_mst = | ||
551 | GNUNET_SERVER_mst_create (&broadcast_mst_cb, plugin); | ||
552 | |||
553 | if (GNUNET_YES != plugin->enable_broadcasting) | 552 | if (GNUNET_YES != plugin->enable_broadcasting) |
554 | return; /* We do not send, just receive */ | 553 | return; /* We do not send, just receive */ |
555 | 554 | ||
@@ -636,13 +635,6 @@ stop_broadcast (struct Plugin *plugin) | |||
636 | GNUNET_free (p); | 635 | GNUNET_free (p); |
637 | } | 636 | } |
638 | } | 637 | } |
639 | |||
640 | /* Destroy MSTs */ | ||
641 | if (NULL != plugin->broadcast_mst) | ||
642 | { | ||
643 | GNUNET_SERVER_mst_destroy (plugin->broadcast_mst); | ||
644 | plugin->broadcast_mst = NULL; | ||
645 | } | ||
646 | } | 638 | } |
647 | 639 | ||
648 | /* end of plugin_transport_udp_broadcasting.c */ | 640 | /* end of plugin_transport_udp_broadcasting.c */ |