chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vala: hide a few vala warnings
[elogind.git]
/
socket.h
diff --git
a/socket.h
b/socket.h
index 356341f2a6f1f67794306d7c03b567a2a9471293..43d28d7e04d3a207873c41ece3c33977e410deaf 100644
(file)
--- a/
socket.h
+++ b/
socket.h
@@
-27,6
+27,7
@@
typedef struct Socket Socket;
#include "manager.h"
#include "unit.h"
#include "socket-util.h"
#include "manager.h"
#include "unit.h"
#include "socket-util.h"
+#include "mount.h"
typedef enum SocketState {
SOCKET_DEAD,
typedef enum SocketState {
SOCKET_DEAD,
@@
-38,10
+39,11
@@
typedef enum SocketState {
SOCKET_STOP_PRE_SIGTERM,
SOCKET_STOP_PRE_SIGKILL,
SOCKET_STOP_POST,
SOCKET_STOP_PRE_SIGTERM,
SOCKET_STOP_PRE_SIGKILL,
SOCKET_STOP_POST,
- SOCKET_
STOP_POST
_SIGTERM,
- SOCKET_
STOP_POST
_SIGKILL,
+ SOCKET_
FINAL
_SIGTERM,
+ SOCKET_
FINAL
_SIGKILL,
SOCKET_MAINTAINANCE,
SOCKET_MAINTAINANCE,
- _SOCKET_STATE_MAX
+ _SOCKET_STATE_MAX,
+ _SOCKET_STATE_INVALID = -1
} SocketState;
typedef enum SocketExecCommand {
} SocketState;
typedef enum SocketExecCommand {
@@
-49,23
+51,26
@@
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;
struct SocketPort {
SocketType type;
} SocketType;
typedef struct SocketPort SocketPort;
struct SocketPort {
SocketType type;
+ int fd;
SocketAddress address;
char *path;
SocketAddress address;
char *path;
- int fd;
Watch fd_watch;
LIST_FIELDS(SocketPort, port);
Watch fd_watch;
LIST_FIELDS(SocketPort, port);
@@
-82,20
+87,26
@@
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;
ExecContext exec_context;
Service *service;
- SocketState state;
+ SocketState state, deserialized_state;
+
+ KillMode kill_mode;
ExecCommand* control_command;
ExecCommand* control_command;
+ SocketExecCommand control_command_id;
pid_t control_pid;
char *bind_to_device;
mode_t directory_mode;
mode_t socket_mode;
pid_t control_pid;
char *bind_to_device;
mode_t directory_mode;
mode_t socket_mode;
+ bool accept;
+ unsigned n_accepted;
+
bool failure;
Watch timer_watch;
};
bool failure;
Watch timer_watch;
};
@@
-106,6
+117,16
@@
int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds);
/* Called from the service when it shut down */
void socket_notify_service_dead(Socket *s);
/* Called from the service when it shut down */
void socket_notify_service_dead(Socket *s);
+/* Called from the mount code figure out if a mount is a dependency of
+ * any of the sockets of this socket */
+int socket_add_one_mount_link(Socket *s, Mount *m);
+
extern const UnitVTable socket_vtable;
extern const UnitVTable socket_vtable;
+const char* socket_state_to_string(SocketState i);
+SocketState socket_state_from_string(const char *s);
+
+const char* socket_exec_command_to_string(SocketExecCommand i);
+SocketExecCommand socket_exec_command_from_string(const char *s);
+
#endif
#endif