X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-daemon.h;h=ac31df94b46df62c16a2103c6991167e8bb1a821;hb=a97a730270418e53e9400de5dce7b07c7dacd19a;hp=67cc66fcbe43d0f6fa68067cf281bf0b873f0e25;hpb=6ff57d0bf5de38bfc4df718cc596d4a3a333f290;p=elogind.git

diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 67cc66fcb..ac31df94b 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #ifndef foosddaemonhfoo
 #define foosddaemonhfoo
 
@@ -22,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
 #include <inttypes.h>
+#include <sys/types.h>
 
 #include "_sd-common.h"
 
@@ -59,6 +57,7 @@ _SD_BEGIN_DECLARATIONS;
 /* The first passed file descriptor is fd 3 */
 #define SD_LISTEN_FDS_START 3
 
+#if 0 /// UNNEEDED by elogind
 /*
   Returns how many file descriptors have been passed, or a negative
   errno code on failure. Optionally, removes the $LISTEN_FDS and
@@ -74,7 +73,9 @@ _SD_BEGIN_DECLARATIONS;
 
   See sd_listen_fds(3) for more information.
 */
-// UNNEEDED int sd_listen_fds(int unset_environment);
+int sd_listen_fds(int unset_environment);
+
+int sd_listen_fds_with_names(int unset_environment, char ***names);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -86,7 +87,7 @@ _SD_BEGIN_DECLARATIONS;
 
   See sd_is_fifo(3) for more information.
 */
-// UNNEEDED int sd_is_fifo(int fd, const char *path);
+int sd_is_fifo(int fd, const char *path);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -98,7 +99,8 @@ _SD_BEGIN_DECLARATIONS;
 
   See sd_is_special(3) for more information.
 */
-// UNNEEDED int sd_is_special(int fd, const char *path);
+int sd_is_special(int fd, const char *path);
+#endif // 0
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -116,6 +118,7 @@ _SD_BEGIN_DECLARATIONS;
 */
 int sd_is_socket(int fd, int family, int type, int listening);
 
+#if 0 /// UNNEEDED by elogind
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
   the file descriptor is an Internet socket, of the specified family
@@ -128,7 +131,19 @@ int sd_is_socket(int fd, int family, int type, int listening);
 
   See sd_is_socket_inet(3) for more information.
 */
-// UNNEEDED int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
+
+/*
+  Helper call for identifying a passed file descriptor. Returns 1 if the
+  file descriptor is an Internet socket of the specified type
+  (SOCK_DGRAM, SOCK_STREAM, ...), and if the address of the socket is
+  the same as the address specified by addr. The listening flag is used
+  the same way as in sd_is_socket(). Returns a negative errno style
+  error code on failure.
+
+  See sd_is_socket_sockaddr(3) for more information.
+*/
+int sd_is_socket_sockaddr(int fd, int type, const struct sockaddr* addr, unsigned addr_len, int listening);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -144,7 +159,7 @@ int sd_is_socket(int fd, int family, int type, int listening);
 
   See sd_is_socket_unix(3) for more information.
 */
-// UNNEEDED int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -154,7 +169,8 @@ int sd_is_socket(int fd, int family, int type, int listening);
 
   See sd_is_mq(3) for more information.
 */
-// UNNEEDED int sd_is_mq(int fd, const char *path);
+int sd_is_mq(int fd, const char *path);
+#endif // 0
 
 /*
   Informs systemd about changed daemon state. This takes a number of
@@ -196,6 +212,11 @@ int sd_is_socket(int fd, int family, int type, int listening);
                   invocation. This variable is only supported with
                   sd_pid_notify_with_fds().
 
+     WATCHDOG_USEC=...
+                  Reset watchdog_usec value during runtime.
+                  To reset watchdog_usec value, start the service again.
+                  Example: "WATCHDOG_USEC=20000000"
+
   Daemons can choose to send additional variables. However, it is
   recommended to prefix variable names not listed above with X_.
 
@@ -214,6 +235,7 @@ int sd_is_socket(int fd, int family, int type, int listening);
 */
 int sd_notify(int unset_environment, const char *state);
 
+#if 0 /// UNNEEDED by elogind
 /*
   Similar to sd_notify() but takes a format string.
 
@@ -234,7 +256,7 @@ int sd_notify(int unset_environment, const char *state);
 
   See sd_notifyf(3) for more information.
 */
-// UNNEEDED int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3);
+int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3);
 
 /*
   Similar to sd_notify(), but send the message on behalf of another
@@ -246,7 +268,8 @@ int sd_pid_notify(pid_t pid, int unset_environment, const char *state);
   Similar to sd_notifyf(), but send the message on behalf of another
   process, if the appropriate permissions are available.
 */
-// UNNEEDED int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4);
+int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4);
+#endif // 0
 
 /*
   Similar to sd_pid_notify(), but also passes the specified fd array
@@ -266,7 +289,7 @@ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state,
 
   See sd_booted(3) for more information.
 */
-// UNNEEDED int sd_booted(void);
+int sd_booted(void);
 
 /*
   Returns > 0 if the service manager expects watchdog keep-alive