From 08f5681b0ebc1bf085ca3d12180bac6e61bf6744 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 15:03:41 +0200
Subject: [PATCH 1/9] core: const arguments for _nm_utils_ptrarray_find_*()
 functions

---
 libnm-core/nm-core-internal.h    | 4 ++--
 libnm-core/nm-utils.c            | 6 ++----
 libnm-core/tests/test-general.c  | 9 ++++-----
 src/nm-route-manager.c           | 2 +-
 src/platform/nm-linux-platform.c | 8 ++++----
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index e491bce6da..111b26d588 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -144,9 +144,9 @@ GPtrArray *_nm_utils_copy_array (const GPtrArray *array,
                                  GDestroyNotify free_func);
 GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array);
 
-gssize _nm_utils_ptrarray_find_first (gpointer *list, gssize len, gconstpointer needle);
+gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer needle);
 
-gssize _nm_utils_ptrarray_find_binary_search (gpointer *list, gsize len, gpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
+gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
 
 gssize      _nm_utils_strv_find_first (char **list, gssize len, const char *needle);
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index df75d56557..c55e4ba81f 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -667,10 +667,8 @@ _nm_utils_copy_object_array (const GPtrArray *array)
 	return _nm_utils_copy_array (array, g_object_ref, g_object_unref);
 }
 
-/* have @list of type 'gpointer *' instead of 'gconstpointer *' to
- * reduce the necessity for annoying const-casts. */
 gssize
-_nm_utils_ptrarray_find_first (gpointer *list, gssize len, gconstpointer needle)
+_nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer needle)
 {
 	gssize i;
 
@@ -694,7 +692,7 @@ _nm_utils_ptrarray_find_first (gpointer *list, gssize len, gconstpointer needle)
 }
 
 gssize
