syslog-217.1.4.tar.gz

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

diff --git a/syslogd.tproj/daemon.c b/syslogd.tproj/daemon.c
index 775a0d79f59972eaac508e3d19ecb23358d438d2..ee89164042517326e151530bbc91deb75ff00037 100644 (file)
--- a/syslogd.tproj/daemon.c
+++ b/syslogd.tproj/daemon.c
@@ -1,27 +1,28 @@
 /*
 /*

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

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

- * "Portions Copyright (c) 2004 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 1.0 (the 'License').  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License."
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
 
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
 

+#include <TargetConditionals.h>
+

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>


@@ -30,471 +31,792 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <sys/queue.h>

 #include <netinet/in.h>
 #include <arpa/inet.h>
 #define SYSLOG_NAMES
 #include <syslog.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #define SYSLOG_NAMES
 #include <syslog.h>

+#include <sys/fslog.h>
+#include <vproc.h>
+#include <pthread.h>
+#include <vproc_priv.h>
+#include <mach/mach.h>
+#include <assert.h>
+#include <libkern/OSAtomic.h>
+#include <libproc.h>
+#include <uuid/uuid.h>

 #include "daemon.h"
 
 #include "daemon.h"
 

+#define LIST_SIZE_DELTA 256
+

 #define streq(A,B) (strcmp(A,B)==0)
 #define streq(A,B) (strcmp(A,B)==0)

+#define forever for(;;)

 
 

-static char myname[MAXHOSTNAMELEN + 1] = {0};
-static int gotname = 0;
+#define ASL_MSG_TYPE_MASK 0x0000000f
+#define ASL_TYPE_ERROR 2

 
 

-struct aslevent
-{
-       int fd;
-       unsigned char read:1; 
-       unsigned char write:1; 
-       unsigned char except:1;
-       aslreadfn readfn;
-       aslwritefn writefn;
-       aslexceptfn exceptfn;
-       char *sender;
-       uid_t uid;
-       gid_t gid;
-       TAILQ_ENTRY(aslevent) entries;
-};
+#define ASL_KEY_FACILITY "Facility"

 
 

-struct asloutput
-{
-       aslsendmsgfn sendmsg;
-       const char *outid;
-       TAILQ_ENTRY(asloutput) entries;
-};
+#define FACILITY_USER "user"
+#define FACILITY_CONSOLE "com.apple.console"
+#define SYSTEM_RESERVED "com.apple.system"
+#define SYSTEM_RESERVED_LEN 16

 
 

-struct aslmatch
-{
-       char *outid;
-       asl_msg_t *query;
-       TAILQ_ENTRY(aslmatch) entries;
-};
+#define VERIFY_STATUS_OK 0
+#define VERIFY_STATUS_INVALID_MESSAGE 1
+#define VERIFY_STATUS_EXCEEDED_QUOTA 2

 
 

-TAILQ_HEAD(ae, aslevent) Eventq;
-TAILQ_HEAD(ao, asloutput) Outq;
-TAILQ_HEAD(am, aslmatch) Matchq;
+extern void disaster_message(aslmsg m);
+extern int asl_action_reset(void);
+extern int asl_action_control_set_param(const char *s);

 
 

-int
-aslevent_init(void)
-{
-       TAILQ_INIT(&Eventq);
-       TAILQ_INIT(&Outq);
-       TAILQ_INIT(&Matchq);
+static char myname[MAXHOSTNAMELEN + 1] = {0};
+static int name_change_token = -1;

 
 

-       return 0;
-}
+static OSSpinLock count_lock = 0;

 
 

-int
-aslevent_log(asl_msg_t *msg, char *outid)
-{
-       struct asloutput *i;
-       int status = -1;
-
-       for (i = Outq.tqh_first; i != NULL; i = i->entries.tqe_next)
-       {
-               if ((outid != NULL) && (strcmp(i->outid, outid) == 0))
-               {
-                       status = i->sendmsg(msg, outid);
-               }
-       }
+#if !TARGET_OS_EMBEDDED
+static vproc_transaction_t vproc_trans = {0};
+#endif

 
 

-       return status;
-}
+#define QUOTA_KERN_EXCEEDED_MESSAGE "*** kernel exceeded %d log message per second limit  -  remaining messages this second discarded ***"

 
 

-int
-aslevent_addmatch(asl_msg_t *query, char *outid)
-{
-       struct aslmatch *tmp;
+#define DEFAULT_DB_FILE_MAX 25600000
+#define DEFAULT_DB_MEMORY_MAX 8192
+#define DEFAULT_DB_MINI_MAX 256
+#define DEFAULT_MPS_LIMIT 500
+#define DEFAULT_REMOTE_DELAY 5000
+#define DEFAULT_BSD_MAX_DUP_SEC 30
+#define DEFAULT_MARK_SEC 0
+#define DEFAULT_UTMP_TTL_SEC 31622400

 
 

-       if (query == NULL) return -1;
-       if (outid == NULL) return -1;
+static time_t quota_time = 0;
+static int32_t kern_quota;
+static int32_t kern_level;

 
 

-       tmp = calloc(1, sizeof(struct aslmatch));
-       if (tmp == NULL) return -1;
-       tmp->query = query;
-       tmp->outid = outid;
-       TAILQ_INSERT_TAIL(&Matchq, tmp, entries);
+static const char *kern_notify_key[] = 
+{
+       "com.apple.system.log.kernel.emergency",
+       "com.apple.system.log.kernel.alert",
+       "com.apple.system.log.kernel.critical",
+       "com.apple.system.log.kernel.error",
+       "com.apple.system.log.kernel.warning",
+       "com.apple.system.log.kernel.notice",
+       "com.apple.system.log.kernel.info",
+       "com.apple.system.log.kernel.debug"
+};

 
 

-       return 0;
-}
+static int kern_notify_token[8] = {-1, -1, -1, -1, -1, -1, -1, -1 };

 
 

-void
-aslevent_match(asl_msg_t *msg)
+static uint32_t
+kern_quota_check(time_t now, aslmsg msg, uint32_t level)

 {
 {

-       struct aslmatch *i;
+       char *str, lstr[2];

 
 

-       if (msg == NULL) return;
+       if (msg == NULL) return VERIFY_STATUS_INVALID_MESSAGE;
+       if (global.mps_limit == 0) return VERIFY_STATUS_OK;

 
 

-       for (i = Matchq.tqh_first; i != NULL; i = i->entries.tqe_next)
+       if (quota_time != now)

        {
        {

-               if (asl_msg_cmp(i->query, msg) != 0)
-               {
-                       aslevent_log(msg, i->outid);
-               }
+               kern_quota = global.mps_limit;
+               kern_level = 7;
+               quota_time = now;

        }
        }

-}

 
 

-int
-aslevent_removefd(int fd)
-{
-       struct aslevent *i;
-       int found = -1;
+       if (level < kern_level) kern_level = level;
+       if (kern_quota > 0) kern_quota--;
+
+       if (kern_quota > 0) return VERIFY_STATUS_OK;
+       if (kern_quota < 0)     return VERIFY_STATUS_EXCEEDED_QUOTA;
+
+       kern_quota = -1;

 
 

-       for (i = Eventq.tqh_first; i != NULL; i = i->entries.tqe_next)
+       str = NULL;
+       asprintf(&str, QUOTA_KERN_EXCEEDED_MESSAGE, global.mps_limit);
+       if (str != NULL)

        {
        {

-               if (fd == i->fd)
-               {
-                       asldebug("removing %d\n", i->fd);
-                       TAILQ_REMOVE(&Eventq, i, entries);
-                       found = 0;
-                       if (i->sender != NULL) free(i->sender);
-                       free(i);
-                       i = NULL;
-                       return 0;
-               }
+               asl_set(msg, ASL_KEY_MSG, str);
+               free(str);
+               lstr[0] = kern_level + '0';
+               lstr[1] = 0;
+               asl_set(msg, ASL_KEY_LEVEL, lstr);

        }
 
        }
 

-       return -1;
+       return VERIFY_STATUS_OK;

 }
 
 }
 

-const char *
+static const char *

 whatsmyhostname()
 {
 whatsmyhostname()
 {

-       char *dot;
+       static dispatch_once_t once;
+       int check, status;
+
+       dispatch_once(&once, ^{
+               snprintf(myname, sizeof(myname), "%s", "localhost");
+               notify_register_check(kNotifySCHostNameChange, &name_change_token);
+       });
+
+       check = 1;
+       status = 0;

 
 

-       if (gotname != 0) return (const char *)myname;
+       if (name_change_token >= 0) status = notify_check(name_change_token, &check);
+
+       if ((status == 0) && (check == 0)) return (const char *)myname;

 
        if (gethostname(myname, MAXHOSTNAMELEN) < 0)
        {
 
        if (gethostname(myname, MAXHOSTNAMELEN) < 0)
        {

-               memset(myname, 0, sizeof(myname));
-               return "localhost";
+               snprintf(myname, sizeof(myname), "%s", "localhost");
+       }
+       else
+       {
+               char *dot;
+               dot = strchr(myname, '.');
+               if (dot != NULL) *dot = '\0';

        }
 
        }
 

-       if (strcmp(myname, "localhost")) gotname = 1;
+       return (const char *)myname;
+}

 
 

-       dot = strchr(myname, '.');
-       if (dot != NULL) *dot = '\0';
+void
+asl_client_count_increment()
+{
+       OSSpinLockLock(&count_lock);

 
 

-       return (const char *)myname;
+#if !TARGET_OS_EMBEDDED
+       if (global.client_count == 0) vproc_trans = vproc_transaction_begin(NULL);
+#endif
+       global.client_count++;
+
+       OSSpinLockUnlock(&count_lock);

 }
 
 }
 

-int
-aslevent_addfd(int fd, aslreadfn readfn, aslwritefn writefn, aslexceptfn exceptfn)
+void
+asl_client_count_decrement()

 {
 {

-       struct aslevent *e;
-       int found = 0;
-#ifdef LOCAL_PEERCRED
-       struct xucred cr;
+       OSSpinLockLock(&count_lock);
+
+       if (global.client_count > 0) global.client_count--;
+#if !TARGET_OS_EMBEDDED
+       if (global.client_count == 0) vproc_transaction_end(NULL, vproc_trans);

 #endif
 #endif

-       int len;
-       uid_t u;
-       gid_t g;
-       struct sockaddr_storage ss;
-       char *sender, str[256];

 
 

-       u = 99;
-       g = 99;
-       sender = NULL;
+       OSSpinLockUnlock(&count_lock);
+}
+
+/*
+ * Checks message content and sets attributes as required
+ *
+ * SOURCE_INTERNAL log messages sent by syslogd itself
+ * SOURCE_ASL_SOCKET legacy asl(3) TCP socket
+ * SOURCE_BSD_SOCKET legacy syslog(3) UDP socket
+ * SOURCE_UDP_SOCKET from the network
+ * SOURCE_KERN from the kernel
+ * SOURCE_ASL_MESSAGE mach messages sent from Libc by asl(3) and syslog(3)
+ * SOURCE_LAUNCHD forwarded from launchd
+ */
+
+static uint32_t
+aslmsg_verify(aslmsg msg, uint32_t source, int32_t *kern_post_level, uid_t *uid_out)
+{
+       const char *val, *fac, *ruval, *rgval;
+       char buf[64];
+       time_t tick, now;
+       uid_t uid;
+       gid_t gid;
+       uint32_t status, level, fnum;
+       pid_t pid;
+       uuid_string_t ustr;
+       struct proc_uniqidentifierinfo pinfo;
+
+       if (msg == NULL) return VERIFY_STATUS_INVALID_MESSAGE;
+
+       /* Time */
+       now = time(NULL);

 
 

-       memset(&ss, 0, sizeof(struct sockaddr_storage));
+       if (kern_post_level != NULL) *kern_post_level = -1;
+       if (uid_out != NULL) *uid_out = -2;

 
 

-       len = sizeof(struct sockaddr_storage);
+       /* PID */
+       pid = 0;

 
 

-       if (getpeername(fd, (struct sockaddr *)&ss, &len) == 0)
+       val = asl_get(msg, ASL_KEY_PID);
+       if (val == NULL) asl_set(msg, ASL_KEY_PID, "0");
+       else pid = (pid_t)atoi(val);
+
+       /* if PID is 1 (launchd), use the refpid if provided */
+       if (pid == 1)

        {
        {

-               if (len == 0)
-               {
-                       /* UNIX Domain socket */
-                       snprintf(str, sizeof(str), whatsmyhostname());
-                       sender = str;
-               }
-               else
-               {
-                       if (inet_ntop(ss.ss_family, (struct sockaddr *)&ss, str, 256) == 0) sender = str;
-               }
+               val = asl_get(msg, ASL_KEY_REF_PID);
+               if (val != NULL) pid = (pid_t)atoi(val);

        }
 
        }
 

-#ifdef LOCAL_PEERCRED
-       len = sizeof(cr);
+       /* Level */
+       val = asl_get(msg, ASL_KEY_LEVEL);
+       level = ASL_LEVEL_DEBUG;
+       if ((val != NULL) && (val[1] == '\0') && (val[0] >= '0') && (val[0] <= '7')) level = val[0] - '0';
+       snprintf(buf, sizeof(buf), "%d", level);
+       asl_set(msg, ASL_KEY_LEVEL, buf);

 
 

-       if (getsockopt(fd, LOCAL_PEERCRED, 1, &cr, &len) == 0)
+       /* check kernel quota if enabled and no processes are watching */
+       if ((pid == 0) && (global.mps_limit > 0) && (global.watchers_active == 0))

        {
        {

-               u = cr.cr_uid;
-               g = cr.cr_gid;
+               status = kern_quota_check(now, msg, level);
+               if (status != VERIFY_STATUS_OK) return status;

        }
        }

-#endif
-
-       asldebug("fd %d   UID %d   GID %d   Sender %s\n", fd, u, g, (sender == NULL) ? "NULL" : sender );

 
 

-       for (e = Eventq.tqh_first; e != NULL; e = e->entries.tqe_next)
+       if (pid != 0)

        {
        {

-               if (fd == e->fd)
+               /* set Sender_Mach_UUID */
+               uuid_clear(pinfo.p_uuid);
+               if (proc_pidinfo(pid, PROC_PIDUNIQIDENTIFIERINFO, 1, &pinfo, sizeof(pinfo)) == sizeof(pinfo))

                {
                {

-                       e->readfn = readfn;
-                       e->writefn = writefn;
-                       e->exceptfn = exceptfn;
-                       if (e->sender != NULL) free(e->sender);
-                       e->sender = NULL;
-                       if (sender != NULL) e->sender = strdup(sender);
-                       e->uid = u;
-                       e->gid = g;
-                       found = 1;
+                       uuid_unparse(pinfo.p_uuid, ustr);
+                       asl_set(msg, ASL_KEY_SENDER_MACH_UUID, ustr);

                }
        }
 
                }
        }
 

-       if (found) return 0;
-
-       e = calloc(1, sizeof(struct aslevent));
-       if (e == NULL) return -1;
-
-       e->fd = fd;
-       e->readfn = readfn;
-       e->writefn = writefn;
-       e->exceptfn = exceptfn;
-       e->sender = NULL;
-       if (sender != NULL) e->sender = strdup(sender);
-       e->uid = u;
-       e->gid = g;
-
-       TAILQ_INSERT_TAIL(&Eventq, e, entries);
-
-       return 0;
-}
-
-int
-aslmsg_verify(struct aslevent *e, asl_msg_t *msg)
-{
-       const char *val;
-       char buf[32], *timestr;
-       time_t tick;
-       struct tm gtime;
-
-       if (msg == NULL) return -1;
-
-       /* Time */

        tick = 0;
        val = asl_get(msg, ASL_KEY_TIME);
        if (val != NULL) tick = asl_parse_time(val);
 
        tick = 0;
        val = asl_get(msg, ASL_KEY_TIME);
        if (val != NULL) tick = asl_parse_time(val);
 

-       if (tick == 0) tick = time(NULL);
-       memset(&gtime, 0, sizeof(struct tm));
-       gmtime_r(&tick, &gtime);
+       /* Set time to now if it is unset or from the future (not allowed!) */
+       if ((tick == 0) || (tick > now)) tick = now;
+
+       /* Canonical form: seconds since the epoch */
+       snprintf(buf, sizeof(buf) - 1, "%lu", tick);
+       asl_set(msg, ASL_KEY_TIME, buf);
+
+       /* Host */
+       val = asl_get(msg, ASL_KEY_HOST);
+       if (val == NULL) asl_set(msg, ASL_KEY_HOST, whatsmyhostname());
+
+       uid = -2;
+       val = asl_get(msg, ASL_KEY_UID);
+       if (val != NULL)
+       {
+               uid = atoi(val);
+               if ((uid == 0) && strcmp(val, "0")) uid = -2;
+               if (uid_out != NULL) *uid_out = uid;
+       }

 
 

-       /* Canonical form: YYYY.MM.DD hh:mm:ss UTC */
-       asprintf(&timestr, "%d.%02d.%02d %02d:%02d:%02d UTC", gtime.tm_year + 1900, gtime.tm_mon + 1, gtime.tm_mday, gtime.tm_hour, gtime.tm_min, gtime.tm_sec);
-       if (timestr != NULL)
+       gid = -2;
+       val = asl_get(msg, ASL_KEY_GID);
+       if (val != NULL)

        {
        {

-               asl_set(msg, ASL_KEY_TIME, timestr);
-               free(timestr);
+               gid = atoi(val);
+               if ((gid == 0) && strcmp(val, "0")) gid = -2;

        }
 
        }
 

-       /* Host */
-       if (e == NULL) asl_set(msg, ASL_KEY_HOST, whatsmyhostname());
-       else if (e->sender != NULL) asl_set(msg, ASL_KEY_HOST, e->sender);
+       /* UID  & GID */
+       switch (source)
+       {
+               case SOURCE_KERN:
+               case SOURCE_INTERNAL:
+               {
+                       asl_set(msg, ASL_KEY_UID, "0");
+                       asl_set(msg, ASL_KEY_GID, "0");
+                       break;
+               }
+               case SOURCE_ASL_SOCKET:
+               case SOURCE_ASL_MESSAGE:
+               case SOURCE_LAUNCHD:
+               {
+                       /* we trust the UID & GID in the message */
+                       break;
+               }
+               default:
+               {
+                       /* we do not trust the UID 0 or GID 0 or 80 in the message */
+                       if (uid == 0) asl_set(msg, ASL_KEY_UID, "-2");
+                       if ((gid == 0) || (gid == 80)) asl_set(msg, ASL_KEY_GID, "-2");
+               }
+       }

 
        /* Sender */
        val = asl_get(msg, ASL_KEY_SENDER);
 
        /* Sender */
        val = asl_get(msg, ASL_KEY_SENDER);

-       if (val == NULL) asl_set(msg, ASL_KEY_SENDER, "Unknown");
-
-       /* PID */
-       val = asl_get(msg, ASL_KEY_PID);
-       if (val == NULL) asl_set(msg, ASL_KEY_PID, "0");
-
-       /* UID */
-       val = asl_get(msg, ASL_KEY_UID);

        if (val == NULL)
        {
        if (val == NULL)
        {

-               if (e == NULL) asl_set(msg, ASL_KEY_UID, "-2");
-               else if (e->uid == 99) asl_set(msg, ASL_KEY_UID, "-2");
-               else
+               switch (source)

                {
                {

-                       snprintf(buf, sizeof(buf), "%d", e->uid);
-                       asl_set(msg, ASL_KEY_UID, buf);
+                       case SOURCE_KERN:
+                       {
+                               asl_set(msg, ASL_KEY_SENDER, "kernel");
+                               break;
+                       }
+                       case SOURCE_INTERNAL:
+                       {
+                               asl_set(msg, ASL_KEY_SENDER, "syslogd");
+                               break;
+                       }
+                       default:
+                       {
+                               asl_set(msg, ASL_KEY_SENDER, "Unknown");
+                       }

                }
        }
                }
        }

-       else if ((e != NULL) && (e->uid != 99))
+       else if ((source != SOURCE_KERN) && (uid != 0) && (!strcmp(val, "kernel")))

        {
        {

-               snprintf(buf, sizeof(buf), "%d", e->uid);
-               asl_set(msg, ASL_KEY_UID, buf);
+               /* allow UID 0 to send messages with "Sender kernel", but nobody else */
+               asl_set(msg, ASL_KEY_SENDER, "Unknown");

        }
 
        }
 

-       /* GID */
-       val = asl_get(msg, ASL_KEY_GID);
-       if (val == NULL)
+       /* Facility */
+       fac = asl_get(msg, ASL_KEY_FACILITY);
+       if (fac == NULL)

        {
        {

-               if (e == NULL) asl_set(msg, ASL_KEY_GID, "-2");
-               else if (e->gid == 99) asl_set(msg, ASL_KEY_GID, "-2");
-               else
+               if (source == SOURCE_KERN) fac = "kern";
+               else fac = "user";
+               asl_set(msg, ASL_KEY_FACILITY, fac);
+       }
+       else if (fac[0] == '#')
+       {
+               fnum = LOG_USER;
+               if ((fac[1] >= '0') && (fac[1] <= '9'))

                {
                {

-                       snprintf(buf, sizeof(buf), "%d", e->gid);
-                       asl_set(msg, ASL_KEY_GID, buf);
+                       fnum = atoi(fac + 1) << 3;
+                       if ((fnum == 0) && (strcmp(fac + 1, "0"))) fnum = LOG_USER;

                }
                }

+
+               fac = asl_syslog_faciliy_num_to_name(fnum);
+               asl_set(msg, ASL_KEY_FACILITY, fac);

        }
        }

-       else if ((e != NULL) && (e->gid != 99))
+       else if (!strncmp(fac, SYSTEM_RESERVED, SYSTEM_RESERVED_LEN))

        {
        {

-               snprintf(buf, sizeof(buf), "%d", e->gid);
-               asl_set(msg, ASL_KEY_GID, buf);
+               /* only UID 0 may use "com.apple.system" */
+               if (uid != 0) asl_set(msg, ASL_KEY_FACILITY, FACILITY_USER);

        }
 
        }
 

-       /* Level */
-       val = asl_get(msg, ASL_KEY_LEVEL);
-       if (val == NULL) asl_set(msg, ASL_KEY_LEVEL, "7");
+       /*
+        * kernel messages are only readable by root and admin group.
+        * all other messages are admin-only readable unless they already
+        * have specific read access controls set.
+        */
+       if (source == SOURCE_KERN)
+       {
+               asl_set(msg, ASL_KEY_READ_UID, "0");
+               asl_set(msg, ASL_KEY_READ_GID, "80");
+       }
+       else
+       {
+               ruval = asl_get(msg, ASL_KEY_READ_UID);
+               rgval = asl_get(msg, ASL_KEY_READ_GID);

 
 

-       return 0;
+               if ((ruval == NULL) && (rgval == NULL))
+               {
+                       asl_set(msg, ASL_KEY_READ_GID, "80");
+               }
+       }
+
+       /* Set DB Expire Time for com.apple.system.utmpx and lastlog */
+       if ((!strcmp(fac, "com.apple.system.utmpx")) || (!strcmp(fac, "com.apple.system.lastlog")))
+       {
+               snprintf(buf, sizeof(buf), "%lu", tick + global.utmp_ttl);
+               asl_set(msg, ASL_KEY_EXPIRE_TIME, buf);
+       }
+
+       /* Set DB Expire Time for Filesystem errors */
+       if (!strcmp(fac, FSLOG_VAL_FACILITY))
+       {
+               snprintf(buf, sizeof(buf), "%lu", tick + FS_TTL_SEC);
+               asl_set(msg, ASL_KEY_EXPIRE_TIME, buf);
+       }
+
+       /*
+        * special case handling of kernel disaster messages
+        */
+       if ((source == SOURCE_KERN) && (level <= KERN_DISASTER_LEVEL))
+       {
+               if (kern_post_level != NULL) *kern_post_level = level;
+               disaster_message(msg);
+       }
+
+       return VERIFY_STATUS_OK;

 }
 
 }
 

