/*
This file is part of GNUnet
- (C) 2010, 2011 Christian Grothoff (and other contributing authors)
+ (C) 2010-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#define LOG(kind,...) GNUNET_log_from (kind, "transport-udp", __VA_ARGS__)
+#define PLUGIN_NAME "udp"
/**
* Number of messages we can defragment in parallel. We only really
*/
#define UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG 128
+/**
+ * Running pretty printers: head
+ */
+static struct PrettyPrinterContext *ppc_dll_head;
-#define DEBUG_MALLOC GNUNET_NO
+/**
+ * Running pretty printers: tail
+ */
+static struct PrettyPrinterContext *ppc_dll_tail;
/**
* Closure for 'append_port'.
*/
struct PrettyPrinterContext
{
+ /**
+ * DLL
+ */
+ struct PrettyPrinterContext *next;
+
+ /**
+ * DLL
+ */
+ struct PrettyPrinterContext *prev;
+
+ /**
+ * Timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * Resolver handle
+ */
+ struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
+
/**
* Function to call with the result.
*/
* Port to add after the IP address.
*/
uint16_t port;
+
+ /**
+ * IPv6 address
+ */
+
+ int ipv6;
+
+ /**
+ * Options
+ */
+ uint32_t options;
};
unsigned int rc;
int in_destroy;
+
+ int inbound;
};
{
struct Session *res;
const struct GNUNET_HELLO_Address *addr;
+ int inbound;
};
};
+/**
+ * Address options
+ */
+static uint32_t myoptions;
+
+
/**
* Encapsulation of all of the state of the plugin.
*/
udp_plugin_select_v6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-/**
- * Start session timeout
- */
-static void
-start_session_timeout (struct Session *s);
-
-/**
- * Increment session timeout due to activity
- */
-static void
-reschedule_session_timeout (struct Session *s);
-
/**
* Cancel timeout
*/
static void
-stop_session_timeout (struct Session *s);
-
-#if DEBUG_MALLOC
-
-struct Allocator
-{
- struct Allocator *prev;
- struct Allocator *next;
-
- unsigned int bytes_alloced;
- unsigned int max_alloced;
- unsigned int diff;
- unsigned int line;
-
- struct GNUNET_TIME_Absolute max_alloced_when;
- struct GNUNET_TIME_Absolute last_alloced_when;
-
-};
-
-struct Allocator *aehead;
-struct Allocator *aetail;
-
-struct Allocation
-{
- struct Allocation *prev;
- struct Allocation *next;
-
- struct Allocator *alloc;
- unsigned int bytes_alloced;
- void *p;
- unsigned int line;
-};
-
-struct Allocation *ahead;
-struct Allocation *atail;
-
-static int bytes_alloced;
-
-static struct Allocator *
-find_allocator (int line)
-{
- struct Allocator *cur = aehead;
- while (NULL != cur)
- {
- if (line == cur->line)
- return cur;
- cur = cur->next;
- }
- return cur;
-}
-
-static void
-print_allocators ()
-{
- static int start = GNUNET_YES;
- static struct GNUNET_TIME_Absolute next;
- static struct GNUNET_TIME_Relative rem;
- struct Allocator *cur = aehead;
- if (start)
- {
- next = GNUNET_TIME_UNIT_ZERO_ABS;
- start = GNUNET_NO;
- }
- if (0 == (rem = GNUNET_TIME_absolute_get_remaining(next)).rel_value)
- {
- fprintf (stderr, "Allocated in `%s' total: %5u bytes\n", __FILE__, bytes_alloced);
- while (NULL != cur)
- {
- char *last_alloc = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string(cur->max_alloced_when));
- fprintf (stderr, "Allocated from line %4u :%5u bytes (diff %5i bytes, max alloc: %5u @ %s, last alloc %s)\n",
- cur->line, cur->bytes_alloced, cur->diff, cur->max_alloced,
- last_alloc,
- GNUNET_STRINGS_absolute_time_to_string(cur->last_alloced_when));
- GNUNET_free (last_alloc);
- cur->diff = 0;
- cur = cur->next;
- }
- fprintf (stderr, "\n");
- next = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), GNUNET_TIME_UNIT_SECONDS);
- }
-}
-
-#endif
-
-static void
-MEMDEBUG_add_alloc (void *p, size_t size, int line)
-{
-#if DEBUG_MALLOC
- struct Allocation *alloc = GNUNET_malloc (sizeof (struct Allocation));
- struct Allocator *allocator = find_allocator(line);
- if (NULL == allocator)
- {
- allocator = GNUNET_malloc (sizeof (struct Allocator));
- allocator->line = line;
- GNUNET_CONTAINER_DLL_insert (aehead, aetail, allocator);
- }
- alloc->alloc = allocator;
- alloc->p = p;
- alloc->line = line;
- alloc->bytes_alloced = size;
- allocator->bytes_alloced += size;
- allocator->last_alloced_when = GNUNET_TIME_absolute_get();
- if (allocator->bytes_alloced >= allocator->max_alloced)
- {
- allocator->max_alloced = allocator->bytes_alloced;
- allocator->max_alloced_when = allocator->last_alloced_when;
- }
- allocator->diff += size;
- GNUNET_CONTAINER_DLL_insert (ahead, atail, alloc);
- print_allocators ();
- bytes_alloced += size;
-#endif
-}
-
-
-static void *
-MEMDEBUG_malloc (size_t size, int line)
+stop_session_timeout (struct Session *s)
{
- void * ret;
-
- ret = GNUNET_malloc (size);
-#if DEBUG_MALLOC
- if (NULL != ret)
- MEMDEBUG_add_alloc (ret, size, line);
-#endif
- return ret;
-
-}
+ GNUNET_assert (NULL != s);
-static void
-MEMDEBUG_free (void * alloc, int line)
-{
-#if DEBUG_MALLOC
- struct Allocation *cur;
- struct Allocator *allocator;
- cur = ahead;
- while (NULL != cur)
- {
- if (alloc == cur->p)
- break;
- cur = cur->next;
- }
- if (NULL == cur)
- {
- fprintf (stderr, "Unmonitored free from line %4u\n", line);
- GNUNET_break (0);
- return;
- }
- allocator = cur->alloc;
- if (NULL == allocator)
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
{
- GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout stopped for session %p canceled\n",
+ s);
}
- GNUNET_CONTAINER_DLL_remove (ahead, atail, cur);
- allocator->bytes_alloced -= cur->bytes_alloced;
- allocator->diff -= cur->bytes_alloced;
- GNUNET_assert (allocator->bytes_alloced >= 0);
- bytes_alloced -= cur->bytes_alloced;
- GNUNET_assert (bytes_alloced >= 0);
- GNUNET_free (cur);
-#endif
- GNUNET_free (alloc);
-}
-
-static void
-MEMDEBUG_free_non_null (void * alloc, int line)
-{
- if (alloc != NULL)
- MEMDEBUG_free (alloc, line);
}
struct GNUNET_TIME_Relative min_delay;
struct UDP_MessageWrapper *udpw;
- if (NULL != plugin->sockv4)
+ if ((GNUNET_YES == plugin->enable_ipv4) && (NULL != plugin->sockv4))
{
/* Find a message ready to send:
* Flow delay from other peer is expired or not set (0) */
for (udpw = plugin->ipv4_queue_head; NULL != udpw; udpw = udpw->next)
min_delay = GNUNET_TIME_relative_min (min_delay,
GNUNET_TIME_absolute_get_remaining (udpw->session->flow_delay_from_other_peer));
-
+
if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel(plugin->select_task);
* - timeout minimum delay */
plugin->select_task =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- (0 == min_delay.rel_value) ? GNUNET_TIME_UNIT_FOREVER_REL : min_delay,
+ (0 == min_delay.rel_value_us) ? GNUNET_TIME_UNIT_FOREVER_REL : min_delay,
plugin->rs_v4,
- (0 == min_delay.rel_value) ? plugin->ws_v4 : NULL,
- &udp_plugin_select, plugin);
+ (0 == min_delay.rel_value_us) ? plugin->ws_v4 : NULL,
+ &udp_plugin_select, plugin);
}
- if (NULL != plugin->sockv6)
+ if ((GNUNET_YES == plugin->enable_ipv6) && (NULL != plugin->sockv6))
{
min_delay = GNUNET_TIME_UNIT_FOREVER_REL;
for (udpw = plugin->ipv6_queue_head; NULL != udpw; udpw = udpw->next)
min_delay = GNUNET_TIME_relative_min (min_delay,
GNUNET_TIME_absolute_get_remaining (udpw->session->flow_delay_from_other_peer));
-
+
if (GNUNET_SCHEDULER_NO_TASK != plugin->select_task_v6)
GNUNET_SCHEDULER_cancel(plugin->select_task_v6);
plugin->select_task_v6 =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- (0 == min_delay.rel_value) ? GNUNET_TIME_UNIT_FOREVER_REL : min_delay,
+ (0 == min_delay.rel_value_us) ? GNUNET_TIME_UNIT_FOREVER_REL : min_delay,
plugin->rs_v6,
- (0 == min_delay.rel_value) ? plugin->ws_v6 : NULL,
+ (0 == min_delay.rel_value_us) ? plugin->ws_v6 : NULL,
&udp_plugin_select_v6, plugin);
}
}
const struct IPv6UdpAddress *t6;
int af;
uint16_t port;
+ uint32_t options;
- if (addrlen == sizeof (struct IPv6UdpAddress))
+ if ((NULL != addr) && (addrlen == sizeof (struct IPv6UdpAddress)))
{
t6 = addr;
af = AF_INET6;
+ options = ntohl (t6->options);
port = ntohs (t6->u6_port);
memcpy (&a6, &t6->ipv6_addr, sizeof (a6));
sb = &a6;
}
- else if (addrlen == sizeof (struct IPv4UdpAddress))
+ else if ((NULL != addr) && (addrlen == sizeof (struct IPv4UdpAddress)))
{
t4 = addr;
af = AF_INET;
+ options = ntohl (t4->options);
port = ntohs (t4->u4_port);
memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
sb = &a4;
}
else
{
- GNUNET_break_op (0);
return NULL;
}
inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
- GNUNET_snprintf (rbuf, sizeof (rbuf), (af == AF_INET6) ? "[%s]:%u" : "%s:%u",
- buf, port);
+
+ GNUNET_snprintf (rbuf, sizeof (rbuf),
+ (af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u",
+ PLUGIN_NAME, options, buf, port);
return rbuf;
}
void **buf, size_t *added)
{
struct sockaddr_storage socket_address;
-
- if ((NULL == addr) || (0 == addrlen))
+ char *address;
+ char *plugin;
+ char *optionstr;
+ uint32_t options;
+
+ /* Format tcp.options.address:port */
+ address = NULL;
+ plugin = NULL;
+ optionstr = NULL;
+
+ if ((NULL == addr) || (addrlen == 0))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if ('\0' != addr[addrlen - 1])
{
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if (strlen (addr) != addrlen - 1)
{
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
+ plugin = GNUNET_strdup (addr);
+ optionstr = strchr (plugin, '.');
+ if (NULL == optionstr)
+ {
+ GNUNET_break (0);
+ GNUNET_free (plugin);
+ return GNUNET_SYSERR;
+ }
+ optionstr[0] = '\0';
+ optionstr ++;
+ options = atol (optionstr);
+ address = strchr (optionstr, '.');
+ if (NULL == address)
+ {
+ GNUNET_break (0);
+ GNUNET_free (plugin);
+ return GNUNET_SYSERR;
+ }
+ address[0] = '\0';
+ address ++;
- if (GNUNET_OK != GNUNET_STRINGS_to_address_ip (addr, strlen (addr),
- &socket_address))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_to_address_ip (address, strlen (address),
+ &socket_address))
{
+ GNUNET_break (0);
+ GNUNET_free (plugin);
return GNUNET_SYSERR;
}
+ GNUNET_free (plugin);
+
switch (socket_address.ss_family)
{
case AF_INET:
{
struct IPv4UdpAddress *u4;
struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
- u4 = MEMDEBUG_malloc (sizeof (struct IPv4UdpAddress), __LINE__ );
+ u4 = GNUNET_malloc (sizeof (struct IPv4UdpAddress));
+ u4->options = htonl (options);
u4->ipv4_addr = in4->sin_addr.s_addr;
u4->u4_port = in4->sin_port;
*buf = u4;
{
struct IPv6UdpAddress *u6;
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address;
- u6 = MEMDEBUG_malloc (sizeof (struct IPv6UdpAddress), __LINE__ );
+ u6 = GNUNET_malloc (sizeof (struct IPv6UdpAddress));
+ u6->options = htonl (options);
u6->ipv6_addr = in6->sin6_addr;
u6->u6_port = in6->sin6_port;
*buf = u6;
}
+static void
+ppc_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct PrettyPrinterContext *ppc = cls;
+ /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "PPC %p was not removed!\n", ppc); */
+ ppc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ if (NULL != ppc->resolver_handle)
+ {
+ GNUNET_RESOLVER_request_cancel (ppc->resolver_handle);
+ ppc->resolver_handle = NULL;
+ }
+
+ GNUNET_CONTAINER_DLL_remove (ppc_dll_head, ppc_dll_tail, ppc);
+ GNUNET_free (ppc);
+}
+
+
/**
* Append our port and forward the result.
*
append_port (void *cls, const char *hostname)
{
struct PrettyPrinterContext *ppc = cls;
+ struct PrettyPrinterContext *cur;
char *ret;
-
+ /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "PPC callback: %p `%s'\n",ppc, hostname); */
if (hostname == NULL)
{
ppc->asc (ppc->asc_cls, NULL);
- MEMDEBUG_free (ppc, __LINE__);
+ GNUNET_CONTAINER_DLL_remove (ppc_dll_head, ppc_dll_tail, ppc);
+ GNUNET_SCHEDULER_cancel (ppc->timeout_task);
+ ppc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ ppc->resolver_handle = NULL;
+ /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "PPC %p was removed!\n", ppc); */
+ GNUNET_free (ppc);
return;
}
- GNUNET_asprintf (&ret, "%s:%d", hostname, ppc->port);
- MEMDEBUG_add_alloc (ret, strlen (ret)+ 1, __LINE__);
+ for (cur = ppc_dll_head; (NULL != cur); cur = cur->next)
+ {
+ if (cur == ppc)
+ break;
+ }
+ if (NULL == cur)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid callback for PPC %p \n", ppc);
+ return;
+ }
+
+ if (GNUNET_YES == ppc->ipv6)
+ GNUNET_asprintf (&ret, "%s.%u.[%s]:%d", PLUGIN_NAME, ppc->options, hostname, ppc->port);
+ else
+ GNUNET_asprintf (&ret, "%s.%u.%s:%d", PLUGIN_NAME, ppc->options, hostname, ppc->port);
ppc->asc (ppc->asc_cls, ret);
- MEMDEBUG_free (ret, __LINE__);
+ GNUNET_free (ret);
}
-
/**
* Convert the transports address to a nice, human-readable
* format.
const struct IPv4UdpAddress *u4;
const struct IPv6UdpAddress *u6;
uint16_t port;
+ uint32_t options;
if (addrlen == sizeof (struct IPv6UdpAddress))
{
a6.sin6_port = u6->u6_port;
memcpy (&a6.sin6_addr, &u6->ipv6_addr, sizeof (struct in6_addr));
port = ntohs (u6->u6_port);
+ options = ntohl (u6->options);
sb = &a6;
sbs = sizeof (a6);
}
a4.sin_port = u4->u4_port;
a4.sin_addr.s_addr = u4->ipv4_addr;
port = ntohs (u4->u4_port);
+ options = ntohl (u4->options);
sb = &a4;
sbs = sizeof (a4);
}
- else if (0 == addrlen)
- {
- asc (asc_cls, "<inbound connection>");
- asc (asc_cls, NULL);
- return;
- }
else
{
/* invalid address */
asc (asc_cls, NULL);
return;
}
- ppc = MEMDEBUG_malloc (sizeof (struct PrettyPrinterContext), __LINE__ );
+ ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
ppc->asc = asc;
ppc->asc_cls = asc_cls;
ppc->port = port;
- GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric, timeout, &append_port, ppc);
+ ppc->options = options;
+ if (addrlen == sizeof (struct IPv6UdpAddress))
+ ppc->ipv6 = GNUNET_YES;
+ else
+ ppc->ipv6 = GNUNET_NO;
+ ppc->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(timeout, 2),
+ &ppc_cancel_task, ppc);
+ GNUNET_CONTAINER_DLL_insert (ppc_dll_head, ppc_dll_tail, ppc);
+ /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "PPC %p was created!\n", ppc); */
+ ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric, timeout, &append_port, ppc);
+
}
if ((addrlen != sizeof (struct IPv4UdpAddress)) &&
(addrlen != sizeof (struct IPv6UdpAddress)))
{
- GNUNET_break_op (0);
return GNUNET_SYSERR;
}
if (addrlen == sizeof (struct IPv4UdpAddress))
if (NULL != s->frag_ctx)
{
GNUNET_FRAGMENT_context_destroy(s->frag_ctx->frag, NULL, NULL);
- MEMDEBUG_free (s->frag_ctx, __LINE__);
+ GNUNET_free (s->frag_ctx);
s->frag_ctx = NULL;
}
- MEMDEBUG_free (s, __LINE__);
+ GNUNET_free (s);
}
plugin->ipv6_queue_tail, udpw);
}
+
static void
fragmented_message_done (struct UDP_FragmentationContext *fc, int result)
{
struct UDP_MessageWrapper dummy;
struct Session *s = fc->session;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "%p : Fragmented message removed with result %s\n", fc, (result == GNUNET_SYSERR) ? "FAIL" : "SUCCESS");
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "%p : Fragmented message removed with result %s\n",
+ fc,
+ (result == GNUNET_SYSERR) ? "FAIL" : "SUCCESS");
+
/* Call continuation for fragmented message */
memset (&dummy, 0, sizeof (dummy));
dummy.msg_type = MSG_FRAGMENTED_COMPLETE;
{
dequeue (plugin, udpw);
call_continuation (udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
}
udpw = tmp;
}
{
dequeue (plugin, udpw);
call_continuation (udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
}
udpw = tmp;
}
&s->last_expected_msg_delay,
&s->last_expected_ack_delay);
s->frag_ctx = NULL;
- MEMDEBUG_free (fc , __LINE__);
+ GNUNET_free (fc );
}
/**
{
dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
}
}
next = plugin->ipv6_queue_head;
{
dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
}
- udpw = next;
}
plugin->env->session_end (plugin->env->cls, &s->target, s);
}
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (plugin->sessions,
- &s->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
+ &s->target,
s));
GNUNET_STATISTICS_set(plugin->env->stats,
"# UDP, sessions active",
- GNUNET_CONTAINER_multihashmap_size(plugin->sessions),
+ GNUNET_CONTAINER_multipeermap_size(plugin->sessions),
GNUNET_NO);
if (s->rc > 0)
s->in_destroy = GNUNET_YES;
* @return GNUNET_OK (continue to iterate)
*/
static int
-disconnect_and_free_it (void *cls, const struct GNUNET_HashCode * key, void *value)
+disconnect_and_free_it (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
disconnect_session(value);
return GNUNET_OK;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting from peer `%s'\n", GNUNET_i2s (target));
/* Clean up sessions */
- GNUNET_CONTAINER_multihashmap_get_multiple (plugin->sessions, &target->hashPubKey, &disconnect_and_free_it, plugin);
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, target,
+ &disconnect_and_free_it, plugin);
}
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Session %p was idle for %llu ms, disconnecting\n",
- s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
/* call session destroy function */
disconnect_session (s);
}
&session_timeout,
s);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout for session %p set to %llu ms\n",
- s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ "Timeout for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
}
&session_timeout,
s);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout rescheduled for session %p set to %llu ms\n",
- s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
-}
-
-
-/**
- * Cancel timeout
- */
-static void
-stop_session_timeout (struct Session *s)
-{
- GNUNET_assert (NULL != s);
-
- if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout stopped for session %p canceled\n",
- s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
- }
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
}
struct sockaddr_in6 *v6;
size_t len;
+ if (NULL == addr)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+
switch (addrlen)
{
case sizeof (struct IPv4UdpAddress):
if (NULL == plugin->sockv4)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not create session for peer `%s' address `%s': IPv4 is not enabled\n",
+ GNUNET_i2s(target),
+ udp_address_to_string(NULL, addr, addrlen));
return NULL;
}
t4 = addr;
- s = MEMDEBUG_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in), __LINE__ );
+ s = GNUNET_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in));
len = sizeof (struct sockaddr_in);
v4 = (struct sockaddr_in *) &s[1];
v4->sin_family = AF_INET;
case sizeof (struct IPv6UdpAddress):
if (NULL == plugin->sockv6)
{
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Could not create session for peer `%s' address `%s': IPv6 is not enabled\n",
+ GNUNET_i2s(target),
+ udp_address_to_string(NULL, addr, addrlen));
return NULL;
}
t6 = addr;
- s =
- MEMDEBUG_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in6), __LINE__ );
+ s = GNUNET_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in6));
len = sizeof (struct sockaddr_in6);
v6 = (struct sockaddr_in6 *) &s[1];
v6->sin6_family = AF_INET6;
break;
default:
/* Must have a valid address to send to */
- GNUNET_break_op (0);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop
+ ("# requests to create session with invalid address"),
+ 1, GNUNET_NO);
return NULL;
}
s->addrlen = len;
s->last_expected_msg_delay = GNUNET_TIME_UNIT_MILLISECONDS;
s->flow_delay_from_other_peer = GNUNET_TIME_UNIT_ZERO_ABS;
s->flow_delay_for_other_peer = GNUNET_TIME_UNIT_ZERO;
+ s->inbound = GNUNET_NO;
start_session_timeout (s);
return s;
}
static int
session_cmp_it (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity * key,
void *value)
{
struct SessionCompareContext * cctx = cls;
socklen_t s_addrlen = s->addrlen;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Comparing address %s <-> %s\n",
- udp_address_to_string (NULL, (void *) address->address, address->address_length),
- GNUNET_a2s (s->sock_addr, s->addrlen));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Comparing address %s <-> %s\n",
+ udp_address_to_string (NULL, (void *) address->address,
+ address->address_length),
+ GNUNET_a2s (s->sock_addr, s->addrlen));
+ if (s->inbound != cctx->inbound)
+ return GNUNET_YES;
if ((address->address_length == sizeof (struct IPv4UdpAddress)) &&
(s_addrlen == sizeof (struct sockaddr_in)))
{
struct IPv4UdpAddress * u4 = NULL;
u4 = (struct IPv4UdpAddress *) address->address;
+ GNUNET_assert (NULL != u4);
const struct sockaddr_in *s4 = (const struct sockaddr_in *) s->sock_addr;
if ((0 == memcmp ((const void *) &u4->ipv4_addr,(const void *) &s4->sin_addr, sizeof (struct in_addr))) &&
(u4->u4_port == s4->sin_port))
{
struct IPv6UdpAddress * u6 = NULL;
u6 = (struct IPv6UdpAddress *) address->address;
+ GNUNET_assert (NULL != u6);
const struct sockaddr_in6 *s6 = (const struct sockaddr_in6 *) s->sock_addr;
if ((0 == memcmp (&u6->ipv6_addr, &s6->sin6_addr, sizeof (struct in6_addr))) &&
(u6->u6_port == s6->sin6_port))
}
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+udp_get_network (void *cls,
+ struct Session *session)
+{
+ return ntohl (session->ats.value);
+}
+
+
/**
* Creates a new outbound session the transport service will use to send data to the
* peer
*
* @param cls the plugin
* @param address the address
+ * @param inbound look for inbound session
* @return the session or NULL of max connections exceeded
*/
static struct Session *
-udp_plugin_get_session (void *cls,
- const struct GNUNET_HELLO_Address *address)
+udp_plugin_lookup_session (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ int inbound)
{
- struct Session * s = NULL;
struct Plugin * plugin = cls;
struct IPv6UdpAddress * udp_a6;
struct IPv4UdpAddress * udp_a4;
((address->address_length != sizeof (struct IPv4UdpAddress)) &&
(address->address_length != sizeof (struct IPv6UdpAddress))))
{
- GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Trying to create session for address of unexpected length %u (should be %u or %u)\n"),
+ address->address_length,
+ sizeof (struct IPv4UdpAddress),
+ sizeof (struct IPv6UdpAddress));
return NULL;
}
struct SessionCompareContext cctx;
cctx.addr = address;
cctx.res = NULL;
+ cctx.inbound = inbound;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Looking for existing session for peer `%s' `%s' \n",
- GNUNET_i2s (&address->peer),
+ "Looking for existing session for peer `%s' `%s' \n",
+ GNUNET_i2s (&address->peer),
udp_address_to_string(NULL, address->address, address->address_length));
- GNUNET_CONTAINER_multihashmap_get_multiple(plugin->sessions, &address->peer.hashPubKey, session_cmp_it, &cctx);
+ GNUNET_CONTAINER_multipeermap_get_multiple(plugin->sessions, &address->peer, session_cmp_it, &cctx);
if (cctx.res != NULL)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Found existing session %p\n", cctx.res);
return cctx.res;
}
+ return NULL;
+}
+
+
+static struct Session *
+udp_plugin_create_session (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ int inbound)
+{
+ struct Session *s;
- /* otherwise create new */
s = create_session (plugin,
- &address->peer,
- address->address,
- address->address_length,
- NULL, NULL);
+ &address->peer,
+ address->address,
+ address->address_length,
+ NULL, NULL);
+ if (NULL == s)
+ return NULL; /* protocol not supported or address invalid */
+ s->inbound = inbound;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Creating new session %p for peer `%s' address `%s'\n",
+ "Creating new %s session %p for peer `%s' address `%s'\n",
+ (GNUNET_YES == s->inbound) ? "inbound" : "outbound",
s,
GNUNET_i2s(&address->peer),
udp_address_to_string(NULL,address->address,address->address_length));
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (plugin->sessions,
- &s->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (plugin->sessions,
+ &s->target,
s,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
GNUNET_STATISTICS_set(plugin->env->stats,
"# UDP, sessions active",
- GNUNET_CONTAINER_multihashmap_size(plugin->sessions),
+ GNUNET_CONTAINER_multipeermap_size(plugin->sessions),
GNUNET_NO);
return s;
}
-static void
+
+/**
+ * Creates a new outbound session the transport service will use to send data to the
+ * peer
+ *
+ * @param cls the plugin
+ * @param address the address
+ * @return the session or NULL of max connections exceeded
+ */
+static struct Session *
+udp_plugin_get_session (void *cls,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct Session *s;
+
+ if (NULL == address)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ if ((address->address_length != sizeof (struct IPv4UdpAddress)) &&
+ (address->address_length != sizeof (struct IPv6UdpAddress)))
+ return NULL;
+
+ /* otherwise create new */
+ if (NULL != (s = udp_plugin_lookup_session (cls, address, GNUNET_NO)))
+ return s;
+ return udp_plugin_create_session (cls, address, GNUNET_NO);
+}
+
+
+static void
enqueue (struct Plugin *plugin, struct UDP_MessageWrapper * udpw)
{
if (plugin->bytes_in_buffer + udpw->msg_size > INT64_MAX)
int result, size_t payload, size_t physical)
{
struct UDP_MessageWrapper *udpw = cls;
- GNUNET_FRAGMENT_context_transmission_done (udpw->frag_ctx->frag);
+
+ GNUNET_FRAGMENT_context_transmission_done (udpw->frag_ctx->frag);
}
struct Plugin *plugin = frag_ctx->plugin;
struct UDP_MessageWrapper * udpw;
size_t msg_len = ntohs (msg->size);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Enqueuing fragment with %u bytes\n", msg_len);
frag_ctx->fragments_used ++;
- udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + msg_len, __LINE__ );
+ udpw = GNUNET_malloc (sizeof (struct UDP_MessageWrapper) + msg_len);
udpw->session = frag_ctx->session;
udpw->msg_buf = (char *) &udpw[1];
udpw->msg_size = msg_len;
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_contains_value(plugin->sessions, &s->target.hashPubKey, s))
+ if (GNUNET_YES != GNUNET_CONTAINER_multipeermap_contains_value(plugin->sessions, &s->target, s))
{
GNUNET_break (0);
return GNUNET_SYSERR;
if (udpmlen <= UDP_MTU)
{
/* unfragmented message */
- udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + udpmlen, __LINE__ );
+ udpw = GNUNET_malloc (sizeof (struct UDP_MessageWrapper) + udpmlen);
udpw->session = s;
udpw->msg_buf = (char *) &udpw[1];
udpw->msg_size = udpmlen; /* message size with UDP overhead */
if (s->frag_ctx != NULL)
return GNUNET_SYSERR;
memcpy (&udp[1], msgbuf, msgbuf_size);
- frag_ctx = MEMDEBUG_malloc (sizeof (struct UDP_FragmentationContext), __LINE__ );
+ frag_ctx = GNUNET_malloc (sizeof (struct UDP_FragmentationContext));
frag_ctx->plugin = plugin;
frag_ctx->session = s;
frag_ctx->cont = cont;
frag_ctx->frag = GNUNET_FRAGMENT_context_create (plugin->env->stats,
UDP_MTU,
&plugin->tracker,
- s->last_expected_msg_delay,
- s->last_expected_ack_delay,
+ s->last_expected_msg_delay,
+ s->last_expected_ack_delay,
&udp->header,
&enqueue_fragment,
- frag_ctx);
+ frag_ctx);
s->frag_ctx = frag_ctx;
GNUNET_STATISTICS_update (plugin->env->stats,
"# UDP, fragmented msgs, messages, pending",
void *arg;
size_t args;
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "NAT notification to %s address `%s'\n",
+ (GNUNET_YES == add_remove) ? "add" : "remove",
+ GNUNET_a2s (addr, addrlen));
+
/* convert 'addr' to our internal format */
switch (addr->sa_family)
{
case AF_INET:
GNUNET_assert (addrlen == sizeof (struct sockaddr_in));
+ memset (&u4, 0, sizeof (u4));
+ u4.options = htonl(myoptions);
u4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
u4.u4_port = ((struct sockaddr_in *) addr)->sin_port;
+ if (0 == ((struct sockaddr_in *) addr)->sin_port)
+ return;
arg = &u4;
- args = sizeof (u4);
+ args = sizeof (struct IPv4UdpAddress);
break;
case AF_INET6:
GNUNET_assert (addrlen == sizeof (struct sockaddr_in6));
+ memset (&u4, 0, sizeof (u4));
+ u6.options = htonl(myoptions);
+ if (0 == ((struct sockaddr_in6 *) addr)->sin6_port)
+ return;
memcpy (&u6.ipv6_addr, &((struct sockaddr_in6 *) addr)->sin6_addr,
sizeof (struct in6_addr));
u6.u6_port = ((struct sockaddr_in6 *) addr)->sin6_port;
arg = &u6;
- args = sizeof (u6);
+ args = sizeof (struct IPv6UdpAddress);
break;
default:
GNUNET_break (0);
&si->sender,
hdr,
si->session,
- si->arg,
- si->args);
+ (GNUNET_YES == si->session->inbound) ? NULL : si->arg,
+ (GNUNET_YES == si->session->inbound) ? 0 : si->args);
plugin->env->update_address_metrics (plugin->env->cls,
&si->sender,
- si->arg,
- si->args,
+ (GNUNET_YES == si->session->inbound) ? NULL : si->arg,
+ (GNUNET_YES == si->session->inbound) ? 0 : si->args,
si->session,
&si->session->ats, 1);
{
case AF_INET:
GNUNET_assert (sender_addr_len == sizeof (struct sockaddr_in));
+ memset (&u4, 0, sizeof (u4));
+ u6.options = htonl (0);
u4.ipv4_addr = ((struct sockaddr_in *) sender_addr)->sin_addr.s_addr;
u4.u4_port = ((struct sockaddr_in *) sender_addr)->sin_port;
arg = &u4;
break;
case AF_INET6:
GNUNET_assert (sender_addr_len == sizeof (struct sockaddr_in6));
+ memset (&u6, 0, sizeof (u6));
+ u6.options = htonl (0);
u6.ipv6_addr = ((struct sockaddr_in6 *) sender_addr)->sin6_addr;
u6.u6_port = ((struct sockaddr_in6 *) sender_addr)->sin6_port;
arg = &u6;
GNUNET_a2s (sender_addr, sender_addr_len));
struct GNUNET_HELLO_Address * address = GNUNET_HELLO_address_allocate(&msg->sender, "udp", arg, args);
- MEMDEBUG_add_alloc (address, GNUNET_HELLO_address_get_size(address), __LINE__);
- s = udp_plugin_get_session(plugin, address);
- MEMDEBUG_free (address, __LINE__);
+ if (NULL == (s = udp_plugin_lookup_session (plugin, address, GNUNET_YES)))
+ {
+ s = udp_plugin_create_session (plugin, address, GNUNET_YES);
+ plugin->env->session_start (NULL, &address->peer, PLUGIN_NAME,
+ address->address, address->address_length, s, NULL, 0);
+ }
+ GNUNET_free (address);
/* iterate over all embedded messages */
si.session = s;
struct LookupContext
{
- const struct sockaddr * addr;
-
struct Session *res;
+ const struct sockaddr * addr;
+
size_t addrlen;
+
+ int must_have_frag_ctx;
};
static int
-lookup_session_by_addr_it (void *cls, const struct GNUNET_HashCode * key, void *value)
+lookup_session_by_addr_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct LookupContext *l_ctx = cls;
struct Session * s = value;
+ if ((GNUNET_YES == l_ctx->must_have_frag_ctx) && (NULL == s->frag_ctx))
+ return GNUNET_YES;
+
+ /*
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Comparing session: have %s %s %p<-> want %s\n",
+ GNUNET_a2s(s->sock_addr, s->addrlen),
+ (GNUNET_YES == s->inbound) ? "inbound" : "outbound",
+ s->frag_ctx,
+ GNUNET_a2s(l_ctx->addr, l_ctx->addrlen));
+ */
if ((s->addrlen == l_ctx->addrlen) &&
(0 == memcmp (s->sock_addr, l_ctx->addr, s->addrlen)))
{
l_ctx->res = s;
- return GNUNET_NO;
+ return GNUNET_YES;
}
return GNUNET_YES;
}
l_ctx.addr = rc->src_addr;
l_ctx.addrlen = rc->addr_len;
l_ctx.res = NULL;
- GNUNET_CONTAINER_multihashmap_iterate (rc->plugin->sessions,
+ l_ctx.must_have_frag_ctx = GNUNET_NO;
+ GNUNET_CONTAINER_multipeermap_iterate (rc->plugin->sessions,
&lookup_session_by_addr_it,
&l_ctx);
s = l_ctx.res;
if (NULL == s)
return;
- if (s->flow_delay_for_other_peer.rel_value <= UINT32_MAX)
- delay = s->flow_delay_for_other_peer.rel_value;
+ if (s->flow_delay_for_other_peer.rel_value_us <= UINT32_MAX)
+ delay = s->flow_delay_for_other_peer.rel_value_us;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending ACK to `%s' including delay of %u ms\n",
+ "Sending ACK to `%s' including delay of %s\n",
GNUNET_a2s (rc->src_addr,
(rc->src_addr->sa_family ==
AF_INET) ? sizeof (struct sockaddr_in) : sizeof (struct
sockaddr_in6)),
- delay);
- udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + msize, __LINE__ );
+ GNUNET_STRINGS_relative_time_to_string (s->flow_delay_for_other_peer,
+ GNUNET_YES));
+ udpw = GNUNET_malloc (sizeof (struct UDP_MessageWrapper) + msize);
udpw->msg_size = msize;
udpw->payload_size = 0;
udpw->session = s;
}
-static void
+static void
read_process_msg (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
const char *addr,
}
-static void
+static void
read_process_ack (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
char *addr,
l_ctx.addr = (const struct sockaddr *) addr;
l_ctx.addrlen = fromlen;
l_ctx.res = NULL;
- GNUNET_CONTAINER_multihashmap_iterate (plugin->sessions,
+ l_ctx.must_have_frag_ctx = GNUNET_YES;
+ GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
&lookup_session_by_addr_it,
&l_ctx);
s = l_ctx.res;
-
if ((NULL == s) || (NULL == s->frag_ctx))
{
return;
}
- flow_delay.rel_value = (uint64_t) ntohl (udp_ack->delay);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "We received a sending delay of %llu\n",
- flow_delay.rel_value);
+
+ flow_delay.rel_value_us = (uint64_t) ntohl (udp_ack->delay);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "We received a sending delay of %s\n",
+ GNUNET_STRINGS_relative_time_to_string (flow_delay,
+ GNUNET_YES));
s->flow_delay_from_other_peer =
GNUNET_TIME_relative_to_absolute (flow_delay);
}
-static void
+static void
read_process_fragment (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
char *addr,
if (d_ctx == NULL)
{
/* Create a new defragmentation context */
- d_ctx = MEMDEBUG_malloc (sizeof (struct DefragContext) + fromlen, __LINE__ );
+ d_ctx = GNUNET_malloc (sizeof (struct DefragContext) + fromlen);
memcpy (&d_ctx[1], addr, fromlen);
d_ctx->src_addr = (const struct sockaddr *) &d_ctx[1];
d_ctx->addr_len = fromlen;
d_ctx->hnode =
GNUNET_CONTAINER_heap_insert (plugin->defrag_ctxs, d_ctx,
(GNUNET_CONTAINER_HeapCostType)
- now.abs_value);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ now.abs_value_us);
+ 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));
/* keep this 'rc' from expiring */
GNUNET_CONTAINER_heap_update_cost (plugin->defrag_ctxs, d_ctx->hnode,
(GNUNET_CONTAINER_HeapCostType)
- now.abs_value);
+ now.abs_value_us);
}
if (GNUNET_CONTAINER_heap_get_size (plugin->defrag_ctxs) >
UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG)
d_ctx = GNUNET_CONTAINER_heap_remove_root (plugin->defrag_ctxs);
GNUNET_assert (NULL != d_ctx);
GNUNET_DEFRAGMENT_context_destroy (d_ctx->defrag);
- MEMDEBUG_free (d_ctx, __LINE__);
+ GNUNET_free (d_ctx);
}
}
}
}
+
static struct UDP_MessageWrapper *
remove_timeout_messages_and_select (struct UDP_MessageWrapper *head,
struct GNUNET_NETWORK_Handle *sock)
{
/* Find messages with timeout */
remaining = GNUNET_TIME_absolute_get_remaining (udpw->timeout);
- if (GNUNET_TIME_UNIT_ZERO.rel_value == remaining.rel_value)
+ if (GNUNET_TIME_UNIT_ZERO.rel_value_us == remaining.rel_value_us)
{
/* Message timed out */
switch (udpw->msg_type) {
call_continuation (udpw, GNUNET_SYSERR);
/* Remove message */
dequeue (plugin, udpw);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
break;
case MSG_FRAGMENTED:
/* Fragmented message */
GNUNET_i2s(&udpw->session->target), udpw->payload_size);
call_continuation (udpw, GNUNET_SYSERR);
dequeue (plugin, udpw);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
break;
default:
break;
{
/* Message did not time out, check flow delay */
remaining = GNUNET_TIME_absolute_get_remaining (udpw->session->flow_delay_from_other_peer);
- if (GNUNET_TIME_UNIT_ZERO.rel_value == remaining.rel_value)
+ if (GNUNET_TIME_UNIT_ZERO.rel_value_us == remaining.rel_value_us)
{
/* this message is not delayed */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Message for peer `%s' (%u bytes) is not delayed \n",
GNUNET_i2s(&udpw->session->target), udpw->payload_size);
break; /* Found message to send, break */
{
/* Message is delayed, try next */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Message for peer `%s' (%u bytes) is delayed for %llu \n",
- GNUNET_i2s(&udpw->session->target), udpw->payload_size, remaining.rel_value);
+ "Message for peer `%s' (%u bytes) is delayed for %s\n",
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size,
+ GNUNET_STRINGS_relative_time_to_string (remaining,
+ GNUNET_YES));
udpw = udpw->next;
}
}
}
}
+
static size_t
udp_select_send (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *sock)
{
call_continuation (udpw, GNUNET_OK);
}
dequeue (plugin, udpw);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
udpw = NULL;
return sent;
(GNUNET_NETWORK_fdset_isset (tc->read_ready, plugin->sockv4)) )
udp_select_read (plugin, plugin->sockv4);
if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) &&
- (NULL != plugin->sockv4) &&
+ (NULL != plugin->sockv4) &&
(NULL != plugin->ipv4_queue_head) &&
(GNUNET_NETWORK_fdset_isset (tc->write_ready, plugin->sockv4)) )
- udp_select_send (plugin, plugin->sockv4);
+ udp_select_send (plugin, plugin->sockv4);
schedule_select (plugin);
}
udp_select_read (plugin, plugin->sockv6);
if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) &&
(NULL != plugin->sockv6) && (plugin->ipv6_queue_head != NULL) &&
- (GNUNET_NETWORK_fdset_isset (tc->write_ready, plugin->sockv6)) )
+ (GNUNET_NETWORK_fdset_isset (tc->write_ready, plugin->sockv6)) )
udp_select_send (plugin, plugin->sockv6);
schedule_select (plugin);
}
+/**
+ *
+ * @return number of sockets that were successfully bound
+ */
static int
-setup_sockets (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct sockaddr_in *serverAddrv4)
+setup_sockets (struct Plugin *plugin,
+ const struct sockaddr_in6 *bind_v6,
+ const struct sockaddr_in *bind_v4)
{
int tries;
int sockets_created = 0;
+ struct sockaddr_in6 serverAddrv6;
+ struct sockaddr_in serverAddrv4;
struct sockaddr *serverAddr;
struct sockaddr *addrs[2];
socklen_t addrlens[2];
socklen_t addrlen;
+ int eno;
/* Create IPv6 socket */
+ eno = EINVAL;
if (plugin->enable_ipv6 == GNUNET_YES)
{
plugin->sockv6 = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 0);
if (NULL == plugin->sockv6)
{
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "socket");
LOG (GNUNET_ERROR_TYPE_WARNING, "Disabling IPv6 since it is not supported on this system!\n");
plugin->enable_ipv6 = GNUNET_NO;
}
else
{
+ memset (&serverAddrv6, '\0', sizeof (struct sockaddr_in6));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv6->sin6_len = sizeof (serverAddrv6);
+ serverAddrv6.sin6_len = sizeof (struct sockaddr_in6);
#endif
- serverAddrv6->sin6_family = AF_INET6;
- serverAddrv6->sin6_addr = in6addr_any;
- serverAddrv6->sin6_port = htons (plugin->port);
+ serverAddrv6.sin6_family = AF_INET6;
+ if (NULL != bind_v6)
+ serverAddrv6.sin6_addr = bind_v6->sin6_addr;
+ else
+ serverAddrv6.sin6_addr = in6addr_any;
+
+ if (0 == plugin->port) /* autodetect */
+ serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ else
+ serverAddrv6.sin6_port = htons (plugin->port);
addrlen = sizeof (struct sockaddr_in6);
- serverAddr = (struct sockaddr *) serverAddrv6;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 port %d\n",
- ntohs (serverAddrv6->sin6_port));
+ serverAddr = (struct sockaddr *) &serverAddrv6;
+
tries = 0;
- while (GNUNET_NETWORK_socket_bind (plugin->sockv6, serverAddrv6, addrlen) !=
- GNUNET_OK)
+ while (tries < 10)
{
- serverAddrv6->sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "IPv6 Binding failed, trying new port %d\n",
- ntohs (serverAddrv6->sin6_port));
- tries++;
- if (tries > 10)
- {
- GNUNET_NETWORK_socket_close (plugin->sockv6);
- plugin->sockv6 = NULL;
- break;
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 `%s'\n",
+ GNUNET_a2s (serverAddr, addrlen));
+ /* binding */
+ if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
+ serverAddr, addrlen))
+ break;
+ eno = errno;
+ if (0 != plugin->port)
+ {
+ tries = 10; /* fail */
+ break; /* bind failed on specific port */
+ }
+ /* autodetect */
+ serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ tries ++;
+ }
+ if (tries >= 10)
+ {
+ GNUNET_NETWORK_socket_close (plugin->sockv6);
+ plugin->enable_ipv6 = GNUNET_NO;
+ plugin->sockv6 = NULL;
}
+
if (plugin->sockv6 != NULL)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "IPv6 socket created on port %d\n",
- ntohs (serverAddrv6->sin6_port));
- addrs[sockets_created] = (struct sockaddr *) serverAddrv6;
+ "IPv6 socket created on port %s\n",
+ GNUNET_a2s (serverAddr, addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &serverAddrv6;
addrlens[sockets_created] = sizeof (struct sockaddr_in6);
sockets_created++;
}
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to bind UDP socket to %s: %s\n",
+ GNUNET_a2s (serverAddr, addrlen),
+ STRERROR (eno));
+ }
}
}
/* Create IPv4 socket */
+ eno = EINVAL;
plugin->sockv4 = GNUNET_NETWORK_socket_create (PF_INET, SOCK_DGRAM, 0);
if (NULL == plugin->sockv4)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "socket");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Disabling IPv4 since it is not supported on this system!\n");
+ plugin->enable_ipv4 = GNUNET_NO;
}
else
{
+ memset (&serverAddrv4, '\0', sizeof (struct sockaddr_in));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv4->sin_len = sizeof (serverAddrv4);
+ serverAddrv4.sin_len = sizeof (struct sockaddr_in);
#endif
- serverAddrv4->sin_family = AF_INET;
- serverAddrv4->sin_addr.s_addr = INADDR_ANY;
- serverAddrv4->sin_port = htons (plugin->port);
+ serverAddrv4.sin_family = AF_INET;
+ if (NULL != bind_v4)
+ serverAddrv4.sin_addr = bind_v4->sin_addr;
+ else
+ serverAddrv4.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);
+ else
+ serverAddrv4.sin_port = htons (plugin->port);
+
+
addrlen = sizeof (struct sockaddr_in);
- serverAddr = (struct sockaddr *) serverAddrv4;
+ serverAddr = (struct sockaddr *) &serverAddrv4;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 port %d\n",
- ntohs (serverAddrv4->sin_port));
tries = 0;
- while (GNUNET_NETWORK_socket_bind (plugin->sockv4, serverAddr, addrlen) !=
- GNUNET_OK)
+ while (tries < 10)
{
- serverAddrv4->sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "IPv4 Binding failed, trying new port %d\n",
- ntohs (serverAddrv4->sin_port));
- tries++;
- if (tries > 10)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 `%s'\n",
+ GNUNET_a2s (serverAddr, addrlen));
+
+ /* binding */
+ if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
+ serverAddr, addrlen))
+ break;
+ eno = errno;
+ if (0 != plugin->port)
{
- GNUNET_NETWORK_socket_close (plugin->sockv4);
- plugin->sockv4 = NULL;
- break;
+ tries = 10; /* fail */
+ break; /* bind failed on specific port */
}
+
+ /* autodetect */
+ serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ tries ++;
}
+
+ if (tries >= 10)
+ {
+ GNUNET_NETWORK_socket_close (plugin->sockv4);
+ plugin->enable_ipv4 = GNUNET_NO;
+ plugin->sockv4 = NULL;
+ }
+
if (plugin->sockv4 != NULL)
{
- addrs[sockets_created] = (struct sockaddr *) serverAddrv4;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "IPv4 socket created on port %s\n", GNUNET_a2s (serverAddr, addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &serverAddrv4;
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));
+ }
+ }
+
+ if (0 == sockets_created)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("Failed to open UDP sockets\n"));
+ return 0; /* No sockets created, return */
}
/* Create file descriptors */
- plugin->rs_v4 = GNUNET_NETWORK_fdset_create ();
- plugin->ws_v4 = GNUNET_NETWORK_fdset_create ();
- GNUNET_NETWORK_fdset_zero (plugin->rs_v4);
- GNUNET_NETWORK_fdset_zero (plugin->ws_v4);
- if (NULL != plugin->sockv4)
+ if (plugin->enable_ipv4 == GNUNET_YES)
{
- GNUNET_NETWORK_fdset_set (plugin->rs_v4, plugin->sockv4);
- GNUNET_NETWORK_fdset_set (plugin->ws_v4, plugin->sockv4);
+ plugin->rs_v4 = GNUNET_NETWORK_fdset_create ();
+ plugin->ws_v4 = GNUNET_NETWORK_fdset_create ();
+ GNUNET_NETWORK_fdset_zero (plugin->rs_v4);
+ GNUNET_NETWORK_fdset_zero (plugin->ws_v4);
+ if (NULL != plugin->sockv4)
+ {
+ GNUNET_NETWORK_fdset_set (plugin->rs_v4, plugin->sockv4);
+ GNUNET_NETWORK_fdset_set (plugin->ws_v4, plugin->sockv4);
+ }
}
- if (0 == sockets_created)
- LOG (GNUNET_ERROR_TYPE_WARNING, _("Failed to open UDP sockets\n"));
if (plugin->enable_ipv6 == GNUNET_YES)
{
plugin->rs_v6 = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_set (plugin->ws_v6, plugin->sockv6);
}
}
+
schedule_select (plugin);
plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
GNUNET_NO, plugin->port,
struct sockaddr_in serverAddrv4;
struct sockaddr_in6 serverAddrv6;
int res;
+ int have_bind4;
+ int have_bind6;
if (NULL == env->receive)
{
/* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
initialze the plugin or the API */
- api = MEMDEBUG_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions), __LINE__ );
+ api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = NULL;
api->address_pretty_printer = &udp_plugin_address_pretty_printer;
api->address_to_string = &udp_address_to_string;
return api;
}
- GNUNET_assert( NULL != env->stats);
+ GNUNET_assert (NULL != env->stats);
- /* Get port number */
+ /* Get port number: port == 0 : autodetect a port,
+ * > 0 : use this port,
+ * not given : 2086 default */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-udp", "PORT",
&port))
if ((GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno (env->cfg, "nat",
"DISABLEV6")))
- {
enable_v6 = GNUNET_NO;
- }
else
enable_v6 = GNUNET_YES;
/* Addresses */
- memset (&serverAddrv6, 0, sizeof (serverAddrv6));
+ have_bind4 = GNUNET_NO;
memset (&serverAddrv4, 0, sizeof (serverAddrv4));
-
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO", &bind4_address))
bind4_address);
if (1 != inet_pton (AF_INET, bind4_address, &serverAddrv4.sin_addr))
{
- MEMDEBUG_free (bind4_address, __LINE__);
+ GNUNET_free (bind4_address);
return NULL;
}
+ have_bind4 = GNUNET_YES;
}
-
+ GNUNET_free_non_null (bind4_address);
+ have_bind6 = GNUNET_NO;
+ memset (&serverAddrv6, 0, sizeof (serverAddrv6));
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO6", &bind6_address))
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"),
bind6_address);
- MEMDEBUG_free_non_null (bind4_address, __LINE__);
- MEMDEBUG_free (bind6_address, __LINE__);
+ GNUNET_free (bind6_address);
return NULL;
}
+ have_bind6 = GNUNET_YES;
}
+ GNUNET_free_non_null (bind6_address);
+
+ /* Initialize my flags */
+ myoptions = 0;
/* Enable neighbour discovery */
broadcast = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, "transport-udp",
}
else
{
- MEMDEBUG_add_alloc (fancy_interval, strlen (fancy_interval)+ 1, __LINE__);
if (GNUNET_SYSERR == GNUNET_STRINGS_fancy_time_to_relative(fancy_interval, &interval))
{
interval = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
}
- MEMDEBUG_free (fancy_interval, __LINE__);
+ GNUNET_free (fancy_interval);
}
/* Maximum datarate */
udp_max_bps = 1024 * 1024 * 50; /* 50 MB/s == infinity for practical purposes */
}
- p = MEMDEBUG_malloc (sizeof (struct Plugin), __LINE__ );
- api = MEMDEBUG_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions), __LINE__ );
-
- GNUNET_BANDWIDTH_tracker_init (&p->tracker,
- GNUNET_BANDWIDTH_value_init ((uint32_t)udp_max_bps), 30);
- p->sessions = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
- p->defrag_ctxs = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
- p->mst = GNUNET_SERVER_mst_create (&process_inbound_tokenized_messages, p);
+ p = GNUNET_malloc (sizeof (struct Plugin));
p->port = port;
p->aport = aport;
p->broadcast_interval = interval;
p->enable_ipv6 = enable_v6;
+ p->enable_ipv4 = GNUNET_YES; /* default */
p->env = env;
-
+ p->sessions = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ 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);
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_ERROR,
+ _("Failed to create network sockets, plugin failed\n"));
+ GNUNET_CONTAINER_multipeermap_destroy (p->sessions);
+ GNUNET_CONTAINER_heap_destroy (p->defrag_ctxs);
+ GNUNET_SERVER_mst_destroy (p->mst);
+ GNUNET_free (p);
+ return NULL;
+ }
+ else if (broadcast == GNUNET_YES)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n");
+ setup_broadcast (p, &serverAddrv6, &serverAddrv4);
+ }
+
+ api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = p;
api->send = NULL;
api->disconnect = &udp_disconnect;
api->check_address = &udp_plugin_check_address;
api->get_session = &udp_plugin_get_session;
api->send = &udp_plugin_send;
+ api->get_network = &udp_get_network;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
- res = setup_sockets (p, &serverAddrv6, &serverAddrv4);
- if ((res == 0) || ((p->sockv4 == NULL) && (p->sockv6 == NULL)))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create network sockets, plugin failed\n");
- MEMDEBUG_free (p, __LINE__);
- MEMDEBUG_free (api, __LINE__);
- return NULL;
- }
-
- if (broadcast == GNUNET_YES)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n");
- setup_broadcast (p, &serverAddrv6, &serverAddrv4);
- }
-
- MEMDEBUG_free_non_null (bind4_address, __LINE__);
- MEMDEBUG_free_non_null (bind6_address, __LINE__);
return api;
}
GNUNET_CONTAINER_heap_remove_node (node);
GNUNET_DEFRAGMENT_context_destroy(d_ctx->defrag);
- MEMDEBUG_free (d_ctx, __LINE__);
+ GNUNET_free (d_ctx);
return GNUNET_YES;
}
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct PrettyPrinterContext *cur;
+ struct PrettyPrinterContext *next;
if (NULL == plugin)
{
- MEMDEBUG_free (api, __LINE__);
+ GNUNET_free (api);
return NULL;
}
}
/* Closing sockets */
- if (plugin->sockv4 != NULL)
+ if (GNUNET_YES ==plugin->enable_ipv4)
{
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv4));
- plugin->sockv4 = NULL;
+ if (plugin->sockv4 != NULL)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv4));
+ plugin->sockv4 = NULL;
+ }
+ GNUNET_NETWORK_fdset_destroy (plugin->rs_v4);
+ GNUNET_NETWORK_fdset_destroy (plugin->ws_v4);
}
- GNUNET_NETWORK_fdset_destroy (plugin->rs_v4);
- GNUNET_NETWORK_fdset_destroy (plugin->ws_v4);
-
- if (plugin->sockv6 != NULL)
+ if (GNUNET_YES ==plugin->enable_ipv6)
{
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv6));
- plugin->sockv6 = NULL;
+ if (plugin->sockv6 != NULL)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv6));
+ plugin->sockv6 = NULL;
- GNUNET_NETWORK_fdset_destroy (plugin->rs_v6);
- GNUNET_NETWORK_fdset_destroy (plugin->ws_v6);
+ GNUNET_NETWORK_fdset_destroy (plugin->rs_v6);
+ GNUNET_NETWORK_fdset_destroy (plugin->ws_v6);
+ }
}
-
- GNUNET_NAT_unregister (plugin->nat);
+ if (NULL != plugin->nat)
+ GNUNET_NAT_unregister (plugin->nat);
if (plugin->defrag_ctxs != NULL)
{
struct UDP_MessageWrapper *tmp = udpw->next;
dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
udpw = tmp;
}
struct UDP_MessageWrapper *tmp = udpw->next;
dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- MEMDEBUG_free (udpw, __LINE__);
+ GNUNET_free (udpw);
udpw = tmp;
}
/* Clean up sessions */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Cleaning up sessions\n");
- GNUNET_CONTAINER_multihashmap_iterate (plugin->sessions, &disconnect_and_free_it, plugin);
- GNUNET_CONTAINER_multihashmap_destroy (plugin->sessions);
+ GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, &disconnect_and_free_it, plugin);
+ GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
+
+ next = ppc_dll_head;
+ for (cur = next; NULL != cur; cur = next)
+ {
+ next = cur->next;
+ GNUNET_CONTAINER_DLL_remove (ppc_dll_head, ppc_dll_tail, cur);
+ GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
+ GNUNET_SCHEDULER_cancel (cur->timeout_task);
+ GNUNET_free (cur);
+ GNUNET_break (0);
+ }
plugin->nat = NULL;
- MEMDEBUG_free (plugin, __LINE__);
- MEMDEBUG_free (api, __LINE__);
+ GNUNET_free (plugin);
+ GNUNET_free (api);
#if DEBUG_MALLOC
struct Allocation *allocation;
while (NULL != ahead)