/*
This file is part of GNUnet
- (C) 2002--2012 Christian Grothoff (and other contributing authors)
+ (C) 2002--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
uint16_t port;
uint32_t options;
- options = 0;
switch (addrlen)
{
case sizeof (struct IPv6TcpAddress):
memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
sb = &a4;
break;
+ case 0:
+ {
+ GNUNET_snprintf (rbuf, sizeof (rbuf), "%s",
+ TRANSPORT_SESSION_INBOUND_STRING);
+ return rbuf;
+ }
default:
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Unexpected address length: %u bytes\n"),
- (unsigned int) addrlen);
- GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Unexpected address length: %u bytes\n"),
+ (unsigned int) addrlen);
return NULL;
}
if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN))
* a binary address.
*
* @param cls closure ('struct Plugin*')
- * @param address string address
+ * @param addr string address
* @param addrlen length of the address
* @param buf location to store the buffer
* @param added location to store the number of bytes in the buffer.
address = NULL;
plugin = NULL;
optionstr = NULL;
- options = 0;
if ((NULL == addr) || (addrlen == 0))
{
GNUNET_break (0);
&socket_address))
{
GNUNET_break (0);
+ GNUNET_free (plugin);
return GNUNET_SYSERR;
}
ret = 0;
now = GNUNET_TIME_absolute_get ();
while ((NULL != (pos = session->pending_messages_head)) &&
- (pos->timeout.abs_value <= now.abs_value))
+ (pos->timeout.abs_value_us <= now.abs_value_us))
{
GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
session->pending_messages_tail, pos);
if (si_ctx.result != NULL)
{
session = si_ctx.result;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Found exisiting session for `%s' address `%s' session %p\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found existing session for `%s' address `%s' session %p\n",
GNUNET_i2s (&address->peer),
tcp_address_to_string(NULL, address->address, address->address_length),
session);
}
else
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- _("%s:%u: Address of unexpected length %u (should be %u or %u)\n"),
- addrlen, sizeof (struct IPv4TcpAddress), sizeof (struct IPv6TcpAddress));
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop
+ ("# requests to create session with invalid address"),
+ 1, GNUNET_NO);
return NULL;
}
}
+/**
+ * Running pretty printers: head
+ */
+static struct PrettyPrinterContext *ppc_dll_head;
+
+/**
+ * Running pretty printers: tail
+ */
+static struct PrettyPrinterContext *ppc_dll_tail;
+
/**
* Context for address to string conversion.
*/
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.
*/
*/
uint16_t port;
+ /**
+ * IPv6 address
+ */
int ipv6;
/**
};
+
+void
+ppc_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ int count = 0;
+ struct PrettyPrinterContext *ppc = cls;
+ struct PrettyPrinterContext *cur;
+ for (cur = ppc_dll_head; (NULL != cur); cur = cur->next)
+ {
+ if (cur != ppc)
+ count++;
+ }
+
+ // GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cancel request %p, %u pending\n", ppc, count);
+ 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;
-
+ int count = 0;
+
+ for (cur = ppc_dll_head; (NULL != cur); cur = cur->next)
+ {
+ if (cur != ppc)
+ count++;
+ }
+ //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Callback request %p == %s, %u pending\n", ppc, hostname, count);
if (hostname == NULL)
{
ppc->asc (ppc->asc_cls, NULL);
+ 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, "Done request %p, %u pending\n", ppc, count);
GNUNET_free (ppc);
return;
}
+ 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
uint16_t port;
uint32_t options;
-
- options = 0;
if (addrlen == sizeof (struct IPv6TcpAddress))
{
t6 = addr;
}
else if (0 == addrlen)
{
- asc (asc_cls, "<inbound connection>");
+ asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
asc (asc_cls, NULL);
return;
}
ppc->asc_cls = asc_cls;
ppc->port = port;
ppc->options = options;
- GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric, timeout, &append_port, ppc);
+ ppc->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(timeout, 2),
+ &ppc_cancel_task, ppc);
+ ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric,
+ timeout, &append_port, ppc);
+ if (NULL != ppc->resolver_handle)
+ {
+ //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding request %p\n", ppc);
+ GNUNET_CONTAINER_DLL_insert (ppc_dll_head, ppc_dll_tail, ppc);
+ }
+ else
+ {
+ GNUNET_break (0);
+ GNUNET_free (ppc);
+ }
}
if ((addrlen != sizeof (struct IPv4TcpAddress)) &&
(addrlen != sizeof (struct IPv6TcpAddress)))
{
- GNUNET_break_op (0);
- return GNUNET_SYSERR;
- }
+ return GNUNET_SYSERR;
+ }
+
if (addrlen == sizeof (struct IPv4TcpAddress))
{
v4 = (struct IPv4TcpAddress *) addr;
struct IPv6TcpAddress *t6;
const struct sockaddr_in *s4;
const struct sockaddr_in6 *s6;
+ struct GNUNET_ATS_Information ats;
if (0 ==
memcmp (&wm->clientIdentity, plugin->env->my_identity,
{
/* refuse connections from ourselves */
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Received %s message from my own identity `%4s' on address `%s'\n",
+ "WELCOME", GNUNET_i2s (&wm->clientIdentity), GNUNET_a2s (vaddr, alen));
+ GNUNET_free (vaddr);
+ }
+ GNUNET_break_op (0);
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received %s message from `%4s'\n", "WELCOME",
- GNUNET_i2s (&wm->clientIdentity));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %s message from `%4s' %p\n", "WELCOME",
+ GNUNET_i2s (&wm->clientIdentity), client);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP WELCOME messages received"), 1,
GNUNET_NO);
{
if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Found existing session %p for peer `%s'\n",
session,
GNUNET_a2s (vaddr, alen));
session->addrlen = sizeof (struct IPv6TcpAddress);
}
- struct GNUNET_ATS_Information ats;
ats = plugin->env->get_address_type (plugin->env->cls, vaddr ,alen);
session->ats_address_network_type = ats.value;
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating new session %p for peer `%s'\n",
+ session,
+ GNUNET_a2s (vaddr, alen));
GNUNET_free (vaddr);
+ GNUNET_CONTAINER_multihashmap_put (plugin->sessionmap,
+ &session->target.hashPubKey,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ inc_sessions (plugin, session, __LINE__);
}
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
+ GNUNET_break (0);
}
- GNUNET_CONTAINER_multihashmap_put (plugin->sessionmap,
- &session->target.hashPubKey,
- session,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- inc_sessions (plugin, session, __LINE__);
}
if (session->expecting_welcome != GNUNET_YES)
{
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_break (0);
return;
}
session->last_activity = GNUNET_TIME_absolute_get ();
session->expecting_welcome = GNUNET_NO;
+ /* Notify transport and ATS about new session */
+ if (GNUNET_YES == session->inbound)
+ {
+ plugin->env->session_start (NULL, &wm->clientIdentity, PLUGIN_NAME,
+ (GNUNET_YES == session->inbound) ? NULL : session->addr,
+ (GNUNET_YES == session->inbound) ? 0 : session->addrlen,
+ session, &ats, 1);
+ }
process_pending_messages (session);
plugin->env->update_address_metrics (plugin->env->cls,
&session->target,
(GNUNET_YES == session->inbound) ? NULL : session->addr,
- (GNUNET_YES == session->inbound) ? 0 : session->addrlen,
- session,
- &distance,
- 1);
+ (GNUNET_YES == session->inbound) ? 0 : session->addrlen,
+ session, &distance, 1);
reschedule_session_timeout (session);
- if (delay.rel_value == 0)
+ if (0 == delay.rel_value_us)
{
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Throttling receiving from `%s' for %llu ms\n",
+ "Throttling receiving from `%s' for %s\n",
GNUNET_i2s (&session->target),
- (unsigned long long) delay.rel_value);
+ GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
GNUNET_SERVER_disable_receive_done_warning (client);
session->receive_delay_task =
GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
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);
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
}
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);
+ s);
}
}
+/**
+ * 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
+tcp_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return ntohl (session->ats_address_network_type);
+}
+
/**
* Entry point for the plugin.
api->check_address = &tcp_plugin_check_address;
api->address_to_string = &tcp_address_to_string;
api->string_to_address = &tcp_string_to_address;
+ api->get_network = &tcp_get_network;
plugin->service = service;
if (service != NULL)
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
struct TCPProbeContext *tcp_probe;
+ struct PrettyPrinterContext *cur;
+ struct PrettyPrinterContext *next;
if (NULL == plugin)
{
/* Removing leftover NAT sessions */
GNUNET_CONTAINER_multihashmap_iterate(plugin->nat_wait_conns, &session_disconnect_it, NULL);
+ 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);
+ if (NULL != cur->resolver_handle)
+ GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
+ GNUNET_SCHEDULER_cancel (cur->timeout_task);
+ GNUNET_free (cur);
+ GNUNET_break (0);
+ }
+
if (plugin->service != NULL)
GNUNET_SERVICE_stop (plugin->service);
else
projects / oweals / gnunet.git / blobdiff