configd-699.30.1.tar.gz

diff --git a/Plugins/IPMonitor/Info-EmbeddedSimulator.plist b/Plugins/IPMonitor/Info-EmbeddedSimulator.plist
index ca9a22baa4d052c641e2c4745a9d0e17a217a474..9cf9740deadfbc4ac3ebac66e09ae132b8992a0c 100644 (file)
--- a/Plugins/IPMonitor/Info-EmbeddedSimulator.plist
+++ b/Plugins/IPMonitor/Info-EmbeddedSimulator.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.13</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/IPMonitor/Info.plist b/Plugins/IPMonitor/Info.plist
index adb5cbd08821050c6644216d9f08c8999d23afa9..12cdb636ce2f96ad25271032859b29a79a29a973 100644 (file)
--- a/Plugins/IPMonitor/Info.plist
+++ b/Plugins/IPMonitor/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/InterfaceNamer/Info.plist b/Plugins/InterfaceNamer/Info.plist
index dfaf2706ee10cc93f371e0a559bdca97a725b32c..69e28dbedc8e10fcd43617b935816f3578a3eb80 100644 (file)
--- a/Plugins/InterfaceNamer/Info.plist
+++ b/Plugins/InterfaceNamer/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/KernelEventMonitor/Info.plist b/Plugins/KernelEventMonitor/Info.plist
index 327a47ab084505a1aff6b56393dbaeb0c261c0e4..a56faba2c08d028aa023c92743c195a4267a68a0 100644 (file)
--- a/Plugins/KernelEventMonitor/Info.plist
+++ b/Plugins/KernelEventMonitor/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/LinkConfiguration/Info.plist b/Plugins/LinkConfiguration/Info.plist
index 63de67e7e950aa5931f5e4b9bccea73b5428f8a3..d7742b0772ffce355a86af3409e559b6d6339465 100644 (file)
--- a/Plugins/LinkConfiguration/Info.plist
+++ b/Plugins/LinkConfiguration/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/Logger/Info-Embedded.plist b/Plugins/Logger/Info-Embedded.plist
index 82171ed0d59e48fb64031f966167cba7fc3b1dcb..19134ec9410cfc496c6c8c84684dce042fecc0db 100644 (file)
--- a/Plugins/Logger/Info-Embedded.plist
+++ b/Plugins/Logger/Info-Embedded.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/Logger/Info.plist b/Plugins/Logger/Info.plist
index 7393541dbdc9a67e657e0acbbc4fb7af720d0ec5..f8ba81749973175af7ddd7e33f246d607baa0238 100644 (file)
--- a/Plugins/Logger/Info.plist
+++ b/Plugins/Logger/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/PreferencesMonitor/Info.plist b/Plugins/PreferencesMonitor/Info.plist
index 04bfd350a73886dd72e9b34a769ef6314245965c..bb78029e15a64dd7eb340d50c0197008d6030d0a 100644 (file)
--- a/Plugins/PreferencesMonitor/Info.plist
+++ b/Plugins/PreferencesMonitor/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist b/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist
index e9cc0aa626abfd6946e80f58c1a1eefdba88ef30..854a3972a17e4c6372ed61d47eeab6430b00b58d 100644 (file)
--- a/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist
+++ b/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.13</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/SCNetworkReachability/Info.plist b/Plugins/SCNetworkReachability/Info.plist
index d42e66af6969b1801f7954289f29d1892c16fcc2..55ce144b61139ad49fcc46f461832056913255bb 100644 (file)
--- a/Plugins/SCNetworkReachability/Info.plist
+++ b/Plugins/SCNetworkReachability/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Plugins/SimulatorSupport/Info.plist b/Plugins/SimulatorSupport/Info.plist
index 4ae6f2724918c30c055dd48191b20d55648434e1..e6d9132b3c68c097e65a8961a59c15482513b377 100644 (file)
--- a/Plugins/SimulatorSupport/Info.plist
+++ b/Plugins/SimulatorSupport/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/SCMonitor/Info.plist b/SCMonitor/Info.plist
index 4496add8bcaaad017f6c7e8fc1213c4ebe2ad0ae..19d53f44db4556c8550f97862a9e3bb94828f824 100644 (file)
--- a/SCMonitor/Info.plist
+++ b/SCMonitor/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/SystemConfiguration.fproj/Info-Embedded.plist b/SystemConfiguration.fproj/Info-Embedded.plist
index b4571b9213fa60a6be3b01c9cded89d9fb0b00bb..ea4c184d790712140fccb004cd35a7ff18b5e2a1 100644 (file)
--- a/SystemConfiguration.fproj/Info-Embedded.plist
+++ b/SystemConfiguration.fproj/Info-Embedded.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/SystemConfiguration.fproj/Info.plist b/SystemConfiguration.fproj/Info.plist
index b4571b9213fa60a6be3b01c9cded89d9fb0b00bb..ea4c184d790712140fccb004cd35a7ff18b5e2a1 100644 (file)
--- a/SystemConfiguration.fproj/Info.plist
+++ b/SystemConfiguration.fproj/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.14</string>
+       <string>1.14.4</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/SystemConfiguration.fproj/SCNetworkReachability.c b/SystemConfiguration.fproj/SCNetworkReachability.c
index d327f9c2d7478c37bfc6e977a173478d52ac6ee3..5533c47ab6ee3daa5c7d60d9ad6213025297a9c5 100644 (file)
--- a/SystemConfiguration.fproj/SCNetworkReachability.c
+++ b/SystemConfiguration.fproj/SCNetworkReachability.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2003-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2003-2015 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *


