commits December 2010

commits@lists.open-mesh.org

1 participants
226 discussions

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 5c947fe08ca2ac7508189db91088f920504c04cd Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Wed Oct 18 22:44:17 2006 +0200 * Add tun_dev_size parameter to add_dev_tun() * Improve bsd tun device code a little. Doesn't seem to be working yet though :-( diff --git a/bsd.c b/bsd.c index bd86d62..0bf11c4 100644 --- a/bsd.c +++ b/bsd.c @@ -200,28 +200,37 @@ void add_del_route(unsigned int dest, unsigned int router, int del, } } -#if defined(__OpenBSD__) -int open_tun_any(void) +/* + * open_tun_any() opens an available tun device. + * It returns the file descriptor as return value, + * or -1 on failure. + * + * The human readable name of the device (e.g. "/dev/tun0") is + * copied into the dev_name parameter. The buffer to hold + * this string is assumed to be dev_name_size bytes large. + */ +#if defined(__OpenBSD__) || defined(__Darwin__) +int open_tun_any(char *dev_name, size_t dev_name_size) { int i; int fd; - char tundev[12]; /* "/dev/tunxxx\0" */ + char tun_dev_name[12]; /* 12 = length("/dev/tunxxx\0") */ - for (i = 0; i < sizeof(tundev); i++) - tundev[i] = '\0'; + for (i = 0; i < sizeof(tun_dev_name); i++) + tun_dev_name[i] = '\0'; /* Try opening tun device /dev/tun[0..255] */ for (i = 0; i < 256; i++) { - snprintf(tundev, sizeof(tundev), "/dev/tun%i", i); - if ((fd = open(tundev, O_RDWR)) >= 0) { - printf("Using /dev/tun%i\n", i); + snprintf(tun_dev_name, sizeof(tun_dev_name), "/dev/tun%i", i); + if ((fd = open(tun_dev_name, O_RDWR)) >= 0) { + strlcpy(dev_name, tun_dev_name, dev_name_size); return fd; } } return -1; } #elif defined(__FreeBSD__) -int open_tun_any(void) +int open_tun_any(char *dev_name, size_t dev_name_size) { int fd; struct stat buf; @@ -230,6 +239,7 @@ int open_tun_any(void) if ((fd = open("/dev/tun", O_RDWR)) >= 0) { fstat(fd, &buf); printf("Using %s\n", devname(buf.st_rdev, S_IFCHR)); + strlcpy(dev_name, devname(buf.st_rdev, S_IFCHR), dev_name_size); return fd; } return -1; @@ -240,8 +250,8 @@ int open_tun_any(void) int probe_tun() { int fd; - fd = open_tun_any(); - if (fd > 0) + fd = open_tun_any(NULL, 0); + if (fd >= 0) close(fd); return fd; } @@ -251,8 +261,9 @@ int del_dev_tun(int fd) return close(fd); } -int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, int *fd) +int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, size_t tun_dev_size, int *fd) { + int so; struct ifreq ifr_tun, ifr_if; struct tuninfo ti; struct sockaddr_in addr; @@ -262,46 +273,58 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de memset(&ifr_if, 0, sizeof(ifr_if)); memset(&ti, 0, sizeof(ti)); - if ((*fd = open_tun_any()) < 0) { + /* Open tun device. */ + if ((*fd = open_tun_any(tun_dev, tun_dev_size)) < 0) { perror("Could not open tun device"); return -1; } + printf("Using %s\n", tun_dev); + + /* Initialise tuninfo to defaults. */ if (ioctl(*fd, TUNGIFINFO, &ti) < 0) { perror("TUNGIFINFO"); del_dev_tun(*fd); return -1; } - /* set ip of this end point of tunnel */ + /* Prepare to set IP of this end point of tunnel */ memset(&addr, 0, sizeof(addr)); addr.sin_addr.s_addr = tun_addr; addr.sin_family = AF_INET; memcpy(&ifr_tun.ifr_addr, &addr, sizeof(struct sockaddr)); - if (ioctl(*fd, SIOCSIFADDR, &ifr_tun) < 0) { + /* Set name of interface to configure */ + strlcpy(ifr_tun.ifr_name, tun_dev, IFNAMSIZ); + + /* Open temporary socket to configure tun interface. */ + so = socket(AF_INET, SOCK_DGRAM, 0); + + /* Set IP of this end point of tunnel */ + if (ioctl(so, SIOCSIFADDR, &ifr_tun, sizeof(ifr_tun)) < 0) { perror("SIOCSIFADDR"); del_dev_tun(*fd); return -1; } - if (ioctl(*fd, SIOCGIFFLAGS, &ifr_tun) < 0) { + /* Get interface flags for tun device */ + if (ioctl(so, SIOCGIFFLAGS, &ifr_tun) < 0) { perror("SIOCGIFFLAGS"); del_dev_tun(*fd); return -1; } + /* Set up and running interface flags on tun device. */ ifr_tun.ifr_flags |= IFF_UP; ifr_tun.ifr_flags |= IFF_RUNNING; - - if (ioctl(*fd, SIOCSIFFLAGS, &ifr_tun) < 0) { + if (ioctl(so, SIOCSIFFLAGS, &ifr_tun) < 0) { perror("SIOCSIFFLAGS"); del_dev_tun(*fd); return -1; } /* get MTU from real interface */ - strncpy(ifr_if.ifr_name, batman_if->dev, IFNAMSIZ - 1); + strlcpy(ifr_if.ifr_name, batman_if->dev, IFNAMSIZ); if (ioctl(*fd, SIOCGIFMTU, &ifr_if) < 0) { perror("SIOCGIFMTU"); del_dev_tun(*fd); @@ -320,6 +343,6 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de } } - strncpy(tun_dev, ifr_tun.ifr_name, IFNAMSIZ - 1); + strlcpy(tun_dev, ifr_tun.ifr_name, tun_dev_size); return 1; } diff --git a/linux.c b/linux.c index 63b4385..4bc9d81 100755 --- a/linux.c +++ b/linux.c @@ -174,7 +174,7 @@ int del_dev_tun( int fd ) { } -int add_dev_tun( struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, int *fd ) { +int add_dev_tun( struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, size_t tun_dev_size, int *fd ) { int tmp_fd; struct ifreq ifr_tun, ifr_if; @@ -289,7 +289,7 @@ int add_dev_tun( struct batman_if *batman_if, unsigned int tun_addr, char *tun_d } - strncpy( tun_dev, ifr_tun.ifr_name, IFNAMSIZ - 1 ); + strncpy( tun_dev, ifr_tun.ifr_name, tun_dev_size - 1 ); close( tmp_fd ); return 1; diff --git a/os.h b/os.h index 0197869..4f18e9e 100755 --- a/os.h +++ b/os.h @@ -38,6 +38,6 @@ int rand_num(int limit); int bind_to_iface( int udp_recv_sock, char *dev ); int probe_tun(); int del_dev_tun( int fd ); -int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ); +int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, size_t tun_dev_size, int *fd ); #endif diff --git a/posix.c b/posix.c index c17d9c7..fe1e2c3 100644 --- a/posix.c +++ b/posix.c @@ -155,7 +155,7 @@ void *client_to_gw_tun( void *arg ) { } - if ( add_dev_tun( curr_gateway_batman_if, curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { + if ( add_dev_tun( curr_gateway_batman_if, curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, sizeof(curr_gateway_tun_if), &curr_gateway_tun_fd ) > 0 ) { add_del_route( 0, 0, 0, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); @@ -301,7 +301,8 @@ void del_default_route() { int add_default_route() { - pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gateway ); + if (pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gateway ) != 0) + perror("Could not spawn thread"); return 1; @@ -500,7 +501,7 @@ void *gw_listen( void *arg ) { } - if ( add_dev_tun( batman_if, tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { + if ( add_dev_tun( batman_if, tmp_ip_holder.s_addr, tun_dev, sizeof(tun_dev), &tun_fd ) < 0 ) { printf( "Could not open tun device on interface: %s\n", gw_addr ); return NULL; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit bc636f673af35bcd0e53a8c566dbb573f154dd27 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Oct 18 22:52:06 2006 +0200 set TTL = 2 on non-primary interfaces diff --git a/batman.c b/batman.c index 9ac431f..1982118 100755 --- a/batman.c +++ b/batman.c @@ -880,7 +880,7 @@ int batman() batman_if->out.orig = batman_if->addr.sin_addr.s_addr; batman_if->out.flags = 0x00; - batman_if->out.ttl = TTL; + batman_if->out.ttl = ( batman_if->if_num == 0 ? TTL : 2 ); batman_if->out.seqno = 0; batman_if->out.gwflags = gateway_class; batman_if->out.version = BATMAN_VERSION; diff --git a/posix.c b/posix.c index fe1e2c3..ab18981 100644 --- a/posix.c +++ b/posix.c @@ -301,8 +301,10 @@ void del_default_route() { int add_default_route() { - if (pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gateway ) != 0) + if (pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gateway ) != 0) { perror("Could not spawn thread"); + curr_gateway = NULL; + } return 1; -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 5b0bf526dde7f43853c741b0e301fa02c4ad761d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Oct 19 17:13:44 2006 +0200 bind to parent interface if alias interface is given diff --git a/linux.c b/linux.c index 4bc9d81..b4cd116 100755 --- a/linux.c +++ b/linux.c @@ -69,16 +69,22 @@ int get_forwarding(void) int bind_to_iface( int udp_recv_sock, char *dev ) { - if ( setsockopt( udp_recv_sock, SOL_SOCKET, SO_BINDTODEVICE, dev, strlen ( dev ) + 1 ) < 0 ) - { - if ( errno == 19 ) { - fprintf( stderr, "Warning: Cannot bind socket to alias device %s\n", dev ); - } else { - fprintf( stderr, "Cannot bind socket to device %s : %s \n", dev, strerror(errno) ); - return -1; - } + char *colon_ptr; + + /* if given interface is an alias bind to parent interface */ + if ( ( colon_ptr = strchr( dev, ':' ) ) != NULL ) + *colon_ptr = '\0'; + + if ( setsockopt( udp_recv_sock, SOL_SOCKET, SO_BINDTODEVICE, dev, strlen ( dev ) + 1 ) < 0 ) { + + fprintf( stderr, "Cannot bind socket to device %s : %s \n", dev, strerror(errno) ); + return -1; + } + if ( colon_ptr != NULL ) + *colon_ptr = ':'; + return 1; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 1f81fe94a6beb87443c7df60d253176b427ced1e Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Wed Oct 11 22:56:29 2006 +0200 Use consistent formatting. Add a small comment in bind_to_iface stub. diff --git a/bsd.c b/bsd.c index f89ed8c..5e4404a 100644 --- a/bsd.c +++ b/bsd.c @@ -45,8 +45,7 @@ void set_forwarding(int state) /* FreeBSD allows us to set the boolean IP forwarding * sysctl to anything. Check the value for sanity. */ - if (state < 0 || state > 1) - { + if (state < 0 || state > 1) { errno = EINVAL; err(1, "set_forwarding: %i", state); } @@ -58,9 +57,7 @@ void set_forwarding(int state) mib[3] = IPCTL_FORWARDING; if (sysctl(mib, 4, NULL, 0, (void*)&state, sizeof(state)) == -1) - { err(1, "Cannot enable packet forwarding"); - } } int get_forwarding(void) @@ -78,16 +75,16 @@ int get_forwarding(void) len = sizeof(int); if (sysctl(mib, 4, &state, &len, NULL, 0) == -1) - { err(1, "Cannot tell if packet forwarding is enabled"); - } + return state; } -int bind_to_iface( int udp_recv_sock, char *dev ) { - +int bind_to_iface( int udp_recv_sock, char *dev ) +{ + /* XXX: Is binding a socket to a specific + * interface possible in *BSD? */ return 1; - } /* Message structure used to interface the kernel routing table. @@ -174,8 +171,7 @@ void add_del_route(unsigned int dest, unsigned int router, int del, do { msg.hdr.rtm_seq = seq; len = write(rt_sock, &msg, msg.hdr.rtm_msglen); - if (len < 0) - { + if (len < 0) { warn("Error sending routing message to kernel"); err(1, "Cannot %s route to %s", del ? "delete" : "add", str1); @@ -190,15 +186,14 @@ void add_del_route(unsigned int dest, unsigned int router, int del, } while (len > 0 && (msg.hdr.rtm_seq != seq || msg.hdr.rtm_pid != pid)); /* Evaluate reply */ - if (msg.hdr.rtm_version != RTM_VERSION) - { + if (msg.hdr.rtm_version != RTM_VERSION) { warn("routing message version mismatch: " "compiled with version %i, " "but running kernel uses version %i", RTM_VERSION, msg.hdr.rtm_version); } - if (msg.hdr.rtm_errno) - { + + if (msg.hdr.rtm_errno) { errno = msg.hdr.rtm_errno; err(1, "Cannot %s route to %s", del ? "delete" : "add", str1); @@ -224,7 +219,7 @@ int open_tun_any(void) } } return -1; -}; +} #elif defined(__FreeBSD__) int open_tun_any(void) { -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit cb2b331ccb1fb7a992c9d0509c6d9aa57ddd8498 Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Thu Oct 12 01:14:10 2006 +0200 Initialise tuninfo properly. Fix setting the MTU. diff --git a/bsd.c b/bsd.c index 5e4404a..bd86d62 100644 --- a/bsd.c +++ b/bsd.c @@ -260,12 +260,19 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de /* set up tunnel device */ memset(&ifr_tun, 0, sizeof(ifr_tun)); memset(&ifr_if, 0, sizeof(ifr_if)); + memset(&ti, 0, sizeof(ti)); if ((*fd = open_tun_any()) < 0) { perror("Could not open tun device"); return -1; } + if (ioctl(*fd, TUNGIFINFO, &ti) < 0) { + perror("TUNGIFINFO"); + del_dev_tun(*fd); + return -1; + } + /* set ip of this end point of tunnel */ memset(&addr, 0, sizeof(addr)); addr.sin_addr.s_addr = tun_addr; @@ -306,8 +313,8 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de fprintf(stderr, "Warning: MTU smaller than 100 - cannot reduce MTU anymore\n" ); } else { ti.mtu = ifr_if.ifr_mtu - 28; - if (ioctl(*fd, TUNSIFMODE, &ti) < 0) { - perror("TUNSIFMODE"); + if (ioctl(*fd, TUNSIFINFO, &ti) < 0) { + perror("TUNSIFINFO"); del_dev_tun(*fd); return -1; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit a3252702566c719a84853830c5aa5bea696d17f7 Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Wed Oct 11 22:45:23 2006 +0200 Preliminary /dev/tun support for FreeBSD and OpenBSD. Not tested. diff --git a/bsd.c b/bsd.c index e0ee8ac..f89ed8c 100644 --- a/bsd.c +++ b/bsd.c @@ -21,9 +21,15 @@ #include <sys/param.h> #include <sys/sysctl.h> #include <sys/socket.h> +#include <sys/ioctl.h> +#include <sys/stat.h> #include <netinet/in.h> #include <arpa/inet.h> #include <net/route.h> +#include <net/if.h> +#include <net/if_tun.h> +#include <fcntl.h> +#include <stdio.h> #include <string.h> #include <errno.h> #include <unistd.h> @@ -199,20 +205,119 @@ void add_del_route(unsigned int dest, unsigned int router, int del, } } -int del_dev_tun(int fd) +#if defined(__OpenBSD__) +int open_tun_any(void) { - /* Implement me! */ - return 1; + int i; + int fd; + char tundev[12]; /* "/dev/tunxxx\0" */ + + for (i = 0; i < sizeof(tundev); i++) + tundev[i] = '\0'; + + /* Try opening tun device /dev/tun[0..255] */ + for (i = 0; i < 256; i++) { + snprintf(tundev, sizeof(tundev), "/dev/tun%i", i); + if ((fd = open(tundev, O_RDWR)) >= 0) { + printf("Using /dev/tun%i\n", i); + return fd; + } + } + return -1; +}; +#elif defined(__FreeBSD__) +int open_tun_any(void) +{ + int fd; + struct stat buf; + + /* Open lowest unused tun device */ + if ((fd = open("/dev/tun", O_RDWR)) >= 0) { + fstat(fd, &buf); + printf("Using %s\n", devname(buf.st_rdev, S_IFCHR)); + return fd; + } + return -1; +} +#endif + +/* Probe for tun interface availability */ +int probe_tun() +{ + int fd; + fd = open_tun_any(); + if (fd > 0) + close(fd); + return fd; } -int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ) +int del_dev_tun(int fd) { - /* Implement me! */ - return 0; + return close(fd); } -int probe_tun() +int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, int *fd) { - /* Implement me! */ - return 0; + struct ifreq ifr_tun, ifr_if; + struct tuninfo ti; + struct sockaddr_in addr; + + /* set up tunnel device */ + memset(&ifr_tun, 0, sizeof(ifr_tun)); + memset(&ifr_if, 0, sizeof(ifr_if)); + + if ((*fd = open_tun_any()) < 0) { + perror("Could not open tun device"); + return -1; + } + + /* set ip of this end point of tunnel */ + memset(&addr, 0, sizeof(addr)); + addr.sin_addr.s_addr = tun_addr; + addr.sin_family = AF_INET; + memcpy(&ifr_tun.ifr_addr, &addr, sizeof(struct sockaddr)); + + if (ioctl(*fd, SIOCSIFADDR, &ifr_tun) < 0) { + perror("SIOCSIFADDR"); + del_dev_tun(*fd); + return -1; + } + + if (ioctl(*fd, SIOCGIFFLAGS, &ifr_tun) < 0) { + perror("SIOCGIFFLAGS"); + del_dev_tun(*fd); + return -1; + } + + ifr_tun.ifr_flags |= IFF_UP; + ifr_tun.ifr_flags |= IFF_RUNNING; + + if (ioctl(*fd, SIOCSIFFLAGS, &ifr_tun) < 0) { + perror("SIOCSIFFLAGS"); + del_dev_tun(*fd); + return -1; + } + + /* get MTU from real interface */ + strncpy(ifr_if.ifr_name, batman_if->dev, IFNAMSIZ - 1); + if (ioctl(*fd, SIOCGIFMTU, &ifr_if) < 0) { + perror("SIOCGIFMTU"); + del_dev_tun(*fd); + return -1; + } + + /* set MTU of tun interface: real MTU - 28 */ + if (ifr_if.ifr_mtu < 100) { + fprintf(stderr, "Warning: MTU smaller than 100 - cannot reduce MTU anymore\n" ); + } else { + ti.mtu = ifr_if.ifr_mtu - 28; + if (ioctl(*fd, TUNSIFMODE, &ti) < 0) { + perror("TUNSIFMODE"); + del_dev_tun(*fd); + return -1; + } + } + + strncpy(tun_dev, ifr_tun.ifr_name, IFNAMSIZ - 1); + return 1; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit a2f2aee344a3bdf7de0106e987cf725dcf7293b5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Oct 6 00:55:31 2006 +0200 Changelog update diff --git a/CHANGELOG b/CHANGELOG index cf3286d..06709f4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,10 @@ version 0.1 ^^^^^^^^^^^ + documentation: -- english documentation updated to 0.10-rc0 - please have a look at it +- english documentation updated to 0.1-rc0 - please have a look at it - german documentation is unmaintained - maybe remove it? too lazy to write a translation at the moment... - changed the name in the documentation and in posix.c to B.A.T.M.A.N-III, since we made quite some changes in the algorithm - added the textfile 'THANKS' @@ -17,6 +18,7 @@ new functions: - set orginator interval via command line switch - batman version check added - preferred gateway funtion added +- UDP tunnel implemented - FreeBSD support added - Mac OS X support added -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit fe53ac6cf1d4313a842521190afd5f905b4c023d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Oct 6 14:37:55 2006 +0200 get MTU of real interface keep_alive_string added diff --git a/linux.c b/linux.c index 026b8de..63b4385 100755 --- a/linux.c +++ b/linux.c @@ -174,15 +174,16 @@ int del_dev_tun( int fd ) { } -int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { +int add_dev_tun( struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, int *fd ) { int tmp_fd; - struct ifreq ifr; + struct ifreq ifr_tun, ifr_if; struct sockaddr_in addr; /* set up tunnel device */ - memset( &ifr, 0, sizeof(ifr) ); - ifr.ifr_flags = IFF_TUN | IFF_NO_PI; + memset( &ifr_tun, 0, sizeof(ifr_tun) ); + memset( &ifr_if, 0, sizeof(ifr_if) ); + ifr_tun.ifr_flags = IFF_TUN | IFF_NO_PI; if ( ( *fd = open( "/dev/net/tun", O_RDWR ) ) < 0 ) { @@ -191,7 +192,7 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - if ( ( ioctl( *fd, TUNSETIFF, (void *) &ifr ) ) < 0 ) { + if ( ( ioctl( *fd, TUNSETIFF, (void *) &ifr_tun ) ) < 0 ) { perror("TUNSETIFF"); close(*fd); @@ -221,10 +222,10 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { memset( &addr, 0, sizeof(addr) ); addr.sin_addr.s_addr = tun_addr; addr.sin_family = AF_INET; - memcpy( &ifr.ifr_addr, &addr, sizeof(struct sockaddr) ); + memcpy( &ifr_tun.ifr_addr, &addr, sizeof(struct sockaddr) ); - if ( ioctl( tmp_fd, SIOCSIFADDR, &ifr) < 0 ) { + if ( ioctl( tmp_fd, SIOCSIFADDR, &ifr_tun) < 0 ) { perror("SIOCSIFADDR"); del_dev_tun( *fd ); @@ -234,7 +235,7 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - if ( ioctl( tmp_fd, SIOCGIFFLAGS, &ifr) < 0 ) { + if ( ioctl( tmp_fd, SIOCGIFFLAGS, &ifr_tun) < 0 ) { perror("SIOCGIFFLAGS"); del_dev_tun( *fd ); @@ -243,10 +244,10 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - ifr.ifr_flags |= IFF_UP; - ifr.ifr_flags |= IFF_RUNNING; + ifr_tun.ifr_flags |= IFF_UP; + ifr_tun.ifr_flags |= IFF_RUNNING; - if ( ioctl( tmp_fd, SIOCSIFFLAGS, &ifr) < 0 ) { + if ( ioctl( tmp_fd, SIOCSIFFLAGS, &ifr_tun) < 0 ) { perror("SIOCSIFFLAGS"); del_dev_tun( *fd ); @@ -255,7 +256,10 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - if ( ioctl( tmp_fd, SIOCGIFMTU, &ifr ) < 0 ) { + /* get MTU from real interface */ + strncpy( ifr_if.ifr_name, batman_if->dev, IFNAMSIZ - 1 ); + + if ( ioctl( tmp_fd, SIOCGIFMTU, &ifr_if ) < 0 ) { perror("SIOCGIFMTU"); del_dev_tun( *fd ); @@ -264,15 +268,16 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - if ( ifr.ifr_mtu < 500 ) { + /* set MTU of tun interface: real MTU - 28 */ + if ( ifr_if.ifr_mtu < 100 ) { - fprintf(stderr, "Warning: MTU smaller than 500 - cannot reduce MTU anymore\n" ); + fprintf(stderr, "Warning: MTU smaller than 100 - cannot reduce MTU anymore\n" ); } else { - ifr.ifr_mtu -= 28; + ifr_tun.ifr_mtu = ifr_if.ifr_mtu - 28; - if ( ioctl( tmp_fd, SIOCSIFMTU, &ifr ) < 0 ) { + if ( ioctl( tmp_fd, SIOCSIFMTU, &ifr_tun ) < 0 ) { perror("SIOCSIFMTU"); del_dev_tun( *fd ); @@ -284,7 +289,7 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - strncpy( tun_dev, ifr.ifr_name, IFNAMSIZ - 1 ); + strncpy( tun_dev, ifr_tun.ifr_name, IFNAMSIZ - 1 ); close( tmp_fd ); return 1; diff --git a/os.h b/os.h index 092602a..0197869 100755 --- a/os.h +++ b/os.h @@ -38,6 +38,6 @@ int rand_num(int limit); int bind_to_iface( int udp_recv_sock, char *dev ); int probe_tun(); int del_dev_tun( int fd ); -int add_dev_tun( unsigned int dest_addr, char *tun_dev, int *fd ); +int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ); #endif diff --git a/posix.c b/posix.c index 18c942c..0ce5cd6 100644 --- a/posix.c +++ b/posix.c @@ -94,7 +94,7 @@ void *client_to_gw_tun( void *arg ) { struct timeval tv; int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd, server_keep_alive_timeout; unsigned int addr_len, curr_gateway_ip; - char curr_gateway_tun_if[IFNAMSIZ]; + char curr_gateway_tun_if[IFNAMSIZ], keep_alive_string[] = "ping\0"; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -155,7 +155,7 @@ void *client_to_gw_tun( void *arg ) { } - if ( add_dev_tun( curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { + if ( add_dev_tun( curr_gateway_batman_if, curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { add_del_route( 0, 0, 0, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); @@ -184,11 +184,11 @@ void *client_to_gw_tun( void *arg ) { while ( ( !is_aborted() ) && ( curr_gateway != NULL ) ) { - if (server_keep_alive_timeout + 30000 < get_time()) { + if ( server_keep_alive_timeout + 30000 < get_time() ) { server_keep_alive_timeout = get_time(); - strcpy (buff, "ping\0"); - if (write (curr_gateway_tcp_sock, buff,5) < 0) { + + if ( write( curr_gateway_tcp_sock, keep_alive_string, sizeof( keep_alive_string ) ) < 0 ) { fprintf(stderr, "server_keepalive failed: no connect to server\n"); break; } @@ -500,7 +500,7 @@ void *gw_listen( void *arg ) { } - if ( add_dev_tun( tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { + if ( add_dev_tun( batman_if, tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { printf( "Could not open tun device on interface: %s\n", gw_addr ); return NULL; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit b61dc97b22fb0662332867fe53de84ca02064a4f Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Wed Oct 11 22:41:12 2006 +0200 Replace call to strcpy with strncpy. Avoids compiler warning on OpenBSD. diff --git a/posix.c b/posix.c index 0ce5cd6..c17d9c7 100644 --- a/posix.c +++ b/posix.c @@ -876,7 +876,7 @@ int main(int argc, char *argv[]) } memset(&int_req, 0, sizeof (struct ifreq)); - strcpy(int_req.ifr_name, batman_if->dev); + strncpy(int_req.ifr_name, batman_if->dev, IFNAMSIZ - 1); if (ioctl(batman_if->udp_recv_sock, SIOCGIFADDR, &int_req) < 0) { -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 7afbd45a0e4b9a9d59575cbe7c1c2399b71a14e7 Author: Corinna 'Elektra' Aichele <onelektra(a)gmx.net> Date: Fri Oct 6 00:26:16 2006 +0200 Now client keeps tunnel alive by sending 'ping' every 30 seconds diff --git a/posix.c b/posix.c index 17fd7a5..a267162 100644 --- a/posix.c +++ b/posix.c @@ -92,7 +92,7 @@ void *client_to_gw_tun( void *arg ) { struct batman_if *curr_gateway_batman_if; struct sockaddr_in gw_addr, my_addr, sender_addr; struct timeval tv; - int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd; + int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd, server_keep_alive_timeout; unsigned int addr_len, curr_gateway_ip; char curr_gateway_tun_if[IFNAMSIZ]; unsigned char buff[1500]; @@ -117,7 +117,7 @@ void *client_to_gw_tun( void *arg ) { /* connect to server (ask permission) */ if ( ( curr_gateway_tcp_sock = socket(PF_INET, SOCK_STREAM, 0) ) < 0 ) { - + perror("socket"); curr_gateway = NULL; return NULL; @@ -133,6 +133,9 @@ void *client_to_gw_tun( void *arg ) { } + server_keep_alive_timeout = get_time(); + + /* connect to server (establish udp tunnel) */ if ( ( curr_gateway_tun_sock = socket(PF_INET, SOCK_DGRAM, 0) ) < 0 ) { @@ -180,13 +183,26 @@ void *client_to_gw_tun( void *arg ) { while ( ( !is_aborted() ) && ( curr_gateway != NULL ) ) { + + if (server_keep_alive_timeout + 30 >= get_time()) { + + server_keep_alive_timeout = get_time(); + strcpy (buff, "ping\0"); + if (write (curr_gateway_tcp_sock, buff,5) < 0) { + fprintf(stderr, "server_keepalive failed: no connect to server\n"); + break; + } + + } + + tv.tv_sec = 0; tv.tv_usec = 250; tmp_wait_sockets = wait_sockets; res = select(max_sock + 1, &tmp_wait_sockets, NULL, NULL, &tv); - + if ( res > 0 ) { /* tcp message from server */ -- batman; test conversation

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010