]> git.saurik.com Git - apple/configd.git/blobdiff - scutil.tproj/tests.c
configd-293.8.tar.gz
[apple/configd.git] / scutil.tproj / tests.c
index e6d9ed06fd835e4221b9e9a9756d5f94f175c676..cc9f95f7f7c0f2b39817c0555dec7853777406ba 100644 (file)
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2001, 2003-2005, 2007-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
  * @APPLE_LICENSE_HEADER_END@
  */
 
  */
 
 #include "scutil.h"
+#include "tests.h"
 
-#include <SystemConfiguration/SCPrivate.h>
+#include <netdb.h>
+#include <netdb_async.h>
 #include <sys/time.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <dnsinfo.h>
 
-void
-do_checkReachability(char *node)
+static SCNetworkReachabilityRef
+_setupReachability(int argc, char **argv, SCNetworkReachabilityContext *context)
 {
-       SCNetworkConnectionFlags        flags   = 0;
-       Boolean                         ok      = FALSE;
-
-       if (isdigit(node[0])) {
-               struct sockaddr_in      sin;
-
-               bzero(&sin, sizeof(sin));
-               sin.sin_len         = sizeof(sin);
-               sin.sin_family      = AF_INET;
-               sin.sin_addr.s_addr = inet_addr(node);
-               if (inet_aton(node, &sin.sin_addr) == 0) {
-                       SCPrint(TRUE, stderr, CFSTR("Could not interpret address \"%s\"\n"), node);
-                       exit(1);
+       struct sockaddr_in              sin;
+       struct sockaddr_in6             sin6;
+       SCNetworkReachabilityRef        target  = NULL;
+
+       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(argv[0], &sin.sin_addr) == 1) {
+               if (argc == 1) {
+                       target = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&sin);
+                       if (context != NULL) {
+                               context->info = "by address";
+                       }
+               } else {
+                       struct sockaddr_in      r_sin;
+
+                       bzero(&r_sin, sizeof(r_sin));
+                       r_sin.sin_len    = sizeof(r_sin);
+                       r_sin.sin_family = AF_INET;
+                       if (inet_aton(argv[1], &r_sin.sin_addr) == 0) {
+                               SCPrint(TRUE, stderr, CFSTR("Could not interpret address \"%s\"\n"), argv[1]);
+                               exit(1);
+                       }
+
+                       target = SCNetworkReachabilityCreateWithAddressPair(NULL,
+                                                                           (struct sockaddr *)&sin,
+                                                                           (struct sockaddr *)&r_sin);
+                       if (context != NULL) {
+                               context->info = "by address pair";
+                       }
+               }
+       } else if (inet_pton(AF_INET6, argv[0], &sin6.sin6_addr) == 1) {
+               char    *p;
+
+               p = strchr(argv[0], '%');
+               if (p != NULL) {
+                       sin6.sin6_scope_id = if_nametoindex(p + 1);
                }
-               ok = SCNetworkCheckReachabilityByAddress((struct sockaddr *)&sin,
-                                                        sizeof(sin),
-                                                        &flags);
 
+               if (argc == 1) {
+                       target = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&sin6);
+                       if (context != NULL) {
+                               context->info = "by (v6) address";
+                       }
+               } else {
+                       struct sockaddr_in6     r_sin6;
+
+                       bzero(&r_sin6, sizeof(r_sin6));
+                       r_sin6.sin6_len         = sizeof(r_sin6);
+                       r_sin6.sin6_family      = AF_INET6;
+                       if (inet_pton(AF_INET6, argv[1], &r_sin6.sin6_addr) == 0) {
+                               SCPrint(TRUE, stderr, CFSTR("Could not interpret address \"%s\"\n"), argv[1]);
+                               exit(1);
+                       }
+
+                       p = strchr(argv[1], '%');
+                       if (p != NULL) {
+                               r_sin6.sin6_scope_id = if_nametoindex(p + 1);
+                       }
+
+                       target = SCNetworkReachabilityCreateWithAddressPair(NULL,
+                                                                           (struct sockaddr *)&sin6,
+                                                                           (struct sockaddr *)&r_sin6);
+                       if (context != NULL) {
+                               context->info = "by (v6) address pair";
+                       }
+               }
        } else {
-               ok = SCNetworkCheckReachabilityByName(node,
-                                                     &flags);
+               if (argc == 1) {
+                       target = SCNetworkReachabilityCreateWithName(NULL, argv[0]);
+                       if (context != NULL) {
+                               context->info = "by name";
+                       }
+               } else {
+                       CFStringRef             str;
+                       CFMutableDictionaryRef  options;
+
+                       options = CFDictionaryCreateMutable(NULL,
+                                                           0,
+                                                           &kCFTypeDictionaryKeyCallBacks,
+                                                           &kCFTypeDictionaryValueCallBacks);
+                       if (strlen(argv[0]) > 0) {
+                               str  = CFStringCreateWithCString(NULL, argv[0], kCFStringEncodingUTF8);
+                               CFDictionarySetValue(options, kSCNetworkReachabilityOptionNodeName, str);
+                               CFRelease(str);
+                       }
+                       if (strlen(argv[1]) > 0) {
+                               str  = CFStringCreateWithCString(NULL, argv[1], kCFStringEncodingUTF8);
+                               CFDictionarySetValue(options, kSCNetworkReachabilityOptionServName, str);
+                               CFRelease(str);
+                       }
+                       if (argc > 2) {
+                               CFDataRef               data;
+                               struct addrinfo         hints   = { 0 };
+                               int                     i;
+
+                               for (i = 2; i < argc; i++) {
+                                       if (strcasecmp(argv[i], "AI_ADDRCONFIG") == 0) {
+                                               hints.ai_flags |= AI_ADDRCONFIG;
+                                       } else if (strcasecmp(argv[i], "AI_ALL") == 0) {
+                                               hints.ai_flags |= AI_ALL;
+                                       } else if (strcasecmp(argv[i], "AI_V4MAPPED") == 0) {
+                                               hints.ai_flags |= AI_V4MAPPED;
+                                       } else if (strcasecmp(argv[i], "AI_V4MAPPED_CFG") == 0) {
+                                               hints.ai_flags |= AI_V4MAPPED_CFG;
+                                       } else if (strcasecmp(argv[i], "AI_ADDRCONFIG") == 0) {
+                                               hints.ai_flags |= AI_ADDRCONFIG;
+                                       } else if (strcasecmp(argv[i], "AI_V4MAPPED") == 0) {
+                                               hints.ai_flags |= AI_V4MAPPED;
+                                       } else if (strcasecmp(argv[i], "AI_DEFAULT") == 0) {
+                                               hints.ai_flags |= AI_DEFAULT;
+#ifdef AI_PARALLEL
+                                       } else if (strcasecmp(argv[i], "AI_PARALLEL") == 0) {
+                                               hints.ai_flags |= AI_PARALLEL;
+#endif // AI_PARALLEL
+                                       } else if (strcasecmp(argv[i], "PF_INET") == 0) {
+                                               hints.ai_family = PF_INET;
+                                       } else if (strcasecmp(argv[i], "PF_INET6") == 0) {
+                                               hints.ai_family = PF_INET6;
+                                       } else if (strcasecmp(argv[i], "SOCK_STREAM") == 0) {
+                                               hints.ai_socktype = SOCK_STREAM;
+                                       } else if (strcasecmp(argv[i], "SOCK_DGRAM") == 0) {
+                                               hints.ai_socktype = SOCK_DGRAM;
+                                       } else if (strcasecmp(argv[i], "SOCK_RAW") == 0) {
+                                               hints.ai_socktype = SOCK_RAW;
+                                       } else if (strcasecmp(argv[i], "IPPROTO_TCP") == 0) {
+                                               hints.ai_protocol = IPPROTO_TCP;
+                                       } else if (strcasecmp(argv[i], "IPPROTO_UDP") == 0) {
+                                               hints.ai_protocol = IPPROTO_UDP;
+                                       } else {
+                                               SCPrint(TRUE, stderr, CFSTR("Unrecognized hint: %s\n"), argv[i]);
+                                               exit(1);
+                                       }
+                               }
+
+                               data = CFDataCreate(NULL, (const UInt8 *)&hints, sizeof(hints));
+                               CFDictionarySetValue(options, kSCNetworkReachabilityOptionHints, data);
+                               CFRelease(data);
+                       }
+                       if (CFDictionaryGetCount(options) > 0) {
+                               target = SCNetworkReachabilityCreateWithOptions(NULL, options);
+                               if (context != NULL) {
+                                       context->info = "by (node and/or serv) name";
+                               }
+                       } else {
+                               SCPrint(TRUE, stderr, CFSTR("Must specify nodename or servname\n"));
+                               exit(1);
+                       }
+                       CFRelease(options);
+               }
        }
 
