memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
sb = &a4;
}
- else if (addrlen == 0)
- {
- GNUNET_snprintf (rbuf, sizeof (rbuf), "%s", TRANSPORT_SESSION_INBOUND_STRING);
- return rbuf;
- }
else
{
return NULL;
sb = &a4;
sbs = sizeof (a4);
}
- else if (0 == addrlen)
- {
- asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
- asc (asc_cls, NULL);
- return;
- }
else
{
/* invalid address */
{
s = udp_plugin_create_session (plugin, address, GNUNET_YES);
plugin->env->session_start (NULL, &address->peer, PLUGIN_NAME,
- (GNUNET_YES == s->inbound) ? NULL : address->address,
- (GNUNET_YES == s->inbound) ? 0 : address->address_length,
- s, NULL, 0);
+ address->address, address->address_length, s, NULL, 0);
}
GNUNET_free (address);
static void
read_process_msg (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
- const char *addr,
+ const struct sockaddr *addr,
socklen_t fromlen)
{
if (ntohs (msg->size) < sizeof (struct UDPMessage))
return;
}
process_udp_message (plugin, (const struct UDPMessage *) msg,
- (const struct sockaddr *) addr, fromlen);
+ addr, fromlen);
}
static void
read_process_ack (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
- char *addr,
+ const struct sockaddr *addr,
socklen_t fromlen)
{
const struct GNUNET_MessageHeader *ack;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"UDP processes %u-byte acknowledgement from `%s' at `%s'\n",
(unsigned int) ntohs (msg->size), GNUNET_i2s (&udp_ack->sender),
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
+ GNUNET_a2s (addr, fromlen));
/* Expect more ACKs to arrive */
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Message full ACK'ed\n",
(unsigned int) ntohs (msg->size), GNUNET_i2s (&udp_ack->sender),
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
+ GNUNET_a2s (addr, fromlen));
/* Remove fragmented message after successful sending */
fragmented_message_done (s->frag_ctx, GNUNET_OK);
static void
read_process_fragment (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
- char *addr,
+ const struct sockaddr *addr,
socklen_t fromlen)
{
struct DefragContext *d_ctx;
struct FindReceiveContext frc;
frc.rc = NULL;
- frc.addr = (const struct sockaddr *) addr;
+ frc.addr = addr;
frc.addr_len = fromlen;
LOG (GNUNET_ERROR_TYPE_DEBUG, "UDP processes %u-byte fragment from `%s'\n",
(unsigned int) ntohs (msg->size),
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
+ GNUNET_a2s (addr, fromlen));
/* Lookup existing receive context for this address */
GNUNET_CONTAINER_heap_iterate (plugin->defrag_ctxs,
&find_receive_context,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Created new defragmentation context for %u-byte fragment from `%s'\n",
(unsigned int) ntohs (msg->size),
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
+ GNUNET_a2s (addr, fromlen));
}
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Found existing defragmentation context for %u-byte fragment from `%s'\n",
(unsigned int) ntohs (msg->size),
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
+ GNUNET_a2s (addr, fromlen));
}
if (GNUNET_OK == GNUNET_DEFRAGMENT_process_fragment (d_ctx->defrag, msg))
udp_select_read (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *rsock)
{
socklen_t fromlen;
- char addr[32];
+ struct sockaddr_storage addr;
char buf[65536] GNUNET_ALIGN;
ssize_t size;
const struct GNUNET_MessageHeader *msg;
fromlen = sizeof (addr);
memset (&addr, 0, sizeof (addr));
size = GNUNET_NETWORK_socket_recvfrom (rsock, buf, sizeof (buf),
- (struct sockaddr *) &addr, &fromlen);
+ (struct sockaddr *) &addr, &fromlen);
#if MINGW
/* On SOCK_DGRAM UDP sockets recvfrom might fail with a
* WSAECONNRESET error to indicate that previous sendto() (yes, sendto!)
msg = (const struct GNUNET_MessageHeader *) buf;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "UDP received %u-byte message from `%s' type %i\n", (unsigned int) size,
- GNUNET_a2s ((const struct sockaddr *) addr, fromlen), ntohs (msg->type));
+ "UDP received %u-byte message from `%s' type %u\n",
+ (unsigned int) size,
+ GNUNET_a2s ((const struct sockaddr *) &addr, fromlen),
+ ntohs (msg->type));
if (size != ntohs (msg->size))
{
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON:
- udp_broadcast_receive (plugin, &buf, size, addr, fromlen);
+ udp_broadcast_receive (plugin, buf, size,
+ (const struct sockaddr *) &addr, fromlen);
return;
-
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE:
- read_process_msg (plugin, msg, addr, fromlen);
+ read_process_msg (plugin, msg,
+ (const struct sockaddr *) &addr, fromlen);
return;
-
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK:
- read_process_ack (plugin, msg, addr, fromlen);
+ read_process_ack (plugin, msg,
+ (const struct sockaddr *) &addr, fromlen);
return;
-
case GNUNET_MESSAGE_TYPE_FRAGMENT:
- read_process_fragment (plugin, msg, addr, fromlen);
+ read_process_fragment (plugin, msg,
+ (const struct sockaddr *) &addr, fromlen);
return;
-
default:
GNUNET_break_op (0);
return;
*/
LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
- _("UDP could not transmit message to `%s': "
- "Please check your network configuration and disable IPv6 if your "
- "connection does not have a global IPv6 address\n"),
- GNUNET_a2s (sa, slen));
+ _("UDP could not transmit IPv6 message! "
+ "Please check your network configuration and disable IPv6 if your "
+ "connection does not have a global IPv6 address\n"));
}
}
else
{
int tries;
int sockets_created = 0;
- struct sockaddr_in6 serverAddrv6;
- struct sockaddr_in serverAddrv4;
- struct sockaddr *serverAddr;
+ struct sockaddr_in6 server_addrv6;
+ struct sockaddr_in server_addrv4;
+ struct sockaddr *server_addr;
struct sockaddr *addrs[2];
socklen_t addrlens[2];
socklen_t addrlen;
}
else
{
- memset (&serverAddrv6, '\0', sizeof (struct sockaddr_in6));
+ memset (&server_addrv6, '\0', sizeof (struct sockaddr_in6));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv6.sin6_len = sizeof (struct sockaddr_in6);
+ server_addrv6.sin6_len = sizeof (struct sockaddr_in6);
#endif
- serverAddrv6.sin6_family = AF_INET6;
+ server_addrv6.sin6_family = AF_INET6;
if (NULL != bind_v6)
- serverAddrv6.sin6_addr = bind_v6->sin6_addr;
+ server_addrv6.sin6_addr = bind_v6->sin6_addr;
else
- serverAddrv6.sin6_addr = in6addr_any;
+ server_addrv6.sin6_addr = in6addr_any;
if (0 == plugin->port) /* autodetect */
- serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
else
- serverAddrv6.sin6_port = htons (plugin->port);
+ server_addrv6.sin6_port = htons (plugin->port);
addrlen = sizeof (struct sockaddr_in6);
- serverAddr = (struct sockaddr *) &serverAddrv6;
+ server_addr = (struct sockaddr *) &server_addrv6;
tries = 0;
while (tries < 10)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 `%s'\n",
- GNUNET_a2s (serverAddr, addrlen));
+ GNUNET_a2s (server_addr, addrlen));
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
- serverAddr, addrlen, 0))
+ server_addr, addrlen))
break;
eno = errno;
if (0 != plugin->port)
break; /* bind failed on specific port */
}
/* autodetect */
- serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
tries ++;
}
if (tries >= 10)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"IPv6 socket created on port %s\n",
- GNUNET_a2s (serverAddr, addrlen));
- addrs[sockets_created] = (struct sockaddr *) &serverAddrv6;
+ GNUNET_a2s (server_addr, addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &server_addrv6;
addrlens[sockets_created] = sizeof (struct sockaddr_in6);
sockets_created++;
}
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to bind UDP socket to %s: %s\n",
- GNUNET_a2s (serverAddr, addrlen),
+ GNUNET_a2s (server_addr, addrlen),
STRERROR (eno));
}
}
}
else
{
- memset (&serverAddrv4, '\0', sizeof (struct sockaddr_in));
+ memset (&server_addrv4, '\0', sizeof (struct sockaddr_in));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv4.sin_len = sizeof (struct sockaddr_in);
+ server_addrv4.sin_len = sizeof (struct sockaddr_in);
#endif
- serverAddrv4.sin_family = AF_INET;
+ server_addrv4.sin_family = AF_INET;
if (NULL != bind_v4)
- serverAddrv4.sin_addr = bind_v4->sin_addr;
+ server_addrv4.sin_addr = bind_v4->sin_addr;
else
- serverAddrv4.sin_addr.s_addr = INADDR_ANY;
+ server_addrv4.sin_addr.s_addr = INADDR_ANY;
if (0 == plugin->port)
/* autodetect */
- serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
else
- serverAddrv4.sin_port = htons (plugin->port);
+ server_addrv4.sin_port = htons (plugin->port);
addrlen = sizeof (struct sockaddr_in);
- serverAddr = (struct sockaddr *) &serverAddrv4;
+ server_addr = (struct sockaddr *) &server_addrv4;
tries = 0;
while (tries < 10)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 `%s'\n",
- GNUNET_a2s (serverAddr, addrlen));
+ GNUNET_a2s (server_addr, addrlen));
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
- serverAddr, addrlen, 0))
+ server_addr, addrlen))
break;
eno = errno;
if (0 != plugin->port)
}
/* autodetect */
- serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
tries ++;
}
if (plugin->sockv4 != NULL)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "IPv4 socket created on port %s\n", GNUNET_a2s (serverAddr, addrlen));
- addrs[sockets_created] = (struct sockaddr *) &serverAddrv4;
+ "IPv4 socket created on port %s\n", GNUNET_a2s (server_addr, addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &server_addrv4;
addrlens[sockets_created] = sizeof (struct sockaddr_in);
sockets_created++;
}
else
- {
+ {
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to bind UDP socket to %s: %s\n",
- GNUNET_a2s (serverAddr, addrlen), STRERROR (eno));
+ GNUNET_a2s (server_addr, addrlen), STRERROR (eno));
}
}
char * bind6_address;
char * fancy_interval;
struct GNUNET_TIME_Relative interval;
- struct sockaddr_in serverAddrv4;
- struct sockaddr_in6 serverAddrv6;
+ struct sockaddr_in server_addrv4;
+ struct sockaddr_in6 server_addrv6;
int res;
int have_bind4;
int have_bind6;
/* Addresses */
have_bind4 = GNUNET_NO;
- memset (&serverAddrv4, 0, sizeof (serverAddrv4));
+ memset (&server_addrv4, 0, sizeof (server_addrv4));
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO", &bind4_address))
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Binding udp plugin to specific address: `%s'\n",
bind4_address);
- if (1 != inet_pton (AF_INET, bind4_address, &serverAddrv4.sin_addr))
+ if (1 != inet_pton (AF_INET, bind4_address, &server_addrv4.sin_addr))
{
GNUNET_free (bind4_address);
return NULL;
}
GNUNET_free_non_null (bind4_address);
have_bind6 = GNUNET_NO;
- memset (&serverAddrv6, 0, sizeof (serverAddrv6));
+ memset (&server_addrv6, 0, sizeof (server_addrv6));
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO6", &bind6_address))
"Binding udp plugin to specific address: `%s'\n",
bind6_address);
if (1 !=
- inet_pton (AF_INET6, bind6_address, &serverAddrv6.sin6_addr))
+ inet_pton (AF_INET6, bind6_address, &server_addrv6.sin6_addr))
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"),
bind6_address);
p->defrag_ctxs = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
p->mst = GNUNET_SERVER_mst_create (&process_inbound_tokenized_messages, p);
GNUNET_BANDWIDTH_tracker_init (&p->tracker,
- GNUNET_BANDWIDTH_value_init ((uint32_t)udp_max_bps), 30);
+ GNUNET_BANDWIDTH_value_init ((uint32_t) udp_max_bps), 30);
plugin = p;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
- res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &serverAddrv6 : NULL,
- (GNUNET_YES == have_bind4) ? &serverAddrv4 : NULL);
- if ((res == 0) || ((p->sockv4 == NULL) && (p->sockv6 == NULL)))
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
+ res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL,
+ (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL );
+ if ((res == 0) || ((p->sockv4 == NULL )&& (p->sockv6 == NULL)))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Failed to create network sockets, plugin failed\n"));
else if (broadcast == GNUNET_YES)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n");
- setup_broadcast (p, &serverAddrv6, &serverAddrv4);
+ setup_broadcast (p, &server_addrv6, &server_addrv4);
}
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
projects / oweals / gnunet.git / blobdiff