/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2011 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
* @APPLE_LICENSE_HEADER_END@
*/
+#include <TargetConditionals.h>
+
+#if TARGET_OS_SIMULATOR
+struct _not_empty;
+#else
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
#define MAXSOCK 16
static int nsock = 0;
static int ufd[MAXSOCK];
+static dispatch_source_t ufd_src[MAXSOCK];
static char uline[MAXLINE + 1];
+static dispatch_source_t in_src[MAXSOCK];
+static dispatch_queue_t in_queue;
+
#define FMT_LEGACY 0
#define FMT_ASL 1
-asl_msg_t *
+void
udp_in_acceptmsg(int fd)
{
socklen_t fromlen;
char fromstr[64], *r, *p;
struct sockaddr_in *s4;
struct sockaddr_in6 *s6;
+ asl_msg_t *m;
fromlen = sizeof(struct sockaddr_storage);
memset(&from, 0, fromlen);
len = recvfrom(fd, uline, MAXLINE, 0, (struct sockaddr *)&from, &fromlen);
- if (len <= 0) return NULL;
+ if (len <= 0) return;
fromstr[0] = '\0';
r = NULL;
s4 = (struct sockaddr_in *)&from;
inet_ntop(from.ss_family, &(s4->sin_addr), fromstr, 64);
r = fromstr;
- asldebug("%s: recvfrom %s len %d\n", MY_ID, fromstr, len);
+ asldebug("%s: fd %d recvfrom %s len %d\n", MY_ID, fd, fromstr, len);
}
else if (from.ss_family == AF_INET6)
{
s6 = (struct sockaddr_in6 *)&from;
inet_ntop(from.ss_family, &(s6->sin6_addr), fromstr, 64);
r = fromstr;
- asldebug("%s: recvfrom %s len %d\n", MY_ID, fromstr, len);
+ asldebug("%s: fd %d recvfrom %s len %d\n", MY_ID, fd, fromstr, len);
}
uline[len] = '\0';
p = strrchr(uline, '\n');
if (p != NULL) *p = '\0';
- return asl_input_parse(uline, len, r, 0);
+ m = asl_input_parse(uline, len, r, SOURCE_UDP_SOCKET);
+ process_message(m, SOURCE_UDP_SOCKET);
}
int
-udp_in_init(void)
+udp_in_init()
{
- int i, rbufsize, len;
+ int i, rbufsize, len, fd;
launch_data_t sockets_dict, fd_array, fd_dict;
+ static dispatch_once_t once;
+
+ dispatch_once(&once, ^{
+ in_queue = dispatch_queue_create(MY_ID, NULL);
+ });
asldebug("%s: init\n", MY_ID);
if (nsock > 0) return 0;
- if (launch_dict == NULL)
+
+ if (global.launch_dict == NULL)
{
- asldebug("%s: laucnchd dict is NULL\n", MY_ID);
+ asldebug("%s: launchd dict is NULL\n", MY_ID);
return -1;
}
- sockets_dict = launch_data_dict_lookup(launch_dict, LAUNCH_JOBKEY_SOCKETS);
+ sockets_dict = launch_data_dict_lookup(global.launch_dict, LAUNCH_JOBKEY_SOCKETS);
if (sockets_dict == NULL)
{
- asldebug("%s: laucnchd lookup of LAUNCH_JOBKEY_SOCKETS failed\n", MY_ID);
+ asldebug("%s: launchd lookup of LAUNCH_JOBKEY_SOCKETS failed\n", MY_ID);
return -1;
}
-
+
fd_array = launch_data_dict_lookup(sockets_dict, UDP_SOCKET_NAME);
if (fd_array == NULL)
{
- asldebug("%s: laucnchd lookup of UDP_SOCKET_NAME failed\n", MY_ID);
+ asldebug("%s: launchd lookup of UDP_SOCKET_NAME failed\n", MY_ID);
return -1;
}
-
+
nsock = launch_data_array_get_count(fd_array);
if (nsock <= 0)
{
- asldebug("%s: laucnchd fd array is empty\n", MY_ID);
+ asldebug("%s: launchd fd array is empty\n", MY_ID);
return -1;
}
-
+
for (i = 0; i < nsock; i++)
{
+ ufd[i] = -1;
+
fd_dict = launch_data_array_get_index(fd_array, i);
if (fd_dict == NULL)
{
- asldebug("%s: laucnchd file discriptor array element 0 is NULL\n", MY_ID);
+ asldebug("%s: launchd file discriptor array element 0 is NULL\n", MY_ID);
return -1;
}
-
- ufd[i] = launch_data_get_fd(fd_dict);
+
+ fd = launch_data_get_fd(fd_dict);
rbufsize = 128 * 1024;
len = sizeof(rbufsize);
- if (setsockopt(ufd[i], SOL_SOCKET, SO_RCVBUF, &rbufsize, len) < 0)
+ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rbufsize, len) < 0)
{
- asldebug("%s: couldn't set receive buffer size for socket %d: %s\n", MY_ID, ufd[i], strerror(errno));
- close(ufd[i]);
- ufd[i] = -1;
- continue;
+ asldebug("%s: couldn't set receive buffer size for file descriptor %d: %s\n", MY_ID, fd, strerror(errno));
}
- if (fcntl(ufd[i], F_SETFL, O_NONBLOCK) < 0)
+ if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
{
- asldebug("%s: couldn't set O_NONBLOCK for socket %d: %s\n", MY_ID, ufd[i], strerror(errno));
- close(ufd[i]);
- ufd[i] = -1;
- continue;
+ asldebug("%s: couldn't set O_NONBLOCK for file descriptor %d: %s\n", MY_ID, fd, strerror(errno));
}
- }
- for (i = 0; i < nsock; i++) if (ufd[i] != -1) aslevent_addfd(ufd[i], 0, udp_in_acceptmsg, NULL, NULL);
- return 0;
-}
+ ufd[i] = fd;
+
+ in_src[i] = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, (uintptr_t)fd, 0, in_queue);
+ dispatch_source_set_event_handler(in_src[i], ^{ udp_in_acceptmsg(fd); });
+
+ dispatch_resume(in_src[i]);
+ }
-int
-udp_in_reset(void)
-{
return 0;
}
{
int i;
- if (nsock == 0) return 1;
+ if (nsock == 0) return -1;
for (i = 0; i < nsock; i++)
{
- if (ufd[i] != -1) close(ufd[i]);
- ufd[i] = -1;
+ if (ufd_src[i] != NULL)
+ {
+ dispatch_source_cancel(in_src[i]);
+ dispatch_release(in_src[i]);
+ in_src[i] = NULL;
+ }
+
+ if (ufd[i] != -1)
+ {
+ close(ufd[i]);
+ ufd[i] = -1;
+ }
}
nsock = 0;
return 0;
}
+
+int
+udp_in_reset(void)
+{
+ if (udp_in_close() != 0) return -1;
+ return udp_in_init();
+}
+
+#endif /* !TARGET_OS_SIMULATOR */
projects / apple / syslog.git / blobdiff