-_nm_utils_ptrarray_find_binary_search (gpointer *list, gsize len, gpointer needle, GCompareDataFunc cmpfcn, gpointer user_data)
+_nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data)
 {
 	gssize imin, imax, imid;
 	int cmp;
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 5dfc897114..8d5997ad2c 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -4960,9 +4960,9 @@ _test_find_binary_search_do (const int *array, gsize len)
 {
 	gsize i;
 	gssize idx;
-	gs_free gpointer *parray = g_new (gpointer, len);
-	const int needle = 0;
-	gpointer pneedle = GINT_TO_POINTER (needle);
+	gs_free gconstpointer *parray = g_new (gconstpointer, len);
+	const int NEEDLE = 0;
+	gconstpointer pneedle = GINT_TO_POINTER (NEEDLE);
 	gssize expected_result;
 
 	for (i = 0; i < len; i++)
@@ -5008,14 +5008,13 @@ _test_find_binary_search_do (const int *array, gsize len)
 }
 #define test_find_binary_search_do(...) \
 	G_STMT_START { \
-		const int _array[] = { __VA_ARGS__ } ; \
+		const int _array[] = { __VA_ARGS__ }; \
 		_test_find_binary_search_do (_array, G_N_ELEMENTS (_array)); \
 	} G_STMT_END
 
 static void
 test_nm_utils_ptrarray_find_binary_search (void)
 {
-#define _NOT(idx) (~ ((gssize) (idx)))
 	test_find_binary_search_do (            0);
 	test_find_binary_search_do (        -1, 0);
 	test_find_binary_search_do (    -2, -1, 0);
diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c
index 2d4c7d9595..95113f8c84 100644
--- a/src/nm-route-manager.c
+++ b/src/nm-route-manager.c
@@ -296,7 +296,7 @@ _route_index_find (const VTableIP *vtable, const RouteIndex *index, const NMPlat
 {
 	gssize idx, idx2;
 
-	idx = _nm_utils_ptrarray_find_binary_search ((gpointer *) index->entries, index->len, (gpointer) needle, (GCompareDataFunc) _vx_route_id_cmp_full, (gpointer) vtable);
+	idx = _nm_utils_ptrarray_find_binary_search ((gconstpointer *) index->entries, index->len, needle, (GCompareDataFunc) _vx_route_id_cmp_full, (gpointer) vtable);
 	if (idx < 0)
 		return idx;
 
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index c30eed9447..cedc220a75 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -3028,7 +3028,7 @@ delayed_action_handle_one (NMPlatform *platform)
 		g_ptr_array_remove_index_fast (priv->delayed_action.list_master_connected, 0);
 		if (priv->delayed_action.list_master_connected->len == 0)
 			priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_MASTER_CONNECTED;
-		nm_assert (_nm_utils_ptrarray_find_first (priv->delayed_action.list_master_connected->pdata, priv->delayed_action.list_master_connected->len, user_data) < 0);
+		nm_assert (_nm_utils_ptrarray_find_first ((gconstpointer *) priv->delayed_action.list_master_connected->pdata, priv->delayed_action.list_master_connected->len, user_data) < 0);
 
 		_LOGt_delayed_action (DELAYED_ACTION_TYPE_MASTER_CONNECTED, user_data, "handle");
 		delayed_action_handle_MASTER_CONNECTED (platform, GPOINTER_TO_INT (user_data));
@@ -3069,7 +3069,7 @@ delayed_action_handle_one (NMPlatform *platform)
 		g_ptr_array_remove_index_fast (priv->delayed_action.list_refresh_link, 0);
 		if (priv->delayed_action.list_refresh_link->len == 0)
 			priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_REFRESH_LINK;
-		nm_assert (_nm_utils_ptrarray_find_first (priv->delayed_action.list_refresh_link->pdata, priv->delayed_action.list_refresh_link->len, user_data) < 0);
+		nm_assert (_nm_utils_ptrarray_find_first ((gconstpointer *) priv->delayed_action.list_refresh_link->pdata, priv->delayed_action.list_refresh_link->len, user_data) < 0);
 
 		_LOGt_delayed_action (DELAYED_ACTION_TYPE_REFRESH_LINK, user_data, "handle");
 
@@ -3118,11 +3118,11 @@ delayed_action_schedule (NMPlatform *platform, DelayedActionType action_type, gp
 
 	switch (action_type) {
 	case DELAYED_ACTION_TYPE_REFRESH_LINK:
-		if (_nm_utils_ptrarray_find_first (priv->delayed_action.list_refresh_link->pdata, priv->delayed_action.list_refresh_link->len, user_data) < 0)
+		if (_nm_utils_ptrarray_find_first ((gconstpointer *) priv->delayed_action.list_refresh_link->pdata, priv->delayed_action.list_refresh_link->len, user_data) < 0)
 			g_ptr_array_add (priv->delayed_action.list_refresh_link, user_data);
 		break;
 	case DELAYED_ACTION_TYPE_MASTER_CONNECTED:
-		if (_nm_utils_ptrarray_find_first (priv->delayed_action.list_master_connected->pdata, priv->delayed_action.list_master_connected->len, user_data) < 0)
+		if (_nm_utils_ptrarray_find_first ((gconstpointer *) priv->delayed_action.list_master_connected->pdata, priv->delayed_action.list_master_connected->len, user_data) < 0)
 			g_ptr_array_add (priv->delayed_action.list_master_connected, user_data);
 		break;
 	case DELAYED_ACTION_TYPE_WAIT_FOR_NL_RESPONSE:

From c3ecca225cd1f13f75250d35e5356ee5f433cff2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 13:37:22 +0200
Subject: [PATCH 2/9] core: add _nm_utils_array_find_binary_search()

Also add nm_cmp_uint32_p_with_data(). Will be used later.
---
 libnm-core/nm-core-internal.h        |  1 +
 libnm-core/nm-utils.c                | 34 +++++++++++++++++++++++
 libnm-core/tests/test-general.c      | 41 ++++++++++++++++++++++++++++
 shared/nm-utils/nm-macros-internal.h | 13 +++++++++
 4 files changed, 89 insertions(+)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 111b26d588..471353e741 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -147,6 +147,7 @@ GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array);
 gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer needle);
 
 gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
+gssize _nm_utils_array_find_binary_search (gconstpointer list, gsize elem_size, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
 
 gssize      _nm_utils_strv_find_first (char **list, gssize len, const char *needle);
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index c55e4ba81f..818b0c43ec 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -724,6 +724,40 @@ _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpoi
 	return ~imin;
 }
 
+gssize
+_nm_utils_array_find_binary_search (gconstpointer list, gsize elem_size, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data)
+{
+	gssize imin, imax, imid;
+	int cmp;
+
+	g_return_val_if_fail (list || !len, ~((gssize) 0));
+	g_return_val_if_fail (cmpfcn, ~((gssize) 0));
+	g_return_val_if_fail (elem_size > 0, ~((gssize) 0));
+
+	imin = 0;
+	if (len == 0)
+		return ~imin;
+
+	imax = len - 1;
+
+	while (imin <= imax) {
+		imid = imin + (imax - imin) / 2;
+
+		cmp = cmpfcn (&((const char *) list)[elem_size * imid], needle, user_data);
+		if (cmp == 0)
+			return imid;
+
+		if (cmp < 0)
+			imin = imid + 1;
+		else
+			imax = imid - 1;
+	}
+
+	/* return the inverse of @imin. This is a negative number, but
+	 * also is ~imin the position where the value should be inserted. */
+	return ~imin;
+}
+
 GVariant *
 _nm_utils_bytes_to_dbus (const GValue *prop_value)
 {
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 8d5997ad2c..e71dd8bc56 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -5006,10 +5006,51 @@ _test_find_binary_search_do (const int *array, gsize len)
 		}
 	}
 }
+
+static void
+_test_find_binary_search_do_uint32 (const int *int_array, gsize len)
+{
+	gssize idx;
+	const int OFFSET = 100;
+	const int NEEDLE = 0 + OFFSET;
+	gssize expected_result = -1;
+	guint32 array[len];
+
+	/* the test data has negative values. Shift them... */
+	for (idx = 0; idx < len; idx++) {
+		int v = int_array[idx];
+
+		g_assert (v > -OFFSET);
+		g_assert (v < OFFSET);
+		g_assert (idx == 0 || v > int_array[idx - 1]);
+		array[idx] = (guint32) (int_array[idx] + OFFSET);
+		if (array[idx] == NEEDLE)
+			expected_result = idx;
+	}
+
+	idx = _nm_utils_array_find_binary_search (array,
+	                                          sizeof (guint32),
+	                                          len,
+	                                          &NEEDLE,
+	                                          nm_cmp_uint32_p_with_data,
+	                                          NULL);
+	if (expected_result >= 0)
+		g_assert_cmpint (expected_result, ==, idx);
+	else {
+		gssize idx2 = ~idx;
+		g_assert_cmpint (idx, <, 0);
+
+		g_assert (idx2 >= 0);
+		g_assert (idx2 <= len);
+		g_assert (idx2 - 1 < 0 || array[idx2 - 1] < NEEDLE);
+		g_assert (idx2 >= len || array[idx2] > NEEDLE);
+	}
+}
 #define test_find_binary_search_do(...) \
 	G_STMT_START { \
 		const int _array[] = { __VA_ARGS__ }; \
 		_test_find_binary_search_do (_array, G_N_ELEMENTS (_array)); \
+		_test_find_binary_search_do_uint32 (_array, G_N_ELEMENTS (_array)); \
 	} G_STMT_END
 
 static void
diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
index 9e9f5d8f3c..003a9e974f 100644
--- a/shared/nm-utils/nm-macros-internal.h
+++ b/shared/nm-utils/nm-macros-internal.h
@@ -516,6 +516,19 @@ nm_strcmp_p_with_data (gconstpointer a, gconstpointer b, gpointer user_data)
 	return strcmp (s1, s2);
 }
 
+static inline int
+nm_cmp_uint32_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_data)
+{
+	const guint32 a = *((const guint32 *) p_a);
+	const guint32 b = *((const guint32 *) p_b);
+
+	if (a < b)
+		return -1;
+	if (a > b)
+		return 1;
+	return 0;
+}
+
 /*****************************************************************************/
 
 /* Taken from systemd's UNIQ_T and UNIQ macros. */

