From a9fe0d3a347c6b8af6d772a758c64ffd9580d9de Mon Sep 17 00:00:00 2001

From: Dan Winship <danw@gnome.org>

Date: Wed, 2 Apr 2014 09:24:21 -0400

Subject: [PATCH] dcb: fix -Wformat-security bugs

---

 src/nm-dcb.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nm-dcb.c b/src/nm-dcb.c

index 77d7b41..5e25cd8 100644

--- a/src/nm-dcb.c

+++ b/src/nm-dcb.c

@@ -204,15 +204,15 @@ _dcb_setup (const char *iface,

 		g_string_append (s, " up2tc:");

 		for (i = 0; i < 8; i++) {

 			id = nm_setting_dcb_get_priority_traffic_class (s_dcb, i);

 			g_assert (id < 8);

 			g_string_append_c (s, '0' + id);

 		}

-		success = do_helper (iface, DCBTOOL, run_func, user_data, error, s->str);

+		success = do_helper (iface, DCBTOOL, run_func, user_data, error, "%s", s->str);

 		g_string_free (s, TRUE);

 		if (!success)

 			return FALSE;

 	} else {

 		/* Ignore disable failure since lldpad <= 0.9.46 does not support disabling

 		 * priority groups without specifying an entire PG config.

 		 */

@@ -238,15 +238,15 @@ _dcb_cleanup (const char *iface,

 		NULL

 	};

 	const char **iter = cmds;

 	gboolean success = TRUE;

 	/* Turn everything off and return first error we get (if any) */

 	while (iter && *iter) {

-		if (!do_helper (iface, DCBTOOL, run_func, user_data, success ? error : NULL, *iter))

+		if (!do_helper (iface, DCBTOOL, run_func, user_data, success ? error : NULL, "%s", *iter))

 			success = FALSE;

 		iter++;

 	}

 	return success;

 }

-- 

1.9.0

From 18fd3e45d8db3428d4840d7cb9ea1980a22ef7de Mon Sep 17 00:00:00 2001

From: Dan Williams <dcbw@redhat.com>

Date: Thu, 27 Mar 2014 13:49:50 -0500

