/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <arpa/inet.h>
#include <stdio.h>
+#include <net/if.h>
#include "macro.h"
#include "util.h"
#include "socket-util.h"
-int address_parse(Address *a, const char *s) {
+int socket_address_parse(SocketAddress *a, const char *s) {
int r;
char *e, *n;
unsigned u;
assert(a);
assert(s);
- memset(a, 0, sizeof(*a));
+ zero(*a);
+ a->type = SOCK_STREAM;
if (*s == '[') {
/* IPv6 in [x:.....:z]:p notation */
a->sockaddr.in6.sin6_family = AF_INET6;
a->sockaddr.in6.sin6_port = htons((uint16_t) u);
a->size = sizeof(struct sockaddr_in6);
- a->bind_ipv6_only = true;
} else if (*s == '/') {
/* AF_UNIX socket */
memcpy(a->sockaddr.un.sun_path, s, l);
a->size = sizeof(sa_family_t) + l + 1;
- } else if (*s == '=') {
+ } else if (*s == '@') {
/* Abstract AF_UNIX socket */
size_t l;
if ((e = strchr(s, ':'))) {
- /* IPv4 in w.x.y.z:p notation */
+ if ((r = safe_atou(e+1, &u)) < 0)
+ return r;
+
+ if (u <= 0 || u > 0xFFFF)
+ return -EINVAL;
+
if (!(n = strndup(s, e-s)))
return -ENOMEM;
- errno = 0;
- if (inet_pton(AF_INET, n, &a->sockaddr.in4.sin_addr) <= 0) {
+ /* IPv4 in w.x.y.z:p notation? */
+ if ((r = inet_pton(AF_INET, n, &a->sockaddr.in4.sin_addr)) < 0) {
free(n);
- return errno != 0 ? -errno : -EINVAL;
+ return -errno;
}
- free(n);
+ if (r > 0) {
+ /* Gotcha, it's a traditional IPv4 address */
+ free(n);
- e++;
- if ((r = safe_atou(e, &u)) < 0)
- return r;
+ a->sockaddr.in4.sin_family = AF_INET;
+ a->sockaddr.in4.sin_port = htons((uint16_t) u);
+ a->size = sizeof(struct sockaddr_in);
+ } else {
+ unsigned idx;
- if (u <= 0 || u > 0xFFFF)
- return -EINVAL;
+ if (strlen(n) > IF_NAMESIZE-1) {
+ free(n);
+ return -EINVAL;
+ }
+
+ /* Uh, our last resort, an interface name */
+ idx = if_nametoindex(n);
+ free(n);
- a->sockaddr.in4.sin_family = AF_INET;
- a->sockaddr.in4.sin_port = htons((uint16_t) u);
- a->size = sizeof(struct sockaddr_in);
+ if (idx == 0)
+ return -EINVAL;
+
+ a->sockaddr.in6.sin6_family = AF_INET6;
+ a->sockaddr.in6.sin6_port = htons((uint16_t) u);
+ a->sockaddr.in6.sin6_scope_id = idx;
+ a->sockaddr.in6.sin6_addr = in6addr_any;
+ a->size = sizeof(struct sockaddr_in6);
+
+ }
} else {
/* Just a port */
return -EINVAL;
a->sockaddr.in6.sin6_family = AF_INET6;
- memcpy(&a->sockaddr.in6.sin6_addr, &in6addr_any, INET6_ADDRSTRLEN);
a->sockaddr.in6.sin6_port = htons((uint16_t) u);
+ a->sockaddr.in6.sin6_addr = in6addr_any;
a->size = sizeof(struct sockaddr_in6);
}
}
return 0;
}
-int address_verify(const Address *a) {
+int socket_address_verify(const SocketAddress *a) {
assert(a);
- switch (address_family(a)) {
+ switch (socket_address_family(a)) {
case AF_INET:
if (a->size != sizeof(struct sockaddr_in))
return -EINVAL;
}
}
-int address_print(const Address *a, char **p) {
+int socket_address_print(const SocketAddress *a, char **p) {
int r;
assert(a);
assert(p);
- if ((r = address_verify(a)) < 0)
+ if ((r = socket_address_verify(a)) < 0)
return r;
- switch (address_family(a)) {
+ switch (socket_address_family(a)) {
case AF_INET: {
char *ret;
if (!(ret = new(char, sizeof(a->sockaddr.un.sun_path)+1)))
return -ENOMEM;
- ret[0] = '=';
+ ret[0] = '@';
memcpy(ret+1, a->sockaddr.un.sun_path+1, sizeof(a->sockaddr.un.sun_path)-1);
ret[sizeof(a->sockaddr.un.sun_path)] = 0;
}
}
-int address_listen(const Address *a, int backlog) {
- int r, fd;
+int socket_address_listen(const SocketAddress *a, int backlog, SocketAddressBindIPv6Only only, const char *bind_to_device, int *ret) {
+ int r, fd, one;
assert(a);
+ assert(ret);
- if ((r = address_verify(a)) < 0)
+ if ((r = socket_address_verify(a)) < 0)
return r;
- if ((fd = socket(address_family(a), a->type, 0)) < 0)
+ if ((fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0)) < 0)
return -errno;
- if (bind(fd, &a->sockaddr.sa, a->size) < 0) {
- close_nointr(fd);
- return -errno;
+ if (socket_address_family(a) == AF_INET6 && only != SOCKET_ADDRESS_DEFAULT) {
+ int flag = only == SOCKET_ADDRESS_IPV6_ONLY;
+
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &flag, sizeof(flag)) < 0)
+ goto fail;
}
- if (a->type == SOCK_STREAM)
- if (listen(fd, backlog) < 0) {
- close_nointr(fd);
- return -errno;
- }
+ if (bind_to_device)
+ if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, bind_to_device, strlen(bind_to_device)+1) < 0)
+ goto fail;
- if (address_family(a) == AF_INET6) {
- int flag = a->bind_ipv6_only;
+ one = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
+ goto fail;
- if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &flag, sizeof(flag)) < 0) {
- close_nointr(fd);
- return -errno;
- }
- }
+ if (bind(fd, &a->sockaddr.sa, a->size) < 0)
+ goto fail;
+
+ if (a->type == SOCK_STREAM)
+ if (listen(fd, backlog) < 0)
+ goto fail;
+ *ret = fd;
return 0;
+
+fail:
+ r = -errno;
+ close_nointr(fd);
+ return r;
}
~ianmdlvl / elogind.git / blobdiff