colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip6: use device's IP interface, not its physical interface

Browse Source
This commit is contained in:
Dan Williams
2009-10-19 14:05:36 -07:00
parent 4eb2346b67
commit 442dc676ef
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nm-device.c
View File

@@ -532,7 +532,7 @@ ip6_addrconf_complete (NMIP6Manager *ip6_manager,
NMDevice *self = NM_DEVICE (user_data); NMDevice *self = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (strcmp (nm_device_get_iface (self), iface) != 0) if (strcmp (nm_device_get_ip_iface (self), iface) != 0)
return; return;
if (!nm_device_get_act_request (self)) if (!nm_device_get_act_request (self))
return; return;
@@ -553,7 +553,7 @@ ip6_config_changed (NMIP6Manager *ip6_manager,
{ {
NMDevice *self = NM_DEVICE (user_data); NMDevice *self = NM_DEVICE (user_data);
if (strcmp (nm_device_get_iface (self), iface) != 0) if (strcmp (nm_device_get_ip_iface (self), iface) != 0)
return; return;
if (!nm_device_get_act_request (self)) if (!nm_device_get_act_request (self))
return; return;
@@ -567,7 +567,7 @@ nm_device_setup_ip6 (NMDevice *self)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMActRequest *req; NMActRequest *req;
NMConnection *connection; NMConnection *connection;
const char *iface, *method = NULL; const char *ip_iface, *method = NULL;
NMSettingIP6Config *s_ip6; NMSettingIP6Config *s_ip6;
req = nm_device_get_act_request (self); req = nm_device_get_act_request (self);
@@ -598,8 +598,8 @@ nm_device_setup_ip6 (NMDevice *self)
priv->ip6_waiting_for_config = FALSE; priv->ip6_waiting_for_config = FALSE;
iface = nm_device_get_iface (self); ip_iface = nm_device_get_ip_iface (self);
nm_ip6_manager_prepare_interface (priv->ip6_manager, iface, s_ip6); nm_ip6_manager_prepare_interface (priv->ip6_manager, ip_iface, s_ip6);
} }
static void static void
@@ -1139,7 +1139,7 @@ static NMActStageReturn
real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason) real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const char *iface = nm_device_get_iface (self); const char *ip_iface = nm_device_get_ip_iface (self);
g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
@@ -1150,7 +1150,7 @@ real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason)
return NM_ACT_STAGE_RETURN_SUCCESS; return NM_ACT_STAGE_RETURN_SUCCESS;
priv->ip6_waiting_for_config = TRUE; priv->ip6_waiting_for_config = TRUE;
nm_ip6_manager_begin_addrconf (priv->ip6_manager, iface); nm_ip6_manager_begin_addrconf (priv->ip6_manager, ip_iface);
return NM_ACT_STAGE_RETURN_POSTPONE; return NM_ACT_STAGE_RETURN_POSTPONE;
} }