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_quota_compliance.c | |
parent | 37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff) | |
download | gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip |
original patch from Mantis 1614
Diffstat (limited to 'src/transport/test_quota_compliance.c')
-rw-r--r-- | src/transport/test_quota_compliance.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 4c4a025f2..39319f8d7 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -65,7 +65,7 @@ struct PeerContext | |||
65 | struct GNUNET_TRANSPORT_Handle *th; | 65 | struct GNUNET_TRANSPORT_Handle *th; |
66 | struct GNUNET_PeerIdentity id; | 66 | struct GNUNET_PeerIdentity id; |
67 | #if START_ARM | 67 | #if START_ARM |
68 | pid_t arm_pid; | 68 | GNUNET_OS_Process *arm_proc; |
69 | #endif | 69 | #endif |
70 | }; | 70 | }; |
71 | 71 | ||
@@ -197,9 +197,11 @@ static void | |||
197 | stop_arm (struct PeerContext *p) | 197 | stop_arm (struct PeerContext *p) |
198 | { | 198 | { |
199 | #if START_ARM | 199 | #if START_ARM |
200 | if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) | 200 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
201 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 201 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
202 | GNUNET_OS_process_wait (p->arm_pid); | 202 | GNUNET_OS_process_wait (p->arm_proc); |
203 | GNUNET_OS_process_close (p->arm_proc); | ||
204 | p->arm_proc = NULL; | ||
203 | #endif | 205 | #endif |
204 | GNUNET_CONFIGURATION_destroy (p->cfg); | 206 | GNUNET_CONFIGURATION_destroy (p->cfg); |
205 | } | 207 | } |
@@ -576,7 +578,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
576 | { | 578 | { |
577 | p->cfg = GNUNET_CONFIGURATION_create (); | 579 | p->cfg = GNUNET_CONFIGURATION_create (); |
578 | #if START_ARM | 580 | #if START_ARM |
579 | p->arm_pid = GNUNET_OS_start_process (NULL, NULL, | 581 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, |
580 | "gnunet-service-arm", | 582 | "gnunet-service-arm", |
581 | "gnunet-service-arm", | 583 | "gnunet-service-arm", |
582 | #if VERBOSE_ARM | 584 | #if VERBOSE_ARM |