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.h
diff --git
a/src/socket-util.h
b/src/socket-util.h
index 841570f002ffc826a0e4b48c7d23a8fcdc767c11..6eb3b5c6ebe84d17e29926c43ad1c067f24b44c8 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
@@
-26,19
+26,20
@@
#include <netinet/in.h>
#include <sys/un.h>
#include <net/if.h>
#include <netinet/in.h>
#include <sys/un.h>
#include <net/if.h>
-#include <selinux/selinux.h>
#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 */
@@
-72,7
+73,7
@@
int socket_address_listen(
bool free_bind,
mode_t directory_mode,
mode_t socket_mode,
bool free_bind,
mode_t directory_mode,
mode_t socket_mode,
-
security_context_t scon
,
+
const char *label
,
int *ret);
bool socket_address_is(const SocketAddress *a, const char *s, int type);
int *ret);
bool socket_address_is(const SocketAddress *a, const char *s, int type);