Merge lp://staging/~phablet-team/network-manager/lp1435776 into lp://staging/~phablet-team/network-manager/vivid-phone-overlay

Proposed by Tony Espy
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: no longer in the source branch.
Merge reported by: Tony Espy
Merged at revision: not available
Proposed branch: lp://staging/~phablet-team/network-manager/lp1435776
Merge into: lp://staging/~phablet-team/network-manager/vivid-phone-overlay
Diff against target: 69 lines (+49/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/lp1435776_rm_ofono_secret_settings.patch (+39/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://staging/~phablet-team/network-manager/lp1435776
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Review via email: mp+258633@code.staging.launchpad.net

Commit message

 * debian/patches/lp1435776_rm_ofono_secret_settings.patch: remove code
    that added USERNAME and PASSWORD to NM_SETTING_GSM object. NM doesn't
    actually need access to these settings, and they can cause issues with
    NM's secrets needed logic.

Description of the change

This change affects the ofono settings plugin and the way that it configures system connections based on ofono gprs_contexts ( aka APNs ).

The change removes the addition of USERNAME and PASSWORD NM_SETTING_GSM settings to the connection, as they're not needed by network-manager, and can cause secret-related activation errors.

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

I have tried the patch in arale vivid image #35, but the bug did not go away.

To reproduce the issue, I use a SIM that does not need user or password. I change the "gprs" file introducing a user, but without password. I check that the operator still activates the context using the activate-context script. Then I checked that current NM is not able to activate the context. Finally, using the patched NM I still see the issue. The only difference I have noted is that apparently NM is trying only once to activate the context. The trace I see are (the old NM produced similar ones, but twice):

May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Auto-activating connection '/214050030479893/context1'.
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) starting connection '/214050030479893/context1'
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) scheduled...
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) started...
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: prepare -> failed (reason 'no-secrets') [40 120 7]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <warn> Activation (ril_0) failed for connection '/214050030479893/context1'
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) complete.
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: failed -> disconnected (reason 'none') [120 30 0]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): deactivating device (reason 'none') [0]

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Please ignore the previous comment, I did not copy around the right library. The fix does solve the issue, and the code seems right to me.

review: Approve
962. By Tony Espy

debian/patches/lp1435776_rm_ofono_secret_settings.patch: remove code
that added USERNAME and PASSWORD to NM_SETTING_GSM object. NM doesn't
actually need access to these settings, and they can cause issues with
NM's secrets needed logic ( LP: #1435776 ).

Revision history for this message
Tony Espy (awe) wrote :

Tested krillin, rc-proposed #171, SIM1: AT&T SIM2: empty

 - phone boots, mobile data (edge-only) connected

 - tested flight-mode ( 5 cycles via the indicator )

 - tested a context/APN w/username, but no passwrd ( this fails w/network-manager 4ubuntu15.1 )
   - manually edited /var/lib/ofono/<IMSI>/gprs after stopping NM & ofono
   - Note: NM won't even attempt to activate this without this fix

Everything worked as expected.

Revision history for this message
Tony Espy (awe) wrote :

Tested arale, tangxi-vivid-proposed #31, SIM: AT&T

 - phone boots, mobile data (hspa) connected

 - flight-mode still broken due to lp: #1445080

 - bad APN ( username w/no pw ) - OK

Revision history for this message
Tony Espy (awe) wrote :

I should've noted, my testing was performed with network-manager-0.9.10.0-4ubuntu15.1.1 from silo-028.

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Tested on

current build number: 13
device name: arale
channel: ubuntu-touch/rc-proposed/meizu

and checked that both #1435776 are fixed #1450790.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: