/[pkg-src]/trunk/pcsc-lite/patches/pcsc-lite-1.7.4-systemd-socket-activation.patch

Diff of /trunk/pcsc-lite/patches/pcsc-lite-1.7.4-systemd-socket-activation.patch

Parent Directory | Revision Log | View Patch Patch

-revision 1573 by niro,
Thu Nov 24 20:58:47 2011 UTC
+revision 1574 by niro,
Thu Nov 24 21:10:23 2011 UTC
 Line 1
- Add systemd socket-based activation support to pcscd as an alternative
+ From ed83954ce404d0e58a04dfe7bfd379203f7830b5 Mon Sep 17 00:00:00 2001
- to the existing autostart code which used forking from the user space
+ From: Kalev Lember <kalev@smartlink.ee>
- library. Systemd socket activation makes it possible to start pcscd on
+ Date: Thu, 23 Jun 2011 21:58:56 +0300
- demand by systemd when a request is sent on the IPC socket.
+ Subject: [PATCH 1/3] Support systemd socket activation
- The implementation uses the $LISTEN_FDS/$LISTEN_PID env var parsing code
+ Add systemd socket-based activation support to pcscd as an alternative
- from systemd's sd-daemon.[ch] copy library.
+ to the existing autostart code which used forking from the user space
- ---
+ library. Systemd socket activation makes it possible to start pcscd on
-  PCSC/src/Makefile.am        |    6 +
+ demand by systemd when a request is sent on the IPC socket.
-  PCSC/src/pcscdaemon.c       |   56 ++++--
-  PCSC/src/sd-daemon.c        |  520 +++++++++++++++++++++++++++++++++++++++++++
-  PCSC/src/sd-daemon.h        |  277 +++++++++++++++++++++++
-  PCSC/src/winscard_msg.h     |    1 +
-  PCSC/src/winscard_msg_srv.c |   25 ++
-files changed, 870 insertions(+), 15 deletions(-)
-  create mode 100644 PCSC/src/sd-daemon.c
-  create mode 100644 PCSC/src/sd-daemon.h
- diff --git a/PCSC/src/Makefile.am b/PCSC/src/Makefile.am
+ The implementation uses the $LISTEN_FDS/$LISTEN_PID env var parsing code
- index 2bd2f11..1b70466 100644
+ from systemd's sd-daemon.[ch] copy library.
- --- a/PCSC/src/Makefile.am
+ ---
- +++ b/PCSC/src/Makefile.am
+  PCSC/src/Makefile.am        |    6 +
- @@ -67,6 +67,8 @@ pcscd_SOURCES = \
+  PCSC/src/pcscdaemon.c       |   56 ++++--
-   prothandler.h \
+  PCSC/src/sd-daemon.c        |  520 +++++++++++++++++++++++++++++++++++++++++++
-   readerfactory.c \
+  PCSC/src/sd-daemon.h        |  277 +++++++++++++++++++++++
-   readerfactory.h \
+  PCSC/src/winscard_msg.h     |    1 +
- + sd-daemon.c \
+  PCSC/src/winscard_msg_srv.c |   25 ++
- + sd-daemon.h \
+files changed, 870 insertions(+), 15 deletions(-)
-   simclist.c \
+  create mode 100644 PCSC/src/sd-daemon.c
-   simclist.h \
+  create mode 100644 PCSC/src/sd-daemon.h
-   strlcat.c \
- @@ -95,6 +97,10 @@ fix-rights: install-sbinPROGRAMS
+ diff --git a/PCSC/src/Makefile.am b/PCSC/src/Makefile.am
-   chgrp pcscd $(DESTDIR)$(sbindir)/pcscd
+ index 2bd2f11..1b70466 100644
-   chmod g+s $(DESTDIR)$(sbindir)/pcscd
+ --- a/PCSC/src/Makefile.am
+ +++ b/PCSC/src/Makefile.am
- +update-systemd:
+ @@ -67,6 +67,8 @@ pcscd_SOURCES = \
- + curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
+  	prothandler.h \
- + curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
+  	readerfactory.c \
- +
+  	readerfactory.h \
-  testpcsc_SOURCES = testpcsc.c
+ +	sd-daemon.c \
-  testpcsc_LDADD = libpcsclite.la
+ +	sd-daemon.h \
+  	simclist.c \
- diff --git a/PCSC/src/pcscdaemon.c b/PCSC/src/pcscdaemon.c
+  	simclist.h \
- index 6abc328..609f981 100644
+  	strlcat.c \
- --- a/PCSC/src/pcscdaemon.c
+ @@ -95,6 +97,10 @@ fix-rights: install-sbinPROGRAMS
- +++ b/PCSC/src/pcscdaemon.c
+  	chgrp pcscd $(DESTDIR)$(sbindir)/pcscd
- @@ -37,6 +37,7 @@
+  	chmod g+s $(DESTDIR)$(sbindir)/pcscd
-  #include "pcsclite.h"
-  #include "pcscd.h"
+ +update-systemd:
-  #include "debuglog.h"
+ +	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
- +#include "sd-daemon.h"
+ +	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
-  #include "winscard_msg.h"
+ +
-  #include "winscard_svc.h"
+  testpcsc_SOURCES = testpcsc.c
-  #include "sys_generic.h"
+  testpcsc_LDADD = libpcsclite.la
- @@ -54,6 +55,7 @@
-  char AraKiri = FALSE;
+ diff --git a/PCSC/src/pcscdaemon.c b/PCSC/src/pcscdaemon.c
-  static char Init = TRUE;
+ index 6abc328..609f981 100644
-  char AutoExit = FALSE;
+ --- a/PCSC/src/pcscdaemon.c
- +char SocketActivated = FALSE;
+ +++ b/PCSC/src/pcscdaemon.c
-  static int ExitValue = EXIT_FAILURE;
+ @@ -37,6 +37,7 @@
-  int HPForceReaderPolling = 0;
+  #include "pcsclite.h"
-  static int pipefd[] = {-1, -1};
+  #include "pcscd.h"
- @@ -316,6 +318,20 @@ int main(int argc, char **argv)
+  #include "debuglog.h"
-   }
+ +#include "sd-daemon.h"
+  #include "winscard_msg.h"
-   /*
+  #include "winscard_svc.h"
- + * Check if systemd passed us any file descriptors
+  #include "sys_generic.h"
- + */
+ @@ -54,6 +55,7 @@
- + rv = sd_listen_fds(0);
+  char AraKiri = FALSE;
- + if (rv > 1)
+  static char Init = TRUE;
- + {
+  char AutoExit = FALSE;
- + Log1(PCSC_LOG_CRITICAL, "Too many file descriptors received");
+ +char SocketActivated = FALSE;
- + return EXIT_FAILURE;
+  static int ExitValue = EXIT_FAILURE;
- + }
+  int HPForceReaderPolling = 0;
- + else if (rv == 1)
+  static int pipefd[] = {-1, -1};
- + SocketActivated = TRUE;
+ @@ -316,6 +318,20 @@ int main(int argc, char **argv)
- + else
+  	}
- + SocketActivated = FALSE;
- +
+  	/*
- + /*
+ +	 * Check if systemd passed us any file descriptors
-   * test the presence of /var/run/pcscd/pcscd.comm
+ +	 */
-   */
+ +	rv = sd_listen_fds(0);
+ +	if (rv > 1)
- @@ -366,16 +382,19 @@ int main(int argc, char **argv)
+ +	{
-   return EXIT_FAILURE;
+ +		Log1(PCSC_LOG_CRITICAL, "Too many file descriptors received");
-   }
+ +		return EXIT_FAILURE;
+ +	}
- - Log1(PCSC_LOG_CRITICAL,
+ +	else if (rv == 1)
- - "file " PCSCLITE_CSOCK_NAME " already exists.");
+ +		SocketActivated = TRUE;
- - Log1(PCSC_LOG_CRITICAL,
+ +	else
- - "Maybe another pcscd is running?");
+ +		SocketActivated = FALSE;
- - Log1(PCSC_LOG_CRITICAL,
+ +
- - "I can't read process pid from " PCSCLITE_RUN_PID);
+ +	/*
- - Log1(PCSC_LOG_CRITICAL, "Remove " PCSCLITE_CSOCK_NAME);
+  	 * test the presence of /var/run/pcscd/pcscd.comm
- - Log1(PCSC_LOG_CRITICAL,
+  	 */
- - "if pcscd is not running to clear this message.");
- - return EXIT_FAILURE;
+ @@ -366,16 +382,19 @@ int main(int argc, char **argv)
- + if (!SocketActivated)
+  				return EXIT_FAILURE;
- + {
+  			}
- + Log1(PCSC_LOG_CRITICAL,
- + "file " PCSCLITE_CSOCK_NAME " already exists.");
+ -			Log1(PCSC_LOG_CRITICAL,
- + Log1(PCSC_LOG_CRITICAL,
+ -				"file " PCSCLITE_CSOCK_NAME " already exists.");
- + "Maybe another pcscd is running?");
+ -			Log1(PCSC_LOG_CRITICAL,
- + Log1(PCSC_LOG_CRITICAL,
+ -				"Maybe another pcscd is running?");
- + "I can't read process pid from " PCSCLITE_RUN_PID);
+ -			Log1(PCSC_LOG_CRITICAL,
- + Log1(PCSC_LOG_CRITICAL, "Remove " PCSCLITE_CSOCK_NAME);
+ -				"I can't read process pid from " PCSCLITE_RUN_PID);
- + Log1(PCSC_LOG_CRITICAL,
+ -			Log1(PCSC_LOG_CRITICAL, "Remove " PCSCLITE_CSOCK_NAME);
- + "if pcscd is not running to clear this message.");
+ -			Log1(PCSC_LOG_CRITICAL,
- + return EXIT_FAILURE;
+ -				"if pcscd is not running to clear this message.");
- + }
+ -			return EXIT_FAILURE;
-   }
+ +			if (!SocketActivated)
-   }
+ +			{
-   else
+ +				Log1(PCSC_LOG_CRITICAL,
- @@ -568,7 +587,11 @@ int main(int argc, char **argv)
+ +					"file " PCSCLITE_CSOCK_NAME " already exists.");
-   /*
+ +				Log1(PCSC_LOG_CRITICAL,
-   * Initialize the comm structure
+ +					"Maybe another pcscd is running?");
-   */
+ +				Log1(PCSC_LOG_CRITICAL,
- - rv = InitializeSocket();
+ +					"I can't read process pid from " PCSCLITE_RUN_PID);
- + if (SocketActivated)
+ +				Log1(PCSC_LOG_CRITICAL, "Remove " PCSCLITE_CSOCK_NAME);
- + rv = ListenExistingSocket(SD_LISTEN_FDS_START + 0);
+ +				Log1(PCSC_LOG_CRITICAL,
- + else
+ +					"if pcscd is not running to clear this message.");
- + rv = InitializeSocket();
+ +				return EXIT_FAILURE;
- +
+ +			}
-   if (rv)
+  		}
-   {
+  	}
-   Log1(PCSC_LOG_CRITICAL, "Error initializing pcscd.");
+  	else
- @@ -652,10 +675,13 @@ static void clean_temp_files(void)
+ @@ -568,7 +587,11 @@ int main(int argc, char **argv)
-  {
+  	/*
-   int rv;
+  	 * Initialize the comm structure
+  	 */
- - rv = remove(PCSCLITE_CSOCK_NAME);
+ -	rv = InitializeSocket();
- - if (rv != 0)
+ +	if (SocketActivated)
- - Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_CSOCK_NAME ": %s",
+ +		rv = ListenExistingSocket(SD_LISTEN_FDS_START + 0);
- - strerror(errno));
+ +	else
- + if (!SocketActivated)
+ +		rv = InitializeSocket();
- + {
+ +
- + rv = remove(PCSCLITE_CSOCK_NAME);
+  	if (rv)
- + if (rv != 0)
+  	{
- + Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_CSOCK_NAME ": %s",
+  		Log1(PCSC_LOG_CRITICAL, "Error initializing pcscd.");
- + strerror(errno));
+ @@ -652,10 +675,13 @@ static void clean_temp_files(void)
- + }
+  {
+  	int rv;
-   rv = remove(PCSCLITE_RUN_PID);
-   if (rv != 0)
+ -	rv = remove(PCSCLITE_CSOCK_NAME);
- diff --git a/PCSC/src/sd-daemon.c b/PCSC/src/sd-daemon.c
+ -	if (rv != 0)
- new file mode 100644
+ -		Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_CSOCK_NAME ": %s",
- index 0000000..a2ec74c
+ -			strerror(errno));
- --- /dev/null
+ +	if (!SocketActivated)
- +++ b/PCSC/src/sd-daemon.c
+ +	{
- @@ -0,0 +1,520 @@
+ +		rv = remove(PCSCLITE_CSOCK_NAME);
- +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ +		if (rv != 0)
- +
+ +			Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_CSOCK_NAME ": %s",
- +/***
+ +				strerror(errno));
- +  Copyright 2010 Lennart Poettering
+ +	}
- +
- +  Permission is hereby granted, free of charge, to any person
+  	rv = remove(PCSCLITE_RUN_PID);
- +  obtaining a copy of this software and associated documentation files
+  	if (rv != 0)
- +  (the "Software"), to deal in the Software without restriction,
+ diff --git a/PCSC/src/sd-daemon.c b/PCSC/src/sd-daemon.c
- +  including without limitation the rights to use, copy, modify, merge,
+ new file mode 100644
- +  publish, distribute, sublicense, and/or sell copies of the Software,
+ index 0000000..a2ec74c
- +  and to permit persons to whom the Software is furnished to do so,
+ --- /dev/null
- +  subject to the following conditions:
+ +++ b/PCSC/src/sd-daemon.c
- +
+ @@ -0,0 +1,520 @@
- +  The above copyright notice and this permission notice shall be
+ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
- +  included in all copies or substantial portions of the Software.
+ +
- +
+ +/***
- +  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ +  Copyright 2010 Lennart Poettering
- +  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ +
- +  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ +  Permission is hereby granted, free of charge, to any person
- +  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ +  obtaining a copy of this software and associated documentation files
- +  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ +  (the "Software"), to deal in the Software without restriction,
- +  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ +  including without limitation the rights to use, copy, modify, merge,
- +  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ +  publish, distribute, sublicense, and/or sell copies of the Software,
- +  SOFTWARE.
+ +  and to permit persons to whom the Software is furnished to do so,
- +***/
+ +  subject to the following conditions:
  +
- +#ifndef _GNU_SOURCE
+ +  The above copyright notice and this permission notice shall be
- +#define _GNU_SOURCE
+ +  included in all copies or substantial portions of the Software.
- +#endif
+ +
- +
+ +  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- +#include <sys/types.h>
+ +  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- +#include <sys/stat.h>
+ +  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- +#include <sys/socket.h>
+ +  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- +#include <sys/un.h>
+ +  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- +#include <sys/fcntl.h>
+ +  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- +#include <netinet/in.h>
+ +  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- +#include <stdlib.h>
+ +  SOFTWARE.
- +#include <errno.h>
+ +***/
- +#include <unistd.h>
+ +
- +#include <string.h>
+ +#ifndef _GNU_SOURCE
- +#include <stdarg.h>
+ +#define _GNU_SOURCE
- +#include <stdio.h>
+ +#endif
- +#include <stddef.h>
+ +
- +#include <limits.h>
+ +#include <sys/types.h>
- +
+ +#include <sys/stat.h>
- +#if defined(__linux__)
+ +#include <sys/socket.h>
- +#include <mqueue.h>
+ +#include <sys/un.h>
- +#endif
+ +#include <sys/fcntl.h>
- +
+ +#include <netinet/in.h>
- +#include "sd-daemon.h"
+ +#include <stdlib.h>
- +
+ +#include <errno.h>
- +#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
+ +#include <unistd.h>
- +#define _sd_hidden_ __attribute__ ((visibility("hidden")))
+ +#include <string.h>
- +#else
+ +#include <stdarg.h>
- +#define _sd_hidden_
+ +#include <stdio.h>
- +#endif
+ +#include <stddef.h>
- +
+ +#include <limits.h>
- +_sd_hidden_ int sd_listen_fds(int unset_environment) {
+ +
- +
+ +#if defined(__linux__)
- +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ +#include <mqueue.h>
- +        return 0;
+ +#endif
- +#else
+ +
- +        int r, fd;
+ +#include "sd-daemon.h"
- +        const char *e;
+ +
- +        char *p = NULL;
+ +#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
- +        unsigned long l;
+ +#define _sd_hidden_ __attribute__ ((visibility("hidden")))
- +
+ +#else
- +        if (!(e = getenv("LISTEN_PID"))) {
+ +#define _sd_hidden_
- +                r = 0;
+ +#endif
- +                goto finish;
+ +
- +        }
+ +_sd_hidden_ int sd_listen_fds(int unset_environment) {
  +
- +        errno = 0;
+ +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
- +        l = strtoul(e, &p, 10);
+ +        return 0;
- +
+ +#else
- +        if (errno != 0) {
+ +        int r, fd;
- +                r = -errno;
+ +        const char *e;
- +                goto finish;
+ +        char *p = NULL;
- +        }
+ +        unsigned long l;
  +
- +        if (!p || *p || l <= 0) {
+ +        if (!(e = getenv("LISTEN_PID"))) {
- +                r = -EINVAL;
+ +                r = 0;
  +                goto finish;
  +        }
  +
- +        /* Is this for us? */
+ +        errno = 0;
- +        if (getpid() != (pid_t) l) {
+ +        l = strtoul(e, &p, 10);
- +                r = 0;
+ +
- +                goto finish;
+ +        if (errno != 0) {
- +        }
+ +                r = -errno;
- +
+ +                goto finish;
- +        if (!(e = getenv("LISTEN_FDS"))) {
+ +        }
- +                r = 0;
+ +
- +                goto finish;
+ +        if (!p || *p || l <= 0) {
- +        }
+ +                r = -EINVAL;
- +
+ +                goto finish;
- +        errno = 0;
+ +        }
- +        l = strtoul(e, &p, 10);
+ +
- +
+ +        /* Is this for us? */
- +        if (errno != 0) {
+ +        if (getpid() != (pid_t) l) {
- +                r = -errno;
+ +                r = 0;
  +                goto finish;
  +        }
  +
- +        if (!p || *p) {
+ +        if (!(e = getenv("LISTEN_FDS"))) {
- +                r = -EINVAL;
+ +                r = 0;
  +                goto finish;
  +        }
  +
- +        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
+ +        errno = 0;
- +                int flags;
+ +        l = strtoul(e, &p, 10);
  +
- +                if ((flags = fcntl(fd, F_GETFD)) < 0) {
+ +        if (errno != 0) {
- +                        r = -errno;
+ +                r = -errno;
- +                        goto finish;
+ +                goto finish;
- +                }
+ +        }
  +
- +                if (flags & FD_CLOEXEC)
+ +        if (!p || *p) {
- +                        continue;
+ +                r = -EINVAL;
- +
+ +                goto finish;
- +                if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
+ +        }
- +                        r = -errno;
+ +
- +                        goto finish;
+ +        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
- +                }
+ +                int flags;
- +        }
+ +
- +
+ +                if ((flags = fcntl(fd, F_GETFD)) < 0) {
- +        r = (int) l;
+ +                        r = -errno;
- +
+ +                        goto finish;
- +finish:
+ +                }
- +        if (unset_environment) {
+ +
- +                unsetenv("LISTEN_PID");
+ +                if (flags & FD_CLOEXEC)
- +                unsetenv("LISTEN_FDS");
+ +                        continue;
- +        }
+ +
- +
+ +                if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
- +        return r;
+ +                        r = -errno;
- +#endif
+ +                        goto finish;
- +}
+ +                }
- +
+ +        }
- +_sd_hidden_ int sd_is_fifo(int fd, const char *path) {
+ +
- +        struct stat st_fd;
+ +        r = (int) l;
  +
- +        if (fd < 0)
+ +finish:
- +                return -EINVAL;
+ +        if (unset_environment) {
- +
+ +                unsetenv("LISTEN_PID");
- +        memset(&st_fd, 0, sizeof(st_fd));
+ +                unsetenv("LISTEN_FDS");
- +        if (fstat(fd, &st_fd) < 0)
+ +        }
- +                return -errno;
+ +
- +
+ +        return r;
- +        if (!S_ISFIFO(st_fd.st_mode))
+ +#endif
- +                return 0;
+ +}
  +
- +        if (path) {
+ +_sd_hidden_ int sd_is_fifo(int fd, const char *path) {
- +                struct stat st_path;
+ +        struct stat st_fd;
  +
- +                memset(&st_path, 0, sizeof(st_path));
+ +        if (fd < 0)
- +                if (stat(path, &st_path) < 0) {
+ +                return -EINVAL;
  +
- +                        if (errno == ENOENT || errno == ENOTDIR)
+ +        memset(&st_fd, 0, sizeof(st_fd));
- +                                return 0;
+ +        if (fstat(fd, &st_fd) < 0)
- +
+ +                return -errno;
- +                        return -errno;
+ +
- +                }
+ +        if (!S_ISFIFO(st_fd.st_mode))
- +
+ +                return 0;
- +                return
+ +
- +                        st_path.st_dev == st_fd.st_dev &&
+ +        if (path) {
- +                        st_path.st_ino == st_fd.st_ino;
+ +                struct stat st_path;
- +        }
+ +
- +
+ +                memset(&st_path, 0, sizeof(st_path));
- +        return 1;
+ +                if (stat(path, &st_path) < 0) {
- +}
+ +
- +
+ +                        if (errno == ENOENT || errno == ENOTDIR)
- +_sd_hidden_ int sd_is_special(int fd, const char *path) {
+ +                                return 0;
- +        struct stat st_fd;
+ +
- +
+ +                        return -errno;
- +        if (fd < 0)
+ +                }
- +                return -EINVAL;
+ +
- +
+ +                return
- +        if (fstat(fd, &st_fd) < 0)
+ +                        st_path.st_dev == st_fd.st_dev &&
- +                return -errno;
+ +                        st_path.st_ino == st_fd.st_ino;
- +
+ +        }
- +        if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode))
+ +
- +                return 0;
+ +        return 1;
- +
+ +}
- +        if (path) {
+ +
- +                struct stat st_path;
+ +_sd_hidden_ int sd_is_special(int fd, const char *path) {
- +
+ +        struct stat st_fd;
- +                if (stat(path, &st_path) < 0) {
+ +
- +
+ +        if (fd < 0)
- +                        if (errno == ENOENT || errno == ENOTDIR)
+ +                return -EINVAL;
- +                                return 0;
+ +
- +
+ +        if (fstat(fd, &st_fd) < 0)
- +                        return -errno;
+ +                return -errno;
- +                }
+ +
- +
+ +        if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode))
- +                if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode))
+ +                return 0;
- +                        return
+ +
- +                                st_path.st_dev == st_fd.st_dev &&
+ +        if (path) {
- +                                st_path.st_ino == st_fd.st_ino;
+ +                struct stat st_path;
- +                else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode))
+ +
- +                        return st_path.st_rdev == st_fd.st_rdev;
+ +                if (stat(path, &st_path) < 0) {
- +                else
+ +
- +                        return 0;
+ +                        if (errno == ENOENT || errno == ENOTDIR)
- +        }
+ +                                return 0;
  +
- +        return 1;
+ +                        return -errno;
- +}
+ +                }
  +
- +static int sd_is_socket_internal(int fd, int type, int listening) {
+ +                if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode))
- +        struct stat st_fd;
+ +                        return
- +
+ +                                st_path.st_dev == st_fd.st_dev &&
- +        if (fd < 0 || type < 0)
+ +                                st_path.st_ino == st_fd.st_ino;
- +                return -EINVAL;
+ +                else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode))
- +
+ +                        return st_path.st_rdev == st_fd.st_rdev;
- +        if (fstat(fd, &st_fd) < 0)
+ +                else
- +                return -errno;
+ +                        return 0;
- +
+ +        }
- +        if (!S_ISSOCK(st_fd.st_mode))
+ +
- +                return 0;
+ +        return 1;
- +
+ +}
- +        if (type != 0) {
+ +
- +                int other_type = 0;
+ +static int sd_is_socket_internal(int fd, int type, int listening) {
- +                socklen_t l = sizeof(other_type);
+ +        struct stat st_fd;
  +
- +                if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)
+ +        if (fd < 0 || type < 0)
- +                        return -errno;
+ +                return -EINVAL;
  +
- +                if (l != sizeof(other_type))
+ +        if (fstat(fd, &st_fd) < 0)
- +                        return -EINVAL;
+ +                return -errno;
  +
- +                if (other_type != type)
+ +        if (!S_ISSOCK(st_fd.st_mode))
- +                        return 0;
+ +                return 0;
- +        }
+ +
- +
+ +        if (type != 0) {
- +        if (listening >= 0) {
+ +                int other_type = 0;
- +                int accepting = 0;
+ +                socklen_t l = sizeof(other_type);
- +                socklen_t l = sizeof(accepting);
+ +
- +
+ +                if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)
- +                if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)
+ +                        return -errno;
- +                        return -errno;
+ +
- +
+ +                if (l != sizeof(other_type))
- +                if (l != sizeof(accepting))
+ +                        return -EINVAL;
- +                        return -EINVAL;
+ +
- +
+ +                if (other_type != type)
- +                if (!accepting != !listening)
+ +                        return 0;
- +                        return 0;
+ +        }
- +        }
+ +
- +
+ +        if (listening >= 0) {
- +        return 1;
+ +                int accepting = 0;
- +}
+ +                socklen_t l = sizeof(accepting);
  +
- +union sockaddr_union {
+ +                if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)
- +        struct sockaddr sa;
+ +                        return -errno;
- +        struct sockaddr_in in4;
+ +
- +        struct sockaddr_in6 in6;
+ +                if (l != sizeof(accepting))
- +        struct sockaddr_un un;
+ +                        return -EINVAL;
- +        struct sockaddr_storage storage;
+ +
- +};
+ +                if (!accepting != !listening)
- +
+ +                        return 0;
- +_sd_hidden_ int sd_is_socket(int fd, int family, int type, int listening) {
+ +        }
- +        int r;
+ +
- +
+ +        return 1;
- +        if (family < 0)
+ +}
- +                return -EINVAL;
+ +
- +
+ +union sockaddr_union {
- +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ +        struct sockaddr sa;
- +                return r;
+ +        struct sockaddr_in in4;
- +
+ +        struct sockaddr_in6 in6;
- +        if (family > 0) {
+ +        struct sockaddr_un un;
- +                union sockaddr_union sockaddr;
+ +        struct sockaddr_storage storage;
- +                socklen_t l;
+ +};
  +
- +                memset(&sockaddr, 0, sizeof(sockaddr));
+ +_sd_hidden_ int sd_is_socket(int fd, int family, int type, int listening) {
- +                l = sizeof(sockaddr);
+ +        int r;
  +
- +                if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ +        if (family < 0)
- +                        return -errno;
+ +                return -EINVAL;
  +
- +                if (l < sizeof(sa_family_t))
+ +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
- +                        return -EINVAL;
+ +                return r;
  +
- +                return sockaddr.sa.sa_family == family;
+ +        if (family > 0) {
- +        }
+ +                union sockaddr_union sockaddr;
- +
+ +                socklen_t l;
- +        return 1;
+ +
- +}
+ +                memset(&sockaddr, 0, sizeof(sockaddr));
- +
+ +                l = sizeof(sockaddr);
- +_sd_hidden_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
+ +
- +        union sockaddr_union sockaddr;
+ +                if (getsockname(fd, &sockaddr.sa, &l) < 0)
- +        socklen_t l;
+ +                        return -errno;
- +        int r;
+ +
- +
+ +                if (l < sizeof(sa_family_t))
- +        if (family != 0 && family != AF_INET && family != AF_INET6)
+ +                        return -EINVAL;
- +                return -EINVAL;
+ +
- +
+ +                return sockaddr.sa.sa_family == family;
- +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ +        }
- +                return r;
+ +
- +
+ +        return 1;
- +        memset(&sockaddr, 0, sizeof(sockaddr));
+ +}
- +        l = sizeof(sockaddr);
+ +
- +
+ +_sd_hidden_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
- +        if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ +        union sockaddr_union sockaddr;
- +                return -errno;
+ +        socklen_t l;
- +
+ +        int r;
- +        if (l < sizeof(sa_family_t))
+ +
- +                return -EINVAL;
+ +        if (family != 0 && family != AF_INET && family != AF_INET6)
- +
+ +                return -EINVAL;
- +        if (sockaddr.sa.sa_family != AF_INET &&
+ +
- +            sockaddr.sa.sa_family != AF_INET6)
+ +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
- +                return 0;
+ +                return r;
  +
- +        if (family > 0)
+ +        memset(&sockaddr, 0, sizeof(sockaddr));
- +                if (sockaddr.sa.sa_family != family)
+ +        l = sizeof(sockaddr);
- +                        return 0;
+ +
- +
+ +        if (getsockname(fd, &sockaddr.sa, &l) < 0)
- +        if (port > 0) {
+ +                return -errno;
- +                if (sockaddr.sa.sa_family == AF_INET) {
+ +
- +                        if (l < sizeof(struct sockaddr_in))
+ +        if (l < sizeof(sa_family_t))
- +                                return -EINVAL;
+ +                return -EINVAL;
  +
- +                        return htons(port) == sockaddr.in4.sin_port;
+ +        if (sockaddr.sa.sa_family != AF_INET &&
- +                } else {
+ +            sockaddr.sa.sa_family != AF_INET6)
- +                        if (l < sizeof(struct sockaddr_in6))
+ +                return 0;
- +                                return -EINVAL;
+ +
- +
+ +        if (family > 0)
- +                        return htons(port) == sockaddr.in6.sin6_port;
+ +                if (sockaddr.sa.sa_family != family)
- +                }
+ +                        return 0;
- +        }
+ +
- +
+ +        if (port > 0) {
- +        return 1;
+ +                if (sockaddr.sa.sa_family == AF_INET) {
- +}
+ +                        if (l < sizeof(struct sockaddr_in))
- +
+ +                                return -EINVAL;
- +_sd_hidden_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
+ +
- +        union sockaddr_union sockaddr;
+ +                        return htons(port) == sockaddr.in4.sin_port;
- +        socklen_t l;
+ +                } else {
- +        int r;
+ +                        if (l < sizeof(struct sockaddr_in6))
- +
+ +                                return -EINVAL;
- +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ +
- +                return r;
+ +                        return htons(port) == sockaddr.in6.sin6_port;
- +
+ +                }
- +        memset(&sockaddr, 0, sizeof(sockaddr));
+ +        }
- +        l = sizeof(sockaddr);
+ +
- +
+ +        return 1;
- +        if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ +}
- +                return -errno;
+ +
- +
+ +_sd_hidden_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
- +        if (l < sizeof(sa_family_t))
+ +        union sockaddr_union sockaddr;
- +                return -EINVAL;
+ +        socklen_t l;
- +
+ +        int r;
- +        if (sockaddr.sa.sa_family != AF_UNIX)
+ +
- +                return 0;
+ +        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
- +
+ +                return r;
- +        if (path) {
+ +
- +                if (length <= 0)
+ +        memset(&sockaddr, 0, sizeof(sockaddr));
- +                        length = strlen(path);
+ +        l = sizeof(sockaddr);
  +
- +                if (length <= 0)
+ +        if (getsockname(fd, &sockaddr.sa, &l) < 0)
- +                        /* Unnamed socket */
+ +                return -errno;
- +                        return l == offsetof(struct sockaddr_un, sun_path);
+ +
- +
+ +        if (l < sizeof(sa_family_t))
- +                if (path[0])
+ +                return -EINVAL;
- +                        /* Normal path socket */
+ +
- +                        return
+ +        if (sockaddr.sa.sa_family != AF_UNIX)
- +                                (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&
+ +                return 0;
- +                                memcmp(path, sockaddr.un.sun_path, length+1) == 0;
+ +
- +                else
+ +        if (path) {
- +                        /* Abstract namespace socket */
+ +                if (length <= 0)
- +                        return
+ +                        length = strlen(path);
- +                                (l == offsetof(struct sockaddr_un, sun_path) + length) &&
+ +
- +                                memcmp(path, sockaddr.un.sun_path, length) == 0;
+ +                if (length <= 0)
- +        }
+ +                        /* Unnamed socket */
- +
+ +                        return l == offsetof(struct sockaddr_un, sun_path);
- +        return 1;
+ +
- +}
+ +                if (path[0])
- +
+ +                        /* Normal path socket */
- +_sd_hidden_ int sd_is_mq(int fd, const char *path) {
+ +                        return
- +#if !defined(__linux__)
+ +                                (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&
- +        return 0;
+ +                                memcmp(path, sockaddr.un.sun_path, length+1) == 0;
- +#else
+ +                else
- +        struct mq_attr attr;
+ +                        /* Abstract namespace socket */
- +
+ +                        return
- +        if (fd < 0)
+ +                                (l == offsetof(struct sockaddr_un, sun_path) + length) &&
- +                return -EINVAL;
+ +                                memcmp(path, sockaddr.un.sun_path, length) == 0;
- +
+ +        }
- +        if (mq_getattr(fd, &attr) < 0)
+ +
- +                return -errno;
+ +        return 1;
- +
+ +}
- +        if (path) {
+ +
- +                char fpath[PATH_MAX];
+ +_sd_hidden_ int sd_is_mq(int fd, const char *path) {
- +                struct stat a, b;
+ +#if !defined(__linux__)
- +
+ +        return 0;
- +                if (path[0] != '/')
+ +#else
- +                        return -EINVAL;
+ +        struct mq_attr attr;
  +
- +                if (fstat(fd, &a) < 0)
+ +        if (fd < 0)
- +                        return -errno;
+ +                return -EINVAL;
  +
- +                strncpy(stpcpy(fpath, "/dev/mqueue"), path, sizeof(fpath) - 12);
+ +        if (mq_getattr(fd, &attr) < 0)
- +                fpath[sizeof(fpath)-1] = 0;
+ +                return -errno;
  +
- +                if (stat(fpath, &b) < 0)
+ +        if (path) {
- +                        return -errno;
+ +                char fpath[PATH_MAX];
- +
+ +                struct stat a, b;
- +                if (a.st_dev != b.st_dev ||
+ +
- +                    a.st_ino != b.st_ino)
+ +                if (path[0] != '/')
- +                        return 0;
+ +                        return -EINVAL;
- +        }
+ +
- +
+ +                if (fstat(fd, &a) < 0)
- +        return 1;
+ +                        return -errno;
- +#endif
+ +
- +}
+ +                strncpy(stpcpy(fpath, "/dev/mqueue"), path, sizeof(fpath) - 12);
- +
+ +                fpath[sizeof(fpath)-1] = 0;
- +_sd_hidden_ int sd_notify(int unset_environment, const char *state) {
+ +
- +#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
+ +                if (stat(fpath, &b) < 0)
- +        return 0;
+ +                        return -errno;
- +#else
+ +
- +        int fd = -1, r;
+ +                if (a.st_dev != b.st_dev ||
- +        struct msghdr msghdr;
+ +                    a.st_ino != b.st_ino)
- +        struct iovec iovec;
+ +                        return 0;
- +        union sockaddr_union sockaddr;
+ +        }
- +        const char *e;
+ +
- +
+ +        return 1;
- +        if (!state) {
+ +#endif
- +                r = -EINVAL;
+ +}
- +                goto finish;
+ +
- +        }
+ +_sd_hidden_ int sd_notify(int unset_environment, const char *state) {
- +
+ +#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
- +        if (!(e = getenv("NOTIFY_SOCKET")))
+ +        return 0;
- +                return 0;
+ +#else
- +
+ +        int fd = -1, r;
- +        /* Must be an abstract socket, or an absolute path */
+ +        struct msghdr msghdr;
- +        if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
+ +        struct iovec iovec;
- +                r = -EINVAL;
+ +        union sockaddr_union sockaddr;
- +                goto finish;
+ +        const char *e;
- +        }
+ +
- +
+ +        if (!state) {
- +        if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ +                r = -EINVAL;
- +                r = -errno;
+ +                goto finish;
- +                goto finish;
+ +        }
- +        }
+ +
- +
+ +        if (!(e = getenv("NOTIFY_SOCKET")))
- +        memset(&sockaddr, 0, sizeof(sockaddr));
+ +                return 0;
- +        sockaddr.sa.sa_family = AF_UNIX;
+ +
- +        strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
+ +        /* Must be an abstract socket, or an absolute path */
- +
+ +        if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
- +        if (sockaddr.un.sun_path[0] == '@')
+ +                r = -EINVAL;
- +                sockaddr.un.sun_path[0] = 0;
+ +                goto finish;
- +
+ +        }
- +        memset(&iovec, 0, sizeof(iovec));
+ +
- +        iovec.iov_base = (char*) state;
+ +        if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
- +        iovec.iov_len = strlen(state);
+ +                r = -errno;
- +
+ +                goto finish;
- +        memset(&msghdr, 0, sizeof(msghdr));
+ +        }
- +        msghdr.msg_name = &sockaddr;
+ +
- +        msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);
+ +        memset(&sockaddr, 0, sizeof(sockaddr));
- +
+ +        sockaddr.sa.sa_family = AF_UNIX;
- +        if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ +        strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
- +                msghdr.msg_namelen = sizeof(struct sockaddr_un);
+ +
- +
+ +        if (sockaddr.un.sun_path[0] == '@')
- +        msghdr.msg_iov = &iovec;
+ +                sockaddr.un.sun_path[0] = 0;
- +        msghdr.msg_iovlen = 1;
+ +
- +
+ +        memset(&iovec, 0, sizeof(iovec));
- +        if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
+ +        iovec.iov_base = (char*) state;
- +                r = -errno;
+ +        iovec.iov_len = strlen(state);
- +                goto finish;
+ +
- +        }
+ +        memset(&msghdr, 0, sizeof(msghdr));
- +
+ +        msghdr.msg_name = &sockaddr;
- +        r = 1;
+ +        msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);
  +