From 1bb00ae66a5dda8a2f3f298d64a2e06d4be4cfc8 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvollmer@redhat.com>
Date: Thu, 15 Sep 2016 23:34:24 +0300
Subject: [PATCH 3/9] manager: Add "Capabilities" property

---
 introspection/nm-manager.xml   |  9 +++++
 libnm-core/nm-dbus-interface.h |  8 +++++
 libnm/libnm.ver                |  1 +
 src/nm-manager.c               | 60 +++++++++++++++++++++++++++++++++-
 src/nm-manager.h               |  3 ++
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index cf178c3951..9893556e56 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -380,6 +380,15 @@
     -->
     <property name="Version" type="s" access="read"/>
 
+    <!--
+        Capabilities:
+
+        The current set of capabilities. See <link
+        linkend="NMCapability">NMCapability</link> for currently
+        defined capability numbers.
+    -->
+    <property name="Capabilities" type="ai" access="read"/>
+
     <!--
         State:
 
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index e5b1b3d6b8..1e69cd0dac 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -83,6 +83,14 @@
 #define NM_DBUS_INTERFACE_SECRET_AGENT    NM_DBUS_INTERFACE ".SecretAgent"
 #define NM_DBUS_PATH_SECRET_AGENT         "/org/freedesktop/NetworkManager/SecretAgent"
 
