X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvpn%2Fgnunet-daemon-vpn.c;h=ddd540cb0744874f409ff00b6c6c340252665dca;hb=4c5f0baee93fdab6471d14dc1c4f50b741157b5a;hp=5cc8321276148d4be5e080143f7ff7e38a181546;hpb=cf2b5b068fe12986ebe4c21a2ce1fa04f5881c55;p=oweals%2Fgnunet.git diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 5cc832127..ddd540cb0 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c @@ -1,6 +1,6 @@ /* 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 @@ -28,6 +28,11 @@ #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" */ /** @@ -36,10 +41,12 @@ 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; @@ -53,51 +60,76 @@ static void cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx } } -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 }; +static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx); - int r = 0; +static void start_helper_and_schedule(struct vpn_cls* mycls) { + mycls->helper_in = GNUNET_DISK_pipe(1); + mycls->helper_out = GNUNET_DISK_pipe(1); - if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) - return; + mycls->helper_pid = GNUNET_OS_start_process(mycls->helper_in, mycls->helper_out, "gnunet-vpn-helper", "gnunet-vpn-helper", NULL); - while (r < sizeof(struct suid_packet_header)) { - int t = GNUNET_DISK_file_read(mycls->fh_from_helper, &hdr, sizeof(struct suid_packet_header)); - if (t< 0) { - fprintf(stderr, "Read error for header: %m\n"); - return; - } - r += t; - } + mycls->fh_from_helper = GNUNET_DISK_pipe_handle (mycls->helper_out, GNUNET_DISK_PIPE_END_READ); - fprintf(stderr, "Read %d bytes for the header. The 'size' is %x, that is %d\n", r, hdr.size, ntohl(hdr.size)); + 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); - struct suid_packet *pkt = (struct suid_packet*) GNUNET_malloc(ntohl(hdr.size)); + 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); + +} - if (memcpy(pkt, &hdr, sizeof(struct suid_packet_header)) < 0) { - fprintf(stderr, "Memcpy: %m\n"); +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; - } - while (r < ntohl(pkt->hdr.size)) { - int t = GNUNET_DISK_file_read(mycls->fh_from_helper, (unsigned char*)pkt + r, ntohl(pkt->hdr.size) - r); - if (t< 0) { - fprintf(stderr, "Read error for data: %m\n"); - return; - } - r += t; + 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; } - printf("read %d bytes. The first 87 are:\n\t", r); + /* FIXME */ GNUNET_SERVER_mst_receive(mycls->mst, NULL, buf, t, 0, 0); - for (r = 0; r < 87; r++) - printf("%02x ", pkt->data[r]); - printf("\n"); + GNUNET_SCHEDULER_add_read_file (mycls->sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls->fh_from_helper, &helper_read, mycls); +} - GNUNET_free(pkt); +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; + } - GNUNET_SCHEDULER_add_read_file (mycls->sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls->fh_from_helper, &helper_read, mycls); } /** @@ -120,16 +152,11 @@ run (void *cls, mycls->sched = sched; - 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->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); - 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); } @@ -155,6 +182,8 @@ main (int argc, char *const *argv) "gnunet-daemon-vpn", gettext_noop ("help text"), options, &run, cls)) ? ret : 1; + + free(cls); // Make clang happy } /* end of gnunet-daemon-vpn.c */