Changeset 23559

Timestamp:

2008-03-19 13:36:52 (5 months ago)

Author:

zarzycki@…

Message:

getnameinfo() only supports IPv4 and IPv6 right now.

Files:

• trunk/launchd/src/launchproxy.c (modified) (1 diff)

trunk/launchd/src/launchproxy.c

@@ -160 +160 @@
                         goto out;
                 } else {
-                        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);
-
-                        if (gni_r) {
-                                syslog(LOG_WARNING, "%s: getnameinfo(): %s", prog, gai_strerror(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);
+
+                                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);
                         }