+/**
+ * NMCapability:
+ *
+ * #NMCapability names the numbers in the Capabilities property.
+ **/
+typedef enum {
+} NMCapability;
+
 /**
  * NMState:
  * @NM_STATE_UNKNOWN: networking state is unknown
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index cc2fc7df62..baaaa8a00f 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -752,6 +752,7 @@ global:
 	nm_simple_connection_new_clone;
 	nm_simple_connection_new_from_dbus;
 	nm_state_get_type;
+	nm_capability_get_type;
 	nm_utils_ap_mode_security_valid;
 	nm_utils_bin2hexstr;
 	nm_utils_check_virtual_device_compatibility;
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 836ab76857..4983da51af 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -100,6 +100,8 @@ typedef struct {
 } RadioState;
 
 typedef struct {
+	GArray *capabilities;
+
 	GSList *active_connections;
 	GSList *authorizing_connections;
 	guint ac_cleanup_id;
@@ -180,6 +182,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 NM_GOBJECT_PROPERTIES_DEFINE (NMManager,
 	PROP_VERSION,
+	PROP_CAPABILITIES,
 	PROP_STATE,
 	PROP_STARTUP,
 	PROP_NETWORKING_ENABLED,
@@ -5439,6 +5442,45 @@ dbus_connection_changed_cb (NMBusManager *dbus_mgr,
 
 /**********************************************************************/
 
+gboolean
+nm_manager_check_capability (NMManager *self,
+                             NMCapability cap)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	int i;
+
+	for (i = 0; i < priv->capabilities->len; i++) {
+		NMCapability test = g_array_index (priv->capabilities, gint, i);
+		if (test == cap)
+			return TRUE;
+		if (test > cap)
+			return FALSE;
+	}
+
+	return FALSE;
+}
+
+static int
+cmp_caps (gconstpointer a, gconstpointer b)
+{
+	return *(gint *)a - *(gint *)b;
+}
+
+void
+nm_manager_set_capability (NMManager *self,
+                           NMCapability cap)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+
+	if (!nm_manager_check_capability (self, cap)) {
+		g_array_append_val (priv->capabilities, cap);
+		g_array_sort (priv->capabilities, cmp_caps);
+		_notify (self, PROP_CAPABILITIES);
+	}
+}
+
+/**********************************************************************/
+
 NM_DEFINE_SINGLETON_REGISTER (NMManager);
 
 NMManager *
@@ -5485,6 +5527,8 @@ constructed (GObject *object)
 
 	G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);
 
+	priv->capabilities = g_array_new (FALSE, FALSE, sizeof (gint));
+
 	_set_prop_filter (self, nm_bus_manager_get_connection (priv->dbus_mgr));
 
 	priv->settings = nm_settings_new ();
@@ -5643,6 +5687,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_VERSION:
 		g_value_set_string (value, VERSION);
 		break;
+	case PROP_CAPABILITIES:
+		g_value_set_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE ("i"),
+		                                                       priv->capabilities->data,
+		                                                       priv->capabilities->len,
+		                                                       sizeof(gint)));
+		break;
 	case PROP_STATE:
 		nm_manager_update_state (self);
 		g_value_set_uint (value, priv->state);
