X-Git-Url: https://git.saurik.com/apple/configd.git/blobdiff_plain/edebe297f772e4cdd76278ebb777820466d2917b..d94708881e41bd90afd74b1a1dd0524d039ba3f7:/SystemConfiguration.fproj/SCNetworkProtocol.c?ds=sidebyside diff --git a/SystemConfiguration.fproj/SCNetworkProtocol.c b/SystemConfiguration.fproj/SCNetworkProtocol.c index c0d5757..d0cd41e 100644 --- a/SystemConfiguration.fproj/SCNetworkProtocol.c +++ b/SystemConfiguration.fproj/SCNetworkProtocol.c @@ -1,15 +1,15 @@ /* - * Copyright (c) 2004-2007 Apple Inc. All rights reserved. + * Copyright (c) 2004-2008, 2016-2018 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ - * + * * 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, @@ -17,7 +17,7 @@ * 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@ */ @@ -31,10 +31,7 @@ #include #include -#include #include "SCNetworkConfigurationInternal.h" -#include -#include #include @@ -45,12 +42,13 @@ static Boolean __SCNetworkProtocolEqual (CFTypeRef cf1, CFTypeRef cf2); static CFHashCode __SCNetworkProtocolHash (CFTypeRef cf); -const CFStringRef kSCNetworkProtocolTypeAppleTalk = CFSTR("AppleTalk"); const CFStringRef kSCNetworkProtocolTypeDNS = CFSTR("DNS"); const CFStringRef kSCNetworkProtocolTypeIPv4 = CFSTR("IPv4"); const CFStringRef kSCNetworkProtocolTypeIPv6 = CFSTR("IPv6"); const CFStringRef kSCNetworkProtocolTypeProxies = CFSTR("Proxies"); +#if !TARGET_OS_IPHONE const CFStringRef kSCNetworkProtocolTypeSMB = CFSTR("SMB"); +#endif // !TARGET_OS_IPHONE static CFTypeID __kSCNetworkProtocolTypeID = _kCFRuntimeNotATypeID; @@ -118,10 +116,10 @@ __SCNetworkProtocolEqual(CFTypeRef cf1, CFTypeRef cf2) return FALSE; // if not the same protocol type if (p1->service == p2->service) - return TRUE; // if both point to the same service + return TRUE; // if both point to the same service if ((p1->service != NULL) && (p2->service != NULL) && CFEqual(p1->service, p2->service)) - return TRUE; // if both effectively point to the same service + return TRUE; // if both effectively point to the same service return FALSE; } @@ -156,16 +154,17 @@ __SCNetworkProtocolCreatePrivate(CFAllocatorRef allocator, pthread_once(&initialized, __SCNetworkProtocolInitialize); /* allocate target */ - size = sizeof(SCNetworkProtocolPrivate) - sizeof(CFRuntimeBase); + size = sizeof(SCNetworkProtocolPrivate) - sizeof(CFRuntimeBase); protocolPrivate = (SCNetworkProtocolPrivateRef)_CFRuntimeCreateInstance(allocator, - __kSCNetworkProtocolTypeID, - size, - NULL); + __kSCNetworkProtocolTypeID, + size, + NULL); if (protocolPrivate == NULL) { return NULL; } - protocolPrivate->entityID = CFStringCreateCopy(NULL, entityID); + /* initialize non-zero/NULL members */ + protocolPrivate->entityID = CFStringCreateCopy(NULL, entityID); protocolPrivate->service = CFRetain(service); return protocolPrivate; @@ -175,17 +174,17 @@ __SCNetworkProtocolCreatePrivate(CFAllocatorRef allocator, __private_extern__ Boolean __SCNetworkProtocolIsValidType(CFStringRef protocolType) { - int i; - static const CFStringRef *valid_types[] = { - &kSCNetworkProtocolTypeAppleTalk, + static const CFStringRef *valid_types[] = { &kSCNetworkProtocolTypeDNS, &kSCNetworkProtocolTypeIPv4, &kSCNetworkProtocolTypeIPv6, &kSCNetworkProtocolTypeProxies, - &kSCNetworkProtocolTypeSMB +#if !TARGET_OS_IPHONE + &kSCNetworkProtocolTypeSMB, +#endif // !TARGET_OS_IPHONE }; - for (i = 0; i < sizeof(valid_types)/sizeof(valid_types[0]); i++) { + for (size_t i = 0; i < sizeof(valid_types)/sizeof(valid_types[0]); i++) { if (CFEqual(protocolType, *valid_types[i])) { // if known/valid protocol type return TRUE; @@ -209,12 +208,12 @@ static CFStringRef copyProtocolConfigurationPath(SCNetworkProtocolPrivateRef protocolPrivate) { CFStringRef path; - SCNetworkServicePrivateRef servicePrivate; + SCNetworkServicePrivateRef servicePrivate; servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; path = SCPreferencesPathKeyCreateNetworkServiceEntity(NULL, // allocator servicePrivate->serviceID, // service - protocolPrivate->entityID); // entity + protocolPrivate->entityID); // entity return path; } @@ -223,6 +222,22 @@ copyProtocolConfigurationPath(SCNetworkProtocolPrivateRef protocolPrivate) #pragma mark SCNetworkProtocol APIs +CFComparisonResult +_SCNetworkProtocolCompare(const void *val1, const void *val2, void *context) +{ +#pragma unused(context) + SCNetworkProtocolRef p1 = (SCNetworkProtocolRef)val1; + SCNetworkProtocolRef p2 = (SCNetworkProtocolRef)val2; + CFStringRef type1; + CFStringRef type2; + + type1 = SCNetworkProtocolGetProtocolType(p1); + type2 = SCNetworkProtocolGetProtocolType(p2); + + return CFStringCompare(type1, type2, 0); +} + + CFTypeID SCNetworkProtocolGetTypeID() { @@ -237,13 +252,14 @@ SCNetworkProtocolGetConfiguration(SCNetworkProtocolRef protocol) CFDictionaryRef config; CFStringRef path; SCNetworkProtocolPrivateRef protocolPrivate = (SCNetworkProtocolPrivateRef)protocol; - SCNetworkServicePrivateRef servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; + SCNetworkServicePrivateRef servicePrivate; if (!isA_SCNetworkProtocol(protocol)) { _SCErrorSet(kSCStatusInvalidArgument); return NULL; } + servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; path = copyProtocolConfigurationPath(protocolPrivate); config = __getPrefsConfiguration(servicePrivate->prefs, path); CFRelease(path); @@ -258,13 +274,14 @@ SCNetworkProtocolGetEnabled(SCNetworkProtocolRef protocol) Boolean enabled; CFStringRef path; SCNetworkProtocolPrivateRef protocolPrivate = (SCNetworkProtocolPrivateRef)protocol; - SCNetworkServicePrivateRef servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; + SCNetworkServicePrivateRef servicePrivate; if (!isA_SCNetworkProtocol(protocol)) { _SCErrorSet(kSCStatusInvalidArgument); return FALSE; } + servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; path = copyProtocolConfigurationPath(protocolPrivate); enabled = __getPrefsEnabled(servicePrivate->prefs, path); CFRelease(path); @@ -293,17 +310,35 @@ SCNetworkProtocolSetConfiguration(SCNetworkProtocolRef protocol, CFDictionaryRef Boolean ok; CFStringRef path; SCNetworkProtocolPrivateRef protocolPrivate = (SCNetworkProtocolPrivateRef)protocol; - SCNetworkServicePrivateRef servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; + SCNetworkServiceRef service; + SCNetworkServicePrivateRef servicePrivate; if (!isA_SCNetworkProtocol(protocol)) { _SCErrorSet(kSCStatusInvalidArgument); return FALSE; } + service = protocolPrivate->service; + servicePrivate = (SCNetworkServicePrivateRef)service; + if (!__SCNetworkServiceExists(service)) { + SC_log(LOG_ERR, "SCNetworkProtocolSetConfiguration() w/removed service\n protocol = %@\n service = %@", + protocolPrivate->entityID, + servicePrivate); + _SC_crash_once("SCNetworkProtocolSetConfiguration() w/removed service", NULL, NULL); + _SCErrorSet(kSCStatusInvalidArgument); + return FALSE; + } + path = copyProtocolConfigurationPath(protocolPrivate); ok = __setPrefsConfiguration(servicePrivate->prefs, path, config, TRUE); CFRelease(path); + if (ok) { + SC_log(LOG_DEBUG, "SCNetworkProtocolSetConfiguration(): %@ --> %@", + protocol, + config != NULL ? config : (CFDictionaryRef)CFSTR("NULL")); + } + return ok; } @@ -314,16 +349,34 @@ SCNetworkProtocolSetEnabled(SCNetworkProtocolRef protocol, Boolean enabled) Boolean ok; CFStringRef path; SCNetworkProtocolPrivateRef protocolPrivate = (SCNetworkProtocolPrivateRef)protocol; - SCNetworkServicePrivateRef servicePrivate = (SCNetworkServicePrivateRef)protocolPrivate->service; + SCNetworkServiceRef service; + SCNetworkServicePrivateRef servicePrivate; if (!isA_SCNetworkProtocol(protocol)) { _SCErrorSet(kSCStatusInvalidArgument); return FALSE; } + service = protocolPrivate->service; + servicePrivate = (SCNetworkServicePrivateRef)service; + if (!__SCNetworkServiceExists(service)) { + SC_log(LOG_ERR, "SCNetworkProtocolSetEnabled() w/removed service\n protocol = %@\n service = %@", + protocolPrivate->entityID, + servicePrivate); + _SC_crash_once("SCNetworkProtocolSetEnabled() w/removed service", NULL, NULL); + _SCErrorSet(kSCStatusInvalidArgument); + return FALSE; + } + path = copyProtocolConfigurationPath(protocolPrivate); ok = __setPrefsEnabled(servicePrivate->prefs, path, enabled); CFRelease(path); + if (ok) { + SC_log(LOG_DEBUG, "SCNetworkProtocolSetEnabled(): %@ -> %s", + protocol, + enabled ? "Enabled" : "Disabled"); + } + return ok; }