- +finish:
+ +        if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
- +        if (unset_environment)
+ +                msghdr.msg_namelen = sizeof(struct sockaddr_un);
- +                unsetenv("NOTIFY_SOCKET");
+ +
- +
+ +        msghdr.msg_iov = &iovec;
- +        if (fd >= 0)
+ +        msghdr.msg_iovlen = 1;
- +                close(fd);
+ +
- +
+ +        if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
- +        return r;
+ +                r = -errno;
- +#endif
+ +                goto finish;
- +}
+ +        }
  +
- +_sd_hidden_ int sd_notifyf(int unset_environment, const char *format, ...) {
+ +        r = 1;
- +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ +
- +        return 0;
+ +finish:
- +#else
+ +        if (unset_environment)
- +        va_list ap;
+ +                unsetenv("NOTIFY_SOCKET");
- +        char *p = NULL;
+ +
- +        int r;
+ +        if (fd >= 0)
- +
+ +                close(fd);
- +        va_start(ap, format);
+ +
- +        r = vasprintf(&p, format, ap);
+ +        return r;
- +        va_end(ap);
+ +#endif
- +
+ +}
- +        if (r < 0 || !p)
+ +
- +                return -ENOMEM;
+ +_sd_hidden_ int sd_notifyf(int unset_environment, const char *format, ...) {
- +
+ +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
- +        r = sd_notify(unset_environment, p);
+ +        return 0;
- +        free(p);
+ +#else
- +
+ +        va_list ap;
- +        return r;
+ +        char *p = NULL;
- +#endif
+ +        int r;
- +}
+ +
- +
+ +        va_start(ap, format);
- +_sd_hidden_ int sd_booted(void) {
+ +        r = vasprintf(&p, format, ap);
- +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ +        va_end(ap);
- +        return 0;
+ +
- +#else
+ +        if (r < 0 || !p)
- +
+ +                return -ENOMEM;
- +        struct stat a, b;
+ +
- +
+ +        r = sd_notify(unset_environment, p);
- +        /* We simply test whether the systemd cgroup hierarchy is
+ +        free(p);
- +         * mounted */
+ +
- +
+ +        return r;
- +        if (lstat("/sys/fs/cgroup", &a) < 0)
+ +#endif
- +                return 0;
+ +}
  +
