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

device: turn nm_d_ip_config_should_fail to get_ip_config_may_fail

Browse Source 
Has a cleaner semantics and will be useful later on. Also, make it static --
it's not used outside nm-device.c.
This commit is contained in:
Lubomir Rintel
2014-12-11 10:13:59 +01:00
parent d19770102e
commit 063ab8da5c
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/nm-device-private.h
View File

@@ -56,8 +56,6 @@ void nm_device_take_down (NMDevice *self, gboolean block);
gboolean nm_device_set_hw_addr (NMDevice *device, const char *addr, gboolean nm_device_set_hw_addr (NMDevice *device, const char *addr,
const char *detail, guint64 hw_log_domain); const char *detail, guint64 hw_log_domain);
gboolean nm_device_ip_config_should_fail (NMDevice *self, gboolean ip6);
void nm_device_set_firmware_missing (NMDevice *self, gboolean missing); void nm_device_set_firmware_missing (NMDevice *self, gboolean missing);
void nm_device_activate_schedule_stage1_device_prepare (NMDevice *device); void nm_device_activate_schedule_stage1_device_prepare (NMDevice *device);

29
src/devices/nm-device.c
View File

@@ -2215,11 +2215,11 @@ activation_source_schedule (NMDevice *self, GSourceFunc func, int family)
} }
} }
gboolean static gboolean
nm_device_ip_config_should_fail (NMDevice *self, gboolean ip6) get_ip_config_may_fail (NMDevice *self, int family)
{ {
NMConnection *connection; NMConnection *connection;
NMSettingIPConfig *s_ip4, *s_ip6; NMSettingIPConfig *s_ip = NULL;
g_return_val_if_fail (self != NULL, TRUE); g_return_val_if_fail (self != NULL, TRUE);
@@ -2227,17 +2227,18 @@ nm_device_ip_config_should_fail (NMDevice *self, gboolean ip6)
g_assert (connection); g_assert (connection);
/* Fail the connection if the failed IP method is required to complete */ /* Fail the connection if the failed IP method is required to complete */
if (ip6) { switch (family) {
s_ip6 = nm_connection_get_setting_ip6_config (connection); case AF_INET:
if (!nm_setting_ip_config_get_may_fail (s_ip6)) s_ip = nm_connection_get_setting_ip4_config (connection);
return TRUE; break;
} else { case AF_INET6:
s_ip4 = nm_connection_get_setting_ip4_config (connection); s_ip = nm_connection_get_setting_ip6_config (connection);
if (!nm_setting_ip_config_get_may_fail (s_ip4)) break;
return TRUE; default:
g_assert_not_reached ();
} }
return FALSE; return nm_setting_ip_config_get_may_fail (s_ip);
} }
static void static void
@@ -4668,7 +4669,7 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
static NMActStageReturn static NMActStageReturn
act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason) act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
{ {
if (nm_device_ip_config_should_fail (self, FALSE)) { if (!get_ip_config_may_fail (self, AF_INET)) {
*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; *reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
return NM_ACT_STAGE_RETURN_FAILURE; return NM_ACT_STAGE_RETURN_FAILURE;
} }
@@ -4746,7 +4747,7 @@ nm_device_activate_schedule_ip4_config_timeout (NMDevice *self)
static NMActStageReturn static NMActStageReturn
act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason) act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
{ {
if (nm_device_ip_config_should_fail (self, TRUE)) { if (!get_ip_config_may_fail (self, AF_INET6)) {
*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; *reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
return NM_ACT_STAGE_RETURN_FAILURE; return NM_ACT_STAGE_RETURN_FAILURE;
} }