configd-963.tar.gz

[apple/configd.git] / IPMonitorControl / IPMonitorControlServer.c

diff --git a/IPMonitorControl/IPMonitorControlServer.c b/IPMonitorControl/IPMonitorControlServer.c
index 53ad39d2138863d969901a60e450c62be00a211f..b4563fce73d27a6cfd3957737ff26c404979ae68 100644 (file)
--- a/IPMonitorControl/IPMonitorControlServer.c
+++ b/IPMonitorControl/IPMonitorControlServer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2013-2017 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -46,7 +46,7 @@
 #include <SystemConfiguration/SCPrivate.h>
 
 #ifdef TEST_IPMONITOR_CONTROL
-#define my_log(__level, fmt, ...)      SCPrint(TRUE, stdout, CFSTR(fmt "\n"), ## __VA_ARGS__)
+#define        my_log(__level, __format, ...)  SCPrint(TRUE, stdout, CFSTR(__format "\n"), ## __VA_ARGS__)
 
 #else /* TEST_IPMONITOR_CONTROL */
 #include "ip_plugin.h"
@@ -81,8 +81,7 @@ InterfaceChangedListAddInterface(CFStringRef ifname)
        CFArrayAppendValue(S_if_changes, ifname);
        S_if_changes_range.length = 1;
     }
-    else if (CFArrayContainsValue(S_if_changes, S_if_changes_range,
-                                 ifname) == FALSE) {
+    else if (!CFArrayContainsValue(S_if_changes, S_if_changes_range, ifname)) {
        CFArrayAppendValue(S_if_changes, ifname);
        S_if_changes_range.length++;
     }
@@ -111,14 +110,14 @@ InterfaceRankAssertionAdd(const void * key, const void * value, void * context)
            = CFDictionaryCreateMutable(NULL, 0,
                                        &kCFTypeDictionaryKeyCallBacks,
                                        &kCFTypeDictionaryValueCallBacks);
-       CFDictionarySetValue(*assertions_p, key, value);
+       CFDictionarySetValue(*assertions_p, key, rank);
        return;
     }
     existing_rank = CFDictionaryGetValue(*assertions_p, key);
     if (existing_rank == NULL
        || (CFNumberCompare(rank, existing_rank, NULL)
            == kCFCompareGreaterThan)) {
-       CFDictionarySetValue(*assertions_p, key, value);
+       CFDictionarySetValue(*assertions_p, key, rank);
     }
     return;
 }
@@ -169,6 +168,8 @@ GenerateNotification(void)
 STATIC void
 AddChangedInterface(const void * key, const void * value, void * context)
 {
+#pragma unused(value)
+#pragma unused(context)
     InterfaceChangedListAddInterface((CFStringRef)key);
     return;
 }
@@ -312,11 +313,12 @@ IPMonitorControlServerHandleSetInterfaceRank(xpc_connection_t connection,
                                             xpc_object_t request,
                                             xpc_object_t reply)
 {
+#pragma unused(reply)
     const char *               ifname;
     SCNetworkServicePrimaryRank        rank;
     ControlSessionRef          session;
 
-    if (IPMonitorControlServerValidateConnection(connection) == FALSE) {
+    if (!IPMonitorControlServerValidateConnection(connection)) {
        my_log(LOG_INFO, "connection %p pid %d permission denied",
               connection, xpc_connection_get_pid(connection));
        return (EPERM);
@@ -454,16 +456,10 @@ IPMonitorControlServerHandleNewConnection(xpc_connection_t connection)
     xpc_handler_t      handler;
 
     handler = ^(xpc_object_t event) {
-       os_activity_t   activity_id;
-
-       activity_id = os_activity_start("processing IPMonitor [rank] request",
-                                       OS_ACTIVITY_FLAG_DEFAULT);
-
        IPMonitorControlServerHandleRequest(connection, event);
-
-       os_activity_end(activity_id);
     };
     xpc_connection_set_event_handler(connection, handler);
+    xpc_connection_set_target_queue(connection, S_IPMonitorControlServerQueue);
     xpc_connection_resume(connection);
     return;
 }
@@ -480,12 +476,8 @@ IPMonitorControlServerCreate(dispatch_queue_t queue, const char * name)
        return (NULL);
     }
     handler = ^(xpc_object_t event) {
-       os_activity_t   activity_id;
        xpc_type_t      type;
 
-       activity_id = os_activity_start("processing IPMonitor [rank] connection request",
-                                       OS_ACTIVITY_FLAG_DEFAULT);
-
        type = xpc_get_type(event);
        if (type == XPC_TYPE_CONNECTION) {
            IPMonitorControlServerHandleNewConnection(event);
@@ -505,8 +497,6 @@ IPMonitorControlServerCreate(dispatch_queue_t queue, const char * name)
        else {
            my_log(LOG_NOTICE, "unknown event %p", type);
        }
-
-       os_activity_end(activity_id);
     };
     S_IPMonitorControlServerQueue = queue;
     xpc_connection_set_event_handler(connection, handler);
@@ -518,6 +508,7 @@ PRIVATE_EXTERN Boolean
 IPMonitorControlServerStart(CFRunLoopRef runloop, CFRunLoopSourceRef rls,
                            Boolean * verbose)
 {
+#pragma unused(verbose)
     dispatch_queue_t   q;
     xpc_connection_t   connection;