summaryrefslogtreecommitdiffstats
path: root/clatd.c
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-12-08 11:27:41 +0900
committerLorenzo Colitti <lorenzo@google.com>2014-12-08 12:38:20 +0900
commitff6f7fe4bd983c623d490100fa17cdb4936b95a2 (patch)
tree1d93045184b4d6fb67b1799e89b6fcacdbd948c8 /clatd.c
parent30588552f63424bd4bdbf5ebdce8ba63d10a7bb2 (diff)
downloadplatform_external_android-clat-ff6f7fe4bd983c623d490100fa17cdb4936b95a2.tar.gz
platform_external_android-clat-ff6f7fe4bd983c623d490100fa17cdb4936b95a2.tar.bz2
platform_external_android-clat-ff6f7fe4bd983c623d490100fa17cdb4936b95a2.zip
Move tun functions to a new tun.c.
Change-Id: I4910b6cfca0bbf6bde2d1348f43d3131a1212399
Diffstat (limited to 'clatd.c')
-rw-r--r--clatd.c39
1 files changed, 1 insertions, 38 deletions
diff --git a/clatd.c b/clatd.c
index dbf725b..e2c96e6 100644
--- a/clatd.c
+++ b/clatd.c
@@ -50,6 +50,7 @@
#include "mtu.h"
#include "getaddr.h"
#include "dump.h"
+#include "tun.h"
#define DEVICENAME4 "clat4"
@@ -65,44 +66,6 @@ void stop_loop() {
running = 0;
}
-/* function: tun_open
- * tries to open the tunnel device
- */
-int tun_open() {
- int fd;
-
- fd = open("/dev/tun", O_RDWR);
- if(fd < 0) {
- fd = open("/dev/net/tun", O_RDWR);
- }
-
- return fd;
-}
-
-/* function: tun_alloc
- * creates a tun interface and names it
- * dev - the name for the new tun device
- */
-int tun_alloc(char *dev, int fd) {
- struct ifreq ifr;
- int err;
-
- memset(&ifr, 0, sizeof(ifr));
-
- ifr.ifr_flags = IFF_TUN;
- if( *dev ) {
- strncpy(ifr.ifr_name, dev, IFNAMSIZ);
- ifr.ifr_name[IFNAMSIZ-1] = '\0';
- }
-
- if( (err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ){
- close(fd);
- return err;
- }
- strcpy(dev, ifr.ifr_name);
- return 0;
-}
-
/* function: configure_packet_socket
* Binds the packet socket and attaches the receive filter to it.
* sock - the socket to configure