diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/nat | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/gnunet-service-nat_helper.c | 2 | ||||
-rw-r--r-- | src/nat/gnunet-service-nat_mini.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c index 80d3559f3..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) | |||
222 | return; | 222 | return; |
223 | } | 223 | } |
224 | h->server_stdout = | 224 | h->server_stdout = |
225 | GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES); | 225 | GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW); |
226 | if (NULL == h->server_stdout) | 226 | if (NULL == h->server_stdout) |
227 | { | 227 | { |
228 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe"); | 228 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe"); |
diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c index b98255ad2..24f77d9cc 100644 --- a/src/nat/gnunet-service-nat_mini.c +++ b/src/nat/gnunet-service-nat_mini.c | |||
@@ -192,7 +192,7 @@ GNUNET_NAT_mini_get_external_ipv4_ (GNUNET_NAT_IPCallback cb, void *cb_cls) | |||
192 | } | 192 | } |
193 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 193 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
194 | "Running `external-ip' to determine our external IP\n"); | 194 | "Running `external-ip' to determine our external IP\n"); |
195 | eh->opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES); | 195 | eh->opipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW); |
196 | if (NULL == eh->opipe) | 196 | if (NULL == eh->opipe) |
197 | { | 197 | { |
198 | eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE; | 198 | eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE; |