chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: add nosuid,nodev,noexec switches to /var/lock and /var/run
[elogind.git]
/
src
/
socket-util.h
diff --git
a/src/socket-util.h
b/src/socket-util.h
index 993972c458380bdff080980f9be2c7bf18fea509..4743c376867c21cb924ea7e2faf76148ab908b87 100644
(file)
--- 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
#ifndef foosocketutilhfoo
#define foosocketutilhfoo
@@
-30,14
+30,16
@@
#include "macro.h"
#include "util.h"
#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 {
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 */
/* We store the size here explicitly due to the weird
* sockaddr_un semantics for abstract sockets */
@@
-68,11
+70,13
@@
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 *ret);
-bool socket_address_is(const SocketAddress *a, const char *s);
+bool socket_address_is(const SocketAddress *a, const char *s
, int type
);
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b);
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b);
@@
-81,4
+85,6
@@
bool socket_address_needs_mount(const SocketAddress *a, const char *prefix);
const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b);
SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s);
const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b);
SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s);
+bool socket_ipv6_is_supported(void);
+
#endif
#endif