Skip to content

Refactor PPP library #13284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Jul 21, 2020
Merged

Refactor PPP library #13284

merged 5 commits into from
Jul 21, 2020

Conversation

LDong-Arm
Copy link
Contributor

Summary of changes

Move the PPP library to connectivity/libraries/ppp and refactor it as per our new directory structure proposal:

connectivity
├── [...]
└── libraries
    ├── [...]
    └── ppp
        ├── mbed_lib.json
        ├── include
        │   ├── ppp
        │   └── polarssl
        └── source

Notes:

  • In include we put polarssl next to ppp instead of inside, because polarssl is also used directly by lwip without going through ppp:

    mbed-os/features/lwipstack/lwip-sys/lwip_tcp_isn.c

    Line 80 in 4a0aaf1

    #include "polarssl/md5.h"
  • But still, we can't make polarssl a standalone library, because the version we include in mbed-os is intermingled with our ppp implementation.
  • ppp_nsapi.cpp is moved into netsocket (where network APIs, including nsapi_ppp.h, sit) - its definition is generic and not tied to our PPP implementation.

Impact of changes

Migration actions required

Documentation

None.

Pull request type 

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results 

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[x] Tests / results supplied as part of this PR

mbed-os-example-cellular compiles. This change does not touch any unit or Greentea tests, but the CI will cover them anyway.

Reviewers

@ARMmbed/mbed-os-core @ARMmbed/mbed-os-connectivity @evedon @0xc0170 @bulislaw

@ciarmcom ciarmcom requested review from 0xc0170, bulislaw, evedon and a team July 13, 2020 15:00
@ciarmcom
Copy link
Member

@LDong-Arm, thank you for your changes.
@0xc0170 @bulislaw @evedon @ARMmbed/mbed-os-ipcore @ARMmbed/mbed-os-maintainers please review.

@LDong-Arm
Copy link
Contributor Author

astyle again...

@LDong-Arm LDong-Arm force-pushed the move_ppp branch 2 times, most recently from 36282ab to c808531 Compare July 14, 2020 15:13
evedon
evedon reviewed Jul 14, 2020
View reviewed changes
Copy link
Contributor

@evedon evedon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

rajkan01
rajkan01 approved these changes Jul 16, 2020
View reviewed changes
Copy link
Contributor

@rajkan01 rajkan01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mergify
Copy link

mergify bot commented Jul 17, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@LDong-Arm LDong-Arm requested review from evedon and rajkan01 July 17, 2020 11:49
@LDong-Arm
Copy link
Contributor Author

@adbridge Rebased
@evedon @rajkan01 Could you please re-approve it? Thanks.

evedon
evedon previously approved these changes Jul 17, 2020
View reviewed changes
@evedon
Copy link
Contributor

evedon commented Jul 17, 2020

@adbridge Rebased
@evedon @rajkan01 Could you please re-approve it? Thanks.

I re-approved. We don't need another review from core.

@mergify mergify bot added needs: CI and removed needs: work labels Jul 17, 2020
@mergify mergify bot added the needs: work label Jul 17, 2020
@mergify
Copy link

mergify bot commented Jul 17, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@mergify mergify bot removed the needs: CI label Jul 17, 2020
@mergify mergify bot dismissed evedon’s stale review July 17, 2020 14:32

Pull request has been modified.

@LDong-Arm
Copy link
Contributor Author

Rebased again

@adbridge adbridge added needs: CI release-type: patch Indentifies a PR as containing just a patch and removed needs: work labels Jul 17, 2020
@adbridge
Copy link
Contributor

CI started

@mbed-ci
Copy link

mbed-ci commented Jul 17, 2020

Test run: SUCCESS

Summary: 6 of 6 test jobs passed
Build number : 1
Build artifacts

evedon
evedon approved these changes Jul 20, 2020
View reviewed changes
Copy link
Contributor

@evedon evedon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-approved

@0xc0170 0xc0170 merged commit 7592d70 into ARMmbed:master Jul 21, 2020
@mergify mergify bot removed the ready for merge label Jul 21, 2020
@mbedmain mbedmain added release-version: 6.2.1 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Aug 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@evedon evedon evedon approved these changes

@rajkan01 rajkan01 rajkan01 approved these changes

@bulislaw bulislaw Awaiting requested review from bulislaw

Assignees
No one assigned
Labels
release-version: 6.2.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@LDong-Arm @ciarmcom @evedon @adbridge @mbed-ci @0xc0170 @rajkan01 @mbedmain