[GNUnet-SVN] r37584 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2016-07-25 23:35:36 +0200 (Mon, 25 Jul 2016)
New Revision: 37584

Modified:
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
-unregister nat on error, indentation, DCE

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2016-07-25 21:34:47 UTC (rev 
37583)
+++ gnunet/src/transport/plugin_transport_tcp.c 2016-07-25 21:35:36 UTC (rev 
37584)
@@ -463,11 +463,6 @@
   struct TCPProbeContext *probe_tail;
 
   /**
-   * Handle for (DYN)DNS lookup of our external IP.
-   */
-  struct GNUNET_RESOLVER_RequestHandle *ext_dns;
-
-  /**
    * Function to call about session status changes.
    */
   GNUNET_TRANSPORT_SessionInfoCallback sic;
@@ -2002,7 +1997,8 @@
                                                        sbs,
                                                        ! numeric,
                                                        timeout,
-                                                       &append_port, ppc);
+                                                       &append_port,
+                                                      ppc);
   if (NULL == ppc->resolver_handle)
   {
     GNUNET_break (0);
@@ -3011,10 +3007,12 @@
                              GNUNET_YES,
                              aport,
                              (unsigned int) ret_s,
-                             (const struct sockaddr **) addrs, addrlens,
+                             (const struct sockaddr **) addrs,
+                            addrlens,
                              &tcp_nat_port_map_callback,
                              &try_connection_reversal,
-                             plugin, NULL);
+                             plugin,
+                            NULL);
     for (ret = ret_s -1; ret >= 0; ret--)
       GNUNET_free (addrs[ret]);
     GNUNET_free_non_null (addrs);
@@ -3075,7 +3073,9 @@
                                           GNUNET_YES);
   }
   plugin->handlers = GNUNET_malloc (sizeof (my_handlers));
-  GNUNET_memcpy (plugin->handlers, my_handlers, sizeof(my_handlers));
+  GNUNET_memcpy (plugin->handlers,
+                my_handlers,
+                sizeof(my_handlers));
   for (i = 0;i < sizeof(my_handlers) / sizeof(struct 
GNUNET_SERVER_MessageHandler);i++)
     plugin->handlers[i].callback_cls = plugin;
 

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2016-07-25 21:34:47 UTC (rev 
37583)
+++ gnunet/src/transport/plugin_transport_udp.c 2016-07-25 21:35:36 UTC (rev 
37584)
@@ -3997,6 +3997,8 @@
     GNUNET_CONTAINER_multipeermap_destroy (p->sessions);
     GNUNET_CONTAINER_heap_destroy (p->defrag_ctxs);
     GNUNET_SERVER_mst_destroy (p->mst);
+    if (NULL != p->nat)
+      GNUNET_NAT_unregister (p->nat);
     GNUNET_free (p);
     return NULL;
   }