Skip to content
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.

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

sys/shell/gnrc_netif: Fix a few blockers for sharing ifconfig shell #19971

Merged
merged 2 commits into from
Oct 16, 2023

Conversation

yarrick
Copy link
Contributor

@yarrick yarrick commented Oct 11, 2023

Contribution description

When using general IPv6 functions, require only shared IPV6 module instead of gnrc version.

Print addresses using l2util functions in gnrc_netif instead of with gnrc wrappers.

Testing procedure

  • ifconfig with gnrc_networking example still works
> ifconfig
Iface  8  HWaddr: 24:0A:C4:E6:0E:9F  Link: up
          L2-PDU:1500  MTU:1500  HL:64  RTR
          RTR_ADV
          Source address length: 6
          Link type: wired
          inet6 addr: fe80::260a:c4ff:fee6:e9f  scope: link  VAL
          inet6 group: ff02::2
          inet6 group: ff02::1
          inet6 group: ff02::1:ffe6:e9f
          inet6 group: ff02::1a
  • tests/pkg/lwip ifconfig prints v6 info when 7160ed9 applied
> ifconfig
Iface  ET0  HWaddr: 24:0A:C4:E6:0E:9F  Link: up
          L2-PDU:1500  Source address length: 6
          Link type: wired
          inet6 addr: fe80::260a:c4ff:fee6:e9f  scope: link
          inet6 addr: 2001:db8::260a:c4ff:fee6:e9f  scope: global

Issues/PRs references

To support lwIP better (dont require gnrc_ipv6)

Also don't require IPv6 for printing link type

With this sc_gnrc_netif can compile and work when using lwIP
(with l2util module added):

```
> ifconfig
Iface  ET1  HWaddr: 24:0A:C4:E6:0E:9C  Channel: 6  Link: up
          L2-PDU:1500  Source address length: 6
          Link type: wireless
          inet6 addr: fe80::260a:c4ff:fee6:e9c  scope: link
          inet6 addr: 2001:db8::260a:c4ff:fee6:e9c  scope: global

Iface  ET0  HWaddr: 24:0A:C4:E6:0E:9F  Link: up
          L2-PDU:1500  Source address length: 6
          Link type: wired
          inet6 addr: fe80::260a:c4ff:fee6:e9f  scope: link
          inet6 addr: 2001:db8::260a:c4ff:fee6:e9f  scope: global

>
```

Still works in gnrc_networking example:

```
> ifconfig
Iface  8  HWaddr: 24:0A:C4:E6:0E:9F  Link: up
          L2-PDU:1500  MTU:1500  HL:64  RTR
          RTR_ADV
          Source address length: 6
          Link type: wired
          inet6 addr: fe80::260a:c4ff:fee6:e9f  scope: link  VAL
          inet6 group: ff02::2
          inet6 group: ff02::1
          inet6 group: ff02::1:ffe6:e9f
          inet6 group: ff02::1a
```
@github-actions github-actions bot added the Area: sys Area: System label Oct 11, 2023
@yarrick yarrick changed the title Fix a few blockers for sharing ifconfig shell sys/shell/gnrc_netif: Fix a few blockers for sharing ifconfig shell Oct 11, 2023
@yarrick yarrick requested review from miri64 and maribu October 11, 2023 19:13
@benpicco benpicco added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Oct 11, 2023
Copy link
Contributor

@benpicco benpicco left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@riot-ci
Copy link

riot-ci commented Oct 11, 2023

Murdock results

✔️ PASSED

ee6ca2b sys/shell/gnrc_netif: Use l2util versions of link addr helpers

Success Failures Total Runtime
7937 0 7937 15m:35s

Artifacts

@yarrick
Copy link
Contributor Author

yarrick commented Oct 12, 2023

Will rebase after #19973 submitted

To avoid dependency on gnrc files.
As suggested in RIOT-OS#16965
@yarrick
Copy link
Contributor Author

yarrick commented Oct 12, 2023

bors merge

@bors
Copy link
Contributor

bors bot commented Oct 12, 2023

🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@bors
Copy link
Contributor

bors bot commented Oct 12, 2023

GitHub status checks took too long to complete, so bors is giving up. You can adjust bors configuration to have it wait longer if you like.

@yarrick
Copy link
Contributor Author

yarrick commented Oct 13, 2023

bors merge

bors bot added a commit that referenced this pull request Oct 13, 2023
19971: sys/shell/gnrc_netif: Fix a few blockers for sharing ifconfig shell r=yarrick a=yarrick



Co-authored-by: Erik Ekman <eekman@google.com>
@bors
Copy link
Contributor

bors bot commented Oct 13, 2023

Build failed:

@benpicco
Copy link
Contributor

bors merge

@bors bors bot merged commit 910e0e2 into RIOT-OS:master Oct 16, 2023
25 checks passed
@bors
Copy link
Contributor

bors bot commented Oct 16, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@yarrick yarrick deleted the shared_ifconfig branch October 16, 2023 19:59
@MrKevinWeiss MrKevinWeiss added this to the Release 2024.01 milestone Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: sys Area: System CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants