assert(a);
assert(s);
- memset(a, 0, sizeof(*a));
+ zero(*a);
a->type = SOCK_STREAM;
if (*s == '[') {
} else {
unsigned idx;
+ if (strlen(n) > IF_NAMESIZE-1) {
+ free(n);
+ return -EINVAL;
+ }
+
/* Uh, our last resort, an interface name */
idx = if_nametoindex(n);
free(n);
- if (n == 0)
+ 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;
- memcpy(&a->sockaddr.in6.sin6_addr, &in6addr_any, INET6_ADDRSTRLEN);
+ a->sockaddr.in6.sin6_addr = in6addr_any;
a->size = sizeof(struct sockaddr_in6);
+
}
} else {
a->sockaddr.in6.sin6_family = AF_INET6;
a->sockaddr.in6.sin6_port = htons((uint16_t) u);
- memcpy(&a->sockaddr.in6.sin6_addr, &in6addr_any, INET6_ADDRSTRLEN);
+ a->sockaddr.in6.sin6_addr = in6addr_any;
a->size = sizeof(struct sockaddr_in6);
}
}
}
}
-int socket_address_listen(const SocketAddress *a, int backlog, SocketAddressBindIPv6Only only) {
- 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 = socket_address_verify(a)) < 0)
return r;
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) {
- close_nointr(fd);
- return -errno;
- }
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &flag, sizeof(flag)) < 0)
+ goto fail;
}
- if (bind(fd, &a->sockaddr.sa, a->size) < 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;
+
+ one = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
+ goto fail;
+
+ if (bind(fd, &a->sockaddr.sa, a->size) < 0)
+ goto fail;
if (a->type == SOCK_STREAM)
- if (listen(fd, backlog) < 0) {
- close_nointr(fd);
- return -errno;
- }
+ if (listen(fd, backlog) < 0)
+ goto fail;
+ *ret = fd;
return 0;
+
+fail:
+ r = -errno;
+ close_nointr(fd);
+ return r;
}