-int
-aslevent_addoutput(aslsendmsgfn fn, const char *outid)
+void
+list_append_msg(asl_search_result_t *list, aslmsg msg)

 {
 {

-       struct asloutput *tmp;
+       if (list == NULL) return;
+       if (msg == NULL) return;

 
 

-       tmp = calloc(1, sizeof(struct asloutput));
-       if (tmp == NULL) return -1;
+       /*
+        * NB: curr is the list size
+        * grow list if necessary
+        */
+       if (list->count == list->curr)
+       {
+               if (list->curr == 0)
+               {
+                       list->msg = (asl_msg_t **)calloc(LIST_SIZE_DELTA, sizeof(asl_msg_t *));
+               }
+               else
+               {
+                       list->msg = (asl_msg_t **)reallocf(list->msg, (list->curr + LIST_SIZE_DELTA) * sizeof(asl_msg_t *));
+               }

 
 

-       tmp->sendmsg = fn;
-       tmp->outid = outid;
+               if (list->msg == NULL)
+               {
+                       list->curr = 0;
+                       list->count = 0;
+                       return;
+               }

 
 

-       TAILQ_INSERT_TAIL(&Outq, tmp, entries);
+               list->curr += LIST_SIZE_DELTA;
+       }

 
 

-       return 0;
+       list->msg[list->count] = (asl_msg_t *)msg;
+       list->count++;

 }
 
 }
 

