#define UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG 128
+#define DEBUG_MALLOC GNUNET_NO
/**
* Closure for 'append_port'.
};
+enum UDP_MessageType
+{
+ UNDEFINED = 0,
+ MSG_FRAGMENTED = 1,
+ MSG_FRAGMENTED_COMPLETE = 2,
+ MSG_UNFRAGMENTED = 3,
+ MSG_ACK = 4,
+ MSG_BEACON = 5
+};
+
struct Session
{
/**
*/
struct GNUNET_PeerIdentity target;
- struct FragmentationContext * frag_ctx;
+ struct UDP_FragmentationContext * frag_ctx;
/**
* Address of the other peer
/**
* expected delay for ACKs
*/
- struct GNUNET_TIME_Relative last_expected_delay;
+ struct GNUNET_TIME_Relative last_expected_ack_delay;
+
+ /**
+ * desired delay between UDP messages
+ */
+ struct GNUNET_TIME_Relative last_expected_msg_delay;
struct GNUNET_ATS_Information ats;
/**
- * Closure for 'process_inbound_tokenized_messages'
+ * Context to send fragmented messages
*/
-struct FragmentationContext
+struct UDP_FragmentationContext
{
- struct FragmentationContext * next;
- struct FragmentationContext * prev;
+ /**
+ * Next in linked list
+ */
+ struct UDP_FragmentationContext * next;
+ /**
+ * Previous in linked list
+ */
+ struct UDP_FragmentationContext * prev;
+
+ /**
+ * The plugin
+ */
struct Plugin * plugin;
+
+ /**
+ * Handle for GNUNET_FRAGMENT context
+ */
struct GNUNET_FRAGMENT_Context * frag;
+
+ /**
+ * The session this fragmentation context belongs to
+ */
struct Session * session;
/**
*/
void *cont_cls;
+ /**
+ * Message timeout
+ */
struct GNUNET_TIME_Absolute timeout;
- size_t bytes_to_send;
+ /**
+ * Payload size of original unfragmented message
+ */
+ size_t payload_size;
+
+ /**
+ * Bytes used to send all fragments on wire including UDP overhead
+ */
+ size_t on_wire_size;
+
+ unsigned int fragments_used;
+
};
-struct UDPMessageWrapper
+struct UDP_MessageWrapper
{
+ /**
+ * Session this message belongs to
+ */
struct Session *session;
- struct UDPMessageWrapper *prev;
- struct UDPMessageWrapper *next;
- char *udp;
/**
- * Function to call upon completion of the transmission.
+ * DLL of messages
+ * previous element
*/
- GNUNET_TRANSPORT_TransmitContinuation cont;
+ struct UDP_MessageWrapper *prev;
/**
- * Closure for 'cont'.
+ * DLL of messages
+ * previous element
*/
- void *cont_cls;
+ struct UDP_MessageWrapper *next;
+
+ /**
+ * Message type
+ * According to UDP_MessageType
+ */
+ int msg_type;
- struct FragmentationContext *frag_ctx;
+ /**
+ * Message with size msg_size including UDP specific overhead
+ */
+ char *msg_buf;
+ /**
+ * Size of UDP message to send including UDP specific overhead
+ */
size_t msg_size;
+ /**
+ * Payload size of original message
+ */
+ size_t payload_size;
+
+ /**
+ * Message timeout
+ */
struct GNUNET_TIME_Absolute timeout;
+
+ /**
+ * Function to call upon completion of the transmission.
+ */
+ GNUNET_TRANSPORT_TransmitContinuation cont;
+
+ /**
+ * Closure for 'cont'.
+ */
+ void *cont_cls;
+
+ /**
+ * Fragmentation context
+ * frag_ctx == NULL if transport <= MTU
+ * frag_ctx != NULL if transport > MTU
+ */
+ struct UDP_FragmentationContext *frag_ctx;
};
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)
+{
+ void * ret;
+
+ ret = GNUNET_malloc (size);
+#if DEBUG_MALLOC
+ if (NULL != ret)
+ MEMDEBUG_add_alloc (ret, size, line);
+#endif
+ return ret;
+
+}
+
+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)
+ {
+ GNUNET_break (0);
+ }
+ 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);
+}
+
/**
* (re)schedule select tasks for this plugin.
schedule_select (struct Plugin *plugin)
{
struct GNUNET_TIME_Relative min_delay;
- struct UDPMessageWrapper *udpw;
+ struct UDP_MessageWrapper *udpw;
if (NULL != plugin->sockv4)
{
+ /* Find a message ready to send:
+ * Flow delay from other peer is expired or not set (0) */
min_delay = GNUNET_TIME_UNIT_FOREVER_REL;
for (udpw = plugin->ipv4_queue_head; NULL != udpw; udpw = udpw->next)
min_delay = GNUNET_TIME_relative_min (min_delay,
if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel(plugin->select_task);
+
+ /* Schedule with:
+ * - write active set if message is ready
+ * - 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,
{
struct IPv4UdpAddress *u4;
struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
- u4 = GNUNET_malloc (sizeof (struct IPv4UdpAddress));
+ u4 = MEMDEBUG_malloc (sizeof (struct IPv4UdpAddress), __LINE__ );
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 = GNUNET_malloc (sizeof (struct IPv6UdpAddress));
+ u6 = MEMDEBUG_malloc (sizeof (struct IPv6UdpAddress), __LINE__ );
u6->ipv6_addr = in6->sin6_addr;
u6->u6_port = in6->sin6_port;
*buf = u6;
if (hostname == NULL)
{
ppc->asc (ppc->asc_cls, NULL);
- GNUNET_free (ppc);
+ MEMDEBUG_free (ppc, __LINE__);
return;
}
GNUNET_asprintf (&ret, "%s:%d", hostname, ppc->port);
+ MEMDEBUG_add_alloc (ret, strlen (ret)+ 1, __LINE__);
ppc->asc (ppc->asc_cls, ret);
- GNUNET_free (ret);
+ MEMDEBUG_free (ret, __LINE__);
}
asc (asc_cls, NULL);
return;
}
- ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
+ ppc = MEMDEBUG_malloc (sizeof (struct PrettyPrinterContext), __LINE__ );
ppc->asc = asc;
ppc->asc_cls = asc_cls;
ppc->port = port;
static void
-call_continuation (struct UDPMessageWrapper *udpw, int result)
+call_continuation (struct UDP_MessageWrapper *udpw, int result)
{
+ size_t overhead;
+
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Calling continuation for %u byte message to `%s' with result %s\n",
- udpw->msg_size, GNUNET_i2s (&udpw->session->target),
+ udpw->payload_size, GNUNET_i2s (&udpw->session->target),
(GNUNET_OK == result) ? "OK" : "SYSERR");
- if (NULL != udpw->cont)
- {
- udpw->cont (udpw->cont_cls, &udpw->session->target,result);
- }
+ if (udpw->msg_size >= udpw->payload_size)
+ overhead = udpw->msg_size - udpw->payload_size;
+ else
+ overhead = udpw->msg_size;
+
+ switch (result) {
+ case GNUNET_OK:
+ switch (udpw->msg_type) {
+ case MSG_UNFRAGMENTED:
+ if (NULL != udpw->cont)
+ {
+ /* Transport continuation */
+ udpw->cont (udpw->cont_cls, &udpw->session->target, result,
+ udpw->payload_size, udpw->msg_size);
+ }
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, messages, sent, success",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes payload, sent, success",
+ udpw->payload_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes overhead, sent, success",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes overhead, sent",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes payload, sent",
+ udpw->payload_size, GNUNET_NO);
+ break;
+ case MSG_FRAGMENTED_COMPLETE:
+ GNUNET_assert (NULL != udpw->frag_ctx);
+ if (udpw->frag_ctx->cont != NULL)
+ udpw->frag_ctx->cont (udpw->frag_ctx->cont_cls, &udpw->session->target, GNUNET_OK,
+ udpw->frag_ctx->payload_size, udpw->frag_ctx->on_wire_size);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, sent, success",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes payload, sent, success",
+ udpw->payload_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes overhead, sent, success",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes overhead, sent",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes payload, sent",
+ udpw->payload_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, pending",
+ -1, GNUNET_NO);
+ break;
+ case MSG_FRAGMENTED:
+ /* Fragmented message: enqueue next fragment */
+ if (NULL != udpw->cont)
+ udpw->cont (udpw->cont_cls, &udpw->session->target, result,
+ udpw->payload_size, udpw->msg_size);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, fragments, sent, success",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, fragments bytes, sent, success",
+ udpw->msg_size, GNUNET_NO);
+ break;
+ case MSG_ACK:
+ /* No continuation */
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, ACK msgs, messages, sent, success",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, ACK msgs, bytes overhead, sent, success",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes overhead, sent",
+ overhead, GNUNET_NO);
+ break;
+ case MSG_BEACON:
+ GNUNET_break (0);
+ break;
+ default:
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "ERROR: %u\n", udpw->msg_type);
+ GNUNET_break (0);
+ break;
+ }
+ break;
+ case GNUNET_SYSERR:
+ switch (udpw->msg_type) {
+ case MSG_UNFRAGMENTED:
+ /* Unfragmented message: failed to send */
+ if (NULL != udpw->cont)
+ udpw->cont (udpw->cont_cls, &udpw->session->target, result,
+ udpw->payload_size, overhead);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, messages, sent, failure",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes payload, sent, failure",
+ udpw->payload_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes overhead, sent, failure",
+ overhead, GNUNET_NO);
+ break;
+ case MSG_FRAGMENTED_COMPLETE:
+ GNUNET_assert (NULL != udpw->frag_ctx);
+ if (udpw->frag_ctx->cont != NULL)
+ udpw->frag_ctx->cont (udpw->frag_ctx->cont_cls, &udpw->session->target, GNUNET_SYSERR,
+ udpw->frag_ctx->payload_size, udpw->frag_ctx->on_wire_size);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, sent, failure",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes payload, sent, failure",
+ udpw->payload_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes payload, sent, failure",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes payload, sent, failure",
+ overhead, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, pending",
+ -1, GNUNET_NO);
+ break;
+ case MSG_FRAGMENTED:
+ GNUNET_assert (NULL != udpw->frag_ctx);
+ /* Fragmented message: failed to send */
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, fragments, sent, failure",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, fragments bytes, sent, failure",
+ udpw->msg_size, GNUNET_NO);
+ break;
+ case MSG_ACK:
+ /* ACK message: failed to send */
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, ACK msgs, messages, sent, failure",
+ 1, GNUNET_NO);
+ break;
+ case MSG_BEACON:
+ /* Beacon message: failed to send */
+ GNUNET_break (0);
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
}
static void
free_session (struct Session *s)
{
- if (s->frag_ctx != NULL)
+ if (NULL != s->frag_ctx)
{
- GNUNET_FRAGMENT_context_destroy(s->frag_ctx->frag);
- GNUNET_free (s->frag_ctx);
+ GNUNET_FRAGMENT_context_destroy(s->frag_ctx->frag, NULL, NULL);
+ MEMDEBUG_free (s->frag_ctx, __LINE__);
s->frag_ctx = NULL;
}
- GNUNET_free (s);
+ MEMDEBUG_free (s, __LINE__);
+}
+
+
+static void
+dequeue (struct Plugin *plugin, struct UDP_MessageWrapper * udpw)
+{
+ if (plugin->bytes_in_buffer < udpw->msg_size)
+ GNUNET_break (0);
+ else
+ {
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes in buffers",
+ - (long long) udpw->msg_size, GNUNET_NO);
+ plugin->bytes_in_buffer -= udpw->msg_size;
+ }
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, msgs in buffers",
+ -1, GNUNET_NO);
+ if (udpw->session->addrlen == sizeof (struct sockaddr_in))
+ GNUNET_CONTAINER_DLL_remove (plugin->ipv4_queue_head,
+ plugin->ipv4_queue_tail, udpw);
+ if (udpw->session->addrlen == sizeof (struct sockaddr_in6))
+ GNUNET_CONTAINER_DLL_remove (plugin->ipv6_queue_head,
+ plugin->ipv6_queue_tail, udpw);
}
+static void
+fragmented_message_done (struct UDP_FragmentationContext *fc, int result)
+{
+ struct UDP_MessageWrapper *udpw;
+ struct UDP_MessageWrapper *tmp;
+ 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");
+
+ /* Call continuation for fragmented message */
+ memset (&dummy, 0, sizeof (dummy));
+ dummy.msg_type = MSG_FRAGMENTED_COMPLETE;
+ dummy.msg_size = s->frag_ctx->on_wire_size;
+ dummy.payload_size = s->frag_ctx->payload_size;
+ dummy.frag_ctx = s->frag_ctx;
+ dummy.cont = NULL;
+ dummy.cont_cls = NULL;
+ dummy.session = s;
+
+ call_continuation (&dummy, result);
+
+ /* Remove leftover fragments from queue */
+ if (s->addrlen == sizeof (struct sockaddr_in6))
+ {
+ udpw = plugin->ipv6_queue_head;
+ while (NULL != udpw)
+ {
+ tmp = udpw->next;
+ if ((udpw->frag_ctx != NULL) && (udpw->frag_ctx == s->frag_ctx))
+ {
+ dequeue (plugin, udpw);
+ call_continuation (udpw, GNUNET_SYSERR);
+ MEMDEBUG_free (udpw, __LINE__);
+ }
+ udpw = tmp;
+ }
+ }
+ if (s->addrlen == sizeof (struct sockaddr_in))
+ {
+ udpw = plugin->ipv4_queue_head;
+ while (udpw!= NULL)
+ {
+ tmp = udpw->next;
+ if ((NULL != udpw->frag_ctx) && (udpw->frag_ctx == s->frag_ctx))
+ {
+ dequeue (plugin, udpw);
+ call_continuation (udpw, GNUNET_SYSERR);
+ MEMDEBUG_free (udpw, __LINE__);
+ }
+ udpw = tmp;
+ }
+ }
+
+ /* Destroy fragmentation context */
+ GNUNET_FRAGMENT_context_destroy (fc->frag,
+ &s->last_expected_msg_delay,
+ &s->last_expected_ack_delay);
+ s->frag_ctx = NULL;
+ MEMDEBUG_free (fc , __LINE__);
+}
/**
* Functions with this signature are called whenever we need
static void
disconnect_session (struct Session *s)
{
- struct UDPMessageWrapper *udpw;
- struct UDPMessageWrapper *next;
+ struct UDP_MessageWrapper *udpw;
+ struct UDP_MessageWrapper *next;
GNUNET_assert (GNUNET_YES != s->in_destroy);
LOG (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_i2s (&s->target),
GNUNET_a2s (s->sock_addr, s->addrlen));
stop_session_timeout (s);
+
+ if (NULL != s->frag_ctx)
+ {
+ /* Remove fragmented message due to disconnect */
+ fragmented_message_done (s->frag_ctx, GNUNET_SYSERR);
+ }
+
next = plugin->ipv4_queue_head;
while (NULL != (udpw = next))
{
next = udpw->next;
if (udpw->session == s)
{
- GNUNET_CONTAINER_DLL_remove(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
+ dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- GNUNET_free (udpw);
+ MEMDEBUG_free (udpw, __LINE__);
}
}
next = plugin->ipv6_queue_head;
next = udpw->next;
if (udpw->session == s)
{
- GNUNET_CONTAINER_DLL_remove(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
+ dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- GNUNET_free (udpw);
+ MEMDEBUG_free (udpw, __LINE__);
}
udpw = next;
}
{
if (NULL != s->frag_ctx->cont)
{
- s->frag_ctx->cont (s->frag_ctx->cont_cls, &s->target, GNUNET_SYSERR);
+ s->frag_ctx->cont (s->frag_ctx->cont_cls, &s->target, GNUNET_SYSERR,
+ s->frag_ctx->payload_size, s->frag_ctx->on_wire_size);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Calling continuation for fragemented message to `%s' with result SYSERR\n",
GNUNET_i2s (&s->target));
&s->target.hashPubKey,
s));
GNUNET_STATISTICS_set(plugin->env->stats,
- "# UDP sessions active",
+ "# UDP, sessions active",
GNUNET_CONTAINER_multihashmap_size(plugin->sessions),
GNUNET_NO);
if (s->rc > 0)
return NULL;
}
t4 = addr;
- s = GNUNET_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in));
+ s = MEMDEBUG_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in), __LINE__ );
len = sizeof (struct sockaddr_in);
v4 = (struct sockaddr_in *) &s[1];
v4->sin_family = AF_INET;
}
t6 = addr;
s =
- GNUNET_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in6));
+ MEMDEBUG_malloc (sizeof (struct Session) + sizeof (struct sockaddr_in6), __LINE__ );
len = sizeof (struct sockaddr_in6);
v6 = (struct sockaddr_in6 *) &s[1];
v6->sin6_family = AF_INET6;
s->addrlen = len;
s->target = *target;
s->sock_addr = (const struct sockaddr *) &s[1];
- s->last_expected_delay = GNUNET_TIME_UNIT_SECONDS;
+ s->last_expected_ack_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250);
+ 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;
start_session_timeout (s);
return s;
}
&s->target.hashPubKey,
s,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-
GNUNET_STATISTICS_set(plugin->env->stats,
- "# UDP sessions active",
+ "# UDP, sessions active",
GNUNET_CONTAINER_multihashmap_size(plugin->sessions),
GNUNET_NO);
-
return s;
}
-
static void
-enqueue (struct Plugin *plugin, struct UDPMessageWrapper * udpw)
+enqueue (struct Plugin *plugin, struct UDP_MessageWrapper * udpw)
{
-
+ if (plugin->bytes_in_buffer + udpw->msg_size > INT64_MAX)
+ GNUNET_break (0);
+ else
+ {
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes in buffers",
+ udpw->msg_size, GNUNET_NO);
+ plugin->bytes_in_buffer += udpw->msg_size;
+ }
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, msgs in buffers",
+ 1, GNUNET_NO);
if (udpw->session->addrlen == sizeof (struct sockaddr_in))
- GNUNET_CONTAINER_DLL_insert(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
+ GNUNET_CONTAINER_DLL_insert (plugin->ipv4_queue_head,
+ plugin->ipv4_queue_tail, udpw);
if (udpw->session->addrlen == sizeof (struct sockaddr_in6))
- GNUNET_CONTAINER_DLL_insert(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
+ GNUNET_CONTAINER_DLL_insert (plugin->ipv6_queue_head,
+ plugin->ipv6_queue_tail, udpw);
}
+
/**
* Fragment message was transmitted via UDP, let fragmentation know
* to send the next fragment now.
* @param cls the 'struct UDPMessageWrapper' of the fragment
* @param target destination peer (ignored)
* @param result GNUNET_OK on success (ignored)
+ * @param payload bytes payload sent
+ * @param physical bytes physical sent
*/
static void
send_next_fragment (void *cls,
const struct GNUNET_PeerIdentity *target,
- int result)
+ int result, size_t payload, size_t physical)
{
- struct UDPMessageWrapper *udpw = cls;
-
+ struct UDP_MessageWrapper *udpw = cls;
GNUNET_FRAGMENT_context_transmission_done (udpw->frag_ctx->frag);
}
static void
enqueue_fragment (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct FragmentationContext *frag_ctx = cls;
+ struct UDP_FragmentationContext *frag_ctx = cls;
struct Plugin *plugin = frag_ctx->plugin;
- struct UDPMessageWrapper * udpw;
+ struct UDP_MessageWrapper * udpw;
size_t msg_len = ntohs (msg->size);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Enqueuing fragment with %u bytes %u\n", msg_len , sizeof (struct UDPMessageWrapper));
- udpw = GNUNET_malloc (sizeof (struct UDPMessageWrapper) + msg_len);
+ "Enqueuing fragment with %u bytes\n", msg_len);
+ frag_ctx->fragments_used ++;
+ udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + msg_len, __LINE__ );
udpw->session = frag_ctx->session;
- udpw->udp = (char *) &udpw[1];
-
+ udpw->msg_buf = (char *) &udpw[1];
udpw->msg_size = msg_len;
+ udpw->payload_size = msg_len; /*FIXME: minus fragment overhead */
udpw->cont = &send_next_fragment;
udpw->cont_cls = udpw;
udpw->timeout = frag_ctx->timeout;
udpw->frag_ctx = frag_ctx;
- memcpy (udpw->udp, msg, msg_len);
+ udpw->msg_type = MSG_FRAGMENTED;
+ memcpy (udpw->msg_buf, msg, msg_len);
enqueue (plugin, udpw);
schedule_select (plugin);
}
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
struct Plugin *plugin = cls;
- size_t mlen = msgbuf_size + sizeof (struct UDPMessage);
- struct UDPMessageWrapper * udpw;
+ size_t udpmlen = msgbuf_size + sizeof (struct UDPMessage);
+ struct UDP_FragmentationContext * frag_ctx;
+ struct UDP_MessageWrapper * udpw;
struct UDPMessage *udp;
- char mbuf[mlen];
+ char mbuf[udpmlen];
GNUNET_assert (plugin != NULL);
GNUNET_assert (s != NULL);
return GNUNET_SYSERR;
if ((s->addrlen == sizeof (struct sockaddr_in)) && (plugin->sockv4 == NULL))
return GNUNET_SYSERR;
- if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (udpmlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"UDP transmits %u-byte message to `%s' using address `%s'\n",
- mlen,
+ udpmlen,
GNUNET_i2s (&s->target),
GNUNET_a2s(s->sock_addr, s->addrlen));
-
+
+
/* Message */
udp = (struct UDPMessage *) mbuf;
- udp->header.size = htons (mlen);
+ udp->header.size = htons (udpmlen);
udp->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE);
udp->reserved = htonl (0);
udp->sender = *plugin->env->my_identity;
reschedule_session_timeout(s);
- if (mlen <= UDP_MTU)
+ if (udpmlen <= UDP_MTU)
{
- udpw = GNUNET_malloc (sizeof (struct UDPMessageWrapper) + mlen);
+ /* unfragmented message */
+ udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + udpmlen, __LINE__ );
udpw->session = s;
- udpw->udp = (char *) &udpw[1];
- udpw->msg_size = mlen;
+ udpw->msg_buf = (char *) &udpw[1];
+ udpw->msg_size = udpmlen; /* message size with UDP overhead */
+ udpw->payload_size = msgbuf_size; /* message size without UDP overhead */
udpw->timeout = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), to);
udpw->cont = cont;
udpw->cont_cls = cont_cls;
udpw->frag_ctx = NULL;
- memcpy (udpw->udp, udp, sizeof (struct UDPMessage));
- memcpy (&udpw->udp[sizeof (struct UDPMessage)], msgbuf, msgbuf_size);
+ udpw->msg_type = MSG_UNFRAGMENTED;
+ memcpy (udpw->msg_buf, udp, sizeof (struct UDPMessage));
+ memcpy (&udpw->msg_buf[sizeof (struct UDPMessage)], msgbuf, msgbuf_size);
enqueue (plugin, udpw);
+
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, messages, attempt",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes payload, attempt",
+ udpw->payload_size, GNUNET_NO);
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "UDP has to fragment message\n");
+ /* fragmented message */
if (s->frag_ctx != NULL)
return GNUNET_SYSERR;
memcpy (&udp[1], msgbuf, msgbuf_size);
- struct FragmentationContext * frag_ctx = GNUNET_malloc(sizeof (struct FragmentationContext));
-
+ frag_ctx = MEMDEBUG_malloc (sizeof (struct UDP_FragmentationContext), __LINE__ );
frag_ctx->plugin = plugin;
frag_ctx->session = s;
frag_ctx->cont = cont;
frag_ctx->cont_cls = cont_cls;
frag_ctx->timeout = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), to);
- frag_ctx->bytes_to_send = mlen;
+ frag_ctx->payload_size = msgbuf_size; /* unfragmented message size without UDP overhead */
+ frag_ctx->on_wire_size = 0; /* bytes with UDP and fragmentation overhead */
frag_ctx->frag = GNUNET_FRAGMENT_context_create (plugin->env->stats,
- UDP_MTU,
- &plugin->tracker,
- s->last_expected_delay,
- &udp->header,
- &enqueue_fragment,
- frag_ctx);
-
+ UDP_MTU,
+ &plugin->tracker,
+ s->last_expected_msg_delay,
+ s->last_expected_ack_delay,
+ &udp->header,
+ &enqueue_fragment,
+ frag_ctx);
s->frag_ctx = frag_ctx;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, pending",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, attempt",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes payload, attempt",
+ frag_ctx->payload_size, GNUNET_NO);
}
schedule_select (plugin);
- return mlen;
+ return udpmlen;
}
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);
- GNUNET_free (address);
+ MEMDEBUG_free (address, __LINE__);
/* iterate over all embedded messages */
si.session = s;
size_t msize = sizeof (struct UDP_ACK_Message) + ntohs (msg->size);
struct UDP_ACK_Message *udp_ack;
uint32_t delay = 0;
- struct UDPMessageWrapper *udpw;
+ struct UDP_MessageWrapper *udpw;
struct Session *s;
-
struct LookupContext l_ctx;
+
l_ctx.addr = rc->src_addr;
l_ctx.addrlen = rc->addr_len;
l_ctx.res = NULL;
AF_INET) ? sizeof (struct sockaddr_in) : sizeof (struct
sockaddr_in6)),
delay);
- udpw = GNUNET_malloc (sizeof (struct UDPMessageWrapper) + msize);
+ udpw = MEMDEBUG_malloc (sizeof (struct UDP_MessageWrapper) + msize, __LINE__ );
udpw->msg_size = msize;
+ udpw->payload_size = 0;
udpw->session = s;
udpw->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
- udpw->udp = (char *)&udpw[1];
- udp_ack = (struct UDP_ACK_Message *) udpw->udp;
+ udpw->msg_buf = (char *)&udpw[1];
+ udpw->msg_type = MSG_ACK;
+ udp_ack = (struct UDP_ACK_Message *) udpw->msg_buf;
udp_ack->header.size = htons ((uint16_t) msize);
udp_ack->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK);
udp_ack->delay = htonl (delay);
udp_ack->sender = *rc->plugin->env->my_identity;
memcpy (&udp_ack[1], msg, ntohs (msg->size));
-
enqueue (rc->plugin, udpw);
}
l_ctx.addrlen = fromlen;
l_ctx.res = NULL;
GNUNET_CONTAINER_multihashmap_iterate (plugin->sessions,
- &lookup_session_by_addr_it,
- &l_ctx);
+ &lookup_session_by_addr_it,
+ &l_ctx);
s = l_ctx.res;
- if ((s == NULL) || (s->frag_ctx == NULL))
+ 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",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "We received a sending delay of %llu\n",
flow_delay.rel_value);
s->flow_delay_from_other_peer =
GNUNET_TIME_relative_to_absolute (flow_delay);
return;
}
+ if (0 != memcmp (&l_ctx.res->target, &udp_ack->sender, sizeof (struct GNUNET_PeerIdentity)))
+ GNUNET_break (0);
if (GNUNET_OK != GNUNET_FRAGMENT_process_ack (s->frag_ctx->frag, 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));
+ /* Expect more ACKs to arrive */
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "FULL MESSAGE ACKed\n",
+ "Message full ACK'ed\n",
(unsigned int) ntohs (msg->size), GNUNET_i2s (&udp_ack->sender),
GNUNET_a2s ((const struct sockaddr *) addr, fromlen));
- s->last_expected_delay = GNUNET_FRAGMENT_context_destroy (s->frag_ctx->frag);
-
- struct UDPMessageWrapper * udpw;
- struct UDPMessageWrapper * tmp;
- if (s->addrlen == sizeof (struct sockaddr_in6))
- {
- udpw = plugin->ipv6_queue_head;
- while (NULL != udpw)
- {
- tmp = udpw->next;
- if ((udpw->frag_ctx != NULL) && (udpw->frag_ctx == s->frag_ctx))
- {
- GNUNET_CONTAINER_DLL_remove(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
- GNUNET_free (udpw);
- }
- udpw = tmp;
- }
- }
- if (s->addrlen == sizeof (struct sockaddr_in))
- {
- udpw = plugin->ipv4_queue_head;
- while (udpw!= NULL)
- {
- tmp = udpw->next;
- if ((udpw->frag_ctx != NULL) && (udpw->frag_ctx == s->frag_ctx))
- {
- GNUNET_CONTAINER_DLL_remove(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
- GNUNET_free (udpw);
- }
- udpw = tmp;
- }
- }
-
- if (s->frag_ctx->cont != NULL)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Calling continuation for fragmented message to `%s' with result %s\n",
- GNUNET_i2s (&s->target), "OK");
- s->frag_ctx->cont (s->frag_ctx->cont_cls, &udp_ack->sender, GNUNET_OK);
- }
- GNUNET_free (s->frag_ctx);
- s->frag_ctx = NULL;
+ /* Remove fragmented message after successful sending */
+ fragmented_message_done (s->frag_ctx, GNUNET_OK);
}
if (d_ctx == NULL)
{
/* Create a new defragmentation context */
- d_ctx = GNUNET_malloc (sizeof (struct DefragContext) + fromlen);
+ d_ctx = MEMDEBUG_malloc (sizeof (struct DefragContext) + fromlen, __LINE__ );
memcpy (&d_ctx[1], addr, fromlen);
d_ctx->src_addr = (const struct sockaddr *) &d_ctx[1];
d_ctx->addr_len = fromlen;
d_ctx = GNUNET_CONTAINER_heap_remove_root (plugin->defrag_ctxs);
GNUNET_assert (NULL != d_ctx);
GNUNET_DEFRAGMENT_context_destroy (d_ctx->defrag);
- GNUNET_free (d_ctx);
+ MEMDEBUG_free (d_ctx, __LINE__);
}
}
(struct sockaddr *) &addr, &fromlen);
#if MINGW
/* On SOCK_DGRAM UDP sockets recvfrom might fail with a
- * WSAECONNRESET error to indicate that previous sendto() (???)
+ * WSAECONNRESET error to indicate that previous sendto() (yes, sendto!)
* on this socket has failed.
+ * Quote from MSDN:
+ * WSAECONNRESET - The virtual circuit was reset by the remote side
+ * executing a hard or abortive close. The application should close
+ * the socket; it is no longer usable. On a UDP-datagram socket this
+ * error indicates a previous send operation resulted in an ICMP Port
+ * Unreachable message.
*/
if ( (-1 == size) && (ECONNRESET == errno) )
return;
#endif
- if ( (-1 == size) || (size < sizeof (struct GNUNET_MessageHeader)))
+ if (-1 == size)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "UDP failed to receive data: %s\n", STRERROR (errno));
+ /* Connection failure or something. Not a protocol violation. */
+ return;
+ }
+ if (size < sizeof (struct GNUNET_MessageHeader))
{
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "UDP got %u bytes, which is not enough for a GNUnet message header\n",
+ (unsigned int) size);
+ /* _MAY_ be a connection failure (got partial message) */
+ /* But it _MAY_ also be that the other side uses non-GNUnet protocol. */
GNUNET_break_op (0);
return;
}
return;
}
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, received",
+ size, GNUNET_NO);
+
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON:
}
}
-
-static size_t
-udp_select_send (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *sock)
+static struct UDP_MessageWrapper *
+remove_timeout_messages_and_select (struct UDP_MessageWrapper *head,
+ struct GNUNET_NETWORK_Handle *sock)
{
- ssize_t sent;
- size_t slen;
- struct GNUNET_TIME_Absolute max;
- struct UDPMessageWrapper *udpw = NULL;
- static int network_down_error;
-
- if (sock == plugin->sockv4)
- {
- udpw = plugin->ipv4_queue_head;
- }
- else if (sock == plugin->sockv6)
- {
- udpw = plugin->ipv6_queue_head;
- }
- else
- {
- GNUNET_break (0);
- return 0;
- }
-
- const struct sockaddr * sa = udpw->session->sock_addr;
- slen = udpw->session->addrlen;
-
- max = GNUNET_TIME_absolute_max(udpw->timeout, GNUNET_TIME_absolute_get());
+ struct UDP_MessageWrapper *udpw = NULL;
+ struct GNUNET_TIME_Relative remaining;
+ udpw = head;
while (udpw != NULL)
{
- if (max.abs_value != udpw->timeout.abs_value)
+ /* Find messages with timeout */
+ remaining = GNUNET_TIME_absolute_get_remaining (udpw->timeout);
+ if (GNUNET_TIME_UNIT_ZERO.rel_value == remaining.rel_value)
{
/* Message timed out */
- call_continuation(udpw, GNUNET_SYSERR);
- if (udpw->frag_ctx != NULL)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Fragmented message for peer `%s' with size %u timed out\n",
- GNUNET_i2s(&udpw->session->target), udpw->frag_ctx->bytes_to_send);
- udpw->session->last_expected_delay = GNUNET_FRAGMENT_context_destroy(udpw->frag_ctx->frag);
- GNUNET_free (udpw->frag_ctx);
- udpw->session->frag_ctx = NULL;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Message for peer `%s' with size %u timed out\n",
- GNUNET_i2s(&udpw->session->target), udpw->msg_size);
+ switch (udpw->msg_type) {
+ case MSG_UNFRAGMENTED:
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, sent, timeout",
+ udpw->msg_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, messages, sent, timeout",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, messages, sent, timeout",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, unfragmented msgs, bytes, sent, timeout",
+ udpw->payload_size, GNUNET_NO);
+ /* Not fragmented message */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Message for peer `%s' with size %u timed out\n",
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size);
+ call_continuation (udpw, GNUNET_SYSERR);
+ /* Remove message */
+ dequeue (plugin, udpw);
+ MEMDEBUG_free (udpw, __LINE__);
+ break;
+ case MSG_FRAGMENTED:
+ /* Fragmented message */
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, sent, timeout",
+ udpw->frag_ctx->on_wire_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, messages, sent, timeout",
+ 1, GNUNET_NO);
+ call_continuation (udpw, GNUNET_SYSERR);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Fragment for message for peer `%s' with size %u timed out\n",
+ GNUNET_i2s(&udpw->session->target), udpw->frag_ctx->payload_size);
+
+
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, messages, sent, timeout",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, fragmented msgs, bytes, sent, timeout",
+ udpw->frag_ctx->payload_size, GNUNET_NO);
+ /* Remove fragmented message due to timeout */
+ fragmented_message_done (udpw->frag_ctx, GNUNET_SYSERR);
+ break;
+ case MSG_ACK:
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, sent, timeout",
+ udpw->msg_size, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, messages, sent, timeout",
+ 1, GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "ACK Message for peer `%s' with size %u timed out\n",
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size);
+ call_continuation (udpw, GNUNET_SYSERR);
+ dequeue (plugin, udpw);
+ MEMDEBUG_free (udpw, __LINE__);
+ break;
+ default:
+ break;
}
-
if (sock == plugin->sockv4)
- {
- GNUNET_CONTAINER_DLL_remove(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
- GNUNET_free (udpw);
udpw = plugin->ipv4_queue_head;
- }
else if (sock == plugin->sockv6)
- {
- GNUNET_CONTAINER_DLL_remove(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
- GNUNET_free (udpw);
udpw = plugin->ipv6_queue_head;
+ else
+ {
+ GNUNET_break (0); /* should never happen */
+ udpw = NULL;
}
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# messages dismissed due to timeout",
+ 1, GNUNET_NO);
}
else
{
- struct GNUNET_TIME_Relative delta = GNUNET_TIME_absolute_get_remaining (udpw->session->flow_delay_from_other_peer);
- if (delta.rel_value == 0)
+ /* 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)
{
/* this message is not delayed */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Message for peer `%s' (%u bytes) is not delayed \n",
- GNUNET_i2s(&udpw->session->target), udpw->msg_size);
- break;
+ "Message for peer `%s' (%u bytes) is not delayed \n",
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size);
+ break; /* Found message to send, break */
}
else
{
- /* this message is delayed, try next */
+ /* 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->msg_size,
- delta);
+ "Message for peer `%s' (%u bytes) is delayed for %llu \n",
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size, remaining.rel_value);
udpw = udpw->next;
}
}
}
+ return udpw;
+}
- if (udpw == NULL)
- {
- /* No message left */
- return 0;
- }
- sent = GNUNET_NETWORK_socket_sendto (sock, udpw->udp, udpw->msg_size, sa, slen);
+static void
+analyze_send_error (struct Plugin *plugin,
+ const struct sockaddr * sa,
+ socklen_t slen,
+ int error)
+{
+ static int network_down_error;
+ struct GNUNET_ATS_Information type;
+
+ type = plugin->env->get_address_type (plugin->env->cls,sa, slen);
+ if (((GNUNET_ATS_NET_LAN == ntohl(type.value)) || (GNUNET_ATS_NET_WAN == ntohl(type.value))) &&
+ ((ENETUNREACH == errno) || (ENETDOWN == errno)))
+ {
+ if ((network_down_error == GNUNET_NO) && (slen == sizeof (struct sockaddr_in)))
+ {
+ /* IPv4: "Network unreachable" or "Network down"
+ *
+ * This indicates we do not have connectivity
+ */
+ LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+ _("UDP could not transmit message to `%s': "
+ "Network seems down, please check your network configuration\n"),
+ GNUNET_a2s (sa, slen));
+ }
+ if ((network_down_error == GNUNET_NO) && (slen == sizeof (struct sockaddr_in6)))
+ {
+ /* IPv6: "Network unreachable" or "Network down"
+ *
+ * This indicates that this system is IPv6 enabled, but does not
+ * have a valid global IPv6 address assigned or we do not have
+ * connectivity
+ */
+
+ 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));
+ }
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "UDP could not transmit message to `%s': `%s'\n",
+ GNUNET_a2s (sa, slen), STRERROR (error));
+ }
+}
+
+static size_t
+udp_select_send (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *sock)
+{
+ const struct sockaddr * sa;
+ ssize_t sent;
+ socklen_t slen;
+
+ struct UDP_MessageWrapper *udpw = NULL;
+
+ /* Find message to send */
+ udpw = remove_timeout_messages_and_select ((sock == plugin->sockv4) ? plugin->ipv4_queue_head : plugin->ipv6_queue_head,
+ sock);
+ if (NULL == udpw)
+ return 0; /* No message to send */
+
+ sa = udpw->session->sock_addr;
+ slen = udpw->session->addrlen;
+
+ sent = GNUNET_NETWORK_socket_sendto (sock, udpw->msg_buf, udpw->msg_size, sa, slen);
if (GNUNET_SYSERR == sent)
{
- const struct GNUNET_ATS_Information type = plugin->env->get_address_type
- (plugin->env->cls,sa, slen);
-
- if (((GNUNET_ATS_NET_LAN == ntohl(type.value)) || (GNUNET_ATS_NET_WAN == ntohl(type.value))) &&
- ((ENETUNREACH == errno) || (ENETDOWN == errno)))
- {
- if ((network_down_error == GNUNET_NO) && (slen == sizeof (struct sockaddr_in)))
- {
- /* IPv4: "Network unreachable" or "Network down"
- *
- * This indicates we do not have connectivity
- */
- LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
- _("UDP could not transmit message to `%s': "
- "Network seems down, please check your network configuration\n"),
- GNUNET_a2s (sa, slen));
- }
- if ((network_down_error == GNUNET_NO) && (slen == sizeof (struct sockaddr_in6)))
- {
- /* IPv6: "Network unreachable" or "Network down"
- *
- * This indicates that this system is IPv6 enabled, but does not
- * have a valid global IPv6 address assigned or we do not have
- * connectivity
- */
-
- 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));
- }
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "UDP could not transmit %u-byte message to `%s': `%s'\n",
- (unsigned int) (udpw->msg_size), GNUNET_a2s (sa, slen),
- STRERROR (errno));
- }
+ /* Failure */
+ analyze_send_error (plugin, sa, slen, errno);
call_continuation(udpw, GNUNET_SYSERR);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, sent, failure",
+ sent, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, messages, sent, failure",
+ 1, GNUNET_NO);
}
else
{
+ /* Success */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "UDP transmitted %u-byte message to `%s' (%d: %s)\n",
- (unsigned int) (udpw->msg_size), GNUNET_a2s (sa, slen), (int) sent,
+ "UDP transmitted %u-byte message to `%s' `%s' (%d: %s)\n",
+ (unsigned int) (udpw->msg_size), GNUNET_i2s(&udpw->session->target) ,GNUNET_a2s (sa, slen), (int) sent,
(sent < 0) ? STRERROR (errno) : "ok");
- call_continuation(udpw, GNUNET_OK);
- network_down_error = GNUNET_NO;
- }
-
- if (sock == plugin->sockv4)
- GNUNET_CONTAINER_DLL_remove(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
- else if (sock == plugin->sockv6)
- GNUNET_CONTAINER_DLL_remove(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
- GNUNET_free (udpw);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, bytes, sent, success",
+ sent, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UDP, total, messages, sent, success",
+ 1, GNUNET_NO);
+ if (NULL != udpw->frag_ctx)
+ udpw->frag_ctx->on_wire_size += udpw->msg_size;
+ call_continuation (udpw, GNUNET_OK);
+ }
+ dequeue (plugin, udpw);
+ MEMDEBUG_free (udpw, __LINE__);
udpw = NULL;
return sent;
{
/* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
initialze the plugin or the API */
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api = MEMDEBUG_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions), __LINE__ );
api->cls = NULL;
api->address_pretty_printer = &udp_plugin_address_pretty_printer;
api->address_to_string = &udp_address_to_string;
bind4_address);
if (1 != inet_pton (AF_INET, bind4_address, &serverAddrv4.sin_addr))
{
- GNUNET_free (bind4_address);
+ MEMDEBUG_free (bind4_address, __LINE__);
return NULL;
}
}
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"),
bind6_address);
- GNUNET_free_non_null (bind4_address);
- GNUNET_free (bind6_address);
+ MEMDEBUG_free_non_null (bind4_address, __LINE__);
+ MEMDEBUG_free (bind6_address, __LINE__);
return NULL;
}
}
}
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);
}
- GNUNET_free (fancy_interval);
+ MEMDEBUG_free (fancy_interval, __LINE__);
}
/* Maximum datarate */
udp_max_bps = 1024 * 1024 * 50; /* 50 MB/s == infinity for practical purposes */
}
- p = GNUNET_malloc (sizeof (struct Plugin));
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ 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);
+ 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->port = port;
if ((res == 0) || ((p->sockv4 == NULL) && (p->sockv6 == NULL)))
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create network sockets, plugin failed\n");
- GNUNET_free (p);
- GNUNET_free (api);
+ MEMDEBUG_free (p, __LINE__);
+ MEMDEBUG_free (api, __LINE__);
return NULL;
}
setup_broadcast (p, &serverAddrv6, &serverAddrv4);
}
- GNUNET_free_non_null (bind4_address);
- GNUNET_free_non_null (bind6_address);
+ 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);
- GNUNET_free (d_ctx);
+ MEMDEBUG_free (d_ctx, __LINE__);
return GNUNET_YES;
}
if (NULL == plugin)
{
- GNUNET_free (api);
+ MEMDEBUG_free (api, __LINE__);
return NULL;
}
}
/* Clean up leftover messages */
- struct UDPMessageWrapper * udpw;
+ struct UDP_MessageWrapper * udpw;
udpw = plugin->ipv4_queue_head;
while (udpw != NULL)
{
- struct UDPMessageWrapper *tmp = udpw->next;
- GNUNET_CONTAINER_DLL_remove(plugin->ipv4_queue_head, plugin->ipv4_queue_tail, udpw);
+ struct UDP_MessageWrapper *tmp = udpw->next;
+ dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- GNUNET_free (udpw);
+ MEMDEBUG_free (udpw, __LINE__);
+
udpw = tmp;
}
udpw = plugin->ipv6_queue_head;
while (udpw != NULL)
{
- struct UDPMessageWrapper *tmp = udpw->next;
- GNUNET_CONTAINER_DLL_remove(plugin->ipv6_queue_head, plugin->ipv6_queue_tail, udpw);
+ struct UDP_MessageWrapper *tmp = udpw->next;
+ dequeue (plugin, udpw);
call_continuation(udpw, GNUNET_SYSERR);
- GNUNET_free (udpw);
+ MEMDEBUG_free (udpw, __LINE__);
+
udpw = tmp;
}
GNUNET_CONTAINER_multihashmap_destroy (plugin->sessions);
plugin->nat = NULL;
- GNUNET_free (plugin);
- GNUNET_free (api);
+ MEMDEBUG_free (plugin, __LINE__);
+ MEMDEBUG_free (api, __LINE__);
+#if DEBUG_MALLOC
+ struct Allocation *allocation;
+ while (NULL != ahead)
+ {
+ allocation = ahead;
+ GNUNET_CONTAINER_DLL_remove (ahead, atail, allocation);
+ GNUNET_free (allocation);
+ }
+ struct Allocator *allocator;
+ while (NULL != aehead)
+ {
+ allocator = aehead;
+ GNUNET_CONTAINER_DLL_remove (aehead, aetail, allocator);
+ GNUNET_free (allocator);
+ }
+#endif
return NULL;
}
projects / oweals / gnunet.git / blobdiff