- +        if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
+ +_sd_hidden_ int sd_booted(void) {
- +                return 0;
+ +#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
- +
+ +        return 0;
- +        return a.st_dev != b.st_dev;
+ +#else
- +#endif
+ +
- +}
+ +        struct stat a, b;
- diff --git a/PCSC/src/sd-daemon.h b/PCSC/src/sd-daemon.h
+ +
- new file mode 100644
+ +        /* We simply test whether the systemd cgroup hierarchy is
- index 0000000..46dc7fd
+ +         * mounted */
- --- /dev/null
+ +
- +++ b/PCSC/src/sd-daemon.h
+ +        if (lstat("/sys/fs/cgroup", &a) < 0)
- @@ -0,0 +1,277 @@
+ +                return 0;
- +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ +
- +
+ +        if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
- +#ifndef foosddaemonhfoo
+ +                return 0;
- +#define foosddaemonhfoo
+ +
- +
+ +        return a.st_dev != b.st_dev;
- +/***
+ +#endif
- +  Copyright 2010 Lennart Poettering
+ +}
- +
+ diff --git a/PCSC/src/sd-daemon.h b/PCSC/src/sd-daemon.h
- +  Permission is hereby granted, free of charge, to any person
+ new file mode 100644
- +  obtaining a copy of this software and associated documentation files
+ index 0000000..46dc7fd
- +  (the "Software"), to deal in the Software without restriction,
+ --- /dev/null
- +  including without limitation the rights to use, copy, modify, merge,
+ +++ b/PCSC/src/sd-daemon.h
- +  publish, distribute, sublicense, and/or sell copies of the Software,
+ @@ -0,0 +1,277 @@
- +  and to permit persons to whom the Software is furnished to do so,
+ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
- +  subject to the following conditions:
+ +
- +
+ +#ifndef foosddaemonhfoo
- +  The above copyright notice and this permission notice shall be
+ +#define foosddaemonhfoo
- +  included in all copies or substantial portions of the Software.
+ +
- +
+ +/***
- +  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ +  Copyright 2010 Lennart Poettering
- +  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ +
- +  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ +  Permission is hereby granted, free of charge, to any person
- +  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ +  obtaining a copy of this software and associated documentation files
- +  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ +  (the "Software"), to deal in the Software without restriction,
- +  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ +  including without limitation the rights to use, copy, modify, merge,
- +  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ +  publish, distribute, sublicense, and/or sell copies of the Software,
- +  SOFTWARE.
+ +  and to permit persons to whom the Software is furnished to do so,
- +***/
+ +  subject to the following conditions:
  +
