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

core: ensure missing IP config settings are treated as "auto" (bgo #699755)

Browse Source 
Due to recent changes not all settings plugins send an IP config setting
when the method is 'auto'.  Some old code in the NMDevice IP config paths
mishandled this.  Fix that up; the expected behavior should be:

1) if the device is a slave, IP configuration is DISABLE/IGNORED
2) if the connection has an IP4 or IP6 setting, use the setting's method
3) default to AUTO
This commit is contained in:
Dan Williams
2013-05-07 13:08:33 -05:00
parent 7aefd5b5f4
commit c2d81b9ea8
1 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/nm-device.c
View File

@@ -1667,25 +1667,6 @@ nm_device_ip_config_should_fail (NMDevice *self, gboolean ip6)
return FALSE; return FALSE;
} }
static gboolean
ip6_method_matches (NMConnection *connection, const char *match)
{
NMSettingIP6Config *s_ip6;
const char *method = NULL;
s_ip6 = nm_connection_get_setting_ip6_config (connection);
if (s_ip6) {
method = nm_setting_ip6_config_get_method (s_ip6);
g_assert (method);
}
/* Treat missing IP6 setting as AUTO */
if (!s_ip6 && !strcmp (match, NM_SETTING_IP6_CONFIG_METHOD_AUTO))
return TRUE;
return method && !strcmp (method, match);
}
static NMActStageReturn static NMActStageReturn
act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason) act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason)
{ {
@@ -2462,12 +2443,17 @@ act_stage3_ip4_config_start (NMDevice *self,
} }
} }
/* If we did not receive IP4 configuration information, default to DHCP */ /* If we did not receive IP4 configuration information, default to DHCP.
* Slaves, on the other hand, never have any IP configuration themselves,
* since the master handles all of that.
*/
s_ip4 = nm_connection_get_setting_ip4_config (connection); s_ip4 = nm_connection_get_setting_ip4_config (connection);
if (s_ip4) if (priv->master) /* eg, device is a slave */
method = nm_setting_ip4_config_get_method (s_ip4);
else if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME))
method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED; method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
else if (s_ip4)
method = nm_setting_ip4_config_get_method (s_ip4);
else
method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
/* Start IPv4 addressing based on the method requested */ /* Start IPv4 addressing based on the method requested */
if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0) if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0)
@@ -2486,12 +2472,12 @@ act_stage3_ip4_config_start (NMDevice *self,
ret = NM_ACT_STAGE_RETURN_SUCCESS; ret = NM_ACT_STAGE_RETURN_SUCCESS;
} else } else
ret = NM_ACT_STAGE_RETURN_FAILURE; ret = NM_ACT_STAGE_RETURN_FAILURE;
} else if (s_ip4 && !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) { } else if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0) {
/* Nothing to do... */ /* Nothing to do... */
ret = NM_ACT_STAGE_RETURN_STOP; ret = NM_ACT_STAGE_RETURN_STOP;
} else { } else {
nm_log_warn (LOGD_IP4, "(%s): unhandled IPv4 config method; will fail", nm_log_warn (LOGD_IP4, "(%s): unhandled IPv4 config method '%s'; will fail",
nm_device_get_ip_iface (self)); nm_device_get_ip_iface (self), method);
} }
return ret; return ret;
@@ -3028,6 +3014,7 @@ act_stage3_ip6_config_start (NMDevice *self,
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
NMConnection *connection; NMConnection *connection;
NMSettingIP6Config *s_ip6; NMSettingIP6Config *s_ip6;
const char *method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
int conf_use_tempaddr; int conf_use_tempaddr;
NMSettingIP6ConfigPrivacy ip6_privacy = NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN; NMSettingIP6ConfigPrivacy ip6_privacy = NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN;
const char *ip6_privacy_str = "0\n"; const char *ip6_privacy_str = "0\n";
@@ -3062,28 +3049,40 @@ act_stage3_ip6_config_start (NMDevice *self,
priv->dhcp6_mode = IP6_DHCP_OPT_NONE; priv->dhcp6_mode = IP6_DHCP_OPT_NONE;
if ( ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_AUTO) /* If we did not receive IP6 configuration information, default to AUTO.
|| ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) { * Slaves, on the other hand, never have any IP configuration themselves,
* since the master handles all of that.
*/
s_ip6 = nm_connection_get_setting_ip6_config (connection);
if (priv->master) /* eg, device is a slave */
method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
else if (s_ip6)
method = nm_setting_ip6_config_get_method (s_ip6);
else
method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
if ( strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0
|| strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) {
if (!addrconf6_start (self)) { if (!addrconf6_start (self)) {
*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; *reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
ret = NM_ACT_STAGE_RETURN_FAILURE; ret = NM_ACT_STAGE_RETURN_FAILURE;
} else } else
ret = NM_ACT_STAGE_RETURN_POSTPONE; ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) { } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0) {
/* Router advertisements shouldn't be used in pure DHCP mode */ /* Router advertisements shouldn't be used in pure DHCP mode */
if (priv->ip6_accept_ra_path) if (priv->ip6_accept_ra_path)
nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0"); nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0");
priv->dhcp6_mode = IP6_DHCP_OPT_MANAGED; priv->dhcp6_mode = IP6_DHCP_OPT_MANAGED;
ret = dhcp6_start (self, connection, priv->dhcp6_mode, reason); ret = dhcp6_start (self, connection, priv->dhcp6_mode, reason);
} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0) {
/* reset the saved RA value when ipv6 is ignored */ /* reset the saved RA value when ipv6 is ignored */
if (priv->ip6_accept_ra_path) { if (priv->ip6_accept_ra_path) {
nm_utils_do_sysctl (priv->ip6_accept_ra_path, nm_utils_do_sysctl (priv->ip6_accept_ra_path,
priv->ip6_accept_ra_save ? "1" : "0"); priv->ip6_accept_ra_save ? "1" : "0");
} }
ret = NM_ACT_STAGE_RETURN_STOP; ret = NM_ACT_STAGE_RETURN_STOP;
} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL) == 0) {
/* New blank config */ /* New blank config */
*out_config = nm_ip6_config_new (); *out_config = nm_ip6_config_new ();
g_assert (*out_config); g_assert (*out_config);
@@ -3093,8 +3092,8 @@ act_stage3_ip6_config_start (NMDevice *self,
nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0"); nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0");
ret = NM_ACT_STAGE_RETURN_SUCCESS; ret = NM_ACT_STAGE_RETURN_SUCCESS;
} else { } else {
nm_log_warn (LOGD_IP6, "(%s): unhandled IPv6 config method; will fail", nm_log_warn (LOGD_IP6, "(%s): unhandled IPv6 config method '%s'; will fail",
nm_device_get_ip_iface (self)); nm_device_get_ip_iface (self), method);
} }
/* Other methods (shared) aren't implemented yet */ /* Other methods (shared) aren't implemented yet */
@@ -3106,11 +3105,8 @@ act_stage3_ip6_config_start (NMDevice *self,
conf_use_tempaddr = ip6_use_tempaddr (); conf_use_tempaddr = ip6_use_tempaddr ();
if (conf_use_tempaddr >= 0) if (conf_use_tempaddr >= 0)
ip6_privacy = conf_use_tempaddr; ip6_privacy = conf_use_tempaddr;
else { else if (s_ip6)
s_ip6 = nm_connection_get_setting_ip6_config (connection); ip6_privacy = nm_setting_ip6_config_get_ip6_privacy (s_ip6);
if (s_ip6)
ip6_privacy = nm_setting_ip6_config_get_ip6_privacy (s_ip6);
}
ip6_privacy = CLAMP (ip6_privacy, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR); ip6_privacy = CLAMP (ip6_privacy, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR);
switch (ip6_privacy) { switch (ip6_privacy) {