[launchd-changes] [23559] trunk/launchd/src/launchproxy.c
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 19 13:36:52 PDT 2008
Revision: 23559
http://trac.macosforge.org/projects/launchd/changeset/23559
Author: zarzycki at apple.com
Date: 2008-03-19 13:36:52 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
getnameinfo() only supports IPv4 and IPv6 right now.
Modified Paths:
--------------
trunk/launchd/src/launchproxy.c
Modified: trunk/launchd/src/launchproxy.c
===================================================================
--- trunk/launchd/src/launchproxy.c 2008-03-18 21:32:54 UTC (rev 23558)
+++ trunk/launchd/src/launchproxy.c 2008-03-19 20:36:52 UTC (rev 23559)
@@ -159,19 +159,23 @@
syslog(LOG_DEBUG, "accept(): %m");
goto out;
} else {
- char fromhost[NI_MAXHOST];
- char fromport[NI_MAXSERV];
- int gni_r;
+ if (ss.ss_family == AF_INET || ss.ss_family == AF_INET6) {
+ char fromhost[NI_MAXHOST];
+ char fromport[NI_MAXSERV];
+ int gni_r;
- gni_r = getnameinfo((struct sockaddr *)&ss, slen,
- fromhost, sizeof(fromhost),
- fromport, sizeof(fromport),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ gni_r = getnameinfo((struct sockaddr *)&ss, slen,
+ fromhost, sizeof(fromhost),
+ fromport, sizeof(fromport),
+ NI_NUMERICHOST | NI_NUMERICSERV);
- if (gni_r) {
- syslog(LOG_WARNING, "%s: getnameinfo(): %s", prog, gai_strerror(gni_r));
+ if (gni_r) {
+ syslog(LOG_WARNING, "%s: getnameinfo(): %s", prog, gai_strerror(gni_r));
+ } else {
+ syslog(LOG_INFO, "%s: Connection from: %s on port: %s", prog, fromhost, fromport);
+ }
} else {
- syslog(LOG_INFO, "%s: Connection from: %s on port: %s", prog, fromhost, fromport);
+ syslog(LOG_WARNING, "%s: getnameinfo() only supports IPv4/IPv6. Connection from address family: %u", prog, ss.ss_family);
}
switch (fork()) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080319/651fc675/attachment-0001.html
More information about the launchd-changes
mailing list