From b7ffbc6af5a0697ee3d9a3052dedfebc6b8270dd Mon Sep 17 00:00:00 2001 From: Apple Date: Mon, 6 Jul 2015 06:03:19 +0000 Subject: [PATCH] configd-699.30.1.tar.gz --- .../IPMonitor/Info-EmbeddedSimulator.plist | 2 +- Plugins/IPMonitor/Info.plist | 2 +- Plugins/InterfaceNamer/Info.plist | 2 +- Plugins/KernelEventMonitor/Info.plist | 2 +- Plugins/LinkConfiguration/Info.plist | 2 +- Plugins/Logger/Info-Embedded.plist | 2 +- Plugins/Logger/Info.plist | 2 +- Plugins/PreferencesMonitor/Info.plist | 2 +- .../Info-EmbeddedSimulator.plist | 2 +- Plugins/SCNetworkReachability/Info.plist | 2 +- Plugins/SimulatorSupport/Info.plist | 2 +- SCMonitor/Info.plist | 2 +- SystemConfiguration.fproj/Info-Embedded.plist | 2 +- SystemConfiguration.fproj/Info.plist | 2 +- .../SCNetworkReachability.c | 16 ++-- get-mobility-info | 87 +++---------------- 16 files changed, 36 insertions(+), 95 deletions(-) diff --git a/Plugins/IPMonitor/Info-EmbeddedSimulator.plist b/Plugins/IPMonitor/Info-EmbeddedSimulator.plist index ca9a22b..9cf9740 100644 --- a/Plugins/IPMonitor/Info-EmbeddedSimulator.plist +++ b/Plugins/IPMonitor/Info-EmbeddedSimulator.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.13 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/IPMonitor/Info.plist b/Plugins/IPMonitor/Info.plist index adb5cbd..12cdb63 100644 --- a/Plugins/IPMonitor/Info.plist +++ b/Plugins/IPMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/InterfaceNamer/Info.plist b/Plugins/InterfaceNamer/Info.plist index dfaf270..69e28db 100644 --- a/Plugins/InterfaceNamer/Info.plist +++ b/Plugins/InterfaceNamer/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/KernelEventMonitor/Info.plist b/Plugins/KernelEventMonitor/Info.plist index 327a47a..a56faba 100644 --- a/Plugins/KernelEventMonitor/Info.plist +++ b/Plugins/KernelEventMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/LinkConfiguration/Info.plist b/Plugins/LinkConfiguration/Info.plist index 63de67e..d7742b0 100644 --- a/Plugins/LinkConfiguration/Info.plist +++ b/Plugins/LinkConfiguration/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/Logger/Info-Embedded.plist b/Plugins/Logger/Info-Embedded.plist index 82171ed..19134ec 100644 --- a/Plugins/Logger/Info-Embedded.plist +++ b/Plugins/Logger/Info-Embedded.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/Logger/Info.plist b/Plugins/Logger/Info.plist index 7393541..f8ba817 100644 --- a/Plugins/Logger/Info.plist +++ b/Plugins/Logger/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/PreferencesMonitor/Info.plist b/Plugins/PreferencesMonitor/Info.plist index 04bfd35..bb78029 100644 --- a/Plugins/PreferencesMonitor/Info.plist +++ b/Plugins/PreferencesMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist b/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist index e9cc0aa..854a397 100644 --- a/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist +++ b/Plugins/SCNetworkReachability/Info-EmbeddedSimulator.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.13 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/SCNetworkReachability/Info.plist b/Plugins/SCNetworkReachability/Info.plist index d42e66a..55ce144 100644 --- a/Plugins/SCNetworkReachability/Info.plist +++ b/Plugins/SCNetworkReachability/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/SimulatorSupport/Info.plist b/Plugins/SimulatorSupport/Info.plist index 4ae6f27..e6d9132 100644 --- a/Plugins/SimulatorSupport/Info.plist +++ b/Plugins/SimulatorSupport/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/SCMonitor/Info.plist b/SCMonitor/Info.plist index 4496add..19d53f4 100644 --- a/SCMonitor/Info.plist +++ b/SCMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/SystemConfiguration.fproj/Info-Embedded.plist b/SystemConfiguration.fproj/Info-Embedded.plist index b4571b9..ea4c184 100644 --- a/SystemConfiguration.fproj/Info-Embedded.plist +++ b/SystemConfiguration.fproj/Info-Embedded.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/SystemConfiguration.fproj/Info.plist b/SystemConfiguration.fproj/Info.plist index b4571b9..ea4c184 100644 --- a/SystemConfiguration.fproj/Info.plist +++ b/SystemConfiguration.fproj/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.14 + 1.14.4 CFBundleSignature ???? CFBundleVersion diff --git a/SystemConfiguration.fproj/SCNetworkReachability.c b/SystemConfiguration.fproj/SCNetworkReachability.c index d327f9c..5533c47 100644 --- 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@ * @@ -2990,9 +2990,9 @@ _SC_checkResolverReachabilityByAddress(SCDynamicStoreRef *storeP, * * 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 - * 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. @@ -3342,7 +3342,7 @@ _dns_callback(DNSServiceRef sdRef, 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. @@ -3364,7 +3364,7 @@ _dns_callback(DNSServiceRef sdRef, if (restart) { SCLog(TRUE, LOG_DEBUG, - CFSTR("%sreconnecting SCNetworkReachability w/\"discoveryd\" (%d)"), + CFSTR("%sreconnecting SCNetworkReachability w/\"mDNSResponder\" (%d)"), targetPrivate->log_prefix, dnsGeneration); @@ -3571,7 +3571,7 @@ enqueueDNSQuery(SCNetworkReachabilityRef target) return; } - // if needed, start interacting with "discoveryd" + // if needed, start interacting with "mDNSResponder" if (dnsMain == NULL) { err = DNSServiceCreateConnection(&dnsMain); if (err != kDNSServiceErr_NoError) { @@ -4382,9 +4382,9 @@ __SCNetworkReachabilityOnDemandCheck(ReachabilityStoreInfoRef store_info, * * 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 - * 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. diff --git a/get-mobility-info b/get-mobility-info index 4a51554..97d3855 100755 --- a/get-mobility-info +++ b/get-mobility-info @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2004-2014 Apple Inc. +# Copyright (c) 2004-2015 Apple Inc. # # get-mobility-info # @@ -99,9 +99,9 @@ if [ -x /usr/bin/dig -a -f /etc/resolv.conf ]; then 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 # @@ -110,68 +110,9 @@ if [ -x /usr/bin/killall ]; then ${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 @@ -554,7 +495,7 @@ if [ -x /usr/local/bin/ddt ]; then /bin/echo -n "" > dispatch-info for BIN in \ configd \ - discoveryd \ + mDNSResponder \ do echo "#" >> dispatch-info @@ -719,14 +660,14 @@ report_binary_info() get_binary_info() { for BIN in \ + /usr/libexec/InternetSharing \ /usr/libexec/bootpd \ /usr/libexec/configd \ - /usr/libexec/discoveryd \ + /usr/libexec/misd \ /usr/sbin/awacsd \ + /usr/sbin/mDNSResponder \ /usr/sbin/pppd \ /usr/sbin/racoon \ - /usr/libexec/misd \ - /usr/libexec/InternetSharing \ /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 # -# 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 \ - discoveryd \ - discoveryd_helper \ eapolclient \ + mDNSResponder \ + mDNSResponderHelper \ pppd \ racoon \ socketfilterfw \ -- 2.47.2