From 588e30f786318fc9df2ce6655e2e75b49d861b87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20T=C3=B6lke?= Date: Tue, 20 Jul 2010 19:53:46 +0000 Subject: [PATCH] remove unsused files --- src/vpn/debug.c | 13 ----- src/vpn/debug.h | 7 --- src/vpn/tcp.c | 146 ------------------------------------------------ src/vpn/tcp.h | 8 --- src/vpn/test.c | 53 ------------------ src/vpn/udp.c | 22 -------- src/vpn/udp.h | 8 --- 7 files changed, 257 deletions(-) delete mode 100644 src/vpn/debug.c delete mode 100644 src/vpn/debug.h delete mode 100644 src/vpn/tcp.c delete mode 100644 src/vpn/tcp.h delete mode 100644 src/vpn/test.c delete mode 100644 src/vpn/udp.c delete mode 100644 src/vpn/udp.h diff --git a/src/vpn/debug.c b/src/vpn/debug.c deleted file mode 100644 index 900a4bd00..000000000 --- a/src/vpn/debug.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include - -#include "debug.h" - -void debug(int lvl, int es, char* msg, ...) { - va_list ap; - va_start(ap, msg); - vprintf(msg, ap); - va_end(ap); - if (es != 0) exit(es); -} diff --git a/src/vpn/debug.h b/src/vpn/debug.h deleted file mode 100644 index 8f3e71813..000000000 --- a/src/vpn/debug.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _GNTUN_DEBUG_H_ -#define _GNTUN_DEBUG_H_ - -/* exits with status exit if != 0; */ -extern void debug(int lvl, int exit, char* msg, ...); - -#endif diff --git a/src/vpn/tcp.c b/src/vpn/tcp.c deleted file mode 100644 index cd40f280a..000000000 --- a/src/vpn/tcp.c +++ /dev/null @@ -1,146 +0,0 @@ -#include "debug.h" -#include "packet.h" -#include "tcp.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct le { - int spt, dpt; - - unsigned char sadr[16]; - unsigned char dadr[16]; - - int socket; - - struct le* next; -}; - -static struct le* le_head = 0; - -static int look_for_child(struct ip6_tcp* pkt) { - struct le* cur; - - for(cur = le_head; cur != 0; cur = cur->next) { - if (cur->spt == pkt->data.spt &&/*{{{*/ - cur->dpt == pkt->data.spt && - cur->sadr[0] == pkt->hdr.sadr[0] && - cur->sadr[1] == pkt->hdr.sadr[1] && - cur->sadr[2] == pkt->hdr.sadr[2] && - cur->sadr[3] == pkt->hdr.sadr[3] && - cur->sadr[4] == pkt->hdr.sadr[4] && - cur->sadr[5] == pkt->hdr.sadr[5] && - cur->sadr[6] == pkt->hdr.sadr[6] && - cur->sadr[7] == pkt->hdr.sadr[7] && - cur->sadr[8] == pkt->hdr.sadr[8] && - cur->sadr[9] == pkt->hdr.sadr[9] && - cur->sadr[10] == pkt->hdr.sadr[10] && - cur->sadr[11] == pkt->hdr.sadr[11] && - cur->sadr[12] == pkt->hdr.sadr[12] && - cur->sadr[13] == pkt->hdr.sadr[13] && - cur->sadr[14] == pkt->hdr.sadr[14] && - cur->sadr[15] == pkt->hdr.sadr[15] && - - cur->dadr[0] == pkt->hdr.dadr[0] && - cur->dadr[1] == pkt->hdr.dadr[1] && - cur->dadr[2] == pkt->hdr.dadr[2] && - cur->dadr[3] == pkt->hdr.dadr[3] && - cur->dadr[4] == pkt->hdr.dadr[4] && - cur->dadr[5] == pkt->hdr.dadr[5] && - cur->dadr[6] == pkt->hdr.dadr[6] && - cur->dadr[7] == pkt->hdr.dadr[7] && - cur->dadr[8] == pkt->hdr.dadr[8] && - cur->dadr[9] == pkt->hdr.dadr[9] && - cur->dadr[10] == pkt->hdr.dadr[10] && - cur->dadr[11] == pkt->hdr.dadr[11] && - cur->dadr[12] == pkt->hdr.dadr[12] && - cur->dadr[13] == pkt->hdr.dadr[13] && - cur->dadr[14] == pkt->hdr.dadr[14] && - cur->dadr[15] == pkt->hdr.dadr[15])/*}}}*/ - return cur->socket; - } - return -1; -} - -static struct le* new_le() {{{ - struct le* res = (struct le*) malloc(sizeof(struct le)); - - struct le** cur; - - for(cur = &le_head; *cur != 0; cur = &((*cur)->next)) {} - - *cur = res; - - return res; -}}} - -static int nat(struct ip6_tcp* pkt) {{{ - unsigned char adr1[] = { 0x12, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; - unsigned char adr2[] = { 0x12, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03}; - - if (strncmp((char*)adr1, (char*)pkt->hdr.dadr, 16)) { - int sock = socket(AF_INET, SOCK_STREAM, 0); - struct sockaddr_in info; - memset(&info, 0, sizeof(info)); - - info.sin_family = AF_INET; - info.sin_port = pkt->data.dpt; - inet_pton(AF_INET, "94.142.241.111", &info.sin_addr.s_addr); - - connect(sock, (const struct sockaddr*)&info, sizeof(info)); - return sock; - } else if (strncmp((char*)adr2, (char*)pkt->hdr.dadr, 16)) { - int sock = socket(AF_INET6, SOCK_STREAM, 0); - - struct sockaddr_in6 info; - memset(&info, 0, sizeof(info)); - - info.sin6_family = AF_INET6; - info.sin6_port = pkt->data.dpt; - - inet_pton(AF_INET6, "2a02:898:17:8000::42", info.sin6_addr.s6_addr); - - connect(sock, (const struct sockaddr*)&info, sizeof(info)); - - return sock; - } - return -1; -}}} - -void handle_tcp(struct ip6_tcp* pkt) { - signal(SIGCHLD, SIG_IGN); - - int fd = look_for_child(pkt); - - if (fd == -1) { - struct le* le = new_le(); - le->spt = pkt->data.spt; - le->dpt = pkt->data.dpt; - - memcpy(le->sadr, pkt->hdr.sadr, 16); - memcpy(le->dadr, pkt->hdr.dadr, 16); - - le->socket = nat(pkt); - fd = le->socket; - } - - int size = payload((&pkt->hdr)) - pkt->data.off; - - int w = 0; - while (size > 0) { - w = write(fd, pkt->data.data, size - w); - if (w < 0) { - debug(1, 0, "writing: %s\n", strerror(errno)); - } else { - size -= w; - } - } -} diff --git a/src/vpn/tcp.h b/src/vpn/tcp.h deleted file mode 100644 index c933b1b4c..000000000 --- a/src/vpn/tcp.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _GNTUN_TCP_H_ -#define _GNTUN_TCP_H_ - -#include "packet.h" - -extern void handle_tcp(struct ip6_tcp*); - -#endif diff --git a/src/vpn/test.c b/src/vpn/test.c deleted file mode 100644 index b24397c71..000000000 --- a/src/vpn/test.c +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include -#include -#include - -#include - -#include "packet.h" -#include "tun.h" -#include "debug.h" -#include "pretty-print.h" -#include "tcp.h" -#include "udp.h" -#include - - -int main(int c, char** v) { - char dev[IFNAMSIZ]; - memset(dev, 0, IFNAMSIZ); - int fd = init_tun(dev); - - debug(1, 0, "Initialized the interface %s.\n", dev); - - struct pkt_tun* pkt; - - for(;;) { - printf("read %d bytes from socket, ", recv_pkt(fd, &pkt)); - switch (ntohs(pkt->type)) { - case 0x86dd: - printf("parsing ipv6:\n"); - struct ip6_pkt* pkt6 = parse_ip6(pkt); - pkt_printf(pkt6); - struct ip6_tcp* pkt6_tcp; - struct ip6_udp* pkt6_udp; - switch(pkt6->hdr.nxthdr) { - case 0x06: - pkt6_tcp = parse_ip6_tcp(pkt6); - pkt_printf_ip6tcp(pkt6_tcp); - handle_tcp(pkt6_tcp); - break; - case 0x11: - pkt6_udp = parse_ip6_udp(pkt6); - pkt_printf_ip6udp(pkt6_udp); - handle_udp(pkt6_udp); - break; - } - break; - default: - printf("unknown/unimplemented packet-type\n"); - break; - } - } -} diff --git a/src/vpn/udp.c b/src/vpn/udp.c deleted file mode 100644 index 4a7cb94ed..000000000 --- a/src/vpn/udp.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "debug.h" -#include "packet.h" -#include "udp.h" - -#include "pretty-print.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void handle_udp(struct ip6_udp* pkt) { - if (ntohs(pkt->data.dpt) == 53) { //TODO check for dadr, too - pkt_printf_ip6dns((struct ip6_udp_dns*)pkt); - return; - } -} diff --git a/src/vpn/udp.h b/src/vpn/udp.h deleted file mode 100644 index ab285d6c8..000000000 --- a/src/vpn/udp.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _GNTUN_UDP_H_ -#define _GNTUN_UDP_H_ - -#include "packet.h" - -extern void handle_udp(struct ip6_udp*); - -#endif -- 2.25.1