+       return target;
+}
+
+static void
+_printReachability(SCNetworkReachabilityRef target)
+{
+       SCNetworkReachabilityFlags      flags;
+       Boolean                         ok;
+
+       ok = SCNetworkReachabilityGetFlags(target, &flags);
        if (!ok) {
-               SCPrint(TRUE, stderr, CFSTR("  Could not determine status: %s\n"), SCErrorString(SCError()));
-               exit(1);
+               printf("    could not determine reachability, %s\n", SCErrorString(SCError()));
+               return;
        }
 
-       SCPrint(_sc_debug, stdout, CFSTR("flags = 0x%x"), flags);
+       SCPrint(_sc_debug, stdout, CFSTR("flags = 0x%08x"), flags);
        if (flags != 0) {
                SCPrint(_sc_debug, stdout, CFSTR(" ("));
-               if (flags & kSCNetworkFlagsReachable) {
+               if (flags & kSCNetworkReachabilityFlagsReachable) {
                        SCPrint(TRUE, stdout, CFSTR("Reachable"));
-                       flags &= ~kSCNetworkFlagsReachable;
+                       flags &= ~kSCNetworkReachabilityFlagsReachable;
                        SCPrint(flags != 0, stdout, CFSTR(","));
                }
-               if (flags & kSCNetworkFlagsTransientConnection) {
+               if (flags & kSCNetworkReachabilityFlagsTransientConnection) {
                        SCPrint(TRUE, stdout, CFSTR("Transient Connection"));
-                       flags &= ~kSCNetworkFlagsTransientConnection;
+                       flags &= ~kSCNetworkReachabilityFlagsTransientConnection;
                        SCPrint(flags != 0, stdout, CFSTR(","));
                }
-               if (flags & kSCNetworkFlagsConnectionRequired) {
+               if (flags & kSCNetworkReachabilityFlagsConnectionRequired) {
                        SCPrint(TRUE, stdout, CFSTR("Connection Required"));
-                       flags &= ~kSCNetworkFlagsConnectionRequired;
+                       flags &= ~kSCNetworkReachabilityFlagsConnectionRequired;
+                       SCPrint(flags != 0, stdout, CFSTR(","));
+               }
+               if (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) {
+                       SCPrint(TRUE, stdout, CFSTR("Automatic Connection On Traffic"));
+                       flags &= ~kSCNetworkReachabilityFlagsConnectionOnTraffic;
                        SCPrint(flags != 0, stdout, CFSTR(","));
                }
-               if (flags & kSCNetworkFlagsConnectionAutomatic) {
-                       SCPrint(TRUE, stdout, CFSTR("Connection Automatic"));
-                       flags &= ~kSCNetworkFlagsConnectionAutomatic;
+               if (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) {
+                       SCPrint(TRUE, stdout, CFSTR("Automatic Connection On Demand"));
+                       flags &= ~kSCNetworkReachabilityFlagsConnectionOnDemand;
                        SCPrint(flags != 0, stdout, CFSTR(","));
                }
-               if (flags & kSCNetworkFlagsInterventionRequired) {
+               if (flags & kSCNetworkReachabilityFlagsInterventionRequired) {
                        SCPrint(TRUE, stdout, CFSTR("Intervention Required"));
-                       flags &= ~kSCNetworkFlagsInterventionRequired;
+                       flags &= ~kSCNetworkReachabilityFlagsInterventionRequired;
+                       SCPrint(flags != 0, stdout, CFSTR(","));
+               }
+               if (flags & kSCNetworkReachabilityFlagsIsLocalAddress) {
+                       SCPrint(TRUE, stdout, CFSTR("Local Address"));
+                       flags &= ~kSCNetworkReachabilityFlagsIsLocalAddress;
+                       SCPrint(flags != 0, stdout, CFSTR(","));
+               }
+               if (flags & kSCNetworkReachabilityFlagsIsDirect) {
+                       SCPrint(TRUE, stdout, CFSTR("Directly Reachable Address"));
+                       flags &= ~kSCNetworkReachabilityFlagsIsDirect;
+                       SCPrint(flags != 0, stdout, CFSTR(","));
+               }
+#if    TARGET_OS_IPHONE
+               if (flags & kSCNetworkReachabilityFlagsIsWWAN) {
+                       SCPrint(TRUE, stdout, CFSTR("WWAN"));
+                       flags &= ~kSCNetworkReachabilityFlagsIsWWAN;
                        SCPrint(flags != 0, stdout, CFSTR(","));
                }
+#endif // TARGET_OS_IPHONE
+               if (flags != 0) {
+                       SCPrint(TRUE, stdout, CFSTR("0x%08x"), flags);
+               }
                SCPrint(_sc_debug, stdout, CFSTR(")"));
        } else {
                SCPrint(_sc_debug, stdout, CFSTR(" ("));
@@ -109,10 +283,215 @@ do_checkReachability(char *node)
                SCPrint(_sc_debug, stdout, CFSTR(")"));
        }
        SCPrint(TRUE, stdout, CFSTR("\n"));
+
+       return;
+}
+
+
+__private_extern__
+void
+do_checkReachability(int argc, char **argv)
+{
+       SCNetworkReachabilityRef        target;
+
+       target = _setupReachability(argc, argv, NULL);
+       if (target == NULL) {
+               SCPrint(TRUE, stderr, CFSTR("  Could not determine status: %s\n"), SCErrorString(SCError()));
+               exit(1);
+       }
+
+       _printReachability(target);
+       CFRelease(target);
        exit(0);
 }
 
 
+static void
+callout(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
+{
+       static int      n = 3;
+       struct tm       tm_now;
+       struct timeval  tv_now;
+
+       (void)gettimeofday(&tv_now, NULL);
+       (void)localtime_r(&tv_now.tv_sec, &tm_now);
+
+       SCPrint(TRUE, stdout, CFSTR("\n*** %2d:%02d:%02d.%03d\n\n"),
+               tm_now.tm_hour,
+               tm_now.tm_min,
+               tm_now.tm_sec,
+               tv_now.tv_usec / 1000);
+       SCPrint(TRUE, stdout, CFSTR("%2d: callback w/flags=0x%08x (info=\"%s\")\n"), n++, flags, (char *)info);
+       SCPrint(TRUE, stdout, CFSTR("    %@\n"), target);
+       _printReachability(target);
+       SCPrint(TRUE, stdout, CFSTR("\n"));
+       return;
+}
+
+
+__private_extern__
+void
+do_watchReachability(int argc, char **argv)
+{
+       SCNetworkReachabilityContext    context = { 0, NULL, NULL, NULL, NULL };
+       SCNetworkReachabilityRef        target;
+       SCNetworkReachabilityRef        target_async;
+
+       target = _setupReachability(argc, argv, NULL);
+       if (target == NULL) {
+               SCPrint(TRUE, stderr, CFSTR("  Could not determine status: %s\n"), SCErrorString(SCError()));
+               exit(1);
+       }
+
+       target_async = _setupReachability(argc, argv, &context);
+       if (target_async == NULL) {
+               SCPrint(TRUE, stderr, CFSTR("  Could not determine status: %s\n"), SCErrorString(SCError()));
+               exit(1);
+       }
+
+       // Normally, we don't want to make any calls to SCNetworkReachabilityGetFlags()
+       // until after the "target" has been scheduled on a run loop.  Otherwise, we'll
+       // end up making a synchronous DNS request and that's not what we want.
+       //
+       // But, to test the case were an application call SCNetworkReachabilityGetFlags()
+       // we provide the "CHECK_REACHABILITY_BEFORE_SCHEDULING" environment variable.
+       if (getenv("CHECK_REACHABILITY_BEFORE_SCHEDULING") != NULL) {
+               CFRelease(target_async);
+               target_async = CFRetain(target);
+       }
+
+       // Direct check of reachability
+       SCPrint(TRUE, stdout, CFSTR(" 0: direct\n"));
+       SCPrint(TRUE, stdout, CFSTR("   %@\n"), target);
+       _printReachability(target);
+       CFRelease(target);
+       SCPrint(TRUE, stdout, CFSTR("\n"));
+
+       // schedule the target
+       SCPrint(TRUE, stdout, CFSTR(" 1: start\n"));
+       SCPrint(TRUE, stdout, CFSTR("   %@\n"), target_async);
+       //_printReachability(target_async);
+       SCPrint(TRUE, stdout, CFSTR("\n"));
+
+       if (!SCNetworkReachabilitySetCallback(target_async, callout, &context)) {
+               printf("SCNetworkReachabilitySetCallback() failed: %s\n", SCErrorString(SCError()));
+               exit(1);
+       }
+
+#if    !TARGET_OS_IPHONE
+       if (doDispatch) {
+               if (!SCNetworkReachabilitySetDispatchQueue(target_async, dispatch_get_current_queue())) {
+                       printf("SCNetworkReachabilitySetDispatchQueue() failed: %s\n", SCErrorString(SCError()));
+                       exit(1);
+               }
+       } else
+#endif // !TARGET_OS_IPHONE
+       {
+               if (!SCNetworkReachabilityScheduleWithRunLoop(target_async, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode)) {
+                       printf("SCNetworkReachabilityScheduleWithRunLoop() failed: %s\n", SCErrorString(SCError()));
+                       exit(1);
+               }
+       }
+
+       // Note: now that we are scheduled on a run loop we can call SCNetworkReachabilityGetFlags()
+       //       to get the current status.  For "names", a DNS lookup has already been initiated.
+       SCPrint(TRUE, stdout, CFSTR(" 2: on %s\n"), doDispatch ? "dispatch queue" : "runloop");
+       SCPrint(TRUE, stdout, CFSTR("   %@\n"), target_async);
+       _printReachability(target_async);
+       SCPrint(TRUE, stdout, CFSTR("\n"));
+
+       CFRunLoopRun();
+       exit(0);
+}
+
+
+__private_extern__
+void
+do_showDNSConfiguration(int argc, char **argv)
+{
+       dns_config_t    *dns_config;
+
+       dns_config = dns_configuration_copy();
+       if (dns_config) {
+               int     n;
+
+               SCPrint(TRUE, stdout, CFSTR("DNS configuration\n"));
+
+               for (n = 0; n < dns_config->n_resolver; n++) {
+                       int             i;
+                       dns_resolver_t  *resolver       = dns_config->resolver[n];
+
+                       SCPrint(TRUE, stdout, CFSTR("\nresolver #%d\n"), n + 1);
+
+                       if (resolver->domain != NULL) {
+                               SCPrint(TRUE, stdout, CFSTR("  domain : %s\n"), resolver->domain);
+                       }
+
+                       for (i = 0; i < resolver->n_search; i++) {
+                               SCPrint(TRUE, stdout, CFSTR("  search domain[%d] : %s\n"), i, resolver->search[i]);
+                       }
+
+                       for (i = 0; i < resolver->n_nameserver; i++) {
+                               char    buf[128];
+
+                               _SC_sockaddr_to_string(resolver->nameserver[i], buf, sizeof(buf));
+                               SCPrint(TRUE, stdout, CFSTR("  nameserver[%d] : %s\n"), i, buf);
+                       }
+
+                       for (i = 0; i < resolver->n_sortaddr; i++) {
+                               char    abuf[32];
+                               char    mbuf[32];
+
+                               (void)inet_ntop(AF_INET, &resolver->sortaddr[i]->address, abuf, sizeof(abuf));
+                               (void)inet_ntop(AF_INET, &resolver->sortaddr[i]->mask,    mbuf, sizeof(mbuf));
+                               SCPrint(TRUE, stdout, CFSTR("  sortaddr[%d] : %s/%s\n"), i, abuf, mbuf);
+                       }
+
+                       if (resolver->options != NULL) {
+                               SCPrint(TRUE, stdout, CFSTR("  options : %s\n"), resolver->options);
+                       }
+
+                       if (resolver->port != 0) {
+                               SCPrint(TRUE, stdout, CFSTR("  port    : %hd\n"), resolver->port);
+                       }
+
+                       if (resolver->timeout != 0) {
+                               SCPrint(TRUE, stdout, CFSTR("  timeout : %d\n"), resolver->timeout);
+                       }
+
+                       if (resolver->search_order != 0) {
+                               SCPrint(TRUE, stdout, CFSTR("  order   : %d\n"), resolver->search_order);
+                       }
+               }
+
+               dns_configuration_free(dns_config);
+       } else {
+               SCPrint(TRUE, stdout, CFSTR("No DNS configuration available\n"));
+       }
+
+       exit(0);
+}
+
+
+__private_extern__
+void
+do_showProxyConfiguration(int argc, char **argv)
+{
+       CFDictionaryRef proxies;
+
+       proxies = SCDynamicStoreCopyProxies(NULL);
+       if (proxies != NULL) {
+               SCPrint(TRUE, stdout, CFSTR("%@\n"), proxies);
+               CFRelease(proxies);
+       } else {
+               SCPrint(TRUE, stdout, CFSTR("No proxy configuration available\n"));
+       }
+
+       exit(0);
+}
+
+
+__private_extern__
 void
 do_snapshot(int argc, char **argv)
 {
@@ -137,25 +516,29 @@ waitTimeout(int sigraised)
 }
 
 
+__private_extern__
 void
 do_wait(char *waitKey, int timeout)
 {
        struct itimerval        itv;
        CFStringRef             key;
        CFMutableArrayRef       keys;
+       Boolean                 ok;
 
        store = SCDynamicStoreCreate(NULL, CFSTR("scutil (wait)"), waitKeyFound, NULL);
-       if (!store) {
+       if (store == NULL) {
                SCPrint(TRUE, stderr,
                        CFSTR("SCDynamicStoreCreate() failed: %s\n"), SCErrorString(SCError()));
                exit(1);
        }
 
+       key  = CFStringCreateWithCString(NULL, waitKey, kCFStringEncodingUTF8);
+
        keys = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
-       key  = CFStringCreateWithCString(NULL, waitKey, kCFStringEncodingMacRoman);
        CFArrayAppendValue(keys, key);
-
-       if (!SCDynamicStoreSetNotificationKeys(store, keys, NULL)) {
+       ok = SCDynamicStoreSetNotificationKeys(store, keys, NULL);
+       CFRelease(keys);
+       if (!ok) {
                SCPrint(TRUE, stderr,
                        CFSTR("SCDynamicStoreSetNotificationKeys() failed: %s\n"), SCErrorString(SCError()));
                exit(1);
@@ -177,11 +560,11 @@ do_wait(char *waitKey, int timeout)
        }
        CFRelease(key);
 
-       if (waitTimeout > 0) {
+       if (timeout > 0) {
                signal(SIGALRM, waitTimeout);
                bzero(&itv, sizeof(itv));
                itv.it_value.tv_sec = timeout;
-               if (setitimer(ITIMER_REAL, &itv, NULL) < 0) {
+               if (setitimer(ITIMER_REAL, &itv, NULL) == -1) {
                        SCPrint(TRUE, stderr,
                                CFSTR("setitimer() failed: %s\n"), strerror(errno));
                        exit(1);
@@ -190,3 +573,18 @@ do_wait(char *waitKey, int timeout)
 
        CFRunLoopRun();
 }
+
+#ifdef TEST_DNS_CONFIGURATION_COPY
+
+CFRunLoopSourceRef     notifyRls       = NULL;
+SCDynamicStoreRef      store           = NULL;
+CFPropertyListRef      value           = NULL;
+
+int
+main(int argc, char **argv)
+{
+       do_showDNSConfiguration(argc, argv);
+       exit(0);
+}
+
+#endif // TEST_DNS_CONFIGURATION_COPY