7 files changed, 17 insertions, 20 deletions

diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 5012d6455..0743a478d 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -392,15 +392,15 @@ run (void *cls,
                                            &stun_read_task,
                                            NULL);
   }
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
   test_finished ();
   return;
 fail_and_shutdown:
   global_ret = 1;
   GNUNET_SCHEDULER_shutdown ();
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
 }
 
 
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index 3b7d48c82..4dcc0312f 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -2009,7 +2009,7 @@ client_disconnect_cb (void *cls,
       ch->caddrs[i].mh = NULL;
     }
   }
-  GNUNET_free_non_null (ch->caddrs);
+  GNUNET_free (ch->caddrs);
   while (NULL != (lal = ch->ext_addr_head))
   {
     GNUNET_CONTAINER_DLL_remove (ch->ext_addr_head,
@@ -2032,8 +2032,8 @@ client_disconnect_cb (void *cls,
     GNUNET_RESOLVER_request_cancel (ch->ext_dns);
     ch->ext_dns = NULL;
   }
-  GNUNET_free_non_null (ch->hole_external);
-  GNUNET_free_non_null (ch->section_name);
+  GNUNET_free (ch->hole_external);
+  GNUNET_free (ch->section_name);
   GNUNET_free (ch);
 }
 
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c
index 58d7b4c61..bd1645d25 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -222,7 +222,7 @@ restart_nat_server (void *cls)
     return;
   }
   h->server_stdout =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if (NULL == h->server_stdout)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
@@ -234,8 +234,7 @@ restart_nat_server (void *cls)
               "Starting `%s' at `%s'\n",
               "gnunet-helper-nat-server",
               ia);
-  h->server_proc = GNUNET_OS_start_process (GNUNET_NO,
-                                            0,
+  h->server_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                             NULL,
                                             h->server_stdout,
                                             NULL,
@@ -378,8 +377,7 @@ GN_request_connection_reversal (const struct in_addr *internal_address,
               remv4,
               internal_port);
   binary = GNUNET_OS_get_suid_binary_path (cfg, "gnunet-helper-nat-client");
-  proc = GNUNET_OS_start_process (GNUNET_NO,
-                                  0,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                   NULL,
                                   NULL,
                                   NULL,
diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c
index ae94e3f5b..24f77d9cc 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -192,15 +192,14 @@ GNUNET_NAT_mini_get_external_ipv4_ (GNUNET_NAT_IPCallback cb, void *cb_cls)
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Running `external-ip' to determine our external IP\n");
-  eh->opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  eh->opipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if (NULL == eh->opipe)
   {
     eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE;
     eh->task = GNUNET_SCHEDULER_add_now (&signal_external_ip_error, eh);
     return eh;
   }
-  eh->eip = GNUNET_OS_start_process (GNUNET_NO,
-                                     0,
+  eh->eip = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                      NULL,
                                      eh->opipe,
                                      NULL,
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 69a2f4218..a3072f712 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -108,7 +108,7 @@ process_if (void *cls,
 
   if (addr == NULL)
     return GNUNET_OK;
-  GNUNET_free_non_null (data->addr);
+  GNUNET_free (data->addr);
   data->addr = GNUNET_malloc (addrlen);
   GNUNET_memcpy (data->addr, addr, addrlen);
   data->addrlen = addrlen;
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 43998c97c..2abab4d5f 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -117,8 +117,8 @@ main (int argc, char *const argv[])
     return 0;
   }
 
-  gns = GNUNET_OS_start_process (GNUNET_YES,
-                                 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  gns = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                 | GNUNET_OS_USE_PIPE_CONTROL,
                                  NULL, NULL, NULL,
                                  "gnunet-nat-server",
                                  "gnunet-nat-server",
diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index a41734af1..75eb877b3 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -277,8 +277,8 @@ main (int argc, char *const argv[])
 
   /* Lets start resolver */
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  proc = GNUNET_OS_start_process (GNUNET_YES,
-                                  GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                  | GNUNET_OS_USE_PIPE_CONTROL,
                                   NULL, NULL, NULL,
                                   fn,
                                   "gnunet-service-resolver",