configd-453.16.tar.gz

[apple/configd.git] / Plugins / IPMonitor / smb-configuration.c

diff --git a/Plugins/IPMonitor/smb-configuration.c b/Plugins/IPMonitor/smb-configuration.c
index 3325efcd2888cbb86a3c40955b58048286566381..8c06cd69d528668989842983319dc047350155f8 100644 (file)
--- a/Plugins/IPMonitor/smb-configuration.c
+++ b/Plugins/IPMonitor/smb-configuration.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2011 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -645,49 +645,28 @@ getnameinfo_async_handleCFReply(CFMachPortRef port, void *msg, CFIndex size, voi
 static Boolean
 start_dns_query(SCDynamicStoreRef store, CFStringRef address)
 {
-       char                            addr[64];
+       union {
+               struct sockaddr         sa;
+               struct sockaddr_in      sin;
+               struct sockaddr_in6     sin6;
+       } addr;
+       char                            buf[64];
        SCNetworkReachabilityFlags      flags;
        Boolean                         haveDNS;
        Boolean                         ok      = FALSE;
-       struct sockaddr                 *sa;
-       struct sockaddr_in              sin;
-       struct sockaddr_in6             sin6;
 
-       if (_SC_cfstring_to_cstring(address, addr, sizeof(addr), kCFStringEncodingASCII) == NULL) {
+       if (_SC_cfstring_to_cstring(address, buf, sizeof(buf), kCFStringEncodingASCII) == NULL) {
                SCLog(TRUE, LOG_ERR, CFSTR("could not convert [primary] address"));
                return FALSE;
        }
 
-       bzero(&sin, sizeof(sin));
-       sin.sin_len    = sizeof(sin);
-       sin.sin_family = AF_INET;
-
-       bzero(&sin6, sizeof(sin6));
-       sin6.sin6_len    = sizeof(sin6);
-       sin6.sin6_family = AF_INET6;
-
-       if (inet_aton(addr, &sin.sin_addr) == 1) {
-               /*
-                * if IPv4 address
-                */
-               sa = (struct sockaddr *)&sin;
-       } else if (inet_pton(AF_INET6, addr, &sin6.sin6_addr) == 1) {
-               /*
-                * if IPv6 address
-                */
-               char    *p;
-
-               p = strchr(addr, '%');
-               if (p != NULL) {
-                       sin6.sin6_scope_id = if_nametoindex(p + 1);
-               }
-
-               sa = (struct sockaddr *)&sin6;
-       } else {
-               goto done;
+       if (_SC_string_to_sockaddr(buf, AF_UNSPEC, (void *)&addr, sizeof(addr)) == NULL) {
+               /* if not an IP[v6] address */
+               SCLog(TRUE, LOG_ERR, CFSTR("could not parse [primary] address"));
+               return FALSE;
        }
 
-       ok = _SC_checkResolverReachabilityByAddress(&store, &flags, &haveDNS, sa);
+       ok = _SC_checkResolverReachabilityByAddress(&store, &flags, &haveDNS, &addr.sa);
        if (ok) {
                if (!(flags & kSCNetworkReachabilityFlagsReachable) ||
                    (flags & kSCNetworkReachabilityFlagsConnectionRequired)) {
@@ -710,8 +689,8 @@ start_dns_query(SCDynamicStoreRef store, CFStringRef address)
                (void) gettimeofday(&dnsQueryStart, NULL);
 
                error = getnameinfo_async_start(&mp,
-                                               sa,
-                                               sa->sa_len,
+                                               &addr.sa,
+                                               addr.sa.sa_len,
                                                NI_NAMEREQD,    // flags
                                                reverseDNSComplete,
                                                (void *)store);