syslog-322.tar.gz

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

diff --git a/syslogd.tproj/udp_in.c b/syslogd.tproj/udp_in.c
index dba721fce0f6feb61cfd6706585ae77398e54edb..75557880d5491ef98f786abe5c51568c01731d2d 100644 (file)
--- a/syslogd.tproj/udp_in.c
+++ b/syslogd.tproj/udp_in.c
@@ -21,6 +21,12 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <TargetConditionals.h>
+
+#if TARGET_IPHONE_SIMULATOR
+struct _not_empty;
+#else
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -65,7 +71,7 @@ udp_in_acceptmsg(int fd)
        char fromstr[64], *r, *p;
        struct sockaddr_in *s4;
        struct sockaddr_in6 *s6;
-       aslmsg m;
+       asl_msg_t *m;
 
        fromlen = sizeof(struct sockaddr_storage);
        memset(&from, 0, fromlen);
@@ -97,7 +103,7 @@ udp_in_acceptmsg(int fd)
        if (p != NULL) *p = '\0';
 
        m = asl_input_parse(uline, len, r, SOURCE_UDP_SOCKET);
-       dispatch_async(global.work_queue, ^{ process_message(m, SOURCE_UDP_SOCKET); });
+       process_message(m, SOURCE_UDP_SOCKET);
 }
 
 int
@@ -178,7 +184,6 @@ udp_in_init()
        return 0;
 }
 
-/* N.B. Does NOT close fds.  They "belong" to launchd. */
 int
 udp_in_close(void)
 {
@@ -197,6 +202,7 @@ udp_in_close(void)
 
                if (ufd[i] != -1)
                {
+                       close(ufd[i]);
                        ufd[i] = -1;
                }
        }
@@ -212,3 +218,5 @@ udp_in_reset(void)
        if (udp_in_close() != 0) return -1;
        return udp_in_init();
 }
+
+#endif /* TARGET_IPHONE_SIMULATOR */