};
+/* DEBUG CODE */
+static const char *
+tcp_address_to_string (void *cls, const void *addr, size_t addrlen);
+
+static unsigned int sessions;
+
+static void inc_sessions (struct Plugin *plugin, struct Session *session, int line)
+{
+ sessions ++;
+ unsigned int size = GNUNET_CONTAINER_multihashmap_size(plugin->sessionmap);
+ if (sessions != size)
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Inconsistent sessions %u <-> session map size: %u\n",
+ sessions, size);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "%4i Session increased to %u (session map size: %u): `%s' `%s'\n",
+ line,
+ sessions,
+ size,
+ GNUNET_i2s (&session->target),
+ tcp_address_to_string (NULL, session->addr, session->addrlen));
+}
+
+static void dec_sessions (struct Plugin *plugin, struct Session *session, int line)
+{
+ GNUNET_assert (sessions > 0);
+ unsigned int size = GNUNET_CONTAINER_multihashmap_size(plugin->sessionmap);
+ sessions --;
+ if (sessions != size)
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Inconsistent sessions %u <-> session map size: %u\n",
+ sessions, size);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "%4i Session decreased to %u (session map size: %u): `%s' `%s'\n",
+ line,
+ sessions,
+ size,
+ GNUNET_i2s (&session->target),
+ tcp_address_to_string (NULL, session->addr, session->addrlen));
+}
+/* DEBUG CODE */
+
/**
* Function to check if an inbound connection is acceptable.
return rbuf;
}
-#define MAX_IPV6_ADDRLEN 47
-
-int
-tcp_string_to_address_ipv6 (void *cls, const char *addr, uint16_t addrlen,
- void **buf, size_t *added)
-{
- char zt_addr[MAX_IPV6_ADDRLEN + 1];
- int ret;
- char *port_colon;
- unsigned int port;
- struct IPv6TcpAddress *ipv6addr;
-
- if (addrlen < 6)
- return GNUNET_SYSERR;
-
- memset (zt_addr, 0, MAX_IPV6_ADDRLEN + 1);
- strncpy (zt_addr, addr, addrlen <= MAX_IPV6_ADDRLEN ? addrlen : MAX_IPV6_ADDRLEN);
-
- port_colon = strrchr (zt_addr, ':');
- if (port_colon == NULL)
- return GNUNET_SYSERR;
- ret = sscanf (port_colon, ":%u", &port);
- if (ret != 1 || port > 65535)
- return GNUNET_SYSERR;
- port_colon[0] = '\0';
-
- ipv6addr = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
- ret = inet_pton (AF_INET6, zt_addr, &ipv6addr->ipv6_addr);
- if (ret <= 0)
- {
- GNUNET_free (ipv6addr);
- return GNUNET_SYSERR;
- }
- ipv6addr->t6_port = port;
- *buf = ipv6addr;
- *added = sizeof (struct IPv6TcpAddress);
- return GNUNET_OK;
-}
-
-#define MAX_IPV4_ADDRLEN 21
-
-int
-tcp_string_to_address_ipv4 (void *cls, const char *addr, uint16_t addrlen,
- void **buf, size_t *added)
-{
- unsigned int temps[5];
- unsigned int port;
- int cnt;
- char zt_addr[MAX_IPV4_ADDRLEN + 1];
- struct IPv4TcpAddress *ipv4addr;
-
- if (addrlen < 9)
- return GNUNET_SYSERR;
-
- memset (zt_addr, 0, MAX_IPV4_ADDRLEN + 1);
- strncpy (zt_addr, addr, addrlen <= MAX_IPV4_ADDRLEN ? addrlen : MAX_IPV4_ADDRLEN);
-
- cnt = sscanf (zt_addr, "%u.%u.%u.%u:%u", &temps[0], &temps[1], &temps[2], &temps[3], &port);
- if (cnt != 5)
- return GNUNET_SYSERR;
-
- for (cnt = 0; cnt < 4; cnt++)
- if (temps[cnt] > 0xFF)
- return GNUNET_SYSERR;
- if (port > 65535)
- return GNUNET_SYSERR;
-
- ipv4addr = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
- ipv4addr->ipv4_addr =
- htonl ((temps[0] << 24) + (temps[1] << 16) + (temps[2] << 8) +
- temps[3]);
- ipv4addr->t4_port = htonl (port);
- *buf = ipv4addr;
- *added = sizeof (struct IPv4TcpAddress);
- return GNUNET_OK;
-}
/**
* Function called to convert a string address to
* @param addr string address
* @param addrlen length of the address
* @param buf location to store the buffer
- * @param max size of the buffer
* @param added location to store the number of bytes in the buffer.
* If the function returns GNUNET_SYSERR, its contents are undefined.
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
tcp_string_to_address (void *cls, const char *addr, uint16_t addrlen,
void **buf, size_t *added)
{
- if (addrlen < 1)
+ struct sockaddr_storage socket_address;
+ int ret = GNUNET_STRINGS_to_address_ip (addr, addrlen,
+ &socket_address);
+
+ if (ret != GNUNET_OK)
return GNUNET_SYSERR;
- if (addr[0] == '(')
- return tcp_string_to_address_ipv6 (cls, addr, addrlen, buf, added);
- else
- return tcp_string_to_address_ipv4 (cls, addr, addrlen, buf, added);
+ if (socket_address.ss_family == AF_INET)
+ {
+ struct IPv4TcpAddress *t4;
+ struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
+ t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
+ t4->ipv4_addr = in4->sin_addr.s_addr;
+ t4->t4_port = in4->sin_port;
+ *buf = t4;
+ *added = sizeof (struct IPv4TcpAddress);
+ }
+ else if (socket_address.ss_family == AF_INET6)
+ {
+ struct IPv6TcpAddress *t6;
+ struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address;
+ t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
+ t6->ipv6_addr = in6->sin6_addr;
+ t6->t6_port = in6->sin6_port;
+ *buf = t6;
+ *added = sizeof (struct IPv6TcpAddress);
+ }
+ return GNUNET_SYSERR;
}
GNUNET_CONTAINER_DLL_insert (ret->pending_messages_head,
ret->pending_messages_tail, pm);
if (is_nat != GNUNET_YES)
+ {
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP sessions active"), 1,
GNUNET_NO);
+ }
return ret;
}
GNUNET_i2s (&session->target),
tcp_address_to_string(NULL, session->addr, session->addrlen));
- GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->sessionmap, &session->target.hashPubKey, session) ||
- GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->nat_wait_conns, &session->target.hashPubKey, session));
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->sessionmap, &session->target.hashPubKey, session))
+ {
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# TCP sessions active"), -1,
+ GNUNET_NO);
+ dec_sessions (plugin, session, __LINE__);
+ }
+ else GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->nat_wait_conns, &session->target.hashPubKey, session));
/* clean up state */
if (session->transmit_handle != NULL)
GNUNET_SERVER_client_drop (session->client);
session->client = NULL;
}
- GNUNET_STATISTICS_update (session->plugin->env->stats,
- gettext_noop ("# TCP sessions active"), -1,
- GNUNET_NO);
+
+
GNUNET_free_non_null (session->addr);
GNUNET_assert (NULL == session->transmit_handle);
GNUNET_free (session);
session->ats_address_network_type = ats.value;
GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &address->peer.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-
+ inc_sessions (plugin, session, __LINE__);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
"Creating new session for `%s' address `%s' session %p\n",
GNUNET_i2s (&address->peer),
* Port to add after the IP address.
*/
uint16_t port;
+
+ int ipv6;
};
GNUNET_free (ppc);
return;
}
- GNUNET_asprintf (&ret, "%s:%d", hostname, ppc->port);
+ if (GNUNET_YES == ppc->ipv6)
+ GNUNET_asprintf (&ret, "[%s]:%d", hostname, ppc->port);
+ else
+ GNUNET_asprintf (&ret, "%s:%d", hostname, ppc->port);
ppc->asc (ppc->asc_cls, ret);
GNUNET_free (ret);
}
else
{
/* invalid address */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp",
+ "Invalid address to string request: plugin `%s', address length: %u bytes\n");
GNUNET_break_op (0);
asc (asc_cls, NULL);
return;
}
ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
+ if (addrlen == sizeof (struct IPv6TcpAddress))
+ ppc->ipv6 = GNUNET_YES;
+ else
+ ppc->ipv6 = GNUNET_NO;
ppc->asc = asc;
ppc->asc_cls = asc_cls;
ppc->port = port;
GNUNET_free (vaddr);
GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &session->target.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-
+ inc_sessions (plugin, session, __LINE__);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP sessions active"), 1,
GNUNET_NO);
#endif
}
GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &wm->clientIdentity.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ inc_sessions (plugin, session, __LINE__);
}
if (session->expecting_welcome != GNUNET_YES)
if (NULL == session)
{
/* No inbound session found */
+ void *vaddr;
+ size_t alen;
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp",
+ "Received unexpected %u bytes of type %u from `%s'\n",
+ (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->type),
+ GNUNET_a2s(vaddr, alen));
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
else if (GNUNET_YES == session->expecting_welcome)
{
/* Session is expecting WELCOME message */
+ void *vaddr;
+ size_t alen;
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp",
+ "Received unexpected %u bytes of type %u from `%s'\n",
+ (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->type),
+ GNUNET_a2s(vaddr, alen));
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
struct sockaddr **addrs;
socklen_t *addrlens;
+ 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 = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api->cls = NULL;
+ api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
+ api->address_to_string = &tcp_address_to_string;
+ api->string_to_address = &tcp_string_to_address;
+ return api;
+ }
+
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
"MAX_CONNECTIONS",
else
service = NULL;
-
-
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->sessionmap = GNUNET_CONTAINER_multihashmap_create(max_connections);
plugin->max_connections = max_connections;
_
("TCP transport advertises itself as being on port %llu\n"),
aport);
+ /* Initially set connections to 0 */
+ GNUNET_STATISTICS_set(plugin->env->stats,
+ gettext_noop ("# TCP sessions active"), 0,
+ GNUNET_NO);
return api;
}
struct Plugin *plugin = api->cls;
struct TCPProbeContext *tcp_probe;
+ if (NULL == plugin)
+ {
+ GNUNET_free (api);
+ return NULL;
+ }
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Shutting down TCP plugin\n");
-
/* Removing leftover sessions */
GNUNET_CONTAINER_multihashmap_iterate(plugin->sessionmap, &session_disconnect_it, NULL);
/* Removing leftover NAT sessions */
projects / oweals / gnunet.git / blobdiff