projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use #5553 function in TCP/UDP communicators
[oweals/gnunet.git]
/
src
/
transport
/
plugin_transport_udp_broadcasting.c
diff --git
a/src/transport/plugin_transport_udp_broadcasting.c
b/src/transport/plugin_transport_udp_broadcasting.c
index 413c7956409c2c55c02050e7fa8c4d9ccf5165c7..0c26aa62493760f66ff0aee499e034bad462b5c2 100644
(file)
--- a/
src/transport/plugin_transport_udp_broadcasting.c
+++ b/
src/transport/plugin_transport_udp_broadcasting.c
@@
-1,21
+1,21
@@
/*
This file is part of GNUnet
/*
This file is part of GNUnet
- Copyright (C) 2010, 2011
Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010, 2011
GNUnet e.V.
- GNUnet is free software
; you can redistribute it and/or modify
-
it under the terms of the GNU
General Public License as published
- by the Free Software Foundation
; either version 3, or (at your
- option) any later version.
+ GNUnet is free software
: you can redistribute it and/or modify it
+
under the terms of the GNU Affero
General Public License as published
+ by the Free Software Foundation
, either version 3 of the License,
+ o
r (at your o
ption) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
*/
/**
@@
-29,7
+29,6
@@
#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_fragmentation_lib.h"
#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_fragmentation_lib.h"
-#include "gnunet_nat_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_resolver_service.h"
#include "gnunet_signatures.h"
#include "gnunet_protocols.h"
#include "gnunet_resolver_service.h"
#include "gnunet_signatures.h"
@@
-120,7
+119,7
@@
struct MstContext
/**
* ATS network type.
*/
/**
* ATS network type.
*/
- enum GNUNET_
ATS_Network_
Type ats_address_network_type;
+ enum GNUNET_
Network
Type ats_address_network_type;
};
};
@@
-134,15
+133,13
@@
struct MstContext
*/
static int
broadcast_mst_cb (void *cls,
*/
static int
broadcast_mst_cb (void *cls,
- void *client,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_MessageHeader *message)
{
- struct
Plugin *plugin
= cls;
- struct
MstContext *mc = client
;
+ struct
MstContext *mc
= cls;
+ struct
Plugin *plugin = mc->plugin
;
struct GNUNET_HELLO_Address *address;
const struct GNUNET_MessageHeader *hello;
const struct UDP_Beacon_Message *msg;
struct GNUNET_HELLO_Address *address;
const struct GNUNET_MessageHeader *hello;
const struct UDP_Beacon_Message *msg;
- struct GNUNET_ATS_Information atsi;
msg = (const struct UDP_Beacon_Message *) message;
msg = (const struct UDP_Beacon_Message *) message;
@@
-156,13
+153,6
@@
broadcast_mst_cb (void *cls,
udp_address_to_string (NULL,
mc->udp_addr,
mc->udp_addr_len));
udp_address_to_string (NULL,
mc->udp_addr,
mc->udp_addr_len));
-
- /* setup ATS */
- atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- atsi.value = htonl (mc->ats_address_network_type);
- GNUNET_break (ntohl(mc->ats_address_network_type) !=
- GNUNET_ATS_NET_UNSPECIFIED);
-
hello = (struct GNUNET_MessageHeader *) &msg[1];
address = GNUNET_HELLO_address_allocate (&msg->sender,
PLUGIN_NAME,
hello = (struct GNUNET_MessageHeader *) &msg[1];
address = GNUNET_HELLO_address_allocate (&msg->sender,
PLUGIN_NAME,
@@
-173,11
+163,6
@@
broadcast_mst_cb (void *cls,
address,
NULL,
hello);
address,
NULL,
hello);
- plugin->env->update_address_metrics (plugin->env->cls,
- address,
- NULL,
- &atsi,
- 1);
GNUNET_HELLO_address_free (address);
GNUNET_STATISTICS_update (plugin->env->stats,
_("# Multicast HELLO beacons received via UDP"),
GNUNET_HELLO_address_free (address);
GNUNET_STATISTICS_update (plugin->env->stats,
_("# Multicast HELLO beacons received via UDP"),
@@
-203,18
+188,22
@@
udp_broadcast_receive (struct Plugin *plugin,
ssize_t size,
const union UdpAddress *udp_addr,
size_t udp_addr_len,
ssize_t size,
const union UdpAddress *udp_addr,
size_t udp_addr_len,
- enum GNUNET_
ATS_Network_
Type network_type)
+ enum GNUNET_
Network
Type network_type)
{
{
+ struct GNUNET_MessageStreamTokenizer *broadcast_mst;
struct MstContext mc;
struct MstContext mc;
+ broadcast_mst = GNUNET_MST_create (&broadcast_mst_cb,
+ &mc);
+ mc.plugin = plugin;
mc.udp_addr = udp_addr;
mc.udp_addr_len = udp_addr_len;
mc.ats_address_network_type = network_type;
mc.udp_addr = udp_addr;
mc.udp_addr_len = udp_addr_len;
mc.ats_address_network_type = network_type;
- GNUNET_
SERVER_mst_receive (plugin->
broadcast_mst,
-
&mc
,
-
buf, size
,
- GNUNET_NO,
-
GNUNET_NO
);
+ GNUNET_
MST_from_buffer (
broadcast_mst,
+
buf, size
,
+
GNUNET_NO
,
+ GNUNET_NO);
+
GNUNET_MST_destroy (broadcast_mst
);
}
}
@@
-239,14
+228,13
@@
prepare_beacon (struct Plugin *plugin,
msg->sender = *(plugin->env->my_identity);
msg->header.size = htons (msg_size);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON);
msg->sender = *(plugin->env->my_identity);
msg->header.size = htons (msg_size);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON);
- memcpy (&msg[1], hello, hello_size);
+
GNUNET_
memcpy (&msg[1], hello, hello_size);
return msg_size;
}
static void
return msg_size;
}
static void
-udp_ipv4_broadcast_send (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+udp_ipv4_broadcast_send (void *cls)
{
struct BroadcastAddress *baddr = cls;
struct Plugin *plugin = baddr->plugin;
{
struct BroadcastAddress *baddr = cls;
struct Plugin *plugin = baddr->plugin;
@@
-321,8
+309,7
@@
udp_ipv4_broadcast_send (void *cls,
static void
static void
-udp_ipv6_broadcast_send (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+udp_ipv6_broadcast_send (void *cls)
{
struct BroadcastAddress *baddr = cls;
struct Plugin *plugin = baddr->plugin;
{
struct BroadcastAddress *baddr = cls;
struct Plugin *plugin = baddr->plugin;
@@
-392,7
+379,7
@@
udp_ipv6_broadcast_send (void *cls,
else
GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
baddr->cryogenic_fd,
else
GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
baddr->cryogenic_fd,
- &udp_ipv
4
_broadcast_send,
+ &udp_ipv
6
_broadcast_send,
baddr);
}
else
baddr);
}
else
@@
-425,7
+412,7
@@
iface_proc (void *cls,
{
struct Plugin *plugin = cls;
struct BroadcastAddress *ba;
{
struct Plugin *plugin = cls;
struct BroadcastAddress *ba;
- enum GNUNET_
ATS_Network_
Type network;
+ enum GNUNET_
Network
Type network;
if (NULL == addr)
return GNUNET_OK;
if (NULL == addr)
return GNUNET_OK;
@@
-441,7
+428,7
@@
iface_proc (void *cls,
GNUNET_a2s (netmask, addrlen), name, netmask);
network = plugin->env->get_address_type (plugin->env->cls, broadcast_addr, addrlen);
GNUNET_a2s (netmask, addrlen), name, netmask);
network = plugin->env->get_address_type (plugin->env->cls, broadcast_addr, addrlen);
- if (GNUNET_
ATS_NE
T_LOOPBACK == network)
+ if (GNUNET_
N
T_LOOPBACK == network)
{
/* Broadcasting on loopback does not make sense */
return GNUNET_YES;
{
/* Broadcasting on loopback does not make sense */
return GNUNET_YES;
@@
-450,7
+437,7
@@
iface_proc (void *cls,
ba = GNUNET_new (struct BroadcastAddress);
ba->plugin = plugin;
ba->addr = GNUNET_malloc (addrlen);
ba = GNUNET_new (struct BroadcastAddress);
ba->plugin = plugin;
ba->addr = GNUNET_malloc (addrlen);
- memcpy (ba->addr, broadcast_addr, addrlen);
+
GNUNET_
memcpy (ba->addr, broadcast_addr, addrlen);
ba->addrlen = addrlen;
if ( (GNUNET_YES == plugin->enable_ipv4) &&
ba->addrlen = addrlen;
if ( (GNUNET_YES == plugin->enable_ipv4) &&
@@
-540,6
+527,13
@@
iface_proc (void *cls,
}
}
+/**
+ * Setup broadcasting subsystem.
+ *
+ * @param plugin
+ * @param server_addrv6
+ * @param server_addrv4
+ */
void
setup_broadcast (struct Plugin *plugin,
struct sockaddr_in6 *server_addrv6,
void
setup_broadcast (struct Plugin *plugin,
struct sockaddr_in6 *server_addrv6,
@@
-555,10
+549,6
@@
setup_broadcast (struct Plugin *plugin,
return;
}
return;
}
- /* always create tokenizers */
- plugin->broadcast_mst =
- GNUNET_SERVER_mst_create (&broadcast_mst_cb, plugin);
-
if (GNUNET_YES != plugin->enable_broadcasting)
return; /* We do not send, just receive */
if (GNUNET_YES != plugin->enable_broadcasting)
return; /* We do not send, just receive */
@@
-590,6
+580,11
@@
setup_broadcast (struct Plugin *plugin,
}
}
+/**
+ * Stop broadcasting subsystem.
+ *
+ * @param plugin
+ */
void
stop_broadcast (struct Plugin *plugin)
{
void
stop_broadcast (struct Plugin *plugin)
{
@@
-640,13
+635,6
@@
stop_broadcast (struct Plugin *plugin)
GNUNET_free (p);
}
}
GNUNET_free (p);
}
}
-
- /* Destroy MSTs */
- if (NULL != plugin->broadcast_mst)
- {
- GNUNET_SERVER_mst_destroy (plugin->broadcast_mst);
- plugin->broadcast_mst = NULL;
- }
}
/* end of plugin_transport_udp_broadcasting.c */
}
/* end of plugin_transport_udp_broadcasting.c */