@@ -5859,6 +5909,8 @@ dispose (GObject *object)
 
 	nm_clear_g_source (&priv->timestamp_update_id);
 
+	g_array_free (priv->capabilities, TRUE);
+
 	G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);
 }
 
@@ -5883,6 +5935,13 @@ nm_manager_class_init (NMManagerClass *manager_class)
 	                         G_PARAM_READABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_CAPABILITIES] =
+		g_param_spec_variant (NM_MANAGER_CAPABILITIES, "", "",
+		                      G_VARIANT_TYPE ("au"),
+		                      NULL,
+		                      G_PARAM_READABLE |
+		                      G_PARAM_STATIC_STRINGS);
+
 	obj_properties[PROP_STATE] =
 	    g_param_spec_uint (NM_MANAGER_STATE, "", "",
 	                       0, NM_STATE_DISCONNECTED, 0,
@@ -6120,4 +6179,3 @@ nm_manager_class_init (NMManagerClass *manager_class)
 	                                        "CheckpointRollback", impl_manager_checkpoint_rollback,
 	                                        NULL);
 }
-
diff --git a/src/nm-manager.h b/src/nm-manager.h
index d7aabff16b..deccbdba53 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -33,6 +33,7 @@
 #define NM_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MANAGER, NMManagerClass))
 
 #define NM_MANAGER_VERSION "version"
+#define NM_MANAGER_CAPABILITIES "capabilities"
 #define NM_MANAGER_STATE "state"
 #define NM_MANAGER_STARTUP "startup"
 #define NM_MANAGER_NETWORKING_ENABLED "networking-enabled"
@@ -111,5 +112,7 @@ gboolean            nm_manager_deactivate_connection   (NMManager *manager,
                                                         NMDeviceStateReason reason,
                                                         GError **error);
 
+gboolean            nm_manager_check_capability (NMManager *self, NMCapability cap);
+void                nm_manager_set_capability   (NMManager *self, NMCapability cap);
 
 #endif /* __NETWORKMANAGER_MANAGER_H__ */

From 2ca1ce5d88a659ca396547cf884dc35fb52257a2 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvollmer@redhat.com>
Date: Fri, 16 Sep 2016 11:14:20 +0300
Subject: [PATCH 4/9] team: Add NM_CAPABILITY_TEAM

