diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/fastd.c | 71 | ||||
| -rw-r--r-- | src/fastd.h | 3 | ||||
| -rw-r--r-- | src/tuntap.c | 90 |
4 files changed, 96 insertions, 69 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 980fc52..aed5b24 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,6 +32,7 @@ add_executable(fastd shell.c socket.c task.c + tuntap.c protocol_ec25519_fhmqvc.c ${FLEX_fastd_config_lex_OUTPUTS} ${BISON_fastd_config_parse_OUTPUTS} diff --git a/src/fastd.c b/src/fastd.c index 6f6a501..2c70007 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -32,20 +32,11 @@ #include <fcntl.h> #include <grp.h> -#include <net/if.h> #include <poll.h> #include <pthread.h> #include <signal.h> #include <string.h> -#include <sys/ioctl.h> #include <sys/resource.h> -#include <sys/socket.h> - -#ifdef __linux__ -#include <linux/if_tun.h> -#else -#include <net/if_tun.h> -#endif static volatile bool sighup = false; @@ -215,64 +206,6 @@ void fastd_setfl(const fastd_context_t *ctx, int fd, int set, int unset) { exit_errno(ctx, "Setting file status flags failed: fcntl"); } -static void init_tuntap(fastd_context_t *ctx) { - struct ifreq ifr; - - pr_debug(ctx, "initializing tun/tap device..."); - - if ((ctx->tunfd = open("/dev/net/tun", O_RDWR|O_CLOEXEC|O_NONBLOCK)) < 0) - exit_errno(ctx, "could not open tun/tap device file"); - - memset(&ifr, 0, sizeof(ifr)); - - if (ctx->conf->ifname) - strncpy(ifr.ifr_name, ctx->conf->ifname, IFNAMSIZ-1); - - switch (ctx->conf->mode) { - case MODE_TAP: - ifr.ifr_flags = IFF_TAP; - break; - - case MODE_TUN: - ifr.ifr_flags = IFF_TUN; - break; - - default: - exit_bug(ctx, "invalid mode"); - } - - ifr.ifr_flags |= IFF_NO_PI; - if (ioctl(ctx->tunfd, TUNSETIFF, &ifr) < 0) - exit_errno(ctx, "TUNSETIFF ioctl failed"); - - ctx->ifname = strndup(ifr.ifr_name, IFNAMSIZ-1); - - int ctl_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (ctl_sock < 0) - exit_errno(ctx, "socket"); - - if (ioctl(ctl_sock, SIOCGIFMTU, &ifr) < 0) - exit_errno(ctx, "SIOCGIFMTU ioctl failed"); - - if (ifr.ifr_mtu != ctx->conf->mtu) { - ifr.ifr_mtu = ctx->conf->mtu; - if (ioctl(ctl_sock, SIOCSIFMTU, &ifr) < 0) - exit_errno(ctx, "SIOCSIFMTU ioctl failed"); - } - - if (close(ctl_sock)) - pr_error_errno(ctx, "close"); - - pr_debug(ctx, "tun/tap device initialized."); -} - -static void close_tuntap(fastd_context_t *ctx) { - if(close(ctx->tunfd)) - pr_warn_errno(ctx, "closing tun/tap: close"); - - free(ctx->ifname); -} - static void close_sockets(fastd_context_t *ctx) { unsigned i; for (i = 0; i < ctx->n_socks; i++) @@ -830,7 +763,7 @@ int main(int argc, char *argv[]) { if (!fastd_socket_handle_binds(&ctx)) exit_error(&ctx, "unable to bind default socket"); - init_tuntap(&ctx); + fastd_tuntap_open(&ctx); init_peer_groups(&ctx); if (conf.daemon) { @@ -899,7 +832,7 @@ int main(int argc, char *argv[]) { delete_peers(&ctx); delete_peer_groups(&ctx); - close_tuntap(&ctx); + fastd_tuntap_close(&ctx); close_sockets(&ctx); free(ctx.protocol_state); diff --git a/src/fastd.h b/src/fastd.h index b346bf0..8ecc141 100644 --- a/src/fastd.h +++ b/src/fastd.h @@ -339,6 +339,9 @@ void fastd_configure(fastd_context_t *ctx, fastd_config_t *conf, int argc, char void fastd_config_load_peer_dirs(fastd_context_t *ctx, fastd_config_t *conf); void fastd_config_handle_options(fastd_context_t *ctx, fastd_config_t *conf, int argc, char *const argv[]); +void fastd_tuntap_open(fastd_context_t *ctx); +void fastd_tuntap_close(fastd_context_t *ctx); + void fastd_cap_init(fastd_context_t *ctx); void fastd_cap_drop(fastd_context_t *ctx); diff --git a/src/tuntap.c b/src/tuntap.c new file mode 100644 index 0000000..6d809c0 --- /dev/null +++ b/src/tuntap.c @@ -0,0 +1,90 @@ +/* + Copyright (c) 2012-2013, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#include "fastd.h" + +#include <fcntl.h> +#include <net/if.h> +#include <sys/ioctl.h> + +#include <linux/if_tun.h> + + +void fastd_tuntap_open(fastd_context_t *ctx) { + struct ifreq ifr = {}; + + pr_debug(ctx, "initializing tun/tap device..."); + + if ((ctx->tunfd = open("/dev/net/tun", O_RDWR|O_CLOEXEC|O_NONBLOCK)) < 0) + exit_errno(ctx, "could not open tun/tap device file"); + + if (ctx->conf->ifname) + strncpy(ifr.ifr_name, ctx->conf->ifname, IFNAMSIZ-1); + + switch (ctx->conf->mode) { + case MODE_TAP: + ifr.ifr_flags = IFF_TAP; + break; + + case MODE_TUN: + ifr.ifr_flags = IFF_TUN; + break; + + default: + exit_bug(ctx, "invalid mode"); + } + + ifr.ifr_flags |= IFF_NO_PI; + if (ioctl(ctx->tunfd, TUNSETIFF, &ifr) < 0) + exit_errno(ctx, "TUNSETIFF ioctl failed"); + + ctx->ifname = strndup(ifr.ifr_name, IFNAMSIZ-1); + + int ctl_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (ctl_sock < 0) + exit_errno(ctx, "socket"); + + if (ioctl(ctl_sock, SIOCGIFMTU, &ifr) < 0) + exit_errno(ctx, "SIOCGIFMTU ioctl failed"); + + if (ifr.ifr_mtu != ctx->conf->mtu) { + ifr.ifr_mtu = ctx->conf->mtu; + if (ioctl(ctl_sock, SIOCSIFMTU, &ifr) < 0) + exit_errno(ctx, "SIOCSIFMTU ioctl failed"); + } + + if (close(ctl_sock)) + pr_error_errno(ctx, "close"); + + pr_debug(ctx, "tun/tap device initialized."); +} + +void fastd_tuntap_close(fastd_context_t *ctx) { + if (close(ctx->tunfd)) + pr_warn_errno(ctx, "closing tun/tap: close"); + + free(ctx->ifname); +} |