Subject: [PATCH] dcb: separate DCB enable/disable and wait for carrier changes

 (rh #799241) (rh #1081991)

Non-git-master versions of lldpad refuse to touch a device that doesn't

have a carrier.  And when enabling/disabling DCB, the kernel driver will

reconfigure itself and may turn carrier off for a few seconds.  So we

must ensure that before enabling/disabling DCB, the carrier is already

on.  Next we must ensure that *after* enabling/disabling DCB, the

carrier is back on before doing further DCB setup.

There's a race condition between enabling/disabling DCB and receiving

the carrier event in NetworkManager that has to be handled carefully.

Because the carrier may not yet be down after the dcbtool call to

enable/disable DCB returns, we need to wait for a couple seconds for

the carrier to go down, and then again for it to come back up.

Otherwise we might see the still-on carrier, proceed with DCB setup,

and the carrier finally goes down halfway through the setup, which

will fail the operations with "DCB not enabled, link down, or DCB

not supported" errors from lldpad.

---

 src/devices/nm-device-ethernet.c | 270 ++++++++++++++++++++++++++++++++++++---

 src/nm-dcb.c                     |  38 ++++--

 src/nm-dcb.h                     |   7 +

 src/tests/test-dcb.c             |  27 ++--

 4 files changed, 300 insertions(+), 42 deletions(-)

diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c

index a6279a4..e6f091d 100644

--- a/src/devices/nm-device-ethernet.c

+++ b/src/devices/nm-device-ethernet.c

@@ -82,14 +82,28 @@ typedef struct Supplicant {

 	guint iface_state_id;

 	/* Timeouts and idles */

 	guint iface_con_error_cb_id;

 	guint con_timeout_id;

 } Supplicant;

+typedef enum {

+	DCB_WAIT_UNKNOWN = 0,

+	/* Ensure carrier is up before enabling DCB */

+	DCB_WAIT_CARRIER_PREENABLE_UP,

+	/* Wait for carrier down when device starts enabling */

+	DCB_WAIT_CARRIER_PRECONFIG_DOWN,

+	/* Wait for carrier up when device has finished enabling */

+	DCB_WAIT_CARRIER_PRECONFIG_UP,

+	/* Wait carrier down when device starts configuring */

+	DCB_WAIT_CARRIER_POSTCONFIG_DOWN,

+	/* Wait carrier up when device has finished configuring */

+	DCB_WAIT_CARRIER_POSTCONFIG_UP,

+} DcbWait;

+

 typedef struct {

 	guint8              perm_hw_addr[ETH_ALEN];    /* Permanent MAC address */

 	guint8              initial_hw_addr[ETH_ALEN]; /* Initial MAC address (as seen when NM starts) */

 	guint32             speed;

 	Supplicant          supplicant;

@@ -102,14 +116,19 @@ typedef struct {

 	char *              subchannels; /* Composite used for checking unmanaged specs */

 	/* PPPoE */

 	NMPPPManager *ppp_manager;

 	NMIP4Config  *pending_ip4_config;

 	gint32        last_pppoe_time;

 	guint         pppoe_wait_id;

+

+	/* DCB */

+	DcbWait       dcb_wait;

+	guint         dcb_timeout_id;

+	guint         dcb_carrier_id;

 } NMDeviceEthernetPrivate;

 enum {

 	PROP_0,

 	PROP_PERM_HW_ADDRESS,

 	PROP_SPEED,

@@ -1090,51 +1109,263 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas

 		*reason = NM_DEVICE_STATE_REASON_PPP_START_FAILED;

 	}

 	return ret;

 }

+/****************************************************************/

+

+static void

+dcb_timeout_cleanup (NMDevice *device)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+

+	if (priv->dcb_timeout_id) {

+		g_source_remove (priv->dcb_timeout_id);

+		priv->dcb_timeout_id = 0;

+	}

+}

+

+static void

+dcb_carrier_cleanup (NMDevice *device)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+

+	if (priv->dcb_carrier_id) {

+		g_signal_handler_disconnect (device, priv->dcb_carrier_id);

+		priv->dcb_carrier_id = 0;

+	}

+}

+

+static void dcb_state (NMDevice *device, gboolean timeout);

+

+static gboolean

+dcb_carrier_timeout (gpointer user_data)

+{

+	NMDevice *device = NM_DEVICE (user_data);

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+

+	g_return_val_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_CONFIG, G_SOURCE_REMOVE);

+

+	priv->dcb_timeout_id = 0;

+	if (priv->dcb_wait != DCB_WAIT_CARRIER_POSTCONFIG_DOWN) {

+		nm_log_warn (LOGD_DCB,

+		             "(%s): DCB: timed out waiting for carrier (step %d)",

+		             nm_device_get_iface (device),

+		             priv->dcb_wait);

+	}

+	dcb_state (device, TRUE);

+	return G_SOURCE_REMOVE;

+}

+

+static gboolean

+dcb_configure (NMDevice *device)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+	NMSettingDcb *s_dcb;

+	const char *iface = nm_device_get_iface (device);

+	GError *error = NULL;

+

+	dcb_timeout_cleanup (device);

+

+	s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB);

+	g_assert (s_dcb);

+	if (!nm_dcb_setup (iface, s_dcb, &error)) {

+		nm_log_warn (LOGD_DCB,

+		             "Activation (%s/wired) failed to enable DCB/FCoE: %s",

+		             iface, error->message);

+		g_clear_error (&error);

+		return FALSE;

+	}

+

+	/* Pause again just in case the device takes the carrier down when

+	 * setting specific DCB attributes.

+	 */

+	nm_log_dbg (LOGD_DCB, "(%s): waiting for carrier (postconfig down)", iface);

