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

ppp: allow update of ppp secrets in all ACTIVATING stages (lp:432205)

Browse Source 
Previously, ppp code would flip device state to _NEED_AUTH before
asking for secrets update; this is not the case anymore after landing
of f28a0df4a66e8f6c98327691c9c90df0604bbd28; hence, we need to
allow update of secrets in all ACTIVATING stages.

This patch updates this behaviour for all device classes with ppp
support.
This commit is contained in:
Alexander Sack
2009-10-30 19:52:14 +01:00
committed by Alexander Sack
parent 06a40dcf73
commit 82011dff04
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modem-manager/nm-modem-cdma.c
View File

@@ -169,6 +169,8 @@ real_connection_secrets_updated (NMDevice *dev,
gboolean found = FALSE;
GSList *iter;
g_return_if_fail (IS_ACTIVATING_STATE (nm_device_get_state (dev)));
if (caller == SECRETS_CALLER_PPP) {
NMPPPManager *ppp_manager;
NMSettingCdma *s_cdma = NULL;

2
src/modem-manager/nm-modem-gsm.c
View File

@@ -335,6 +335,8 @@ real_connection_secrets_updated (NMDevice *dev,
gboolean found = FALSE;
GSList *iter;
g_return_if_fail (IS_ACTIVATING_STATE (nm_device_get_state (dev)));
if (caller == SECRETS_CALLER_PPP) {
NMPPPManager *ppp_manager;
NMSettingGsm *s_gsm = NULL;

4
src/nm-device-ethernet.c
View File

@@ -632,8 +632,7 @@ real_connection_secrets_updated (NMDevice *dev,
gboolean valid = FALSE;
GSList *iter;
if (nm_device_get_state (dev) != NM_DEVICE_STATE_NEED_AUTH)
return;
g_return_if_fail (IS_ACTIVATING_STATE (nm_device_get_state (dev)));
/* PPPoE? */
if (caller == SECRETS_CALLER_PPP) {
@@ -663,6 +662,7 @@ real_connection_secrets_updated (NMDevice *dev,
/* Only caller could be ourselves for 802.1x */
g_return_if_fail (caller == SECRETS_CALLER_ETHERNET);
g_return_if_fail (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH);
for (iter = updated_settings; iter; iter = g_slist_next (iter)) {
const char *setting_name = (const char *) iter->data;