fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 00:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

team: minor cleanup handling empty team config

Browse source
This commit is contained in:
Thomas Haller 2016-10-12 19:42:59 +02:00
parent 34970e4141
commit 16a6991b90
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/devices/team/nm-device-team.c
View file

@ -166,18 +166,28 @@ ensure_teamd_connection (NMDevice *device)
return !!priv->tdc;
}
static const char *
_get_config (NMDeviceTeam *self)
{
return nm_str_not_empty (NM_DEVICE_TEAM_GET_PRIVATE (self)->config);
}
static gboolean
teamd_read_config (NMDevice *device)
{
NMDeviceTeam *self = NM_DEVICE_TEAM (device);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
char *config = NULL;
const char *config = NULL;
int err;
if (priv->tdc) {
err = teamdctl_config_actual_get_raw_direct (priv->tdc, &config);
err = teamdctl_config_actual_get_raw_direct (priv->tdc, (char **) &config);
if (err)
return FALSE;
if (!config) {
/* set "" to distinguish an empty result from no config at all. */
config = "";
}
}
if (!nm_streq0 (config, priv->config)) {
@ -224,7 +234,7 @@ update_connection (NMDevice *device, NMConnection *connection)
priv->tdc = NULL;
}
g_object_set (G_OBJECT (s_team), NM_SETTING_TEAM_CONFIG, priv->config, NULL);
g_object_set (G_OBJECT (s_team), _get_config (self), NULL);
}
/*****************************************************************************/
@ -768,11 +778,10 @@ get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMDeviceTeam *self = NM_DEVICE_TEAM (object);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
switch (prop_id) {
case PROP_CONFIG:
g_value_set_string (value, priv->config);
g_value_set_string (value, _get_config (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);