+	priv->dcb_wait = DCB_WAIT_CARRIER_POSTCONFIG_DOWN;

+	priv->dcb_timeout_id = g_timeout_add_seconds (3, dcb_carrier_timeout, device);

+	return TRUE;

+}

+

+static gboolean

+dcb_enable (NMDevice *device)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+	const char *iface = nm_device_get_iface (device);

+	GError *error = NULL;

+

+	dcb_timeout_cleanup (device);

+	if (!nm_dcb_enable (iface, TRUE, &error)) {

+		nm_log_warn (LOGD_DCB,

+		             "Activation (%s/wired) failed to enable DCB/FCoE: %s",

+		             iface, error->message);

+		g_clear_error (&error);

+		return FALSE;

+	}

+

+	/* Pause for 3 seconds after enabling DCB to let the card reconfigure

+	 * itself.  Drivers will often re-initialize internal settings which

+	 * takes the carrier down for 2 or more seconds.  During this time,

+	 * lldpad will refuse to do anything else with the card since the carrier

+	 * is down.  But NM might get the carrier-down signal long after calling

+	 * "dcbtool dcb on", so we have to first wait for the carrier to go down.

+	 */

+	nm_log_dbg (LOGD_DCB, "(%s): waiting for carrier (preconfig down)", iface);

+	priv->dcb_wait = DCB_WAIT_CARRIER_PRECONFIG_DOWN;

+	priv->dcb_timeout_id = g_timeout_add_seconds (3, dcb_carrier_timeout, device);

+	return TRUE;

+}

+

+static void

+dcb_state (NMDevice *device, gboolean timeout)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+	const char *iface = nm_device_get_iface (device);

+	gboolean carrier;

+

+	g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_CONFIG);

+

+

+	carrier = nm_platform_link_is_connected (nm_device_get_ifindex (device));

+	nm_log_dbg (LOGD_DCB, "(%s): dcb_state() wait %d carrier %d timeout %d", iface, priv->dcb_wait, carrier, timeout);

+

+	switch (priv->dcb_wait) {

+	case DCB_WAIT_CARRIER_PREENABLE_UP:

+		if (timeout || carrier) {

+			nm_log_dbg (LOGD_DCB, "(%s): dcb_state() enabling DCB", iface);

+			dcb_timeout_cleanup (device);

+			if (!dcb_enable (device)) {

+				dcb_carrier_cleanup (device);

+				nm_device_state_changed (device,

+				                         NM_ACT_STAGE_RETURN_FAILURE,

+				                         NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED);

+			}

+		}

+		break;

+	case DCB_WAIT_CARRIER_PRECONFIG_DOWN:

+		dcb_timeout_cleanup (device);

+		priv->dcb_wait = DCB_WAIT_CARRIER_PRECONFIG_UP;

+

+		if (!carrier) {

+			/* Wait for the carrier to come back up */

+			nm_log_dbg (LOGD_DCB, "(%s): waiting for carrier (preconfig up)", iface);

+			priv->dcb_timeout_id = g_timeout_add_seconds (5, dcb_carrier_timeout, device);

+			break;

+		}

+		nm_log_dbg (LOGD_DCB, "(%s): dcb_state() preconfig down falling through", iface);

+		/* carrier never went down? fall through */

+	case DCB_WAIT_CARRIER_PRECONFIG_UP:

+		if (timeout || carrier) {

+			nm_log_dbg (LOGD_DCB, "(%s): dcb_state() preconfig up configuring DCB", iface);

+			dcb_timeout_cleanup (device);

+			if (!dcb_configure (device)) {

+				dcb_carrier_cleanup (device);

+				nm_device_state_changed (device,

+				                         NM_ACT_STAGE_RETURN_FAILURE,

+				                         NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED);

+			}

+		}

+		break;

+	case DCB_WAIT_CARRIER_POSTCONFIG_DOWN:

+		dcb_timeout_cleanup (device);

+		priv->dcb_wait = DCB_WAIT_CARRIER_POSTCONFIG_UP;

+

+		if (!carrier) {

+			/* Wait for the carrier to come back up */

+			nm_log_dbg (LOGD_DCB, "(%s): waiting for carrier (postconfig up)", iface);

+			priv->dcb_timeout_id = g_timeout_add_seconds (5, dcb_carrier_timeout, device);

+			break;

+		}

+		nm_log_dbg (LOGD_DCB, "(%s): dcb_state() postconfig down falling through", iface);

+		/* carrier never went down? fall through */

+	case DCB_WAIT_CARRIER_POSTCONFIG_UP:

+		if (timeout || carrier) {

+			nm_log_dbg (LOGD_DCB, "(%s): dcb_state() postconfig up starting IP", iface);

+			dcb_timeout_cleanup (device);

+			dcb_carrier_cleanup (device);

+			priv->dcb_wait = DCB_WAIT_UNKNOWN;

+			nm_device_activate_schedule_stage3_ip_config_start (device);

+		}

+		break;

+	default:

+		g_assert_not_reached ();

+	}

