diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-08 10:58:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-08 10:58:56 +0000 |
commit | f2e1a736377f59b2f7f12b0dcfc8c73e6e80e897 (patch) | |
tree | 96177dab2e137f625b2b60b97890716b0d2a0471 /src/nat/nat_mini.c | |
parent | 95d933d6e52f1c8d8dda1f6e1d8e8f8dc03d3c17 (diff) | |
download | gnunet-f2e1a736377f59b2f7f12b0dcfc8c73e6e80e897.tar.gz gnunet-f2e1a736377f59b2f7f12b0dcfc8c73e6e80e897.zip |
apifix
Diffstat (limited to 'src/nat/nat_mini.c')
-rw-r--r-- | src/nat/nat_mini.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 8f13d298f..2e4dd1a38 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -188,13 +188,10 @@ process_refresh_output (void *cls, | |||
188 | const char *line) | 188 | const char *line) |
189 | { | 189 | { |
190 | struct GNUNET_NAT_MiniHandle *mini = cls; | 190 | struct GNUNET_NAT_MiniHandle *mini = cls; |
191 | enum GNUNET_OS_ProcessStatusType type; | ||
192 | unsigned long code; | ||
193 | 191 | ||
194 | if (NULL == line) | 192 | if (NULL == line) |
195 | { | 193 | { |
196 | GNUNET_OS_command_stop (mini->refresh_cmd, | 194 | GNUNET_OS_command_stop (mini->refresh_cmd); |
197 | &type, &code); | ||
198 | mini->refresh_cmd = NULL; | 195 | mini->refresh_cmd = NULL; |
199 | mini->refresh_task = GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, | 196 | mini->refresh_task = GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, |
200 | &do_refresh, | 197 | &do_refresh, |
@@ -242,8 +239,6 @@ process_map_output (void *cls, | |||
242 | const char *line) | 239 | const char *line) |
243 | { | 240 | { |
244 | struct GNUNET_NAT_MiniHandle *mini = cls; | 241 | struct GNUNET_NAT_MiniHandle *mini = cls; |
245 | enum GNUNET_OS_ProcessStatusType type; | ||
246 | unsigned long code; | ||
247 | const char *ipaddr; | 242 | const char *ipaddr; |
248 | char *ipa; | 243 | char *ipa; |
249 | const char *pstr; | 244 | const char *pstr; |
@@ -251,8 +246,7 @@ process_map_output (void *cls, | |||
251 | 246 | ||
252 | if (NULL == line) | 247 | if (NULL == line) |
253 | { | 248 | { |
254 | GNUNET_OS_command_stop (mini->map_cmd, | 249 | GNUNET_OS_command_stop (mini->map_cmd); |
255 | &type, &code); | ||
256 | mini->map_cmd = NULL; | 250 | mini->map_cmd = NULL; |
257 | if (mini->did_map == GNUNET_YES) | 251 | if (mini->did_map == GNUNET_YES) |
258 | mini->refresh_task = GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, | 252 | mini->refresh_task = GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, |
@@ -354,13 +348,10 @@ process_unmap_output (void *cls, | |||
354 | const char *line) | 348 | const char *line) |
355 | { | 349 | { |
356 | struct GNUNET_NAT_MiniHandle *mini = cls; | 350 | struct GNUNET_NAT_MiniHandle *mini = cls; |
357 | enum GNUNET_OS_ProcessStatusType type; | ||
358 | unsigned long code; | ||
359 | 351 | ||
360 | if (NULL == line) | 352 | if (NULL == line) |
361 | { | 353 | { |
362 | GNUNET_OS_command_stop (mini->unmap_cmd, | 354 | GNUNET_OS_command_stop (mini->unmap_cmd); |
363 | &type, &code); | ||
364 | mini->unmap_cmd = NULL; | 355 | mini->unmap_cmd = NULL; |
365 | GNUNET_free (mini); | 356 | GNUNET_free (mini); |
366 | return; | 357 | return; |
@@ -381,15 +372,12 @@ void | |||
381 | GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini) | 372 | GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini) |
382 | { | 373 | { |
383 | char pstr[6]; | 374 | char pstr[6]; |
384 | enum GNUNET_OS_ProcessStatusType type; | ||
385 | unsigned long code; | ||
386 | 375 | ||
387 | if (! mini->did_map) | 376 | if (! mini->did_map) |
388 | { | 377 | { |
389 | if (mini->map_cmd != NULL) | 378 | if (mini->map_cmd != NULL) |
390 | { | 379 | { |
391 | GNUNET_OS_command_stop (mini->map_cmd, | 380 | GNUNET_OS_command_stop (mini->map_cmd); |
392 | &type, &code); | ||
393 | mini->map_cmd = NULL; | 381 | mini->map_cmd = NULL; |
394 | } | 382 | } |
395 | GNUNET_free (mini); | 383 | GNUNET_free (mini); |
@@ -402,8 +390,7 @@ GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini) | |||
402 | } | 390 | } |
403 | if (mini->refresh_cmd != NULL) | 391 | if (mini->refresh_cmd != NULL) |
404 | { | 392 | { |
405 | GNUNET_OS_command_stop (mini->refresh_cmd, | 393 | GNUNET_OS_command_stop (mini->refresh_cmd); |
406 | &type, &code); | ||
407 | mini->refresh_cmd = NULL; | 394 | mini->refresh_cmd = NULL; |
408 | } | 395 | } |
409 | mini->ac (mini->ac_cls, GNUNET_NO, | 396 | mini->ac (mini->ac_cls, GNUNET_NO, |