X-Git-Url: https://git.saurik.com/apple/configd.git/blobdiff_plain/a5f60add6851c80e3e97d4c50c2855d3be97e589..HEAD:/configd.tproj/_notifychanges.c

diff --git a/configd.tproj/_notifychanges.c b/configd.tproj/_notifychanges.c
index 4d9595a..31f64c7 100644
--- a/configd.tproj/_notifychanges.c
+++ b/configd.tproj/_notifychanges.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004, 2006, 2011, 2013, 2015, 2019 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 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.
  *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
  */
@@ -33,46 +34,26 @@
 #include "configd.h"
 #include "session.h"
 
+__private_extern__
 int
 __SCDynamicStoreCopyNotifiedKeys(SCDynamicStoreRef store, CFArrayRef *notifierKeys)
 {
+	serverSessionRef		mySession;
 	SCDynamicStorePrivateRef	storePrivate = (SCDynamicStorePrivateRef)store;
-	CFStringRef			sessionKey;
-	CFDictionaryRef			info;
-	CFMutableDictionaryRef		newInfo;
 
-	SCLog(_configd_verbose, LOG_DEBUG, CFSTR("__SCDynamicStoreCopyNotifiedKeys:"));
-
-	if (!store || (storePrivate->server == MACH_PORT_NULL)) {
-		return kSCStatusNoStoreSession;	/* you must have an open session to play */
-	}
-
-	sessionKey = CFStringCreateWithFormat(NULL, NULL, CFSTR("%d"), storePrivate->server);
-	info = CFDictionaryGetValue(sessionData, sessionKey);
-	if ((info == NULL) ||
-	    (CFDictionaryContainsKey(info, kSCDChangedKeys) == FALSE)) {
-		CFRelease(sessionKey);
-		*notifierKeys = CFArrayCreate(NULL, NULL, 0, &kCFTypeArrayCallBacks);;
-		return kSCStatusOK;
-	}
-	newInfo = CFDictionaryCreateMutableCopy(NULL, 0, info);
-
-	*notifierKeys = CFDictionaryGetValue(newInfo, kSCDChangedKeys);
-	CFRetain(*notifierKeys);
-
-	CFDictionaryRemoveValue(newInfo, kSCDChangedKeys);
-	if (CFDictionaryGetCount(newInfo) > 0) {
-		CFDictionarySetValue(sessionData, sessionKey, newInfo);
+	mySession = getSession(storePrivate->server);
+	if (mySession->changedKeys != NULL) {
+		*notifierKeys = mySession->changedKeys;
+		mySession->changedKeys = NULL;
 	} else {
-		CFDictionaryRemoveValue(sessionData, sessionKey);
+		*notifierKeys = CFArrayCreate(NULL, NULL, 0, &kCFTypeArrayCallBacks);
 	}
-	CFRelease(newInfo);
-	CFRelease(sessionKey);
 
 	return kSCStatusOK;
 }
 
 
+__private_extern__
 kern_return_t
 _notifychanges(mach_port_t			server,
 	       xmlDataOut_t			*listRef,	/* raw XML bytes */
@@ -80,23 +61,27 @@ _notifychanges(mach_port_t			server,
 	       int				*sc_status
 )
 {
+	CFIndex			len;
 	serverSessionRef	mySession = getSession(server);
 	CFArrayRef		notifierKeys;	/* array of CFStringRef's */
 	Boolean			ok;
 
-	SCLog(_configd_verbose, LOG_DEBUG, CFSTR("List notification keys which have changed."));
-	SCLog(_configd_verbose, LOG_DEBUG, CFSTR("  server = %d"), server);
-
 	*listRef = NULL;
 	*listLen = 0;
 
+	if (mySession == NULL) {
+		*sc_status = kSCStatusNoStoreSession;	/* you must have an open session to play */
+		return KERN_SUCCESS;
+	}
+
 	*sc_status = __SCDynamicStoreCopyNotifiedKeys(mySession->store, &notifierKeys);
 	if (*sc_status != kSCStatusOK) {
 		return KERN_SUCCESS;
 	}
 
 	/* serialize the array of keys */
-	ok = _SCSerialize(notifierKeys, NULL, (void **)listRef, (CFIndex *)listLen);
+	ok = _SCSerialize(notifierKeys, NULL, (void **)listRef, &len);
+	*listLen = (mach_msg_type_number_t)len;
 	CFRelease(notifierKeys);
 	if (!ok) {
 		*sc_status = kSCStatusFailed;