X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-daemon.h;h=cd9e30e9ee46767e8fec5be58f7ad2d2768fdca7;hp=7b7df571e7d401721bea6910d1201061d0161991;hb=HEAD;hpb=1e2ea8296e947c80e2499c6f1e00912f4fadfc86

diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 7b7df571e..cd9e30e9e 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"
 
@@ -74,9 +72,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);
 
-// UNNEEDED int sd_listen_fds_with_names(int unset_environment, char ***names);
+int sd_listen_fds_with_names(int unset_environment, char ***names);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -88,7 +86,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
@@ -100,7 +98,7 @@ _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);
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -130,7 +128,21 @@ 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);
+
+#if 0 /// unsupported by elogind
+/*
+  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);
+#endif // 0
 
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
@@ -146,8 +158,9 @@ 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);
 
+#if 0 /// UNNEEDED by elogind
 /*
   Helper call for identifying a passed file descriptor. Returns 1 if
   the file descriptor is a POSIX Message Queue of the specified name,
@@ -156,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
@@ -198,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_.
 
@@ -236,7 +255,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
@@ -248,7 +267,7 @@ 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);
 
 /*
   Similar to sd_pid_notify(), but also passes the specified fd array
@@ -268,7 +287,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