aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-01-15 21:48:12 +0100
committerChristian Grothoff <christian@grothoff.org>2017-01-15 21:48:12 +0100
commit4270685ca41e6401f0836716a24e87dbab4d1145 (patch)
treeb20ce84c119386598d408f43c6b541f756a9e225 /src
parent5b32752cd7b02adcb8e6fec7798637638c6f63a0 (diff)
downloadgnunet-4270685ca41e6401f0836716a24e87dbab4d1145.tar.gz
gnunet-4270685ca41e6401f0836716a24e87dbab4d1145.zip
fix format string issue
Diffstat (limited to 'src')
-rw-r--r--src/nat/gnunet-service-nat_helper.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c
index b850c8a6b..e91f63beb 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -49,7 +49,7 @@ struct HelperContext
49 * Closure for @e cb. 49 * Closure for @e cb.
50 */ 50 */
51 void *cb_cls; 51 void *cb_cls;
52 52
53 /** 53 /**
54 * How long do we wait for restarting a crashed gnunet-helper-nat-server? 54 * How long do we wait for restarting a crashed gnunet-helper-nat-server?
55 */ 55 */
@@ -126,7 +126,7 @@ nat_server_read (void *cls)
126 memset (mybuf, 126 memset (mybuf,
127 0, 127 0,
128 sizeof (mybuf)); 128 sizeof (mybuf));
129 bytes 129 bytes
130 = GNUNET_DISK_file_read (h->server_stdout_handle, 130 = GNUNET_DISK_file_read (h->server_stdout_handle,
131 mybuf, 131 mybuf,
132 sizeof (mybuf)); 132 sizeof (mybuf));
@@ -134,7 +134,7 @@ nat_server_read (void *cls)
134 { 134 {
135 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 135 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
136 "Finished reading from server stdout with code: %d\n", 136 "Finished reading from server stdout with code: %d\n",
137 bytes); 137 (int) bytes);
138 if (0 != GNUNET_OS_process_kill (h->server_proc, 138 if (0 != GNUNET_OS_process_kill (h->server_proc,
139 GNUNET_TERM_SIG)) 139 GNUNET_TERM_SIG))
140 GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, 140 GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING,
@@ -185,7 +185,7 @@ nat_server_read (void *cls)
185 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 185 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
186 _("gnunet-helper-nat-server generated malformed address `%s'\n"), 186 _("gnunet-helper-nat-server generated malformed address `%s'\n"),
187 mybuf); 187 mybuf);
188 h->server_read_task 188 h->server_read_task
189 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, 189 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
190 h->server_stdout_handle, 190 h->server_stdout_handle,
191 &nat_server_read, 191 &nat_server_read,
@@ -199,7 +199,7 @@ nat_server_read (void *cls)
199 port); 199 port);
200 h->cb (h->cb_cls, 200 h->cb (h->cb_cls,
201 &sin_addr); 201 &sin_addr);
202 h->server_read_task 202 h->server_read_task
203 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, 203 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
204 h->server_stdout_handle, 204 h->server_stdout_handle,
205 &nat_server_read, 205 &nat_server_read,
@@ -219,9 +219,9 @@ restart_nat_server (void *cls)
219 struct HelperContext *h = cls; 219 struct HelperContext *h = cls;
220 char *binary; 220 char *binary;
221 char ia[INET_ADDRSTRLEN]; 221 char ia[INET_ADDRSTRLEN];
222 222
223 h->server_read_task = NULL; 223 h->server_read_task = NULL;
224 h->server_stdout 224 h->server_stdout
225 = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, 225 = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES,
226 GNUNET_NO, GNUNET_YES); 226 GNUNET_NO, GNUNET_YES);
227 if (NULL == h->server_stdout) 227 if (NULL == h->server_stdout)
@@ -243,7 +243,7 @@ restart_nat_server (void *cls)
243 /* Start the server process */ 243 /* Start the server process */
244 binary 244 binary
245 = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server"); 245 = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
246 h->server_proc 246 h->server_proc
247 = GNUNET_OS_start_process (GNUNET_NO, 247 = GNUNET_OS_start_process (GNUNET_NO,
248 0, 248 0,
249 NULL, 249 NULL,
@@ -267,10 +267,10 @@ restart_nat_server (void *cls)
267 /* Close the write end of the read pipe */ 267 /* Close the write end of the read pipe */
268 GNUNET_DISK_pipe_close_end (h->server_stdout, 268 GNUNET_DISK_pipe_close_end (h->server_stdout,
269 GNUNET_DISK_PIPE_END_WRITE); 269 GNUNET_DISK_PIPE_END_WRITE);
270 h->server_stdout_handle 270 h->server_stdout_handle
271 = GNUNET_DISK_pipe_handle (h->server_stdout, 271 = GNUNET_DISK_pipe_handle (h->server_stdout,
272 GNUNET_DISK_PIPE_END_READ); 272 GNUNET_DISK_PIPE_END_READ);
273 h->server_read_task 273 h->server_read_task
274 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, 274 = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
275 h->server_stdout_handle, 275 h->server_stdout_handle,
276 &nat_server_read, 276 &nat_server_read,
@@ -316,7 +316,7 @@ GN_start_gnunet_nat_server_ (const struct in_addr *internal_address,
316 */ 316 */
317void 317void
318GN_stop_gnunet_nat_server_ (struct HelperContext *h) 318GN_stop_gnunet_nat_server_ (struct HelperContext *h)
319{ 319{
320 if (NULL != h->server_read_task) 320 if (NULL != h->server_read_task)
321 { 321 {
322 GNUNET_SCHEDULER_cancel (h->server_read_task); 322 GNUNET_SCHEDULER_cancel (h->server_read_task);
@@ -384,7 +384,7 @@ GN_request_connection_reversal (const struct in_addr *internal_address,
384 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, 384 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
385 "inet_ntop"); 385 "inet_ntop");
386 return GNUNET_SYSERR; 386 return GNUNET_SYSERR;
387 } 387 }
388 GNUNET_snprintf (port_as_string, 388 GNUNET_snprintf (port_as_string,
389 sizeof (port_as_string), 389 sizeof (port_as_string),
390 "%d", 390 "%d",