X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Fnat_mini.c;h=fbb6e769a7a995622357cb419e33c6ce0f88fa91;hb=70466ec3c34f9a920e9e798e3169f886e9486a59;hp=864a7f04e6d6cba841029c3c8a5d638c1ce44acd;hpb=9fac6b6eefdc9144053f736fd388cb2199a97046;p=oweals%2Fgnunet.git

diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 864a7f04e..fbb6e769a 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -165,7 +165,13 @@ GNUNET_NAT_mini_get_external_ipv4 (struct GNUNET_TIME_Relative timeout,
   struct GNUNET_NAT_ExternalHandle *eh;
 
   if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip"))
+  {
+    LOG (GNUNET_ERROR_TYPE_INFO,
+	 _("`external-ip' command not found\n"));
     return NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Running `external-ip' to determine our external IP\n");
   eh = GNUNET_malloc (sizeof (struct GNUNET_NAT_ExternalHandle));
   eh->cb = cb;
   eh->cb_cls = cb_cls;
@@ -176,7 +182,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 +208,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);
@@ -408,6 +414,8 @@ do_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Running `upnpc' to check if our mapping still exists\n");
   mini->refresh_task = GNUNET_SCHEDULER_NO_TASK;
   mini->found = GNUNET_NO;
   mini->refresh_cmd =
@@ -492,7 +500,13 @@ GNUNET_NAT_mini_map_start (uint16_t port, int is_tcp,
   char pstr[6];
 
   if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc"))
+  {
+    LOG (GNUNET_ERROR_TYPE_INFO,
+	 _("`upnpc' command not found\n"));
     return NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Running `upnpc' to install mapping\n");
   ret = GNUNET_malloc (sizeof (struct GNUNET_NAT_MiniHandle));
   ret->ac = ac;
   ret->ac_cls = ac_cls;