checkpoint save

[oweals/gnunet.git] / src / nat / nat_mini.c

diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 84cc841867bd254781772079e4cad653711fd30b..5dffa8120baba31b38029769a2d0d0db52320bed 100644 (file)
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -176,7 +176,7 @@ GNUNET_NAT_mini_get_external_ipv4 (struct GNUNET_TIME_Relative timeout,
     return NULL;
   }
   eh->eip =
-    GNUNET_OS_start_process (GNUNET_NO, NULL, eh->opipe, "external-ip", "external-ip",
+    GNUNET_OS_start_process (GNUNET_NO, 0, NULL, eh->opipe, "external-ip", "external-ip",
                                NULL);
   if (NULL == eh->eip)
   {
@@ -202,7 +202,7 @@ void
 GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh)
 {
   (void) GNUNET_OS_process_kill (eh->eip, SIGKILL);
-  GNUNET_OS_process_close (eh->eip);
+  GNUNET_OS_process_destroy (eh->eip);
   GNUNET_DISK_pipe_close (eh->opipe);
   if (GNUNET_SCHEDULER_NO_TASK != eh->task)
     GNUNET_SCHEDULER_cancel (eh->task);
@@ -524,9 +524,7 @@ process_unmap_output (void *cls, const char *line)
 
   if (NULL == line)
   {
-#if DEBUG_NAT
     LOG (GNUNET_ERROR_TYPE_DEBUG, "UPnP unmap done\n");
-#endif
     GNUNET_OS_command_stop (mini->unmap_cmd);
     mini->unmap_cmd = NULL;
     GNUNET_free (mini);
@@ -577,10 +575,8 @@ GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini)
    * often are the same, but it might... */
   GNUNET_snprintf (pstr, sizeof (pstr), "%u",
                    (unsigned int) ntohs (mini->current_addr.sin_port));
-#if DEBUG_NAT
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Unmapping port %u with UPnP\n",
        ntohs (mini->current_addr.sin_port));
-#endif
   mini->unmap_cmd =
       GNUNET_OS_command_run (&process_unmap_output, mini, UNMAP_TIMEOUT,
                              "upnpc", "upnpc", "-d", pstr,