summaryrefslogtreecommitdiffstats
path: root/src/fastd.c
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2012-11-01 11:04:39 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2012-11-01 11:04:39 +0100
commit80cbd0c9bd83fd0501b505f54ec8e29028894af5 (patch)
tree1ed94db626c470b9d468a61b3d84a88aafd9c233 /src/fastd.c
parent921485a5bc0c8448bcc23ae5587777e762473dd2 (diff)
downloadfastd-80cbd0c9bd83fd0501b505f54ec8e29028894af5.tar
fastd-80cbd0c9bd83fd0501b505f54ec8e29028894af5.zip
Refactor bind address configuration
Diffstat (limited to 'src/fastd.c')
-rw-r--r--src/fastd.c191
1 files changed, 87 insertions, 104 deletions
diff --git a/src/fastd.c b/src/fastd.c
index 88e7401..a117b1e 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -147,140 +147,114 @@ static void crypto_free(fastd_context *ctx) {
}
-static unsigned max_sockets(const fastd_config *conf) {
- unsigned n = 0;
- fastd_bind_address *addr;
-
- for (addr = conf->bind_addrs; addr; addr = addr->next)
- n++;
-
- return n;
-}
-
static void init_sockets(fastd_context *ctx) {
- static const fastd_bind_address bind_any = {};
+ ctx->socks = malloc(ctx->conf->n_bind_addrs * sizeof(fastd_socket));
- const fastd_bind_address *addr = ctx->conf->bind_addrs;
- const fastd_bind_address *default_v4 = ctx->conf->bind_addr_default_v4;
- const fastd_bind_address *default_v6 = ctx->conf->bind_addr_default_v6;
-
- if (!addr)
- addr = default_v4 = default_v6 = &bind_any;
+ unsigned i;
+ fastd_bind_address *addr = ctx->conf->bind_addrs;
+ for (i = 0; i < ctx->conf->n_bind_addrs; i++) {
+ ctx->socks[i] = (fastd_socket){-2, addr};
- unsigned n_v4 = 0, n_v6 = 0;
- bool info_ipv6 = true;
+ if (addr == ctx->conf->bind_addr_default_v4)
+ ctx->sock_default_v4 = &ctx->socks[i];
- ctx->socks = calloc(max_sockets(ctx->conf), sizeof(fastd_socket));
+ if (addr == ctx->conf->bind_addr_default_v6)
+ ctx->sock_default_v6 = &ctx->socks[i];
- while (addr) {
- int fd = -1;
- int af = AF_UNSPEC;
+ addr = addr->next;
+ }
- if (addr->addr.sa.sa_family != AF_INET) {
- fd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
- if (fd < 0) {
- if (info_ipv6) {
- pr_warn(ctx, "there seems to be no IPv6 support; explicitely bind to an IPv4 address (or 0.0.0.0) to disable this warning");
- info_ipv6 = false;
- }
- }
- else {
- af = AF_INET6;
+ ctx->n_socks = ctx->conf->n_bind_addrs;
+}
- int val = (addr->addr.sa.sa_family == AF_INET6);
- if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val))) {
- pr_warn_errno(ctx, "setsockopt");
- goto error;
- }
- }
- }
- if (fd < 0 && addr->addr.sa.sa_family != AF_INET6) {
- fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (fd < 0)
- exit_errno(ctx, "unable to create socket");
- else
- af = AF_INET;
- }
+static int bind_socket(fastd_context *ctx, const fastd_bind_address *addr, bool warn) {
+ int fd = -1;
+ int af = AF_UNSPEC;
- if (fd < 0)
- goto error;
+ if (addr->addr.sa.sa_family != AF_INET) {
+ fd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+ if (fd >= 0) {
+ af = AF_INET6;
- if (addr->bindtodev) {
- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, addr->bindtodev, strlen(addr->bindtodev))) {
- pr_warn_errno(ctx, "setsockopt: unable to bind to device");
+ int val = (addr->addr.sa.sa_family == AF_INET6);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val))) {
+ if (warn)
+ pr_warn_errno(ctx, "setsockopt");
goto error;
}
}
+ }
+ if (fd < 0 && addr->addr.sa.sa_family != AF_INET6) {
+ fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ if (fd < 0)
+ exit_errno(ctx, "unable to create socket");
+ else
+ af = AF_INET;
+ }
- fastd_peer_address bind_address = addr->addr;
-
- if (bind_address.sa.sa_family == AF_UNSPEC) {
- memset(&bind_address, 0, sizeof(bind_address));
- bind_address.sa.sa_family = af;
-
- if (af == AF_INET6)
- bind_address.in6.sin6_port = addr->addr.in.sin_port;
- else
- bind_address.in.sin_port = addr->addr.in.sin_port;
- }
+ if (fd < 0)
+ goto error;
- if (bind(fd, (struct sockaddr*)&bind_address, af == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
- pr_warn(ctx, "bind");
+ if (addr->bindtodev) {
+ if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, addr->bindtodev, strlen(addr->bindtodev))) {
+ if (warn)
+ pr_warn_errno(ctx, "setsockopt: unable to bind to device");
goto error;
}
+ }
- ctx->socks[ctx->n_socks] = (fastd_socket){fd, addr};
-
- if (af == AF_INET6) {
- if (addr == default_v6)
- ctx->sock_default_v6 = &ctx->socks[ctx->n_socks];
-
- n_v6++;
-
- if (addr->addr.sa.sa_family == AF_UNSPEC) {
- if (addr == default_v4)
- ctx->sock_default_v4 = &ctx->socks[ctx->n_socks];
+ fastd_peer_address bind_address = addr->addr;
- n_v4++;
- }
- }
- else {
- if (addr == default_v4)
- ctx->sock_default_v4 = &ctx->socks[ctx->n_socks];
+ if (bind_address.sa.sa_family == AF_UNSPEC) {
+ memset(&bind_address, 0, sizeof(bind_address));
+ bind_address.sa.sa_family = af;
- n_v4++;
- }
+ if (af == AF_INET6)
+ bind_address.in6.sin6_port = addr->addr.in.sin_port;
+ else
+ bind_address.in.sin_port = addr->addr.in.sin_port;
+ }
- ctx->n_socks++;
+ if (bind(fd, (struct sockaddr*)&bind_address, af == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
+ if (warn)
+ pr_warn(ctx, "bind");
+ goto error;
+ }
- addr = addr->next;
- continue;
+ return fd;
- error:
- if (fd >= 0) {
- if (close(fd))
- pr_error_errno(ctx, "close");
- }
+ error:
+ if (fd >= 0) {
+ if (close(fd))
+ pr_error_errno(ctx, "close");
+ }
+ if (warn) {
if (addr->bindtodev)
pr_warn(ctx, "unable to bind to %I on `%s'", &addr->addr, addr->bindtodev);
- else
+ else
pr_warn(ctx, "unable to bind to %I", &addr->addr);
+ }
- if (addr == default_v4 || addr == default_v6)
- exit_error(ctx, "unable to bind to default address");
+ return -1;
+}
- addr = addr->next;
- }
+static void bind_sockets(fastd_context *ctx) {
+ unsigned i;
- if (!ctx->n_socks)
- exit_error(ctx, "all bind attempts failed");
+ for (i = 0; i < ctx->n_socks; i++) {
+ if (ctx->socks[i].fd >= 0)
+ continue;
- if (!n_v4 && ctx->conf->n_v4)
- pr_warn(ctx, "there are IPv4 peers defined, but there was no successful IPv4 bind");
+ ctx->socks[i].fd = bind_socket(ctx, ctx->socks[i].addr, ctx->socks[i].fd < -1);
- if (!n_v6 && ctx->conf->n_v6)
- pr_warn(ctx, "there are IPv6 peers defined, but there was no successful IPv4 bind");
+ if (ctx->socks[i].fd >= 0) {
+ if (ctx->socks[i].addr->bindtodev)
+ pr_info(ctx, "successfully bound to %I on `%s'", &ctx->socks[i].addr->addr, ctx->socks[i].addr->bindtodev);
+ else
+ pr_info(ctx, "successfully bound to %I", &ctx->socks[i].addr->addr);
+ }
+ }
}
static void init_tuntap(fastd_context *ctx) {
@@ -315,12 +289,17 @@ static void init_tuntap(fastd_context *ctx) {
ctx->ifname = strndup(ifr.ifr_name, IFNAMSIZ);
- int ctl_sock = ctx->socks[0].fd;
+ int ctl_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ if (ctl_sock < 0)
+ exit_errno(ctx, "socket");
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.");
}
@@ -924,6 +903,8 @@ int main(int argc, char *argv[]) {
pr_info(&ctx, "fastd " FASTD_VERSION " starting");
init_sockets(&ctx);
+ bind_sockets(&ctx);
+
init_tuntap(&ctx);
init_peers(&ctx);
@@ -949,6 +930,8 @@ int main(int argc, char *argv[]) {
while (!terminate) {
handle_tasks(&ctx);
+
+ bind_sockets(&ctx);
handle_input(&ctx);
maintenance(&ctx);