chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: properly handle if the main process is down and we wait for the cgroup to...
[elogind.git]
/
src
/
socket-util.c
diff --git
a/src/socket-util.c
b/src/socket-util.c
index 0c9fc9f999e939b1c3fe188ef2b8c51a790433d1..151757c52bdd6d84d945a52552c8d69041c60bd1 100644
(file)
--- a/
src/socket-util.c
+++ b/
src/socket-util.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-33,6
+33,8
@@
#include "macro.h"
#include "util.h"
#include "socket-util.h"
#include "macro.h"
#include "util.h"
#include "socket-util.h"
+#include "missing.h"
+#include "label.h"
int socket_address_parse(SocketAddress *a, const char *s) {
int r;
int socket_address_parse(SocketAddress *a, const char *s) {
int r;
@@
-100,7
+102,7
@@
int socket_address_parse(SocketAddress *a, const char *s) {
a->sockaddr.un.sun_family = AF_UNIX;
memcpy(a->sockaddr.un.sun_path+1, s+1, l);
a->sockaddr.un.sun_family = AF_UNIX;
memcpy(a->sockaddr.un.sun_path+1, s+1, l);
- a->size = sizeof(s
truct sockaddr_un)
;
+ a->size = sizeof(s
a_family_t) + 1 + l
;
} else {
} else {
@@
-197,11
+199,7
@@
int socket_address_verify(const SocketAddress *a) {
if (a->size > sizeof(sa_family_t)) {
if (a->size > sizeof(sa_family_t)) {
- if (a->sockaddr.un.sun_path[0] == 0) {
- /* abstract */
- if (a->size != sizeof(struct sockaddr_un))
- return -EINVAL;
- } else {
+ if (a->sockaddr.un.sun_path[0] != 0) {
char *e;
/* path */
char *e;
/* path */
@@
-305,8
+303,10
@@
int socket_address_listen(
int backlog,
SocketAddressBindIPv6Only only,
const char *bind_to_device,
int backlog,
SocketAddressBindIPv6Only only,
const char *bind_to_device,
+ bool free_bind,
mode_t directory_mode,
mode_t socket_mode,
mode_t directory_mode,
mode_t socket_mode,
+ const char *label,
int *ret) {
int r, fd, one;
int *ret) {
int r, fd, one;
@@
-316,8
+316,17
@@
int socket_address_listen(
if ((r = socket_address_verify(a)) < 0)
return r;
if ((r = socket_address_verify(a)) < 0)
return r;
- if ((fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0)) < 0)
- return -errno;
+ r = label_socket_set(label);
+ if (r < 0)
+ return r;
+
+ fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
+ r = fd < 0 ? -errno : 0;
+
+ label_socket_clear();
+
+ if (r < 0)
+ return r;
if (socket_address_family(a) == AF_INET6 && only != SOCKET_ADDRESS_DEFAULT) {
int flag = only == SOCKET_ADDRESS_IPV6_ONLY;
if (socket_address_family(a) == AF_INET6 && only != SOCKET_ADDRESS_DEFAULT) {
int flag = only == SOCKET_ADDRESS_IPV6_ONLY;
@@
-330,6
+339,12
@@
int socket_address_listen(
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, bind_to_device, strlen(bind_to_device)+1) < 0)
goto fail;
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, bind_to_device, strlen(bind_to_device)+1) < 0)
goto fail;
+ if (free_bind) {
+ one = 1;
+ if (setsockopt(fd, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0)
+ log_warning("IP_FREEBIND failed: %m");
+ }
+
one = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
goto fail;
one = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
goto fail;
@@
-429,7
+444,7
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
if (strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0)
return false;
} else {
if (strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0)
return false;
} else {
- if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path,
sizeof(a->sockaddr.un.sun_path)
) != 0)
+ if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path,
a->size
) != 0)
return false;
}
return false;
}
@@
-443,7
+458,7
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
return true;
}
return true;
}
-bool socket_address_is(const SocketAddress *a, const char *s) {
+bool socket_address_is(const SocketAddress *a, const char *s
, int type
) {
struct SocketAddress b;
assert(a);
struct SocketAddress b;
assert(a);
@@
-452,6
+467,8
@@
bool socket_address_is(const SocketAddress *a, const char *s) {
if (socket_address_parse(&b, s) < 0)
return false;
if (socket_address_parse(&b, s) < 0)
return false;
+ b.type = type;
+
return socket_address_equal(a, &b);
}
return socket_address_equal(a, &b);
}