diff --git a/mDNSMacOSX/helper-stubs.c b/mDNSMacOSX/helper-stubs.c index fecd36b..449e297 100644 --- a/mDNSMacOSX/helper-stubs.c +++ b/mDNSMacOSX/helper-stubs.c @@ -23,7 +23,6 @@ #include "helper.h" #include #include -#include #include // diff --git a/mDNSMacOSX/mDNSMacOSX.c b/mDNSMacOSX/mDNSMacOSX.c index b94371c..d233b33 100644 --- a/mDNSMacOSX/mDNSMacOSX.c +++ b/mDNSMacOSX/mDNSMacOSX.c @@ -24,9 +24,9 @@ // including ones that mDNSResponder chooses not to use. #define LIST_ALL_INTERFACES 0 -#include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above -#include "DNSCommon.h" -#include "uDNS.h" +#include "../mDNSCore/mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above +#include "../mDNSCore/DNSCommon.h" +#include "../mDNSCore/uDNS.h" #include "mDNSMacOSX.h" // Defines the specific types needed to run mDNS on this platform #include "dns_sd.h" // For mDNSInterface_LocalOnly etc. #include "dns_sd_internal.h" @@ -72,7 +72,6 @@ #include #include -#include "dnsinfo.h" #include @@ -80,7 +79,6 @@ #include #include -#include #include #include @@ -89,7 +87,6 @@ #include "helper.h" #include "P2PPacketFilter.h" -#include #if (TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST) #include // For WiFiManagerClientRef etc, declarations. @@ -99,7 +96,6 @@ #include "system_utilities.h" // Include definition of opaque_presence_indication for KEV_DL_NODE_PRESENCE handling logic. -#include #if APPLE_OSX_mDNSResponder #include // for ne_session_set_socket_attributes() @@ -482,6 +478,7 @@ mDNSexport NetworkInterfaceInfoOSX *IfindexToInterfaceInfoOSX(mDNSInterfaceID if } #if !MDNSRESPONDER_SUPPORTS(APPLE, QUERIER) +/* mDNSexport mdns_interface_monitor_t GetInterfaceMonitorForIndex(uint32_t ifIndex) { mDNS *const m = &mDNSStorage; @@ -577,6 +574,7 @@ mDNSexport mdns_interface_monitor_t GetInterfaceMonitorForIndex(uint32_t ifIndex return monitor; } +*/ #endif mDNSexport mDNSInterfaceID mDNSPlatformInterfaceIDfromInterfaceIndex(mDNS *const m, mDNSu32 ifindex) @@ -628,6 +626,7 @@ mDNSexport mDNSu32 mDNSPlatformInterfaceIndexfromInterfaceID(mDNS *const m, mDNS return(0); } +/* mDNSlocal mDNSBool GetInterfaceSupportsWakeOnLANPacket(mDNSInterfaceID id) { NetworkInterfaceInfoOSX *info = IfindexToInterfaceInfoOSX(id); @@ -990,6 +989,7 @@ mDNSexport mStatus mDNSPlatformSendUDP(const mDNS *const m, const void *const ms return(result); } +*/ mDNSlocal ssize_t myrecvfrom(const int s, void *const buffer, const size_t max, struct sockaddr *const from, socklen_t *const fromlen, mDNSAddr *dstaddr, char ifname[IF_NAMESIZE], mDNSu8 *ttl) @@ -1749,7 +1749,6 @@ mDNSlocal mStatus SetupTCPSocket(TCPSocket *sock, mDNSAddr_Type addrtype, mDNSIP } // for TCP sockets, the traffic class is set once and not changed - setTrafficClass(skt, useBackgroundTrafficClass); sock->fd = skt; sock->kqEntry.KQcallback = tcpKQSocketCallback; @@ -2214,6 +2213,7 @@ mDNSexport mDNSBool mDNSPlatformTCPWritable(TCPSocket *sock) // If mDNSIPPort port is non-zero, then it's a multicast socket on the specified interface // If mDNSIPPort port is zero, then it's a randomly assigned port number, used for sending unicast queries +/* mDNSlocal mStatus SetupSocket(KQSocketSet *cp, const mDNSIPPort port, u_short sa_family, mDNSIPPort *const outport) { int *s = (sa_family == AF_INET) ? &cp->sktv4 : &cp->sktv6; @@ -2418,6 +2418,7 @@ mDNSexport UDPSocket *mDNSPlatformUDPSocket(const mDNSIPPort requestedport) } return(p); } +*/ #ifdef UNIT_TEST UNITTEST_UDPCLOSE @@ -3635,6 +3636,7 @@ mDNSlocal mDNSBool NetWakeInterface(NetworkInterfaceInfoOSX *i) #endif // TARGET_OS_WATCH } +/* mDNSlocal u_int64_t getExtendedFlags(const char *ifa_name) { int sockFD; @@ -3697,6 +3699,7 @@ mDNSlocal mDNSBool isExcludedInterface(int sockFD, char * ifa_name) else return mDNSfalse; } +*/ #if (TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST) @@ -3864,6 +3867,7 @@ mDNSlocal mDNSBool IsCarPlaySSID(char *ifa_name) // may return NULL if out of memory (unlikely) or parameters are invalid for some reason // (e.g. sa_family not AF_INET or AF_INET6) +/* mDNSlocal NetworkInterfaceInfoOSX *AddInterfaceToList(const struct ifaddrs *ifa, const mDNSs32 utc) { mDNS *const m = &mDNSStorage; @@ -4005,6 +4009,7 @@ mDNSlocal NetworkInterfaceInfoOSX *AddInterfaceToList(const struct ifaddrs *ifa, *p = i; return(i); } +*/ #if COMPILER_LIKES_PRAGMA_MARK #pragma mark - @@ -4074,6 +4079,7 @@ mDNSlocal mStatus ReorderInterfaceList() return (mStatus_NoError); } +/* mDNSlocal mStatus UpdateInterfaceList(mDNSs32 utc) { mDNS *const m = &mDNSStorage; @@ -4248,6 +4254,7 @@ mDNSlocal mStatus UpdateInterfaceList(mDNSs32 utc) return(mStatus_NoError); } +*/ // Returns number of leading one-bits in mask: 0-32 for IPv4, 0-128 for IPv6 // Returns -1 if all the one-bits are not contiguous @@ -4550,6 +4557,7 @@ mDNSlocal void AppendDNameListElem(DNameListElem ***List, mDNSu32 uid, domainnam } } +/* mDNSlocal int compare_dns_configs(const void *aa, const void *bb) { dns_resolver_t *a = *(dns_resolver_t**)aa; @@ -4557,6 +4565,7 @@ mDNSlocal int compare_dns_configs(const void *aa, const void *bb) return (a->search_order < b->search_order) ? -1 : (a->search_order == b->search_order) ? 0 : 1; } +*/ mDNSlocal void UpdateSearchDomainHash(MD5_CTX *sdc, char *domain, mDNSInterfaceID InterfaceID) { @@ -4612,6 +4621,7 @@ mDNSlocal void FinalizeSearchDomainHash(MD5_CTX *sdc) else { LogInfo("FinalizeSearchDomains: The hash is same"); } } +/* mDNSlocal void ConfigSearchDomains(dns_resolver_t *resolver, mDNSInterfaceID interfaceId, mDNSu32 scope, MD5_CTX *sdc, uint64_t generation) { const char *scopeString = DNSScopeToString(scope); @@ -4646,6 +4656,7 @@ mDNSlocal void ConfigSearchDomains(dns_resolver_t *resolver, mDNSInterfaceID int LogInfo("ConfigSearchDomains: (%s) Ignoring search domain for interface %s", scopeString, InterfaceNameForID(&mDNSStorage, interfaceId)); } } +*/ mDNSlocal mDNSInterfaceID ConfigParseInterfaceID(mDNSu32 ifindex) { @@ -4677,6 +4688,7 @@ mDNSlocal mDNSInterfaceID ConfigParseInterfaceID(mDNSu32 ifindex) return interface; } +/* mDNSlocal void ConfigNonUnicastResolver(dns_resolver_t *r) { char *opt = r->options; @@ -4826,6 +4838,7 @@ mDNSlocal void ConfigResolvers(dns_config_t *config, mDNSu32 scope, mDNSBool set #endif } } +*/ #if MDNSRESPONDER_SUPPORTS(APPLE, REACHABILITY_TRIGGER) mDNSlocal mDNSBool QuestionValidForDNSTrigger(const DNSQuestion *q) @@ -4880,6 +4893,7 @@ mDNSexport void mDNSPlatformUpdateDNSStatus(const DNSQuestion *q) } #endif // MDNSRESPONDER_SUPPORTS(APPLE, REACHABILITY_TRIGGER) +/* mDNSlocal void AckConfigd(dns_config_t *config) { mDNS_CheckLock(&mDNSStorage); @@ -4888,6 +4902,7 @@ mDNSlocal void AckConfigd(dns_config_t *config) mDNSStorage.p->DNSTrigger = NonZeroTime(mDNSStorage.timenow); _dns_configuration_ack(config, "com.apple.mDNSResponder"); } +*/ #if MDNSRESPONDER_SUPPORTS(APPLE, REACHABILITY_TRIGGER) // If v4q is non-NULL, it means we have received some answers for "A" type questions @@ -5084,6 +5099,7 @@ mDNSlocal void SetupDDNSDomains(domainname *const fqdn, DNameListElem **RegDomai } // Returns mDNSfalse, if it does not set the configuration i.e., if the DNS configuration did not change +/* mDNSexport mDNSBool mDNSPlatformSetDNSConfig(mDNSBool setservers, mDNSBool setsearch, domainname *const fqdn, DNameListElem **RegDomains, DNameListElem **BrowseDomains, mDNSBool ackConfig) { @@ -5260,6 +5276,7 @@ mDNSexport mDNSBool mDNSPlatformSetDNSConfig(mDNSBool setservers, mDNSBool setse SetupDDNSDomains(fqdn, RegDomains, BrowseDomains); return mDNStrue; } +*/ mDNSexport mStatus mDNSPlatformGetPrimaryInterface(mDNSAddr *v4, mDNSAddr *v6, mDNSAddr *r) @@ -6207,6 +6224,7 @@ mDNSlocal void SetKeyChainTimer(mDNSs32 delay) } } +/* mDNSexport void mDNSMacOSXNetworkChanged(void) { mDNS *const m = &mDNSStorage; @@ -6305,6 +6323,7 @@ mDNSexport void mDNSMacOSXNetworkChanged(void) } } +*/ // Copy the fourth slash-delimited element from either: // State:/Network/Interface//IPv4 @@ -6443,6 +6462,7 @@ done: return found; } +/* mDNSlocal void NetworkChanged(SCDynamicStoreRef store, CFArrayRef changedKeys, void *context) { (void)store; // Parameter not used @@ -6546,6 +6566,7 @@ mDNSlocal void NetworkChanged(SCDynamicStoreRef store, CFArrayRef changedKeys, v mDNS_Unlock(m); KQueueUnlock("NetworkChanged"); } +*/ #if APPLE_OSX_mDNSResponder mDNSlocal void RefreshSPSStatus(const void *key, const void *value, void *context) @@ -6595,6 +6616,7 @@ mDNSlocal void DynamicStoreReconnected(SCDynamicStoreRef store, void *info) KQueueUnlock("DynamicStoreReconnected"); } +/* mDNSlocal mStatus WatchForNetworkChanges(mDNS *const m) { mStatus err = -1; @@ -8301,6 +8323,7 @@ mDNSlocal mStatus mDNSPlatformInit_setup(mDNS *const m) if (iopmerr) LogMsg("IOPMConnectionScheduleWithRunLoop failed %d", iopmerr); LogInfo("IOPMConnectionScheduleWithRunLoop is now running"); #endif /* MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM */ +/* } } m->p->IOPMConnection = iopmerr ? mDNSNULL : c; @@ -8316,6 +8339,7 @@ mDNSlocal mStatus mDNSPlatformInit_setup(mDNS *const m) #else CFRunLoopAddSource(CFRunLoopGetMain(), IONotificationPortGetRunLoopSource(m->p->PowerPortRef), kCFRunLoopDefaultMode); #endif /* MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM */ +/* } } @@ -8324,17 +8348,6 @@ mDNSlocal mStatus mDNSPlatformInit_setup(mDNS *const m) // SPMetricPortability <= 35 means nominally a non-portable machine (i.e. Mac mini or better) // Apple TVs, AirPort base stations, and Time Capsules do not actually weigh 3kg, but we assign them // higher 'nominal' masses to indicate they should be treated as being relatively less portable than a laptop - if (!strncasecmp(HINFO_HWstring, "Xserve", 6)) { SPMetricPortability = 25 /* 30kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; } - else if (!strncasecmp(HINFO_HWstring, "RackMac", 7)) { SPMetricPortability = 25 /* 30kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; } - else if (!strncasecmp(HINFO_HWstring, "MacPro", 6)) { SPMetricPortability = 27 /* 20kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; } - else if (!strncasecmp(HINFO_HWstring, "PowerMac", 8)) { SPMetricPortability = 27 /* 20kg */; SPMetricMarginalPower = 82 /* 160W */; SPMetricTotalPower = 83 /* 200W */; } - else if (!strncasecmp(HINFO_HWstring, "iMac", 4)) { SPMetricPortability = 30 /* 10kg */; SPMetricMarginalPower = 77 /* 50W */; SPMetricTotalPower = 78 /* 60W */; } - else if (!strncasecmp(HINFO_HWstring, "Macmini", 7)) { SPMetricPortability = 33 /* 5kg */; SPMetricMarginalPower = 73 /* 20W */; SPMetricTotalPower = 74 /* 25W */; } - else if (!strncasecmp(HINFO_HWstring, "TimeCapsule", 11)) { SPMetricPortability = 34 /* 4kg */; SPMetricMarginalPower = 10 /* ~0W */; SPMetricTotalPower = 70 /* 13W */; } - else if (!strncasecmp(HINFO_HWstring, "AirPort", 7)) { SPMetricPortability = 35 /* 3kg */; SPMetricMarginalPower = 10 /* ~0W */; SPMetricTotalPower = 70 /* 12W */; } - else if ( IsAppleTV() ) { SPMetricPortability = 35 /* 3kg */; SPMetricMarginalPower = 60 /* 1W */; SPMetricTotalPower = 63 /* 2W */; } - else if (!strncasecmp(HINFO_HWstring, "MacBook", 7)) { SPMetricPortability = 37 /* 2kg */; SPMetricMarginalPower = 71 /* 13W */; SPMetricTotalPower = 72 /* 15W */; } - else if (!strncasecmp(HINFO_HWstring, "PowerBook", 9)) { SPMetricPortability = 37 /* 2kg */; SPMetricMarginalPower = 71 /* 13W */; SPMetricTotalPower = 72 /* 15W */; } LogSPS("HW_MODEL: %.*s (%s) Portability %d Marginal Power %d Total Power %d Features %d", HINFO_HWstring_prefixlen, HINFO_HWstring, HINFO_HWstring, SPMetricPortability, SPMetricMarginalPower, SPMetricTotalPower, SPMetricFeatures); #endif // APPLE_OSX_mDNSResponder @@ -8494,6 +8507,7 @@ mDNSexport void mDNSPlatformClose(mDNS *const m) } #endif } +*/ #if COMPILER_LIKES_PRAGMA_MARK #pragma mark - @@ -8583,6 +8597,7 @@ mDNSexport void *mDNSPlatformMemAllocateClear(mDNSu32 len) { return(callocL("mDN mDNSexport void mDNSPlatformMemFree (void *mem) { freeL("mDNSPlatformMemFree", mem); } #endif +/* mDNSexport void mDNSPlatformSetAllowSleep(mDNSBool allowSleep, const char *reason) { mDNS *const m = &mDNSStorage; @@ -8662,6 +8677,7 @@ mDNSexport void mDNSPlatformSendWakeupPacket(mDNSInterfaceID InterfaceID, char * mDNSSendWakeupPacket(ifindex, EthAddr, IPAddr, iteration); } } +*/ mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID) { diff --git a/mDNSMacOSX/mDNSMacOSX.h b/mDNSMacOSX/mDNSMacOSX.h index 8c55ad5..f101c9c 100644 --- a/mDNSMacOSX/mDNSMacOSX.h +++ b/mDNSMacOSX/mDNSMacOSX.h @@ -25,7 +25,6 @@ extern "C" { #include #include #include -#include #include #include #include "mDNSEmbeddedAPI.h" // for domain name structure diff --git a/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj b/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj index a7522e0..e0434f9 100644 --- a/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj +++ b/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj @@ -711,6 +711,7 @@ outputFiles = ( "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c", ); + runOncePerArchitecture = 0; script = "/usr/bin/bison -o \"${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}.c\" \"${INPUT_FILE_PATH}\"\n"; }; D284BFB80ADD8E510027CCDF /* PBXBuildRule */ = { @@ -723,6 +724,7 @@ outputFiles = ( "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c", ); + runOncePerArchitecture = 0; script = "/usr/bin/flex -i -o${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}.c ${INPUT_FILE_PATH}\n"; }; /* End PBXBuildRule section */ @@ -4973,7 +4975,7 @@ "USE_LIBIDN=1", "DEBUG=1", ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; MACOSX_DEPLOYMENT_TARGET = 10.15; MVERS = "\"(Engineering Build)\""; @@ -4981,13 +4983,12 @@ "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS", "-fwrapv", ); - SDKROOT = macosx.internal; + SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = debugging; SUPPORTED_PLATFORMS = "macosx iphoneos appletvos watchos"; WARNING_CFLAGS = ( "-W", - "-Wall", "-Wmissing-prototypes", "-Wno-four-char-constants", "-Wno-unknown-pragmas", @@ -8028,7 +8029,7 @@ "_BUILDING_XCODE_PROJECT_=1", "USE_LIBIDN=1", ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; MACOSX_DEPLOYMENT_TARGET = 10.15; MVERS = "\"(Engineering Build)\""; @@ -8037,12 +8038,11 @@ "-fwrapv", "-flto=full", ); - SDKROOT = macosx.internal; + SDKROOT = macosx; STRIP_STYLE = debugging; SUPPORTED_PLATFORMS = "macosx iphoneos appletvos watchos"; WARNING_CFLAGS = ( "-W", - "-Wall", "-Wmissing-prototypes", "-Wno-four-char-constants", "-Wno-unknown-pragmas", diff --git a/mDNSMacOSX/mdns_objects/mdns_dns_service.h b/mDNSMacOSX/mdns_objects/mdns_dns_service.h index 4bc76ff..73890c3 100644 --- a/mDNSMacOSX/mdns_objects/mdns_dns_service.h +++ b/mDNSMacOSX/mdns_objects/mdns_dns_service.h @@ -21,7 +21,6 @@ #include "mdns_object.h" #include "mdns_resolver.h" -#include #include #include #include @@ -147,8 +146,6 @@ mdns_dns_service_manager_activate(mdns_dns_service_manager_t manager); * configuration. DNS service objects that were created for previous DNS configurations, but that are not * present in this configuration, are marked as defunct. */ -void -mdns_dns_service_manager_apply_dns_config(mdns_dns_service_manager_t manager, const dns_config_t *config); /*! * @brief diff --git a/mDNSShared/CommonServices.h b/mDNSShared/CommonServices.h index 096fc7b..f8f646b 100644 --- a/mDNSShared/CommonServices.h +++ b/mDNSShared/CommonServices.h @@ -39,6 +39,7 @@ extern "C" { // Macintosh #if ( !defined( TARGET_OS_MAC ) ) +#define TARGET_OS_MAC 1 #if ( ( macintosh || __MACH__ ) && !KERNEL ) // ConditionalMacros.h in CoreServices will define this TARGET_* flag. #else @@ -98,6 +99,7 @@ extern "C" { #if ( !defined( TARGET_OS_WIN32 ) ) #if ( macintosh || __MACH__ ) + #define TARGET_OS_WIN32 0 // ConditionalMacros.h in CoreServices will define this TARGET_* flag. #else #if ( defined( _WIN32 ) )