core: allow selective failure of IP configuration (rh #567978)

As long as at least one IP config method completes, and as long as
methods that the user required to complete do complete, allow the
connection to complete.
This commit is contained in:
Dan Williams
2010-05-03 01:19:54 -07:00
parent 3fb8cdb35f
commit 8aef7ef411
5 changed files with 158 additions and 53 deletions

View File

@@ -72,10 +72,16 @@ ppp_failed (NMModem *modem, NMDeviceStateReason reason, gpointer user_data)
case NM_DEVICE_STATE_PREPARE:
case NM_DEVICE_STATE_CONFIG:
case NM_DEVICE_STATE_NEED_AUTH:
case NM_DEVICE_STATE_IP_CONFIG:
case NM_DEVICE_STATE_ACTIVATED:
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason);
break;
case NM_DEVICE_STATE_IP_CONFIG:
if (nm_device_ip_config_should_fail (device, FALSE)) {
nm_device_state_changed (device,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
}
break;
default:
break;
}