X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.h;h=2067eb425428be24f67a288909534df4bed0db28;hp=43d28d7e04d3a207873c41ece3c33977e410deaf;hb=84e3543ef4c4758621f8a304b14642072303ef82;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/socket.h b/src/socket.h index 43d28d7e0..2067eb425 100644 --- a/src/socket.h +++ b/src/socket.h @@ -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;