fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: build composite subchannels for unmanaged spec matching

Browse source
This commit is contained in:
Dan Williams 2010-06-25 21:44:01 -07:00
parent fd10f97d98
commit d08b7895fb
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nm-device-ethernet.c
View file

@ -109,7 +109,6 @@ typedef struct {
guint8 hw_addr[ETH_ALEN]; /* Currently set MAC address */ guint8 hw_addr[ETH_ALEN]; /* Currently set MAC address */
guint8 perm_hw_addr[ETH_ALEN]; /* Currently set MAC address */ guint8 perm_hw_addr[ETH_ALEN]; /* Currently set MAC address */
char * s390_subchannels;
gboolean carrier; gboolean carrier;
NMNetlinkMonitor * monitor; NMNetlinkMonitor * monitor;
@ -124,6 +123,7 @@ typedef struct {
char * subchan1; char * subchan1;
char * subchan2; char * subchan2;
char * subchan3; char * subchan3;
char * subchannels; /* Composite used for checking unmanaged specs */
/* PPPoE */ /* PPPoE */
NMPPPManager *ppp_manager; NMPPPManager *ppp_manager;
@ -387,6 +387,18 @@ _update_s390_subchannels (NMDeviceEthernet *self)
g_dir_close (dir); g_dir_close (dir);
if (priv->subchan3) {
priv->subchannels = g_strdup_printf ("%s,%s,%s",
priv->subchan1,
priv->subchan2,
priv->subchan3);
} else if (priv->subchan2) {
priv->subchannels = g_strdup_printf ("%s,%s",
priv->subchan1,
priv->subchan2);
} else
priv->subchannels = g_strdup (priv->subchan1);
out: out:
if (parent) if (parent)
g_object_unref (parent); g_object_unref (parent);
@ -1758,8 +1770,8 @@ spec_match_list (NMDevice *device, const GSList *specs)
matched = nm_match_spec_hwaddr (specs, hwaddr); matched = nm_match_spec_hwaddr (specs, hwaddr);
g_free (hwaddr); g_free (hwaddr);
if (!matched && priv->s390_subchannels) if (!matched && priv->subchannels)
matched = nm_match_spec_s390_subchannels (specs, priv->s390_subchannels); matched = nm_match_spec_s390_subchannels (specs, priv->subchannels);
return matched; return matched;
} }
@ -1988,6 +2000,7 @@ dispose (GObject *object)
g_free (priv->subchan1); g_free (priv->subchan1);
g_free (priv->subchan2); g_free (priv->subchan2);
g_free (priv->subchan3); g_free (priv->subchan3);
g_free (priv->subchannels);
G_OBJECT_CLASS (nm_device_ethernet_parent_class)->dispose (object); G_OBJECT_CLASS (nm_device_ethernet_parent_class)->dispose (object);
} }