diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-03 21:26:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-03 21:26:40 +0000 |
commit | 721e49caeea6ba5073f8bc5c6c08359295c02bb5 (patch) | |
tree | e06e80ba90af91e9452a48a7a5782913199b4877 /src/transport/test_transport_api_reliability.c | |
parent | 37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff) | |
download | gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip |
original patch from Mantis 1614
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 0625230a4..d9e88fe49 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -62,7 +62,7 @@ struct PeerContext | |||
62 | struct GNUNET_TRANSPORT_Handle *th; | 62 | struct GNUNET_TRANSPORT_Handle *th; |
63 | struct GNUNET_PeerIdentity id; | 63 | struct GNUNET_PeerIdentity id; |
64 | #if START_ARM | 64 | #if START_ARM |
65 | pid_t arm_pid; | 65 | GNUNET_OS_Process *arm_proc; |
66 | #endif | 66 | #endif |
67 | }; | 67 | }; |
68 | 68 | ||
@@ -141,9 +141,11 @@ static void | |||
141 | stop_arm (struct PeerContext *p) | 141 | stop_arm (struct PeerContext *p) |
142 | { | 142 | { |
143 | #if START_ARM | 143 | #if START_ARM |
144 | if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) | 144 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
145 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 145 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
146 | GNUNET_OS_process_wait (p->arm_pid); | 146 | GNUNET_OS_process_wait (p->arm_proc); |
147 | GNUNET_OS_process_close (p->arm_proc); | ||
148 | p->arm_proc = NULL; | ||
147 | #endif | 149 | #endif |
148 | GNUNET_CONFIGURATION_destroy (p->cfg); | 150 | GNUNET_CONFIGURATION_destroy (p->cfg); |
149 | } | 151 | } |
@@ -381,7 +383,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
381 | { | 383 | { |
382 | p->cfg = GNUNET_CONFIGURATION_create (); | 384 | p->cfg = GNUNET_CONFIGURATION_create (); |
383 | #if START_ARM | 385 | #if START_ARM |
384 | p->arm_pid = GNUNET_OS_start_process (NULL, NULL, | 386 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, |
385 | "gnunet-service-arm", | 387 | "gnunet-service-arm", |
386 | "gnunet-service-arm", | 388 | "gnunet-service-arm", |
387 | #if VERBOSE_ARM | 389 | #if VERBOSE_ARM |