[GNUnet-SVN] r33014 - gnunet/src/nat

[gnunet]

Author: wachs
Date: 2014-04-10 10:18:33 +0200 (Thu, 10 Apr 2014)
New Revision: 33014

Modified:
   gnunet/src/nat/nat_test.c
Log:
handle nat_register fail


Modified: gnunet/src/nat/nat_test.c
===================================================================
--- gnunet/src/nat/nat_test.c   2014-04-10 08:04:26 UTC (rev 33013)
+++ gnunet/src/nat/nat_test.c   2014-04-10 08:18:33 UTC (rev 33014)
@@ -333,7 +333,7 @@
         GNUNET_a2s (addr, addrlen));
     return;                     /* ignore IPv6 here */
   }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
+  LOG (GNUNET_ERROR_TYPE_INFO,
        "Asking gnunet-nat-server to connect to `%s'\n",
        GNUNET_a2s (addr, addrlen));
   sa = (const struct sockaddr_in *) addr;
@@ -445,9 +445,19 @@
         "NAT test listens on port %u (%s)\n",
         bnd_port,
         (GNUNET_YES == is_tcp) ? "tcp" : "udp");
-    ret->nat =
-        GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens,
+    ret->nat = GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens,
                              &addr_cb, NULL, ret);
+    if (NULL == ret->nat)
+    {
+      LOG (GNUNET_ERROR_TYPE_ERROR,
+          _("NAT test failed to start NAT library\n"));
+      if (GNUNET_SCHEDULER_NO_TASK != ret->ltask)
+        GNUNET_SCHEDULER_cancel (ret->ltask);
+      if (NULL != ret->lsock)
+        GNUNET_NETWORK_socket_close (ret->lsock);
+      GNUNET_free (ret);
+      return NULL;
+    }
   }
   return ret;
 }