X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket-util.h;h=6eb3b5c6ebe84d17e29926c43ad1c067f24b44c8;hp=ffcc86882f353a712a6231bc4c3177a751d00556;hb=706900b704eac4eb26e3e30795c2ead8b0c3e673;hpb=27ca8d7a250915b290cf89c195e383a8abab35d5 diff --git a/src/socket-util.h b/src/socket-util.h index ffcc86882..6eb3b5c6e 100644 --- a/src/socket-util.h +++ b/src/socket-util.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef foosocketutilhfoo #define foosocketutilhfoo @@ -30,14 +30,16 @@ #include "macro.h" #include "util.h" +union sockaddr_union { + struct sockaddr sa; + struct sockaddr_in in4; + struct sockaddr_in6 in6; + struct sockaddr_un un; + struct sockaddr_storage storage; +}; + typedef struct SocketAddress { - union { - struct sockaddr sa; - struct sockaddr_in in4; - struct sockaddr_in6 in6; - struct sockaddr_un un; - struct sockaddr_storage storage; - } sockaddr; + union sockaddr_union sockaddr; /* We store the size here explicitly due to the weird * sockaddr_un semantics for abstract sockets */ @@ -68,8 +70,10 @@ int socket_address_listen( int backlog, SocketAddressBindIPv6Only only, const char *bind_to_device, + bool free_bind, mode_t directory_mode, mode_t socket_mode, + const char *label, int *ret); bool socket_address_is(const SocketAddress *a, const char *s, int type);