* DLL
*/
struct PrettyPrinterContext *next;
-
+
/**
* DLL
*/
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);
(0 == min_delay.rel_value_us) ? GNUNET_TIME_UNIT_FOREVER_REL : min_delay,
plugin->rs_v4,
(0 == min_delay.rel_value_us) ? plugin->ws_v4 : NULL,
- &udp_plugin_select, plugin);
+ &udp_plugin_select, plugin);
}
if ((GNUNET_YES == plugin->enable_ipv6) && (NULL != plugin->sockv6))
{
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 =
memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
sb = &a4;
}
- else if (addrlen == 0)
- {
- GNUNET_snprintf (rbuf, sizeof (rbuf), "%s", TRANSPORT_SESSION_INBOUND_STRING);
- return rbuf;
- }
else
{
return NULL;
}
inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
- GNUNET_snprintf (rbuf, sizeof (rbuf),
+ GNUNET_snprintf (rbuf, sizeof (rbuf),
(af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u",
PLUGIN_NAME, options, buf, port);
return rbuf;
sb = &a4;
sbs = sizeof (a4);
}
- else if (0 == addrlen)
- {
- asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
- asc (asc_cls, NULL);
- return;
- }
else
{
/* invalid address */
struct UDP_MessageWrapper dummy;
struct Session *s = fc->session;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ 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;
}
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);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout rescheduled for session %p set to %s\n",
- s,
+ s,
GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
GNUNET_YES));
}
static int
session_cmp_it (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity * key,
void *value)
{
struct SessionCompareContext * cctx = cls;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Comparing address %s <-> %s\n",
- udp_address_to_string (NULL, (void *) address->address,
+ udp_address_to_string (NULL, (void *) address->address,
address->address_length),
GNUNET_a2s (s->sock_addr, s->addrlen));
if (s->inbound != cctx->inbound)
* @return the network type in HBO or GNUNET_SYSERR
*/
static enum GNUNET_ATS_Network_Type
-udp_get_network (void *cls,
+udp_get_network (void *cls,
struct Session *session)
{
return ntohl (session->ats.value);
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);
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
+static void
enqueue (struct Plugin *plugin, struct UDP_MessageWrapper * udpw)
{
if (plugin->bytes_in_buffer + udpw->msg_size > INT64_MAX)
{
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 = GNUNET_malloc (sizeof (struct UDP_MessageWrapper) + 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;
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",
{
s = udp_plugin_create_session (plugin, address, GNUNET_YES);
plugin->env->session_start (NULL, &address->peer, PLUGIN_NAME,
- (GNUNET_YES == s->inbound) ? NULL : address->address,
- (GNUNET_YES == s->inbound) ? 0 : address->address_length,
- s, NULL, 0);
+ address->address, address->address_length, s, NULL, 0);
}
GNUNET_free (address);
static 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;
l_ctx.addrlen = rc->addr_len;
l_ctx.res = NULL;
l_ctx.must_have_frag_ctx = GNUNET_NO;
- GNUNET_CONTAINER_multihashmap_iterate (rc->plugin->sessions,
+ GNUNET_CONTAINER_multipeermap_iterate (rc->plugin->sessions,
&lookup_session_by_addr_it,
&l_ctx);
s = l_ctx.res;
}
-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.addrlen = fromlen;
l_ctx.res = NULL;
l_ctx.must_have_frag_ctx = GNUNET_YES;
- GNUNET_CONTAINER_multihashmap_iterate (plugin->sessions,
+ GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
&lookup_session_by_addr_it,
&l_ctx);
s = l_ctx.res;
flow_delay.rel_value_us = (uint64_t) ntohl (udp_ack->delay);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"We received a sending delay of %s\n",
GNUNET_STRINGS_relative_time_to_string (flow_delay,
GNUNET_YES));
}
-static void
+static void
read_process_fragment (struct Plugin *plugin,
const struct GNUNET_MessageHeader *msg,
char *addr,
GNUNET_CONTAINER_heap_insert (plugin->defrag_ctxs, d_ctx,
(GNUNET_CONTAINER_HeapCostType)
now.abs_value_us);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ 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));
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 %s\n",
- GNUNET_i2s(&udpw->session->target), udpw->payload_size,
+ GNUNET_i2s(&udpw->session->target), udpw->payload_size,
GNUNET_STRINGS_relative_time_to_string (remaining,
GNUNET_YES));
udpw = udpw->next;
(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,
+setup_sockets (struct Plugin *plugin,
const struct sockaddr_in6 *bind_v6,
const struct sockaddr_in *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;
-
+
tries = 0;
while (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, 0))
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)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
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"));
p->enable_ipv6 = enable_v6;
p->enable_ipv4 = GNUNET_YES; /* default */
p->env = env;
- p->sessions = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+ 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);
+ GNUNET_BANDWIDTH_value_init ((uint32_t) udp_max_bps), 30);
plugin = p;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
+ 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)))
+ (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_multihashmap_destroy (p->sessions);
+ GNUNET_CONTAINER_multipeermap_destroy (p->sessions);
GNUNET_CONTAINER_heap_destroy (p->defrag_ctxs);
GNUNET_SERVER_mst_destroy (p->mst);
GNUNET_free (p);
/* 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)
projects / oweals / gnunet.git / blobdiff