+}

+

+static void

+dcb_carrier_changed (NMDevice *device, GParamSpec *pspec, gpointer unused)

+{

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

+

+	g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_CONFIG);

+

+	if (priv->dcb_timeout_id) {

+		nm_log_dbg (LOGD_DCB, "(%s): carrier_changed() calling dcb_state()", nm_device_get_iface (device));

+		dcb_state (device, FALSE);

+	}

+}

+

+/****************************************************************/

+

 static NMActStageReturn

 act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)

 {

+	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);

 	NMSettingConnection *s_con;

 	const char *connection_type;

 	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;

 	NMSettingDcb *s_dcb;

-	GError *error = NULL;

 	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);

-	/* DCB and FCoE setup */

-	s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB);

-	if (s_dcb) {

-		if (!nm_dcb_setup (nm_device_get_iface (device), s_dcb, &error)) {

-			nm_log_warn (LOGD_DEVICE | LOGD_HW,

-			             "Activation (%s/wired) failed to enable DCB/FCoE: %s",

-			             nm_device_get_iface (device), error->message);

-			g_clear_error (&error);

-			*reason = NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED;

-			return NM_ACT_STAGE_RETURN_FAILURE;

-		}

-	}

-

 	s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION));

 	g_assert (s_con);

+	dcb_timeout_cleanup (device);

+	dcb_carrier_cleanup (device);

+

 	/* 802.1x has to run before any IP configuration since the 802.1x auth

 	 * process opens the port up for normal traffic.

 	 */

 	connection_type = nm_setting_connection_get_connection_type (s_con);

 	if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {

 		NMSetting8021x *security;

 		security = (NMSetting8021x *) device_get_setting (device, NM_TYPE_SETTING_802_1X);

-		if (security)

-			ret = nm_8021x_stage2_config (NM_DEVICE_ETHERNET (device), reason);

+		if (security) {

+			/* FIXME: for now 802.1x is mutually exclusive with DCB */

+			return nm_8021x_stage2_config (NM_DEVICE_ETHERNET (device), reason);

+		}

+	}

+

+	/* DCB and FCoE setup */

+	s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB);

