[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12295 - gnunet/src/vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12295 - gnunet/src/vpn |
Date: |
Tue, 20 Jul 2010 21:53:50 +0200 |
Author: toelke
Date: 2010-07-20 21:53:50 +0200 (Tue, 20 Jul 2010)
New Revision: 12295
Modified:
gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
make it possible to restart the helper
Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c 2010-07-20 19:53:49 UTC (rev 12294)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c 2010-07-20 19:53:50 UTC (rev 12295)
@@ -55,6 +55,32 @@
}
}
+static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tsdkctx);
+
+static void start_helper_and_schedule(struct vpn_cls* mycls) {
+ mycls->helper_in = GNUNET_DISK_pipe(1);
+ mycls->helper_out = GNUNET_DISK_pipe(1);
+
+ mycls->helper_pid = GNUNET_OS_start_process(mycls->helper_in,
mycls->helper_out, "gnunet-vpn-helper", "gnunet-vpn-helper", NULL);
+
+ mycls->fh_from_helper = GNUNET_DISK_pipe_handle (mycls->helper_out,
GNUNET_DISK_PIPE_END_READ);
+
+ GNUNET_SCHEDULER_add_read_file (mycls->sched,
GNUNET_TIME_UNIT_FOREVER_REL, mycls->fh_from_helper, &helper_read, mycls);
+}
+
+
+static void restart_helper(void* cls, const struct
GNUNET_SCHEDULER_TaskContext* tskctx) {
+ struct vpn_cls* mycls = (struct vpn_cls*) cls;
+
+ // Kill the helper
+ PLIBC_KILL(mycls->helper_pid, SIGTERM);
+ GNUNET_OS_process_wait(mycls->helper_pid);
+
+ // Restart the helper
+ start_helper_and_schedule(mycls);
+
+}
+
static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext*
tsdkctx) {
struct vpn_cls* mycls = (struct vpn_cls*) cls;
struct suid_packet_header hdr = { .size = 0 };
@@ -135,14 +161,7 @@
GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL,
&cleanup, cls);
- mycls->helper_in = GNUNET_DISK_pipe(1);
- mycls->helper_out = GNUNET_DISK_pipe(1);
-
- mycls->helper_pid = GNUNET_OS_start_process(mycls->helper_in,
mycls->helper_out, "gnunet-vpn-helper", "gnunet-vpn-helper", NULL);
-
- mycls->fh_from_helper = GNUNET_DISK_pipe_handle (mycls->helper_out,
GNUNET_DISK_PIPE_END_READ);
-
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL,
mycls->fh_from_helper, &helper_read, mycls);
+ start_helper_and_schedule(mycls);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12295 - gnunet/src/vpn,
gnunet <=