From b0c6303a205120eb4638b2b5e6168bbe44eaa232 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Sun, 3 Apr 2011 17:30:09 +0200 Subject: [PATCH] removed tundev stuff --- src/curvetun.c | 60 +-------------------------------------------------- src/curvetun/Makefile | 1 - src/tundev.c | 58 ------------------------------------------------- src/tundev.h | 19 ---------------- 4 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 src/tundev.c delete mode 100644 src/tundev.h diff --git a/src/curvetun.c b/src/curvetun.c index 1ea06641..62926207 100644 --- a/src/curvetun.c +++ b/src/curvetun.c @@ -31,7 +31,6 @@ #include "die.h" #include "strlcpy.h" #include "signals.h" -#include "tundev.h" #include "curves.h" #include "protocol.h" #include "serialize.h" @@ -404,72 +403,15 @@ static int main_keygen(void) static int main_client(char *dev, enum client_mode cmode) { - int fd; - check_config_exists_or_die(); - info("MD: C\n"); - - fd = tun_open_or_die("tun0"); - info("Tunnel opened\n"); - - - - tun_close(fd); + info("MD: S\n"); return 0; } static int main_server(char *dev, unsigned short port) { - int fdu, fdt, max, ret, set = 1; - char buf[1600]; - struct sockaddr_in saddr; - fd_set fds; - size_t len; - check_config_exists_or_die(); info("MD: S\n"); - - fdt = tun_open_or_die("tun0"); - info("Tunnel opened!\n"); - - fdu = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (fdu < 0) - panic("Cannot obtain socket!\n"); - - ret = setsockopt(fdu, SOL_SOCKET, SO_REUSEADDR, &set, sizeof(set)); - if (ret) - panic("Cannot set socket option!\n"); - - saddr.sin_family = PF_INET; - saddr.sin_port = htons(port); - saddr.sin_addr.s_addr = INADDR_ANY; - - ret = bind(fdu, (struct sockaddr *) &saddr, sizeof(saddr)); - if (ret) - panic("Cannot bind udp socket!\n"); - - max = MAX(fdu, fdt) + 1; - - while (likely(!sigint)) { - FD_ZERO(&fds); - FD_SET(fdu, &fds); - FD_SET(fdt, &fds); - - select(max, &fds, NULL, NULL, NULL); - - if (FD_ISSET(fdu, &fds)) { - len = read(fdu, buf, sizeof(buf)); - write(fdt, buf, len); - } - - if (FD_ISSET(fdt, &fds)) { - len = read(fdt, buf, sizeof(buf)); - write(fdu, buf, len); - } - } - - close(fdu); - tun_close(fdt); return 0; } diff --git a/src/curvetun/Makefile b/src/curvetun/Makefile index b65645bd..c9c99fe6 100644 --- a/src/curvetun/Makefile +++ b/src/curvetun/Makefile @@ -12,7 +12,6 @@ LIBS = -lgcrypt core-objs = curvetun.o lib-objs = xmalloc.o \ strlcpy.o \ - tundev.o \ aes256ctr.o \ curves.o \ ecc.o \ diff --git a/src/tundev.c b/src/tundev.c deleted file mode 100644 index e4702f85..00000000 --- a/src/tundev.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * netsniff-ng - the packet sniffing beast - * By Daniel Borkmann - * Copyright 2011 Daniel Borkmann , - * Swiss federal institute of technology (ETH Zurich) - * Subject to the GPL. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tundev.h" -#include "die.h" -#include "strlcpy.h" - -int tun_open_or_die(char *name) -{ - int fd, ret; - struct ifreq ifr; - - fd = open("/dev/net/tun", O_RDWR); - if (fd < 0) - panic("Cannot open /dev/net/tun!\n"); - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags = IFF_TUN | IFF_NO_PI; - - if (name) - strlcpy(ifr.ifr_name, name, IFNAMSIZ); - - ret = ioctl(fd, TUNSETIFF, &ifr); - if (ret < 0) - panic("ioctl screwed up!\n"); - - return fd; -} - -ssize_t tun_write(int fd, const void *buf, size_t count) -{ - return write(fd, buf, count); -} - -ssize_t tun_read(int fd, void *buf, size_t count) -{ - return read(fd, buf, count); -} - -void tun_close(int fd) -{ - close(fd); -} - diff --git a/src/tundev.h b/src/tundev.h deleted file mode 100644 index d735e4a1..00000000 --- a/src/tundev.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * netsniff-ng - the packet sniffing beast - * By Daniel Borkmann - * Copyright 2011 Daniel Borkmann , - * Swiss federal institute of technology (ETH Zurich) - * Subject to the GPL. - */ - -#ifndef TUNDEV_H -#define TUNDEV_H - -#include - -extern int tun_open_or_die(char *name); -extern ssize_t tun_write(int fd, const void *buf, size_t count); -extern ssize_t tun_read(int fd, void *buf, size_t count); -extern void tun_close(int fd); - -#endif /* TUNDEV_H */ -- 2.11.4.GIT