syslog-97.1.tar.gz

[apple/syslog.git] / syslogd.tproj / bsd_in.c

diff --git a/syslogd.tproj/bsd_in.c b/syslogd.tproj/bsd_in.c
index 8e4e10b91a9746ec524e3da3b9ab23f237fc252c..eafca64b52eefe409b21472abf5818a3239409c9 100644 (file)
--- a/syslogd.tproj/bsd_in.c
+++ b/syslogd.tproj/bsd_in.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2008 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -34,8 +34,9 @@
 #include <errno.h>
 #include "daemon.h"
 
 #include <errno.h>
 #include "daemon.h"
 

+#define BSD_SOCKET_NAME "BSDSystemLogger"

 #define MY_ID "bsd_in"
 #define MY_ID "bsd_in"

-#define MAXLINE 1024
+#define MAXLINE 4096

 
 static int sock = -1;
 
 
 static int sock = -1;
 


@@ -53,45 +54,64 @@ bsd_in_acceptmsg(int fd)
        if (n <= 0) return NULL;
 
        line[n] = '\0';
        if (n <= 0) return NULL;
 
        line[n] = '\0';

-       return asl_syslog_input_convert(line, n, NULL, 0);
+
+       return asl_input_parse(line, n, NULL, 0);

 }
 
 int
 bsd_in_init(void)
 {
 }
 
 int
 bsd_in_init(void)
 {

-       struct sockaddr_un sun;

        int rbufsize;
        int len;
        int rbufsize;
        int len;

+       launch_data_t sockets_dict, fd_array, fd_dict;

 
        asldebug("%s: init\n", MY_ID);
        if (sock >= 0) return sock;
 
 
        asldebug("%s: init\n", MY_ID);
        if (sock >= 0) return sock;
 

-       unlink(_PATH_SYSLOG_IN);
-       sock = socket(AF_UNIX, SOCK_DGRAM, 0);
-       if (sock < 0)
+       if (global.launch_dict == NULL)

        {
        {

-               asldebug("%s: couldn't create socket for %s: %s\n", MY_ID, _PATH_SYSLOG_IN, strerror(errno));
+               asldebug("%s: launchd dict is NULL\n", MY_ID);

                return -1;
        }
 
                return -1;
        }
 

-       asldebug("%s: creating %s for fd %d\n", MY_ID, _PATH_SYSLOG_IN, sock);
+       sockets_dict = launch_data_dict_lookup(global.launch_dict, LAUNCH_JOBKEY_SOCKETS);
+       if (sockets_dict == NULL)
+       {
+               asldebug("%s: launchd lookup of LAUNCH_JOBKEY_SOCKETS failed\n", MY_ID);
+               return -1;
+       }

 
 

-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strcpy(sun.sun_path, _PATH_SYSLOG_IN);
+       fd_array = launch_data_dict_lookup(sockets_dict, BSD_SOCKET_NAME);
+       if (fd_array == NULL)
+       {
+               asldebug("%s: launchd lookup of BSD_SOCKET_NAME failed\n", MY_ID);
+               return -1;
+       }

 
 

-       len = sizeof(struct sockaddr_un);
-       if (bind(sock, (struct sockaddr *)&sun, len) < 0)
+       len = launch_data_array_get_count(fd_array);
+       if (len <= 0)

        {
        {

-               asldebug("%s: couldn't bind socket %d for %s: %s\n", MY_ID, sock, _PATH_SYSLOG_IN, strerror(errno));
-               close(sock);
-               sock = -1;
+               asldebug("%s: launchd fd array is empty\n", MY_ID);

                return -1;
        }
 
                return -1;
        }
 

+       if (len > 1)
+       {
+               asldebug("%s: warning! launchd fd array has %d sockets\n", MY_ID, len);
+       }
+
+       fd_dict = launch_data_array_get_index(fd_array, 0);
+       if (fd_dict == NULL)
+       {
+               asldebug("%s: launchd file discriptor array element 0 is NULL\n", MY_ID);
+               return -1;
+       }
+
+       sock = launch_data_get_fd(fd_dict);
+

        rbufsize = 128 * 1024;
        len = sizeof(rbufsize);
        rbufsize = 128 * 1024;
        len = sizeof(rbufsize);

-       
+

        if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rbufsize, len) < 0)
        {
                asldebug("%s: couldn't set receive buffer size for socket %d (%s): %s\n", MY_ID, sock, _PATH_SYSLOG_IN, strerror(errno));
        if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rbufsize, len) < 0)
        {
                asldebug("%s: couldn't set receive buffer size for socket %d (%s): %s\n", MY_ID, sock, _PATH_SYSLOG_IN, strerror(errno));


@@ -108,9 +128,7 @@ bsd_in_init(void)
                return -1;
        }
 
                return -1;
        }
 

-       chmod(_PATH_SYSLOG_IN, 0666);
-
-       return aslevent_addfd(sock, bsd_in_acceptmsg, NULL, NULL);
+       return aslevent_addfd(SOURCE_BSD_SOCKET, sock, ADDFD_FLAGS_LOCAL, bsd_in_acceptmsg, NULL, NULL);

 }
 
 int
 }
 
 int