+	if (s_dcb) {

+		/* lldpad really really wants the carrier to be up */

+		if (nm_platform_link_is_connected (nm_device_get_ifindex (device))) {

+			if (!dcb_enable (device)) {

+				*reason = NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED;

+				return NM_ACT_STAGE_RETURN_FAILURE;

+			}

+		} else {

+			nm_log_dbg (LOGD_DCB, "(%s): waiting for carrier (preenable up)",

+			            nm_device_get_iface (device));

+			priv->dcb_wait = DCB_WAIT_CARRIER_PREENABLE_UP;

+			priv->dcb_timeout_id = g_timeout_add_seconds (4, dcb_carrier_timeout, device);

+		}

+

+		/* Watch carrier independently of NMDeviceClass::carrier_changed so

+		 * we get instant notifications of disconnection that aren't deferred.

+		 */

+		priv->dcb_carrier_id = g_signal_connect (device,

+		                                         "notify::" NM_DEVICE_CARRIER,

+		                                         G_CALLBACK (dcb_carrier_changed),

+		                                         NULL);

+		ret = NM_ACT_STAGE_RETURN_POSTPONE;

 	}

 	return ret;

 }

 static NMActStageReturn

 act_stage3_ip4_config_start (NMDevice *device,

@@ -1202,14 +1433,18 @@ deactivate (NMDevice *device)

 	if (priv->ppp_manager) {

 		g_object_unref (priv->ppp_manager);

 		priv->ppp_manager = NULL;

 	}

 	supplicant_interface_release (self);

+	priv->dcb_wait = DCB_WAIT_UNKNOWN;

+	dcb_timeout_cleanup (device);

+	dcb_carrier_cleanup (device);

+

 	/* Tear down DCB/FCoE if it was enabled */

 	s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB);

 	if (s_dcb) {

 		if (!nm_dcb_cleanup (nm_device_get_iface (device), &error)) {

 			nm_log_warn (LOGD_DEVICE | LOGD_HW,

 			             "(%s) failed to disable DCB/FCoE: %s",

 			             nm_device_get_iface (device), error->message);

@@ -1405,14 +1640,17 @@ dispose (GObject *object)

 	g_free (priv->subchannels);

 	if (priv->pppoe_wait_id) {

 		g_source_remove (priv->pppoe_wait_id);

 		priv->pppoe_wait_id = 0;

 	}

+	dcb_timeout_cleanup (NM_DEVICE (self));

+	dcb_carrier_cleanup (NM_DEVICE (self));

+

 	G_OBJECT_CLASS (nm_device_ethernet_parent_class)->dispose (object);

 }

 static void

 get_property (GObject *object, guint prop_id,

               GValue *value, GParamSpec *pspec)

 {

diff --git a/src/nm-dcb.c b/src/nm-dcb.c

index 5e25cd8..428c61e 100644

--- a/src/nm-dcb.c

+++ b/src/nm-dcb.c

@@ -88,14 +88,27 @@ out:

 		g_strfreev (split);

 	g_free (argv);

 	g_free (cmdline);

 	g_free (errmsg);

 	return success;

 }

+gboolean

+_dcb_enable (const char *iface,

+             gboolean enable,

+             DcbFunc run_func,

+             gpointer user_data,

+             GError **error)

+{

+	if (enable)

+		return do_helper (iface, DCBTOOL, run_func, user_data, error, "dcb on");

+	else

+		return do_helper (iface, DCBTOOL, run_func, user_data, error, "dcb off");

+}

+

 #define SET_FLAGS(f, tag) \

 G_STMT_START { \

 	if (!do_helper (iface, DCBTOOL, run_func, user_data, error, tag " e:%c a:%c w:%c", \

 	                 f & NM_SETTING_DCB_FLAG_ENABLE ? '1' : '0', \

 	                 f & NM_SETTING_DCB_FLAG_ADVERTISE ? '1' : '0', \

 	                 f & NM_SETTING_DCB_FLAG_WILLING ? '1' : '0')) \

 		return FALSE; \

@@ -120,17 +133,14 @@ _dcb_setup (const char *iface,

             GError **error)

 {

 	NMSettingDcbFlags flags;

 	guint i;

 	g_assert (s_dcb);

-	if (!do_helper (iface, DCBTOOL, run_func, user_data, error, "dcb on"))

-		return FALSE;

-

 	/* FCoE */

 	flags = nm_setting_dcb_get_app_fcoe_flags (s_dcb);

 	SET_APP (flags, s_dcb, fcoe);

 	/* iSCSI */

 	flags = nm_setting_dcb_get_app_iscsi_flags (s_dcb);

 	SET_APP (flags, s_dcb, iscsi);

@@ -225,15 +235,14 @@ _dcb_setup (const char *iface,

 gboolean

 _dcb_cleanup (const char *iface,

               DcbFunc run_func,

               gpointer user_data,

               GError **error)

 {

 	const char *cmds[] = {

-		"dcb off",

 		"app:fcoe e:0",

 		"app:iscsi e:0",

 		"app:fip e:0",

 		"pfc e:0",

 		"pg e:0",

 		NULL

 	};

@@ -243,14 +252,17 @@ _dcb_cleanup (const char *iface,

 	/* Turn everything off and return first error we get (if any) */

 	while (iter && *iter) {

 		if (!do_helper (iface, DCBTOOL, run_func, user_data, success ? error : NULL, "%s", *iter))

 			success = FALSE;

 		iter++;

 	}

+	if (!_dcb_enable (iface, FALSE, run_func, user_data, success ? error : NULL))

+		success = FALSE;

+

 	return success;

 }

 gboolean

 _fcoe_setup (const char *iface,

              NMSettingDcb *s_dcb,

              DcbFunc run_func,

@@ -351,32 +363,32 @@ run_helper (char **argv, guint which, gpointer user_data, GError **error)

 	g_free (errmsg);

 	g_free (cmdline);

 	return success;

 }

 gboolean

+nm_dcb_enable (const char *iface, gboolean enable, GError **error)

+{

+	return _dcb_enable (iface, enable, run_helper, GUINT_TO_POINTER (DCBTOOL), error);

+}

+

+gboolean

 nm_dcb_setup (const char *iface, NMSettingDcb *s_dcb, GError **error)

 {

 	gboolean success;

 	success = _dcb_setup (iface, s_dcb, run_helper, GUINT_TO_POINTER (DCBTOOL), error);

 	if (success)

 		success = _fcoe_setup (iface, s_dcb, run_helper, GUINT_TO_POINTER (FCOEADM), error);

 	return success;

 }

 gboolean

 nm_dcb_cleanup (const char *iface, GError **error)

 {

-	gboolean success;

-

-	success = _dcb_cleanup (iface, run_helper, GUINT_TO_POINTER (DCBTOOL), error);

-	if (success) {

-		/* Only report FCoE errors if DCB cleanup was successful */

-		success = _fcoe_cleanup (iface, run_helper, GUINT_TO_POINTER (FCOEADM), success ? error : NULL);

-	}

-

-	return success;

+	/* Ignore FCoE cleanup errors */

+	_fcoe_cleanup (iface, run_helper, GUINT_TO_POINTER (FCOEADM), NULL);

+	return _dcb_cleanup (iface, run_helper, GUINT_TO_POINTER (DCBTOOL), error);

 }

diff --git a/src/nm-dcb.h b/src/nm-dcb.h

index 3dbd5e6..bfe5ced 100644

--- a/src/nm-dcb.h

+++ b/src/nm-dcb.h

@@ -44,14 +44,15 @@ typedef enum {

 #define NM_DCB_ERROR (nm_dcb_error_quark ())

 GQuark nm_dcb_error_quark (void);

 #define NM_TYPE_DCB_ERROR (nm_dcb_error_get_type ())

 GType  nm_dcb_error_get_type (void);

+gboolean nm_dcb_enable (const char *iface, gboolean enable, GError **error);

 gboolean nm_dcb_setup (const char *iface, NMSettingDcb *s_dcb, GError **error);

 gboolean nm_dcb_cleanup (const char *iface, GError **error);

 /* For testcases only! */

 typedef gboolean (*DcbFunc) (char **argv,

                              guint which,

                              gpointer user_data,

@@ -64,14 +65,20 @@ gboolean do_helper (const char *iface,

                     guint which,

                     DcbFunc run_func,

                     gpointer user_data,

                     GError **error,

                     const char *fmt,

                     ...) G_GNUC_PRINTF(6, 7);

+gboolean _dcb_enable (const char *iface,

+                      gboolean enable,

+                      DcbFunc run_func,

+                      gpointer user_data,

+                      GError **error);

+

 gboolean _dcb_setup (const char *iface,

                      NMSettingDcb *s_dcb,

                      DcbFunc run_func,

                      gpointer user_data,

                      GError **error);

 gboolean _dcb_cleanup (const char *iface,

diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c

index 74dcca5..aead8f1 100644

--- a/src/tests/test-dcb.c

+++ b/src/tests/test-dcb.c

@@ -50,16 +50,15 @@ test_dcb_func (char **argv, guint which, gpointer user_data, GError **error)

                        NM_SETTING_DCB_FLAG_ADVERTISE | \

                        NM_SETTING_DCB_FLAG_WILLING)

 static void

 test_dcb_fcoe (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",

-		  "dcbtool sc eth0 app:fcoe e:1 a:1 w:1",

+		{ "dcbtool sc eth0 app:fcoe e:1 a:1 w:1",

 		  "dcbtool sc eth0 app:fcoe appcfg:40",

 		  "dcbtool sc eth0 app:iscsi e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:fip e:0 a:0 w:0",

 		  "dcbtool sc eth0 pfc e:0 a:0 w:0",

 		  "dcbtool sc eth0 pg e:0",

 		  NULL },

 	};

@@ -81,16 +80,15 @@ test_dcb_fcoe (void)

 	g_object_unref (s_dcb);

 }

 static void

 test_dcb_iscsi (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",

-		  "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

+		{ "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:iscsi e:1 a:0 w:1",

 		  "dcbtool sc eth0 app:iscsi appcfg:08",

 		  "dcbtool sc eth0 app:fip e:0 a:0 w:0",

 		  "dcbtool sc eth0 pfc e:0 a:0 w:0",

 		  "dcbtool sc eth0 pg e:0",

 		  NULL },

 	};

@@ -112,16 +110,15 @@ test_dcb_iscsi (void)

 	g_object_unref (s_dcb);

 }

 static void

 test_dcb_fip (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",

-		  "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

+		{ "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:iscsi e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:fip e:1 a:1 w:0",

 		  "dcbtool sc eth0 app:fip appcfg:01",

 		  "dcbtool sc eth0 pfc e:0 a:0 w:0",

 		  "dcbtool sc eth0 pg e:0",

 		  NULL },

 	};

@@ -143,16 +140,15 @@ test_dcb_fip (void)

 	g_object_unref (s_dcb);

 }

 static void

 test_dcb_fip_default_prio (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",

-		  "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

+		{ "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:iscsi e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:fip e:1 a:1 w:0",

 		  "dcbtool sc eth0 pfc e:0 a:0 w:0",

 		  "dcbtool sc eth0 pg e:0",

 		  NULL },

 	};

 	NMSettingDcb *s_dcb;

@@ -173,16 +169,15 @@ test_dcb_fip_default_prio (void)

 	g_object_unref (s_dcb);

 }

 static void

 test_dcb_pfc (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",

-		  "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

+		{ "dcbtool sc eth0 app:fcoe e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:iscsi e:0 a:0 w:0",

 		  "dcbtool sc eth0 app:fip e:0 a:0 w:0",

 		  "dcbtool sc eth0 pfc e:1 a:1 w:1",

 		  "dcbtool sc eth0 pfc pfcup:01101100",

 		  "dcbtool sc eth0 pg e:0",

 		  NULL },

 	};

@@ -212,16 +207,15 @@ test_dcb_pfc (void)

 	g_object_unref (s_dcb);

 }

 static void

 test_dcb_priority_groups (void)

 {

 	static DcbExpected expected = { 0,

-		{ "dcbtool sc eth0 dcb on",