---
 libnm-core/nm-dbus-interface.h     | 2 ++
 src/devices/team/Makefile.am       | 2 +-
 src/devices/team/nm-team-factory.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 1e69cd0dac..7934f565d0 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -85,10 +85,12 @@
 
 /**
  * NMCapability:
+ * @NM_CAPABILITY_TEAM: Teams can be managed
  *
  * #NMCapability names the numbers in the Capabilities property.
  **/
 typedef enum {
+	NM_CAPABILITY_TEAM
 } NMCapability;
 
 /**
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index 00d824915d..f0ed8201be 100644
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 	-I${top_builddir}/src \
 	-I${top_srcdir}/src/devices \
 	-I${top_srcdir}/src/platform \
+	-I${top_srcdir}/src/settings \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
@@ -54,4 +55,3 @@ check-local:
 	$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-team.so)
 
 endif
-
diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index 971efe8722..edb1329995 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <gmodule.h>
 
+#include "nm-manager.h"
 #include "nm-device-factory.h"
 #include "nm-team-factory.h"
 #include "nm-device-team.h"
@@ -41,6 +42,7 @@ G_DEFINE_TYPE_EXTENDED (NMTeamFactory, nm_team_factory, G_TYPE_OBJECT, 0,
 G_MODULE_EXPORT NMDeviceFactory *
 nm_device_factory_create (GError **error)
 {
+	nm_manager_set_capability (nm_manager_get (), NM_CAPABILITY_TEAM);
 	return (NMDeviceFactory *) g_object_new (NM_TYPE_TEAM_FACTORY, NULL);
 }
 

From 4a6c07d4e5b1c8c2bf3556ecb8cd11e7d0a796f9 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 13:16:20 +0200
Subject: [PATCH 5/9] capabilities: fix data type to "u" / uint32

The property NM_MANAGER_CAPABILITIES was already "au".
The types must be used consistently.
---
 introspection/nm-manager.xml | 2 +-
 src/nm-manager.c             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 9893556e56..f3fb847831 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -387,7 +387,7 @@
         linkend="NMCapability">NMCapability</link> for currently
         defined capability numbers.
     -->
-    <property name="Capabilities" type="ai" access="read"/>
+    <property name="Capabilities" type="au" access="read"/>
 
     <!--
         State:
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 4983da51af..657051b8a5 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -5450,7 +5450,7 @@ nm_manager_check_capability (NMManager *self,
 	int i;
 
 	for (i = 0; i < priv->capabilities->len; i++) {
-		NMCapability test = g_array_index (priv->capabilities, gint, i);
+		NMCapability test = g_array_index (priv->capabilities, guint32, i);
 		if (test == cap)
 			return TRUE;
 		if (test > cap)
@@ -5527,7 +5527,7 @@ constructed (GObject *object)
 
 	G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);
 
-	priv->capabilities = g_array_new (FALSE, FALSE, sizeof (gint));
+	priv->capabilities = g_array_new (FALSE, FALSE, sizeof (guint32));
 
 	_set_prop_filter (self, nm_bus_manager_get_connection (priv->dbus_mgr));
 
@@ -5688,10 +5688,10 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, VERSION);
 		break;
 	case PROP_CAPABILITIES:
-		g_value_set_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE ("i"),
+		g_value_set_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE ("u"),
 		                                                       priv->capabilities->data,
 		                                                       priv->capabilities->len,
-		                                                       sizeof(gint)));
+		                                                       sizeof (guint32)));
 		break;
 	case PROP_STATE:
 		nm_manager_update_state (self);

From ede4b1c5e57ec56530a6b06d56bfac69b630a9cf Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 13:18:32 +0200
Subject: [PATCH 6/9] libnm: fix symbol versioning

Already released versions must not be extended or modified.
The new symbol is part of upcomming 1.6.0 release.
---
 libnm/libnm.ver | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index baaaa8a00f..6c149f6587 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -752,7 +752,6 @@ global:
 	nm_simple_connection_new_clone;
 	nm_simple_connection_new_from_dbus;
 	nm_state_get_type;
-	nm_capability_get_type;
 	nm_utils_ap_mode_security_valid;
 	nm_utils_bin2hexstr;
 	nm_utils_check_virtual_device_compatibility;
@@ -1084,3 +1083,7 @@ global:
 	nm_vpn_plugin_info_new_search_file;
 	nm_vpn_plugin_info_supports_hints;
 } libnm_1_2_0;
+
+libnm_1_6_0 {
+	nm_capability_get_type;
+} libnm_1_4_0;

From ab262480807a179615de114fea1f9e3e162aa851 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 13:20:47 +0200
Subject: [PATCH 7/9] capabilities: fix number for NM_CAPABILITY_TEAM

The enum defines should name their numerical value explicitly,
so that it can be easily seen by looking at the code. Also,
they are public, stable API. They must not change.

Anyway, the capability 0 shall be reserved. Change NM_CAPABILITY_TEAM
to value 1.
---
 libnm-core/nm-dbus-interface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 7934f565d0..5e63cc069d 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -90,7 +90,7 @@
  * #NMCapability names the numbers in the Capabilities property.
  **/
 typedef enum {
-	NM_CAPABILITY_TEAM
+	NM_CAPABILITY_TEAM = 1,
 } NMCapability;
 
 /**

From 9d00736527e595315752f5dbcbd9f1aabd17b324 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 13:24:10 +0200
Subject: [PATCH 8/9] capabilities: fix destroying capabilities in dispose()

dispose() must be re-entrant. Thus, at the very least it must clear the
priv->capabilities after freeing the array.

While at it, move it to finalize (which is only called once) and
move initialization of the array from "constructed" to nm_manager_init()
which is called first.
---
 src/nm-manager.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 657051b8a5..9802f8dcc7 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -5527,8 +5527,6 @@ constructed (GObject *object)
 
 	G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);
 
-	priv->capabilities = g_array_new (FALSE, FALSE, sizeof (guint32));
-
 	_set_prop_filter (self, nm_bus_manager_get_connection (priv->dbus_mgr));
 
 	priv->settings = nm_settings_new ();
@@ -5600,6 +5598,8 @@ nm_manager_init (NMManager *self)
 	guint i;
 	GFile *file;
 
+	priv->capabilities = g_array_new (FALSE, FALSE, sizeof (guint32));
+
 	/* Initialize rfkill structures and states */
 	memset (priv->radio_states, 0, sizeof (priv->radio_states));
 
