configd-1109.101.1.tar.gz

[apple/configd.git] / configd.tproj / _notifychanges.c

diff --git a/configd.tproj/_notifychanges.c b/configd.tproj/_notifychanges.c
index 0cb0ed8232a3d132338e3f9065f64059e49ed1a7..31f64c7516ed5246d0fc01b8a69ec9c0dae0b9f3 100644 (file)
--- a/configd.tproj/_notifychanges.c
+++ b/configd.tproj/_notifychanges.c
@@ -1,21 +1,22 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004, 2006, 2011, 2013, 2015, 2019 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @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,
  * 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@
  */
  *
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -33,46 +34,26 @@
 #include "configd.h"
 #include "session.h"
 
 #include "configd.h"
 #include "session.h"
 

+__private_extern__

 int
 __SCDynamicStoreCopyNotifiedKeys(SCDynamicStoreRef store, CFArrayRef *notifierKeys)
 {
 int
 __SCDynamicStoreCopyNotifiedKeys(SCDynamicStoreRef store, CFArrayRef *notifierKeys)
 {

+       serverSessionRef                mySession;

        SCDynamicStorePrivateRef        storePrivate = (SCDynamicStorePrivateRef)store;
        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 {
        } else {

-               CFDictionaryRemoveValue(sessionData, sessionKey);
+               *notifierKeys = CFArrayCreate(NULL, NULL, 0, &kCFTypeArrayCallBacks);

        }
        }

-       CFRelease(newInfo);
-       CFRelease(sessionKey);

 
        return kSCStatusOK;
 }
 
 
 
        return kSCStatusOK;
 }
 
 

+__private_extern__

 kern_return_t
 _notifychanges(mach_port_t                     server,
               xmlDataOut_t                     *listRef,       /* raw XML bytes */
 kern_return_t
 _notifychanges(mach_port_t                     server,
               xmlDataOut_t                     *listRef,       /* raw XML bytes */


@@ -80,40 +61,32 @@ _notifychanges(mach_port_t                  server,
               int                              *sc_status
 )
 {
               int                              *sc_status
 )
 {

-       kern_return_t           status;
+       CFIndex                 len;

        serverSessionRef        mySession = getSession(server);
        CFArrayRef              notifierKeys;   /* array of CFStringRef's */
        serverSessionRef        mySession = getSession(server);
        CFArrayRef              notifierKeys;   /* array of CFStringRef's */

-       CFDataRef               xmlList;        /* list (XML serialized) */
+       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) {
 
        *sc_status = __SCDynamicStoreCopyNotifiedKeys(mySession->store, &notifierKeys);
        if (*sc_status != kSCStatusOK) {

-               *listRef = NULL;
-               *listLen = 0;

                return KERN_SUCCESS;
        }
 
                return KERN_SUCCESS;
        }
 

-       /*
-        * serialize the array, copy it into an allocated buffer which will be
-        * released when it is returned as part of a Mach message.
-        */
-       xmlList = CFPropertyListCreateXMLData(NULL, notifierKeys);
+       /* serialize the array of keys */
+       ok = _SCSerialize(notifierKeys, NULL, (void **)listRef, &len);
+       *listLen = (mach_msg_type_number_t)len;

        CFRelease(notifierKeys);
        CFRelease(notifierKeys);

-       *listLen = CFDataGetLength(xmlList);
-       status = vm_allocate(mach_task_self(), (void *)listRef, *listLen, TRUE);
-       if (status != KERN_SUCCESS) {
-               SCLog(_configd_verbose, LOG_DEBUG, CFSTR("vm_allocate(): %s"), mach_error_string(status));
-               CFRelease(xmlList);
-               *listRef = NULL;
-               *listLen = 0;
+       if (!ok) {

                *sc_status = kSCStatusFailed;
                return KERN_SUCCESS;
        }
 
                *sc_status = kSCStatusFailed;
                return KERN_SUCCESS;
        }
 

-       bcopy((char *)CFDataGetBytePtr(xmlList), *listRef, *listLen);
-       CFRelease(xmlList);
-

        return KERN_SUCCESS;
 }
        return KERN_SUCCESS;
 }