X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.h;h=5a2cd06d9d66a761c2df62421c0bfd00d3e64a10;hp=43d28d7e04d3a207873c41ece3c33977e410deaf;hb=33be102a214e7010949496549f4c737b0f8269a3;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/socket.h b/src/socket.h index 43d28d7e0..5a2cd06d9 100644 --- a/src/socket.h +++ b/src/socket.h @@ -41,7 +41,7 @@ typedef enum SocketState { SOCKET_STOP_POST, SOCKET_FINAL_SIGTERM, SOCKET_FINAL_SIGKILL, - SOCKET_MAINTAINANCE, + SOCKET_MAINTENANCE, _SOCKET_STATE_MAX, _SOCKET_STATE_INVALID = -1 } SocketState; @@ -62,19 +62,16 @@ typedef enum SocketType { _SOCKET_FIFO_INVALID = -1 } SocketType; -typedef struct SocketPort SocketPort; - -struct SocketPort { +typedef struct SocketPort { SocketType type; int fd; SocketAddress address; char *path; - Watch fd_watch; - LIST_FIELDS(SocketPort, port); -}; + LIST_FIELDS(struct SocketPort, port); +} SocketPort; struct Socket { Meta meta; @@ -82,7 +79,7 @@ struct Socket { LIST_HEAD(SocketPort, ports); /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */ - bool bind_ipv6_only; + SocketAddressBindIPv6Only bind_ipv6_only; unsigned backlog; usec_t timeout_usec;