-int
-aslevent_fdsets(fd_set *rd, fd_set *wr, fd_set *ex)
+void
+init_globals(void)

 {
 {

-       struct aslevent *e;
-       int status = 0;
+       asl_out_rule_t *r;
+
+       OSSpinLockLock(&global.lock);

 
 

-       asldebug("--> aslevent_fdsets\n");
-       FD_ZERO(rd);
-       FD_ZERO(wr);
-       FD_ZERO(ex);
+       global.pid = getpid();
+       global.debug = 0;
+       free(global.debug_file);
+       global.debug_file = NULL;
+       global.launchd_enabled = 1;

 
 

-       for (e = Eventq.tqh_first; e != NULL; e = e->entries.tqe_next)
+#if TARGET_OS_EMBEDDED
+       global.dbtype = DB_TYPE_MINI;
+#else
+       global.dbtype = DB_TYPE_FILE;
+#endif
+       global.db_file_max = DEFAULT_DB_FILE_MAX;
+       global.db_memory_max = DEFAULT_DB_MEMORY_MAX;
+       global.db_mini_max = DEFAULT_DB_MINI_MAX;
+       global.mps_limit = DEFAULT_MPS_LIMIT;
+       global.remote_delay_time = DEFAULT_REMOTE_DELAY;
+       global.bsd_max_dup_time = DEFAULT_BSD_MAX_DUP_SEC;
+       global.mark_time = DEFAULT_MARK_SEC;
+       global.utmp_ttl = DEFAULT_UTMP_TTL_SEC;
+
+       global.asl_out_module = asl_out_module_init();
+       OSSpinLockUnlock(&global.lock);
+
+       if (global.asl_out_module != NULL)

        {
        {

-               asldebug("adding fd %d\n", e->fd);
-               if (e->readfn)
+               for (r = global.asl_out_module->ruleset; r != NULL; r = r->next)

                {
                {

-                       FD_SET(e->fd, rd);
-                       status = MAX(e->fd, status);
+                       if ((r->action == ACTION_SET_PARAM) && (r->query == NULL) && (!strncmp(r->options, "debug", 5))) control_set_param(r->options, true);

                }
                }

+       }
+}
+
+/*
+ * Used to set config parameters.
+ * Line format "= name value"
+ */
+int
+control_set_param(const char *s, bool eval)
+{
+       char **l;
+       uint32_t intval, count, v32a, v32b, v32c;

 
 

-               if (e->writefn)
+       if (s == NULL) return -1;
+       if (s[0] == '\0') return 0;
+
+       /* skip '=' and whitespace */
+       if (*s == '=') s++;
+       while ((*s == ' ') || (*s == '\t')) s++;
+
+       l = explode(s, " \t");
+       if (l == NULL) return -1;
+
+       for (count = 0; l[count] != NULL; count++);
+
+       /* name is required */
+       if (count == 0)
+       {
+               free_string_list(l);
+               return -1;
+       }
+
+       /* Check variables that allow 0 or 1 / boolean */
+       if (!strcasecmp(l[0], "debug"))
+       {
+               /* = debug [0|1] [file] */
+               if (count == 1)

                {
                {

-                       FD_SET(e->fd, wr);
-                       status = MAX(e->fd, status);
+                       intval = (eval) ? 1 : 0;
+                       config_debug(intval, NULL);

                }
                }

-
-               if (e->exceptfn)
+               else if (!strcmp(l[1], "0"))
+               {
+                       config_debug(0, l[2]);
+               }
+               else if (!strcmp(l[1], "1"))

                {
                {

-                       FD_SET(e->fd, ex);
-                       status = MAX(e->fd, status);
+                       config_debug(1, l[2]);

                }
                }

+               else
+               {
+                       intval = (eval) ? 1 : 0;
+                       config_debug(intval, l[1]);
+               }
+
+               free_string_list(l);
+               return 0;

        }
 
        }
 

-       asldebug("<--aslevent_fdsets\n");
-       return status;
-}
+       /* value is required */
+       if (count == 1)
+       {
+               free_string_list(l);
+               return -1;
+       }

 
 

-void
-aslevent_handleevent(fd_set rd, fd_set wr, fd_set ex, char *errstr)
-{
-       struct aslevent *e;
-       char *out = NULL;
-       asl_msg_t *msg;
+       if (!strcasecmp(l[0], "mark_time"))
+       {
+               /* = mark_time seconds */
+               OSSpinLockLock(&global.lock);
+               if (eval) global.mark_time = atoll(l[1]);
+               else global.mark_time = 0;
+               OSSpinLockUnlock(&global.lock);
+       }
+       else if (!strcasecmp(l[0], "dup_delay"))
+       {
+               /* = bsd_max_dup_time seconds */
+               OSSpinLockLock(&global.lock);
+               if (eval) global.bsd_max_dup_time = atoll(l[1]);
+               else global.bsd_max_dup_time = DEFAULT_BSD_MAX_DUP_SEC;
+               OSSpinLockUnlock(&global.lock);
+       }
+       else if (!strcasecmp(l[0], "remote_delay"))
+       {
+               /* = remote_delay microseconds */
+               OSSpinLockLock(&global.lock);
+               if (eval) global.remote_delay_time = atol(l[1]);
+               else global.remote_delay_time = DEFAULT_REMOTE_DELAY;
+               OSSpinLockUnlock(&global.lock);
+       }
+       else if (!strcasecmp(l[0], "utmp_ttl"))
+       {
+               /* = utmp_ttl seconds */
+               OSSpinLockLock(&global.lock);
+               if (eval) global.utmp_ttl = (time_t)atoll(l[1]);
+               else global.utmp_ttl = DEFAULT_UTMP_TTL_SEC;
+               OSSpinLockUnlock(&global.lock);
+       }
+       else if (!strcasecmp(l[0], "mps_limit"))
+       {
+               /* = mps_limit number */
+               OSSpinLockLock(&global.lock);
+               if (eval) global.mps_limit = (uint32_t)atol(l[1]);
+               else global.mps_limit = DEFAULT_MPS_LIMIT;
+               OSSpinLockUnlock(&global.lock);
+       }
+       else if (!strcasecmp(l[0], "max_file_size"))
+       {
+               /* = max_file_size bytes */
+               pthread_mutex_lock(global.db_lock);

 
 

-       asldebug("--> aslevent_handleevent\n");
-       if (errstr) errstr = NULL;
+               if (global.dbtype & DB_TYPE_FILE)
+               {
+                       asl_store_close(global.file_db);
+                       global.file_db = NULL;
+                       if (eval) global.db_file_max = atoi(l[1]);
+                       else global.db_file_max = DEFAULT_DB_FILE_MAX;
+               }

 
 

-       for (e = Eventq.tqh_first; e != NULL; e = e->entries.tqe_next)
+               pthread_mutex_unlock(global.db_lock);
+       }
+       else if ((!strcasecmp(l[0], "db")) || (!strcasecmp(l[0], "database")) || (!strcasecmp(l[0], "datastore")))

        {
        {

-               if (FD_ISSET(e->fd, &rd) && (e->readfn != NULL))
+               /* NB this is private / unpublished */
+               /* = db type [max]... */
+               if (eval)

                {
                {

-                       asldebug("handling read event on %d\n", e->fd);
-                       msg = e->readfn(e->fd);
-                       if (msg == NULL)
+                       v32a = 0;
+                       v32b = 0;
+                       v32c = 0;
+                       
+                       if ((l[1][0] >= '0') && (l[1][0] <= '9'))

                        {
                        {

-                               asldebug("error reading message\n");
-                               continue;
+                               intval = atoi(l[1]);
+                               if ((count >= 3) && (strcmp(l[2], "-"))) v32a = atoi(l[2]);
+                               if ((count >= 4) && (strcmp(l[3], "-"))) v32b = atoi(l[3]);
+                               if ((count >= 5) && (strcmp(l[4], "-"))) v32c = atoi(l[4]);

                        }
                        }

-
-                       if (aslmsg_verify(e, msg) < 0)
+                       else if (!strcasecmp(l[1], "file"))

                        {
                        {

-                               asl_free(msg);
-                               asldebug("recieved invalid message\n");
+                               intval = DB_TYPE_FILE;
+                               if ((count >= 3) && (strcmp(l[2], "-"))) v32a = atoi(l[2]);
+                       }
+                       else if (!strncasecmp(l[1], "mem", 3))
+                       {
+                               intval = DB_TYPE_MEMORY;
+                               if ((count >= 3) && (strcmp(l[2], "-"))) v32b = atoi(l[2]);
+                       }
+                       else if (!strncasecmp(l[1], "min", 3))
+                       {
+                               intval = DB_TYPE_MINI;
+                               if ((count >= 3) && (strcmp(l[2], "-"))) v32c = atoi(l[2]);

                        }
                        else
                        {
                        }
                        else
                        {

-                               aslevent_match(msg);
-                               asl_free(msg);
+                               free_string_list(l);
+                               return -1;

                        }
                        }

+                       
+                       if (v32a == 0) v32a = global.db_file_max;
+                       if (v32b == 0) v32b = global.db_memory_max;
+                       if (v32c == 0) v32c = global.db_mini_max;
+                       
+                       config_data_store(intval, v32a, v32b, v32c);

                }
                }

-
-               if (FD_ISSET(e->fd, &ex) && e->exceptfn)
+               else

                {
                {

-                       asldebug("handling except event on %d\n", e->fd);
-                       out = e->exceptfn(e->fd);
-                       if (out == NULL) asldebug("error writing message\n");
+#if TARGET_OS_EMBEDDED
+                       intval = DB_TYPE_MINI;
+#else
+                       intval = DB_TYPE_FILE;
+#endif
+                       config_data_store(intval, DEFAULT_DB_FILE_MAX, DEFAULT_DB_MEMORY_MAX, DEFAULT_DB_MINI_MAX);

                }
        }
 
                }
        }
 

-       asldebug("<-- aslevent_handleevent\n");
+       free_string_list(l);
+       return 0;

 }
 
 }
 

