/*
This file is part of GNUnet.
- (C) 2010 Philipp Tölke
+ (C) 2010 Christian Grothoff
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_getopt_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet_os_lib.h"
+#include "gnunet-vpn-helper-p.h"
+#include "gnunet-vpn-packet.h"
+#include "gnunet-vpn-pretty-print.h"
+#include "gnunet_common.h"
+#include "gnunet_protocols.h"
+#include "gnunet_server_lib.h"
/* #include "gnunet_template_service.h" */
/**
static int ret;
struct vpn_cls {
- struct GNUNET_DISK_PipeHandle* helper_in;
- struct GNUNET_DISK_PipeHandle* helper_out;
+ struct GNUNET_DISK_PipeHandle* helper_in; // From the helper
+ struct GNUNET_DISK_PipeHandle* helper_out; // To the helper
+ const struct GNUNET_DISK_FileHandle* fh_from_helper;
+
+ struct GNUNET_SERVER_MessageStreamTokenizer* mst;
+
+ struct GNUNET_SCHEDULER_Handle *sched;
pid_t helper_pid;
};
static void cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
struct vpn_cls* mycls = (struct vpn_cls*) cls;
- if (tskctx->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) {
+ if (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) {
PLIBC_KILL(mycls->helper_pid, SIGTERM);
GNUNET_OS_process_wait(mycls->helper_pid);
}
}
+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_DISK_pipe_close_end(mycls->helper_out, GNUNET_DISK_PIPE_END_WRITE);
+ GNUNET_DISK_pipe_close_end(mycls->helper_in, 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, SIGKILL);
+ 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;
+ char buf[65535];
+
+ if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
+
+ int t = GNUNET_DISK_file_read(mycls->fh_from_helper, &buf, 65535);
+ if (t<=0) {
+ fprintf(stderr, "Read error for header: %m\n");
+ GNUNET_SCHEDULER_add_now(mycls->sched, restart_helper, cls);
+ return;
+ }
+
+ /* FIXME */ GNUNET_SERVER_mst_receive(mycls->mst, NULL, buf, t, 0, 0);
+
+ GNUNET_SCHEDULER_add_read_file (mycls->sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls->fh_from_helper, &helper_read, mycls);
+}
+
+static void message_token(void *cls, void *client, const struct GNUNET_MessageHeader *message) {
+ if (ntohs(message->type) != GNUNET_MESSAGE_TYPE_VPN_HELPER) return;
+
+ struct ip6_pkt *pkt6 = (struct ip6_pkt*) message;
+ struct ip6_tcp *pkt6_tcp;
+ struct ip6_udp *pkt6_udp;
+
+ pkt_printf(pkt6);
+ switch(pkt6->ip6_hdr.nxthdr) {
+ case 0x06:
+ pkt6_tcp = (struct ip6_tcp*)pkt6;
+ pkt_printf_ip6tcp(pkt6_tcp);
+ break;
+ case 0x11:
+ pkt6_udp = (struct ip6_udp*)pkt6;
+ pkt_printf_ip6udp(pkt6_udp);
+ if (ntohs(pkt6_udp->udp_hdr.dpt) == 53) {
+ pkt_printf_ip6dns((struct ip6_udp_dns*)pkt6_udp);
+ }
+ break;
+ }
+
}
/**
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg) {
+ struct GNUNET_SCHEDULER_Handle *sched,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg) {
struct vpn_cls* mycls = (struct vpn_cls*) cls;
- GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
+ mycls->sched = sched;
- mycls->helper_in = GNUNET_DISK_pipe(1);
- mycls->helper_out = GNUNET_DISK_pipe(1);
+ mycls->mst = GNUNET_SERVER_mst_create(&message_token, mycls);
- mycls->helper_pid = GNUNET_OS_start_process(mycls->helper_in, mycls->helper_out, "gnunet-vpn-helper", "gnunet-vpn-helper", NULL);
+ GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
- const struct GNUNET_DISK_FileHandle* fh = GNUNET_DISK_pipe_handle (mycls->helper_out, GNUNET_DISK_PIPE_END_READ);
-
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL, fh, &helper_read, mycls);
+ start_helper_and_schedule(mycls);
}
"gnunet-daemon-vpn",
gettext_noop ("help text"),
options, &run, cls)) ? ret : 1;
+
+ free(cls); // Make clang happy
}
/* end of gnunet-daemon-vpn.c */