- +#include <sys/types.h>
+ +  The above copyright notice and this permission notice shall be
- +#include <inttypes.h>
+ +  included in all copies or substantial portions of the Software.
  +
- +#ifdef __cplusplus
+ +  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- +extern "C" {
+ +  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- +#endif
+ +  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- +
+ +  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- +/*
+ +  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- +  Reference implementation of a few systemd related interfaces for
+ +  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- +  writing daemons. These interfaces are trivial to implement. To
+ +  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- +  simplify porting we provide this reference implementation.
+ +  SOFTWARE.
- +  Applications are welcome to reimplement the algorithms described
+ +***/
- +  here if they do not want to include these two source files.
+ +
- +
+ +#include <sys/types.h>
- +  The following functionality is provided:
+ +#include <inttypes.h>
  +
- +  - Support for logging with log levels on stderr
+ +#ifdef __cplusplus
- +  - File descriptor passing for socket-based activation
+ +extern "C" {
- +  - Daemon startup and status notification
+ +#endif
- +  - Detection of systemd boots
+ +
- +
+ +/*
- +  You may compile this with -DDISABLE_SYSTEMD to disable systemd
+ +  Reference implementation of a few systemd related interfaces for
- +  support. This makes all those calls NOPs that are directly related to
+ +  writing daemons. These interfaces are trivial to implement. To
- +  systemd (i.e. only sd_is_xxx() will stay useful).
+ +  simplify porting we provide this reference implementation.
- +
+ +  Applications are welcome to reimplement the algorithms described
- +  Since this is drop-in code we don't want any of our symbols to be
+ +  here if they do not want to include these two source files.
- +  exported in any case. Hence we declare hidden visibility for all of
+ +
- +  them.
+ +  The following functionality is provided:
  +
- +  You may find an up-to-date version of these source files online:
+ +  - Support for logging with log levels on stderr
- +
+ +  - File descriptor passing for socket-based activation
+ +  - Daemon startup and status notification
+ +  - Detection of systemd boots
+ +
+ +  You may compile this with -DDISABLE_SYSTEMD to disable systemd
+ +  support. This makes all those calls NOPs that are directly related to
+ +  systemd (i.e. only sd_is_xxx() will stay useful).
+ +
+ +  Since this is drop-in code we don't want any of our symbols to be
+ +  exported in any case. Hence we declare hidden visibility for all of
+ +  them.
+ +
+ +  You may find an up-to-date version of these source files online:
+ +
  +  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
  +  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
  +
  +  This should compile on non-Linux systems, too, but with the
  +  exception of the sd_is_xxx() calls all functions will become NOPs.
  +
  +  See sd-daemon(7) for more information.
  +*/
  +
  +#ifndef _sd_printf_attr_
  +#if __GNUC__ >= 4
  +#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
  +#else
  +#define _sd_printf_attr_(a,b)
  +#endif
  +#endif
  +
  +/*
  +  Log levels for usage on stderr:
  +
  +          fprintf(stderr, SD_NOTICE "Hello World!\n");
  +
  +  This is similar to printk() usage in the kernel.
  +*/
  +#define SD_EMERG   "<0>"  /* system is unusable */
  +#define SD_ALERT   "<1>"  /* action must be taken immediately */
  +#define SD_CRIT    "<2>"  /* critical conditions */
  +#define SD_ERR     "<3>"  /* error conditions */
  +#define SD_WARNING "<4>"  /* warning conditions */
  +#define SD_NOTICE  "<5>"  /* normal but significant condition */
  +#define SD_INFO    "<6>"  /* informational */
  +#define SD_DEBUG   "<7>"  /* debug-level messages */
  +
  +/* The first passed file descriptor is fd 3 */
  +#define SD_LISTEN_FDS_START 3
  +
  +/*
  +  Returns how many file descriptors have been passed, or a negative
  +  errno code on failure. Optionally, removes the $LISTEN_FDS and
  +  $LISTEN_PID file descriptors from the environment (recommended, but
  +  problematic in threaded environments). If r is the return value of
  +  this function you'll find the file descriptors passed as fds
  +  SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative
  +  errno style error code on failure. This function call ensures that
  +  the FD_CLOEXEC flag is set for the passed file descriptors, to make
  +  sure they are not passed on to child processes. If FD_CLOEXEC shall
  +  not be set, the caller needs to unset it after this call for all file
  +  descriptors that are used.
  +
  +  See sd_listen_fds(3) for more information.
  +*/
  +int sd_listen_fds(int unset_environment);
  +
  +/*
  +  Helper call for identifying a passed file descriptor. Returns 1 if
  +  the file descriptor is a FIFO in the file system stored under the
  +  specified path, 0 otherwise. If path is NULL a path name check will
  +  not be done and the call only verifies if the file descriptor
  +  refers to a FIFO. Returns a negative errno style error code on
  +  failure.
  +
  +  See sd_is_fifo(3) for more information.
  +*/
  +int sd_is_fifo(int fd, const char *path);
  +
  +/*
  +  Helper call for identifying a passed file descriptor. Returns 1 if
  +  the file descriptor is a special character device on the file
  +  system stored under the specified path, 0 otherwise.
  +  If path is NULL a path name check will not be done and the call
  +  only verifies if the file descriptor refers to a special character.
  +  Returns a negative errno style error code on failure.
  +
  +  See sd_is_special(3) for more information.
  +*/
  +int sd_is_special(int fd, const char *path);
  +
  +/*
  +  Helper call for identifying a passed file descriptor. Returns 1 if
  +  the file descriptor is a socket of the specified family (AF_INET,
  +  ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If
  +  family is 0 a socket family check will not be done. If type is 0 a
  +  socket type check will not be done and the call only verifies if
  +  the file descriptor refers to a socket. If listening is > 0 it is
  +  verified that the socket is in listening mode. (i.e. listen() has
  +  been called) If listening is == 0 it is verified that the socket is
  +  not in listening mode. If listening is < 0 no listening mode check
  +  is done. Returns a negative errno style error code on failure.
  +
  +  See sd_is_socket(3) for more information.
  +*/
  +int sd_is_socket(int fd, int family, int type, int listening);
  +
  +/*
  +  Helper call for identifying a passed file descriptor. Returns 1 if
  +  the file descriptor is an Internet socket, of the specified family
  +  (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM,
  +  SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version
  +  check is not done. If type is 0 a socket type check will not be
  +  done. If port is 0 a socket port check will not be done. 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_inet(3) for more information.
  +*/
  +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 AF_UNIX socket of the specified type
  +  (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0
  +  a socket type check will not be done. If path is NULL a socket path
  +  check will not be done. For normal AF_UNIX sockets set length to
  +  0. For abstract namespace sockets set length to the length of the
  +  socket name (including the initial 0 byte), and pass the full
  +  socket path in path (including the initial 0 byte). 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_unix(3) for more information.
  +*/
  +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
  +  the file descriptor is a POSIX Message Queue of the specified name,
  +  0 otherwise. If path is NULL a message queue name check is not
  +  done. Returns a negative errno style error code on failure.
  +*/
  +int sd_is_mq(int fd, const char *path);
  +
  +/*
  +  Informs systemd about changed daemon state. This takes a number of
  +  newline separated environment-style variable assignments in a
  +  string. The following variables are known:
  +
  +     READY=1      Tells systemd that daemon startup is finished (only
  +                  relevant for services of Type=notify). The passed
  +                  argument is a boolean "1" or "0". Since there is
  +                  little value in signaling non-readiness the only
  +                  value daemons should send is "READY=1".
  +
  +     STATUS=...   Passes a single-line status string back to systemd
  +                  that describes the daemon state. This is free-from
  +                  and can be used for various purposes: general state
  +                  feedback, fsck-like programs could pass completion
  +                  percentages and failing programs could pass a human
  +                  readable error message. Example: "STATUS=Completed
  +                  66% of file system check..."
  +
  +     ERRNO=...    If a daemon fails, the errno-style error code,
  +                  formatted as string. Example: "ERRNO=2" for ENOENT.
  +
  +     BUSERROR=... If a daemon fails, the D-Bus error-style error
  +                  code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut"
  +
  +     MAINPID=...  The main pid of a daemon, in case systemd did not
  +                  fork off the process itself. Example: "MAINPID=4711"
  +
  +  Daemons can choose to send additional variables. However, it is
  +  recommended to prefix variable names not listed above with X_.
  +
  +  Returns a negative errno-style error code on failure. Returns > 0
  +  if systemd could be notified, 0 if it couldn't possibly because
  +  systemd is not running.
  +
  +  Example: When a daemon finished starting up, it could issue this
  +  call to notify systemd about it:
  +
  +     sd_notify(0, "READY=1");
  +
  +  See sd_notifyf() for more complete examples.
  +
  +  See sd_notify(3) for more information.
  +*/
  +int sd_notify(int unset_environment, const char *state);
  +
  +/*
  +  Similar to sd_notify() but takes a format string.
  +
  +  Example 1: A daemon could send the following after initialization:
  +
  +     sd_notifyf(0, "READY=1\n"
  +                   "STATUS=Processing requests...\n"
  +                   "MAINPID=%lu",
  +                   (unsigned long) getpid());
  +
  +  Example 2: A daemon could send the following shortly before
  +  exiting, on failure:
  +
  +     sd_notifyf(0, "STATUS=Failed to start up: %s\n"
  +                   "ERRNO=%i",
  +                   strerror(errno),
  +                   errno);
  +
  +  See sd_notifyf(3) for more information.
  +*/
  +int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3);
  +
  +/*
  +  Returns > 0 if the system was booted with systemd. Returns < 0 on
  +  error. Returns 0 if the system was not booted with systemd. Note
  +  that all of the functions above handle non-systemd boots just
  +  fine. You should NOT protect them with a call to this function. Also
  +  note that this function checks whether the system, not the user
  +  session is controlled by systemd. However the functions above work
  +  for both user and system services.
  +
  +  See sd_booted(3) for more information.
  +*/
  +int sd_booted(void);
  +
  +#ifdef __cplusplus
  +}
  +#endif
  +
  +#endif
  diff --git a/PCSC/src/winscard_msg.h b/PCSC/src/winscard_msg.h
  index b2b6f90..b8c490c 100644
  --- a/PCSC/src/winscard_msg.h
  +++ b/PCSC/src/winscard_msg.h
  @@ -252,6 +252,7 @@
   #ifdef PCSCD
-   int32_t InitializeSocket(void);
+  	int32_t InitializeSocket(void);
- + int32_t ListenExistingSocket(int fd);
+ +	int32_t ListenExistingSocket(int fd);
-   int32_t ProcessEventsServer(/*@out@*/ uint32_t *);
+  	int32_t ProcessEventsServer(/*@out@*/ uint32_t *);
   #else
-   char *getSocketName(void);
+  	char *getSocketName(void);
  diff --git a/PCSC/src/winscard_msg_srv.c b/PCSC/src/winscard_msg_srv.c
  index 19ea363..4bb5bdc 100644
  --- a/PCSC/src/winscard_msg_srv.c
  +++ b/PCSC/src/winscard_msg_srv.c
  @@ -39,6 +39,7 @@
   #include "misc.h"
   #include "pcscd.h"
  +#include "sd-daemon.h"
   #include "winscard.h"
   #include "debuglog.h"
   #include "winscard_msg.h"
  @@ -138,6 +139,30 @@ INTERNAL int32_t InitializeSocket(void)
   }
   /**
  + * @brief Acquires a socket passed in from systemd.
  + *
  + * This is called by the server to start listening on an existing socket for
  + * local IPC with the clients.
  + *
  + * @param fd The file descriptor to start listening on.
  + *
  + * @return Error code.
  + * @retval 0 Success
  + * @retval -1 Passed FD is not an UNIX socket.
  + */
  +INTERNAL int32_t ListenExistingSocket(int fd)
  +{
- + if (!sd_is_socket(fd, AF_UNIX, SOCK_STREAM, -1))
+ +	if (!sd_is_socket(fd, AF_UNIX, SOCK_STREAM, -1))
- + {
+ +	{
- + Log1(PCSC_LOG_CRITICAL, "Passed FD is not an UNIX socket");
+ +		Log1(PCSC_LOG_CRITICAL, "Passed FD is not an UNIX socket");
- + return -1;
+ +		return -1;
- + }
+ +	}
  +
- + commonSocket = fd;
+ +	commonSocket = fd;
- + return 0;
+ +	return 0;
  +}
  +
  +/**
    * @brief Looks for messages sent by clients.
    *
    * This is called by the Server's function \c SVCServiceRunLoop().
  --
 .7.5.4

 Legend:



Removed from v.1573
 


changed lines


 
Added in v.1574
 Legend:



Removed from v.1573
 


changed lines


 
Added in v.1574
-Removed from v.1573
+Added in v.1574