@@ -5909,9 +5909,17 @@ dispose (GObject *object)
 
 	nm_clear_g_source (&priv->timestamp_update_id);
 
+	G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE ((NMManager *) object);
+
 	g_array_free (priv->capabilities, TRUE);
 
-	G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);
+	G_OBJECT_CLASS (nm_manager_parent_class)->finalize (object);
 }
 
 static void
@@ -5927,6 +5935,7 @@ nm_manager_class_init (NMManagerClass *manager_class)
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
 	object_class->dispose = dispose;
+	object_class->finalize = finalize;
 
 	/* properties */
 	obj_properties[PROP_VERSION] =

From e80b0a98c02509048c9caf62059d3cd2b51a9225 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 23 Sep 2016 14:32:50 +0200
Subject: [PATCH 9/9] core: use binary-search for nm_manager_set_capability()

And drop the unused function nm_manager_check_capability().
I don't think we need such a function server-side, as the
server usually has better ways to check whether a capability
is supported.
---
 src/nm-manager.c | 54 +++++++++++++++++++++---------------------------
 src/nm-manager.h |  1 -
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 9802f8dcc7..2335a731bf 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -5442,41 +5442,35 @@ dbus_connection_changed_cb (NMBusManager *dbus_mgr,
 
 /**********************************************************************/
 
-gboolean
-nm_manager_check_capability (NMManager *self,
-                             NMCapability cap)
-{
-	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	int i;
-
-	for (i = 0; i < priv->capabilities->len; i++) {
-		NMCapability test = g_array_index (priv->capabilities, guint32, i);
-		if (test == cap)
-			return TRUE;
-		if (test > cap)
-			return FALSE;
-	}
-
-	return FALSE;
-}
-
-static int
-cmp_caps (gconstpointer a, gconstpointer b)
-{
-	return *(gint *)a - *(gint *)b;
-}
-
 void
 nm_manager_set_capability (NMManager *self,
                            NMCapability cap)
 {
-	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	NMManagerPrivate *priv;
+	guint32 cap_i;
+	gssize idx;
 
-	if (!nm_manager_check_capability (self, cap)) {
-		g_array_append_val (priv->capabilities, cap);
-		g_array_sort (priv->capabilities, cmp_caps);
-		_notify (self, PROP_CAPABILITIES);
-	}
+	g_return_if_fail (NM_IS_MANAGER (self));
+	if (cap < 1 || cap > NM_CAPABILITY_TEAM)
+		g_return_if_reached ();
+
+	cap_i = (guint32) cap;
+
+	priv = NM_MANAGER_GET_PRIVATE (self);
+
+	idx = _nm_utils_array_find_binary_search (&g_array_index (priv->capabilities, guint32, 0),
+	                                          sizeof (guint32),
+	                                          priv->capabilities->len,
+	                                          &cap_i,
+	                                          nm_cmp_uint32_p_with_data,
+	                                          NULL);
+	if (idx >= 0)
+		return;
+
+	nm_assert ((~idx) <= (gssize) priv->capabilities->len);
+
+	g_array_insert_val (priv->capabilities, ~idx, cap_i);
+	_notify (self, PROP_CAPABILITIES);
 }
 
 /**********************************************************************/
diff --git a/src/nm-manager.h b/src/nm-manager.h
index deccbdba53..11c4eb4a18 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -112,7 +112,6 @@ gboolean            nm_manager_deactivate_connection   (NMManager *manager,
                                                         NMDeviceStateReason reason,
                                                         GError **error);
 
-gboolean            nm_manager_check_capability (NMManager *self, NMCapability cap);
 void                nm_manager_set_capability   (NMManager *self, NMCapability cap);
 
 #endif /* __NETWORKMANAGER_MANAGER_H__ */