@@ -2990,9 +2990,9 @@ _SC_checkResolverReachabilityByAddress(SCDynamicStoreRef          *storeP,
  *
  * Notes :
  *
  *
  * Notes :
  *

- * 1. We have a "contract" with discoveryd that for EVERY network
+ * 1. We have a "contract" with mDNSResponder that for EVERY network

  *    or DNS configuration change that should warrant our [re-]starting
  *    or DNS configuration change that should warrant our [re-]starting

- *    a query, discoveryd will acknowledge the latest DNS configuration.
+ *    a query, mDNSResponder will acknowledge the latest DNS configuration.

  *
  * 2. IPMonitor also posts a notification AFTER every network or DNS
  *    configuration change.
  *
  * 2. IPMonitor also posts a notification AFTER every network or DNS
  *    configuration change.


@@ -3342,7 +3342,7 @@ _dns_callback(DNSServiceRef               sdRef,
                                targetPrivate->dnsAddresses = CFRetain(kCFNull);
                                targetPrivate->dnsError     = EAI_NONAME;
                        } else if (targetPrivate->dnsGeneration == dnsGeneration) {
                                targetPrivate->dnsAddresses = CFRetain(kCFNull);
                                targetPrivate->dnsError     = EAI_NONAME;
                        } else if (targetPrivate->dnsGeneration == dnsGeneration) {

-                               // if not, then "discoveryd" crashed or some
+                               // if not, then "mDNSResponder" crashed or some

                                // other/unexpected error occurred.  In this
                                // case, we'll try again with a clean slate and
                                // restart all requests.
                                // other/unexpected error occurred.  In this
                                // case, we'll try again with a clean slate and
                                // restart all requests.


@@ -3364,7 +3364,7 @@ _dns_callback(DNSServiceRef               sdRef,
 
        if (restart) {
                SCLog(TRUE, LOG_DEBUG,
 
        if (restart) {
                SCLog(TRUE, LOG_DEBUG,

-                     CFSTR("%sreconnecting SCNetworkReachability w/\"discoveryd\" (%d)"),
+                     CFSTR("%sreconnecting SCNetworkReachability w/\"mDNSResponder\" (%d)"),

                      targetPrivate->log_prefix,
                      dnsGeneration);
 
                      targetPrivate->log_prefix,
                      dnsGeneration);
 


@@ -3571,7 +3571,7 @@ enqueueDNSQuery(SCNetworkReachabilityRef target)
                        return;
                }
 
                        return;
                }
 

-               // if needed, start interacting with "discoveryd"
+               // if needed, start interacting with "mDNSResponder"

                if (dnsMain == NULL) {
                        err = DNSServiceCreateConnection(&dnsMain);
                        if (err != kDNSServiceErr_NoError) {
                if (dnsMain == NULL) {
                        err = DNSServiceCreateConnection(&dnsMain);
                        if (err != kDNSServiceErr_NoError) {


@@ -4382,9 +4382,9 @@ __SCNetworkReachabilityOnDemandCheck(ReachabilityStoreInfoRef     store_info,
  *
  * Notes :
  *
  *
  * Notes :
  *

- * 1. We have a "contract" with discoveryd that for EVERY network
+ * 1. We have a "contract" with mDNSResponder that for EVERY network

  *    or DNS configuration change that should warrant our [re-]starting
  *    or DNS configuration change that should warrant our [re-]starting

- *    a query, discoveryd will acknowledge the latest DNS configuration.
+ *    a query, mDNSResponder will acknowledge the latest DNS configuration.

  *
  * 2. IPMonitor also posts a notification AFTER every network or DNS
  *    configuration change.
  *
  * 2. IPMonitor also posts a notification AFTER every network or DNS
  *    configuration change.

diff --git a/get-mobility-info b/get-mobility-info
index 4a51554879ae4e97b833dd17be754233c686dd4e..97d38551aefc2380298c8e0b5490b511a758798d 100755 (executable)
--- a/get-mobility-info
+++ b/get-mobility-info
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# Copyright (c) 2004-2014 Apple Inc.
+# Copyright (c) 2004-2015 Apple Inc.

 #
 # get-mobility-info
 #
 #
 # get-mobility-info
 #


@@ -99,9 +99,9 @@ if [ -x /usr/bin/dig -a -f /etc/resolv.conf ]; then
 fi
 
 #
 fi
 
 #

-# Signal "networkd" to log its "state" info. This logging will continue while
-# we execute a few other commands and should be complete by the time we collect
-# the log content.
+# Signal "networkd" and "mDNSResponder" early to log their "state" info. This
+# logging will continue while we execute a few other commands and should be
+# complete by the time we collect the log content.

 #
 if [ -x /usr/bin/killall ]; then
        #
 #
 if [ -x /usr/bin/killall ]; then
        #


@@ -110,68 +110,9 @@ if [ -x /usr/bin/killall ]; then
        ${PRIV} /usr/bin/killall -INFO networkd                                 2>/dev/null
 
        #
        ${PRIV} /usr/bin/killall -INFO networkd                                 2>/dev/null
 
        #

-       # discoveryd info
+       # request mDNSResponder state

        #
        #

-       if [ -x /usr/libexec/discoveryd -a -x /usr/sbin/discoveryutil ]; then
-               ${PRIV} pgrep -q -x discoveryd
-               if [ $? -eq 0 ]; then
-                       P_ARG=""
-                       case "`${PRIV} discoveryutil help 2>&1`" in
-                           Warning:* )
-                               P_ARG="--priv"
-                               ;;
-                       esac
-                       #
-                       # upgrade logging (if needed)
-                       #
-                       CLASS_o=`${PRIV} discoveryutil ${P_ARG} logclass`
-                       CLASS_n=`${PRIV} discoveryutil ${P_ARG} logclass Cache`
-
-                       LEVEL_o=`${PRIV} discoveryutil ${P_ARG} loglevel | awk '{ print $5 }'`
-                       if [ ${LEVEL_o} -le 1 ]; then
-                               LEVEL_n=`${PRIV} discoveryutil ${P_ARG} loglevel Intermediate | awk '{ print $5 }'`
-                       else
-                               LEVEL_n=${LEVEL_o}
-                       fi
-
-                       cp /dev/null                                            discoveryd-info
-                       for c in                        \
-                               clientlisteners         \
-                               configinterfaces        \
-                               configresolvers         \
-                               dnsproxystate           \
-                               mdnsbrowses             \
-                               mdnscachecontents       \
-                               mdnscachestats          \
-                               mdnslisteners           \
-                               mdnsregistrations       \
-                               nattraversals           \
-                               udnscachecontents       \
-                               udnscachestats          \
-                               udnsresolvers           \
-                               udnsunanswered          \
-
-                       do
-                               echo "#"                                        >> discoveryd-info
-                               echo "# discoveryutil ${c}"                     >> discoveryd-info
-                               echo "#"                                        >> discoveryd-info
-                               ${PRIV} discoveryutil ${P_ARG} --timeout ${c}   >> discoveryd-info
-                       done
-
-                       if [ "$CLASS_o" != "$CLASS_n" ]; then
-                               #
-                               # restore log settings
-                               #
-                               ${PRIV} discoveryutil ${P_ARG} lognoclass Cache         >/dev/null
-                       fi
-
-                       if [ "$LEVEL_o" != "$LEVEL_n" ]; then
-                               ${PRIV} discoveryutil ${P_ARG} loglevel ${LEVEL_o}      >/dev/null
-                       fi
-
-                       ${PRIV} cat /var/run/com.apple.discoveryd-trace.sb      > com.apple.discoveryd-trace.sb 2>/dev/null
-               fi
-       fi
+       ${PRIV} /usr/bin/killall -INFO mDNSResponder                            2>/dev/null

 
        sleep 1
 fi
 
        sleep 1
 fi


@@ -554,7 +495,7 @@ if [ -x /usr/local/bin/ddt ]; then
     /bin/echo -n ""                                    >  dispatch-info
     for BIN in         \
        configd         \
     /bin/echo -n ""                                    >  dispatch-info
     for BIN in         \
        configd         \

-       discoveryd      \
+       mDNSResponder   \

 
     do
        echo "#"                                        >> dispatch-info
 
     do
        echo "#"                                        >> dispatch-info


@@ -719,14 +660,14 @@ report_binary_info()
 get_binary_info()
 {
     for BIN in                                                                         \
 get_binary_info()
 {
     for BIN in                                                                         \

+       /usr/libexec/InternetSharing                                                    \

        /usr/libexec/bootpd                                                             \
        /usr/libexec/configd                                                            \
        /usr/libexec/bootpd                                                             \
        /usr/libexec/configd                                                            \

-       /usr/libexec/discoveryd                                                         \
+       /usr/libexec/misd                                                               \

        /usr/sbin/awacsd                                                                \
        /usr/sbin/awacsd                                                                \

+       /usr/sbin/mDNSResponder                                                         \

        /usr/sbin/pppd                                                                  \
        /usr/sbin/racoon                                                                \
        /usr/sbin/pppd                                                                  \
        /usr/sbin/racoon                                                                \

-       /usr/libexec/misd                                                               \
-       /usr/libexec/InternetSharing                                                    \

        /System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration    \
 
     do
        /System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration    \
 
     do


@@ -834,8 +775,8 @@ if [ -x /usr/bin/what -a -x /usr/bin/sum -a -x /bin/ls ]; then
 fi
 
 #
 fi
 
 #

-# to give a chance for "networkd" to finish dumping its state, the last
-# thing we do is collect the logs
+# to give a chance for "networkd" and "mDNSResponder" to finish dumping their
+# state, the last thing we do is collect the logs

 #
 
 #
 #
 
 #


@@ -928,9 +869,9 @@ if [ -x /bin/ls ]; then
                        awacsd                  \
                        bootpd                  \
                        configd                 \
                        awacsd                  \
                        bootpd                  \
                        configd                 \

-                       discoveryd              \
-                       discoveryd_helper       \

                        eapolclient             \
                        eapolclient             \

+                       mDNSResponder           \
+                       mDNSResponderHelper     \

                        pppd                    \
                        racoon                  \
                        socketfilterfw          \
                        pppd                    \
                        racoon                  \
                        socketfilterfw          \