-int
-asl_log_string(const char *str)
+static int
+control_message(aslmsg msg)

 {
 {

-       asl_msg_t *msg;
+       const char *str = asl_get(msg, ASL_KEY_MSG);

 
 

-       if (str == NULL) return 1;
+       if (str == NULL) return 0;

 
 

-       msg = asl_msg_from_string(str);
-       if (aslmsg_verify(NULL, msg) < 0)
+       if (!strncmp(str, "= reset", 7))

        {
        {

-               asl_free(msg);
-               return -1;
+               init_globals();
+               return asl_action_reset();
+       }
+       else if (!strncmp(str, "= crash", 7))
+       {
+               abort();
+       }
+       else if (!strncmp(str, "@ ", 2))
+       {
+               return asl_action_control_set_param(str);
+       }
+       else if (!strncmp(str, "= ", 2))
+       {
+               return control_set_param(str, true);

        }
 
        }
 

-       aslevent_match(msg);
-       asl_free(msg);

        return 0;
 }
 
 void
        return 0;
 }
 
 void

-aslmark(void)
+process_message(aslmsg msg, uint32_t source)

 {
 {

-       char *str;
+       if (msg == NULL) return;

 
 

-       str = NULL;
-       asprintf(&str, "[%s syslogd] [%s %u] [%s %u] [%s -- MARK --] [%s 0] [%s 0] [Facility syslog]",
-                        ASL_KEY_SENDER,
-                        ASL_KEY_LEVEL, ASL_LEVEL_INFO,
-                        ASL_KEY_PID, getpid(),
-                        ASL_KEY_MSG, ASL_KEY_UID, ASL_KEY_GID);
-
-       asl_log_string(str);
-       if (str != NULL) free(str);
+       OSAtomicIncrement32(&global.work_queue_count);
+       dispatch_async(global.work_queue, ^{
+               int32_t kplevel;
+               uint32_t status;
+               uid_t uid;
+
+               kplevel = -1;
+               uid = -2;
+
+               status = aslmsg_verify(msg, source, &kplevel, &uid);
+               if (status == VERIFY_STATUS_OK)
+               {
+                       if ((source == SOURCE_KERN) && (kplevel >= 0))
+                       {
+                               if (kplevel > 7) kplevel = 7;
+                               if (kern_notify_token[kplevel] < 0)
+                               {
+                                       status = notify_register_plain(kern_notify_key[kplevel], &(kern_notify_token[kplevel]));
+                                       if (status != 0) asldebug("notify_register_plain(%s) failed status %u\n", status);
+                               }
+
+                               notify_post(kern_notify_key[kplevel]);
+                       }
+
+                       if ((uid == 0) && asl_check_option(msg, ASL_OPT_CONTROL)) control_message(msg);
+
+                       /* send message to output modules */
+                       asl_out_message(msg);
+#if !TARGET_IPHONE_SIMULATOR
+                       if (global.bsd_out_enabled) bsd_out_message(msg);
+#endif
+               }
+
+               asl_free(msg);
+               OSAtomicDecrement32(&global.work_queue_count);
+       });
+}
+
+int
+internal_log_message(const char *str)
+{
+       aslmsg msg;
+
+       if (str == NULL) return 1;
+
+       msg = (aslmsg)asl_msg_from_string(str);
+       if (msg == NULL) return 1;
+
+       process_message(msg, SOURCE_INTERNAL);
+
+       return 0;

 }
 
 }
 

