gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r4934 - GNUnet/src/server


From: gnunet
Subject: [GNUnet-SVN] r4934 - GNUnet/src/server
Date: Tue, 5 Jun 2007 22:45:43 -0600 (MDT)

Author: grothoff
Date: 2007-06-05 22:45:43 -0600 (Tue, 05 Jun 2007)
New Revision: 4934

Modified:
   GNUnet/src/server/gnunet-transport-check.c
   GNUnet/src/server/tcpserver.c
Log:
fail gradefully if port already used

Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c  2007-06-06 04:27:23 UTC (rev 
4933)
+++ GNUnet/src/server/gnunet-transport-check.c  2007-06-06 04:45:43 UTC (rev 
4934)
@@ -450,6 +450,7 @@
                                              "TRANSPORTS",
                                              "udp tcp http",
                                              &trans)) {
+    FREE(expectedValue);
     GNUNET_fini(ectx, cfg);
     return 1;
   }
@@ -490,7 +491,12 @@
                                      "");
   }
   cron = cron_create(ectx);
-  initCore(ectx, cfg, cron, NULL);
+  if (OK != initCore(ectx, cfg, cron, NULL)) {
+    FREE(expectedValue);
+    cron_destroy(cron);
+    GNUNET_fini(ectx, cfg);
+    return 1;
+  }
   initConnection(ectx, cfg, NULL, cron);
   registerPlaintextHandler(P2P_PROTO_noise,
                           &noiseHandler);

Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c       2007-06-06 04:27:23 UTC (rev 4933)
+++ GNUnet/src/server/tcpserver.c       2007-06-06 04:45:43 UTC (rev 4934)
@@ -317,6 +317,7 @@
           _("`%s' failed for port %d. Is gnunetd already running?\n"),
           "bind",
           listenerPort);
+    CLOSE(listenerFD);
     return SYSERR;
   }
   selector = select_create("tcpserver",





reply via email to

[Prev in Thread] Current Thread [Next in Thread]