-makefile for new test_stream_local (commented)

[oweals/gnunet.git] / src / transport / plugin_transport_tcp.c

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index e5d3014bc5c0e84b4ba57fd7cbcf9d02313cef30..9831070dd5e759adc0b67608f2e19f56d5210bb9 100644 (file)
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -403,6 +403,44 @@ struct Plugin
 
 };
 
+/* 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.
@@ -678,9 +716,11 @@ create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target,
   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;
 }
 
@@ -867,8 +907,14 @@ disconnect_session (struct Session *session)
                    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)
@@ -919,9 +965,8 @@ disconnect_session (struct Session *session)
     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);
@@ -1285,7 +1330,7 @@ tcp_plugin_get_session (void *cls,
   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),
@@ -1369,6 +1414,8 @@ struct PrettyPrinterContext
    * Port to add after the IP address.
    */
   uint16_t port;
+
+  int ipv6;
 };
 
 
@@ -1390,7 +1437,10 @@ append_port (void *cls, const char *hostname)
     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);
 }
@@ -1452,11 +1502,17 @@ tcp_plugin_address_pretty_printer (void *cls, const char *type,
   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;
@@ -1663,7 +1719,7 @@ handle_tcp_nat_probe (void *cls, struct GNUNET_SERVER_Client *client,
   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);
@@ -1763,6 +1819,7 @@ handle_tcp_welcome (void *cls, struct GNUNET_SERVER_Client *client,
 #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)
@@ -1839,6 +1896,14 @@ handle_tcp_data (void *cls, struct GNUNET_SERVER_Client *client,
   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;
@@ -1846,6 +1911,14 @@ handle_tcp_data (void *cls, struct GNUNET_SERVER_Client *client,
   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;
@@ -2187,6 +2260,10 @@ libgnunet_plugin_transport_tcp_init (void *cls)
                      _
                      ("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;
 }