-asl_msg_t *
-asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
+int
+asldebug(const char *str, ...)
+{
+       va_list v;
+       FILE *dfp = NULL;
+
+       if (global.debug == 0) return 0;
+
+       if (global.debug_file == NULL) dfp = fopen(_PATH_SYSLOGD_LOG, "a");
+       else dfp = fopen(global.debug_file, "a");
+       if (dfp == NULL) return 0;
+
+       va_start(v, str);
+       vfprintf(dfp, str, v);
+       va_end(v);
+
+       fclose(dfp);
+
+       return 0;
+}
+
+void
+asl_mark(void)
+{
+       char *str = NULL;
+
+       asprintf(&str, "[Sender syslogd] [Level 6] [PID %u] [Message -- MARK --] [UID 0] [UID 0] [Facility syslog]", global.pid);
+       internal_log_message(str);
+       free(str);
+}
+
+aslmsg 
+asl_syslog_input_convert(const char *in, int len, char *rhost, uint32_t source)

 {
        int pf, pri, index, n;
 {
        int pf, pri, index, n;

-       char *p, *colon, *brace, *tmp, *tval, *sval, *pval, *mval;
+       char *p, *colon, *brace, *space, *tmp, *tval, *hval, *sval, *pval, *mval;

        char prival[8];
        const char *fval;
        char prival[8];
        const char *fval;

-       asl_msg_t *msg;
+       aslmsg msg;

        struct tm time;
        time_t tick;
 
        if (in == NULL) return NULL;
        if (len <= 0) return NULL;
 
        struct tm time;
        time_t tick;
 
        if (in == NULL) return NULL;
        if (len <= 0) return NULL;
 

-       asldebug("asl_syslog_input_convert: %s\n", in); 
-

        pri = LOG_DEBUG;
        tval = NULL;
        pri = LOG_DEBUG;
        tval = NULL;

+       hval = NULL;

        sval = NULL;
        pval = NULL;
        mval = NULL;
        sval = NULL;
        pval = NULL;
        mval = NULL;


@@ -503,6 +825,7 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
        index = 0;
        p = (char *)in;
 
        index = 0;
        p = (char *)in;
 

+       /* skip leading whitespace */

        while ((index < len) && ((*p == ' ') || (*p == '\t')))
        {
                p++;
        while ((index < len) && ((*p == ' ') || (*p == '\t')))
        {
                p++;


@@ -511,6 +834,7 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
 
        if (index >= len) return NULL;
 
 
        if (index >= len) return NULL;
 

+       /* parse "<NN>" priority (level and facility) */

        if (*p == '<')
        {
                p++;
        if (*p == '<')
        {
                p++;


@@ -538,9 +862,12 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
 
        snprintf(prival, sizeof(prival), "%d", pri);
 
 
        snprintf(prival, sizeof(prival), "%d", pri);
 

+       /* check if a timestamp is included */

        if (((len - index) > 15) && (p[9] == ':') && (p[12] == ':') && (p[15] == ' '))
        {
                tmp = malloc(16);
        if (((len - index) > 15) && (p[9] == ':') && (p[12] == ':') && (p[15] == ' '))
        {
                tmp = malloc(16);

+               if (tmp == NULL) return NULL;
+

                memcpy(tmp, p, 15);
                tmp[15] = '\0';
 
                memcpy(tmp, p, 15);
                tmp[15] = '\0';
 


@@ -560,49 +887,56 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
                index += 16;
        }
 
                index += 16;
        }
 

-       if (kern != 0)
+       /* stop here for kernel messages */
+       if (source == SOURCE_KERN)

        {
        {

-               msg = (asl_msg_t *)calloc(1, sizeof(asl_msg_t));
-               msg->type = ASL_TYPE_MSG;
-
-               asl_set(msg, ASL_KEY_SENDER, "kernel");
-
-               asl_set(msg, "Facility", "kern");
-               if (tval != NULL)
-               {
-                       asl_set(msg, ASL_KEY_TIME, tval);
-                       free(tval);
-               }
+               msg = asl_new(ASL_TYPE_MSG);
+               if (msg == NULL) return NULL;

 
                asl_set(msg, ASL_KEY_MSG, p);
 
                asl_set(msg, ASL_KEY_MSG, p);

-

                asl_set(msg, ASL_KEY_LEVEL, prival);
                asl_set(msg, ASL_KEY_LEVEL, prival);

-

                asl_set(msg, ASL_KEY_PID, "0");
 
                asl_set(msg, ASL_KEY_PID, "0");
 

-               asl_set(msg, ASL_KEY_UID, "0");
+               return msg;
+       }

 
 

-               asl_set(msg, ASL_KEY_GID, "0");
+       /* if message is from a network socket, hostname follows */
+       if (source == SOURCE_UDP_SOCKET)
+       {
+               space = strchr(p, ' ');
+               if (space != NULL)
+               {
+                       n = space - p;
+                       hval = malloc(n + 1);
+                       if (hval == NULL) return NULL;

 
 

-               asl_set(msg, ASL_KEY_HOST, whatsmyhostname());
+                       memcpy(hval, p, n);
+                       hval[n] = '\0';

 
 

-               return msg;
+                       p = space + 1;
+                       index += (n + 1);
+               }

        }
 
        colon = strchr(p, ':');
        brace = strchr(p, '[');
 
        }
 
        colon = strchr(p, ':');
        brace = strchr(p, '[');
 

+       /* check for "sender:" or sender[pid]:"  */

        if (colon != NULL)
        {
                if ((brace != NULL) && (brace < colon))
                {
                        n = brace - p;
                        sval = malloc(n + 1);
        if (colon != NULL)
        {
                if ((brace != NULL) && (brace < colon))
                {
                        n = brace - p;
                        sval = malloc(n + 1);

+                       if (sval == NULL) return NULL;
+

                        memcpy(sval, p, n);
                        sval[n] = '\0';
 
                        n = colon - (brace + 1) - 1;
                        pval = malloc(n + 1);
                        memcpy(sval, p, n);
                        sval[n] = '\0';
 
                        n = colon - (brace + 1) - 1;
                        pval = malloc(n + 1);

+                       if (pval == NULL) return NULL;
+

                        memcpy(pval, (brace + 1), n);
                        pval[n] = '\0';
                }
                        memcpy(pval, (brace + 1), n);
                        pval[n] = '\0';
                }


@@ -610,6 +944,8 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
                {
                        n = colon - p;
                        sval = malloc(n + 1);
                {
                        n = colon - p;
                        sval = malloc(n + 1);

+                       if (sval == NULL) return NULL;
+

                        memcpy(sval, p, n);
                        sval[n] = '\0';
                }
                        memcpy(sval, p, n);
                        sval[n] = '\0';
                }


@@ -629,14 +965,16 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
        if (n > 0)
        {
                mval = malloc(n + 1);
        if (n > 0)
        {
                mval = malloc(n + 1);

+               if (mval == NULL) return NULL;
+

                memcpy(mval, p, n);
                mval[n] = '\0';
        }
 
        if (fval == NULL) fval = asl_syslog_faciliy_num_to_name(LOG_USER);
 
                memcpy(mval, p, n);
                mval[n] = '\0';
        }
 
        if (fval == NULL) fval = asl_syslog_faciliy_num_to_name(LOG_USER);
 

-       msg = (asl_msg_t *)calloc(1, sizeof(asl_msg_t));
-       msg->type = ASL_TYPE_MSG;
+       msg = asl_new(ASL_TYPE_MSG);
+       if (msg == NULL) return NULL;

 
        if (tval != NULL)
        {
 
        if (tval != NULL)
        {


@@ -658,7 +996,10 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
                asl_set(msg, ASL_KEY_PID, pval);
                free(pval);
        }
                asl_set(msg, ASL_KEY_PID, pval);
                free(pval);
        }

-       else asl_set(msg, ASL_KEY_PID, "-1");
+       else
+       {
+               asl_set(msg, ASL_KEY_PID, "-1");
+       }

 
        if (mval != NULL)
        {
 
        if (mval != NULL)
        {


@@ -670,31 +1011,161 @@ asl_syslog_input_convert(const char *in, int len, char *rhost, int kern)
        asl_set(msg, ASL_KEY_UID, "-2");
        asl_set(msg, ASL_KEY_GID, "-2");
 
        asl_set(msg, ASL_KEY_UID, "-2");
        asl_set(msg, ASL_KEY_GID, "-2");
 

-       if (rhost == NULL) asl_set(msg, ASL_KEY_HOST, whatsmyhostname());
-       else asl_set(msg, ASL_KEY_HOST, rhost);
+       if (hval != NULL)
+       {
+               asl_set(msg, ASL_KEY_HOST, hval);
+               free(hval);
+       }
+       else if (rhost != NULL)
+       {
+               asl_set(msg, ASL_KEY_HOST, rhost);
+       }
+
+       return msg;
+}
+
+aslmsg 
+asl_input_parse(const char *in, int len, char *rhost, uint32_t source)
+{
+       aslmsg msg;
+       int status, x, legacy, off;
+
+       asldebug("asl_input_parse: %s\n", (in == NULL) ? "NULL" : in);
+
+       if (in == NULL) return NULL;
+
+       legacy = 1;
+       msg = NULL;
+
+       /* calculate length if not provided */
+       if (len == 0) len = strlen(in);

 
 

-       if (msg->count == 0)
+       /*
+        * Determine if the input is "old" syslog format or new ASL format.
+        * Old format lines should start with "<", but they can just be straight text.
+        * ASL input may start with a length (10 bytes) followed by a space and a '['.
+        * The length is optional, so ASL messages may also just start with '['.
+        */
+       if ((in[0] != '<') && (len > 11))

        {
        {

-               asl_free(msg);
-               return NULL;
+               status = sscanf(in, "%d ", &x);
+               if ((status == 1) && (in[10] == ' ') && (in[11] == '[')) legacy = 0;

        }
 
        }
 

+       if (legacy == 1) return asl_syslog_input_convert(in, len, rhost, source);
+
+       off = 11;
+       if (in[0] == '[') off = 0;
+
+       msg = (aslmsg)asl_msg_from_string(in + off);
+       if (msg == NULL) return NULL;
+
+       if (rhost != NULL) asl_set(msg, ASL_KEY_HOST, rhost);
+

        return msg;
 }
 
        return msg;
 }
 

-char *
-get_line_from_file(FILE *f)
+#if !TARGET_IPHONE_SIMULATOR
+void
+launchd_callback(struct timeval *when, pid_t from_pid, pid_t about_pid, uid_t sender_uid, gid_t sender_gid, int priority, const char *from_name, const char *about_name, const char *session_name, const char *msg)

 {
 {

-       char *s, *out;
-       size_t len;
+       aslmsg m;
+       char str[256];
+       time_t now;

 
 

-       out = fgetln(f, &len);
-       if (out == NULL) return NULL;
-       if (len == 0) return NULL;
+       if (global.launchd_enabled == 0) return;

 
 

-       s = malloc(len + 1);
-       memcpy(s, out, len);
+/*
+       asldebug("launchd_callback Time %lu %lu PID %u RefPID %u UID %d GID %d PRI %d Sender %s Ref %s Session %s Message %s\n",
+       when->tv_sec, when->tv_usec, from_pid, about_pid, sender_uid, sender_gid, priority, from_name, about_name, session_name, msg);
+*/
+
+       m = asl_new(ASL_TYPE_MSG);
+       if (m == NULL) return;
+
+       /* Level */
+       if (priority < ASL_LEVEL_EMERG) priority = ASL_LEVEL_EMERG;
+       if (priority > ASL_LEVEL_DEBUG) priority = ASL_LEVEL_DEBUG;
+       snprintf(str, sizeof(str), "%d", priority);
+
+       asl_set(m, ASL_KEY_LEVEL, str);
+
+       /* Time */
+       if (when != NULL)
+       {
+               snprintf(str, sizeof(str), "%lu", when->tv_sec);
+               asl_set(m, ASL_KEY_TIME, str);
+
+               snprintf(str, sizeof(str), "%lu", 1000 * (unsigned long int)when->tv_usec);
+               asl_set(m, ASL_KEY_TIME_NSEC, str);
+       }
+       else
+       {
+               now = time(NULL);
+               snprintf(str, sizeof(str), "%lu", now);
+               asl_set(m, ASL_KEY_TIME, str);
+       }
+
+       /* Facility */
+       asl_set(m, ASL_KEY_FACILITY, FACILITY_CONSOLE);
+
+       /* UID */
+       snprintf(str, sizeof(str), "%u", (unsigned int)sender_uid);
+       asl_set(m, ASL_KEY_UID, str);
+
+       /* GID */
+       snprintf(str, sizeof(str), "%u", (unsigned int)sender_gid);
+       asl_set(m, ASL_KEY_GID, str);
+
+       /* PID */
+       if (from_pid != 0)
+       {
+               snprintf(str, sizeof(str), "%u", (unsigned int)from_pid);
+               asl_set(m, ASL_KEY_PID, str);
+       }
+
+       /* Reference PID */
+       if ((about_pid > 0) && (about_pid != from_pid))
+       {
+               snprintf(str, sizeof(str), "%u", (unsigned int)about_pid);
+               asl_set(m, ASL_KEY_REF_PID, str);
+       }
+
+       /* Sender */
+       if (from_name != NULL)
+       {
+               asl_set(m, ASL_KEY_SENDER, from_name);
+       }
+
+       /* ReadUID */
+       if (sender_uid != 0)
+       {
+               snprintf(str, sizeof(str), "%d", (int)sender_uid);
+               asl_set(m, ASL_KEY_READ_UID, str);
+       }
+
+       /* Reference Process */
+       if (about_name != NULL)
+       {
+               if ((from_name != NULL) && (strcmp(from_name, about_name) != 0))
+               {
+                       asl_set(m, ASL_KEY_REF_PROC, about_name);
+               }
+       }
+
+       /* Session */
+       if (session_name != NULL)
+       {
+               asl_set(m, ASL_KEY_SESSION, session_name);
+       }

 
 

-       s[len - 1] = '\0';
-       return s;
+       /* Message */
+       if (msg != NULL)
+       {
+               asl_set(m, ASL_KEY_MSG, msg);
+       }
+
+       process_message(m, SOURCE_LAUNCHD);

 }
 }

+
+#endif