chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: remove testing assert
[elogind.git]
/
socket.h
diff --git
a/socket.h
b/socket.h
index 356341f2a6f1f67794306d7c03b567a2a9471293..4e053c0a449a8b1525ac4270a71ea1e96dc2fb2e 100644
(file)
--- a/
socket.h
+++ b/
socket.h
@@
-41,7
+41,8
@@
typedef enum SocketState {
SOCKET_STOP_POST_SIGTERM,
SOCKET_STOP_POST_SIGKILL,
SOCKET_MAINTAINANCE,
SOCKET_STOP_POST_SIGTERM,
SOCKET_STOP_POST_SIGKILL,
SOCKET_MAINTAINANCE,
- _SOCKET_STATE_MAX
+ _SOCKET_STATE_MAX,
+ _SOCKET_STATE_INVALID = -1
} SocketState;
typedef enum SocketExecCommand {
} SocketState;
typedef enum SocketExecCommand {
@@
-49,12
+50,15
@@
typedef enum SocketExecCommand {
SOCKET_EXEC_START_POST,
SOCKET_EXEC_STOP_PRE,
SOCKET_EXEC_STOP_POST,
SOCKET_EXEC_START_POST,
SOCKET_EXEC_STOP_PRE,
SOCKET_EXEC_STOP_POST,
- _SOCKET_EXEC_MAX
+ _SOCKET_EXEC_COMMAND_MAX,
+ _SOCKET_EXEC_COMMAND_INVALID = -1
} SocketExecCommand;
typedef enum SocketType {
SOCKET_SOCKET,
} SocketExecCommand;
typedef enum SocketType {
SOCKET_SOCKET,
- SOCKET_FIFO
+ SOCKET_FIFO,
+ _SOCKET_FIFO_MAX,
+ _SOCKET_FIFO_INVALID = -1
} SocketType;
typedef struct SocketPort SocketPort;
} SocketType;
typedef struct SocketPort SocketPort;
@@
-82,13
+86,15
@@
struct Socket {
usec_t timeout_usec;
usec_t timeout_usec;
- ExecCommand* exec_command[_SOCKET_EXEC_MAX];
+ ExecCommand* exec_command[_SOCKET_EXEC_
COMMAND_
MAX];
ExecContext exec_context;
Service *service;
SocketState state;
ExecContext exec_context;
Service *service;
SocketState state;
+ KillMode kill_mode;
+
ExecCommand* control_command;
pid_t control_pid;
ExecCommand* control_command;
pid_t control_pid;