-trying to make issues such as #2389 less likely, but I doubt this fixes it

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index a527585cc06055daa1b1c885f409c8d6c40993d9..88950ea79fcb970ec64ba36dfd9d5c059d206327 100644 (file)
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1694,20 +1694,20 @@ handle_tcp_nat_probe (void *cls, struct GNUNET_SERVER_Client *client,
     session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove
-                 (plugin->nat_wait_conns,
-                  &tcp_nat_probe->clientIdentity.hashPubKey,
-                  session) == GNUNET_YES);
   if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
   {
     GNUNET_break (0);
-    GNUNET_free (session);
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    disconnect_session (session);
     return;
   }
-
-  GNUNET_SERVER_client_keep (client);
-  session->client = client;
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove
+                 (plugin->nat_wait_conns,
+                  &tcp_nat_probe->clientIdentity.hashPubKey,
+                  session) == GNUNET_YES);
+  GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap,
+                                   &session->target.hashPubKey, session, 
+                                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);  
   session->last_activity = GNUNET_TIME_absolute_get ();
   session->inbound = GNUNET_NO;
   LOG (GNUNET_ERROR_TYPE_DEBUG, 
@@ -1736,15 +1736,14 @@ handle_tcp_nat_probe (void *cls, struct GNUNET_SERVER_Client *client,
     LOG (GNUNET_ERROR_TYPE_DEBUG, 
         "Bad address for incoming connection!\n");
     GNUNET_free (vaddr);
-
     GNUNET_SERVER_client_drop (client);
-    GNUNET_free (session);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    disconnect_session (session);
     return;
   }
   GNUNET_free (vaddr);
-
-  GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &session->target.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  GNUNET_SERVER_client_keep (client);
+  session->client = client;
   inc_sessions (plugin, session, __LINE__);
   GNUNET_STATISTICS_update (plugin->env->stats,
                             gettext_noop ("# TCP sessions active"), 1,