gnrc/ipv6/nib: Expose configurations to Kconfig by leandrolanzieri · Pull Request #13626 · RIOT-OS/RIOT

leandrolanzieri · 2020-03-12T17:19:29Z

Contribution description

This PR moves configuration macros of GNRC NIB module to the CONFIG_ namespace and exposes them to Kconfig. To keep compatibility with boolean macros generated by Kconfig I modified the evaluation of many of them using IS_ACTIVE.

I think there are some cases where the #if could be changed to C conditionals, but as I was not so sure I decided not to change this in general.

Testing procedure

Examples using this module should still work
Unittests for the module should still pass
One should be able to configure NIB using menuconfig interface and it should be reflected on the application

Issues/PRs references

Part of #12888

miri64 · 2020-03-30T07:11:34Z

@leandrolanzieri please rebase.

sys/include/net/gnrc/ipv6/nib/conf.h

leandrolanzieri · 2020-03-30T10:33:02Z

I wrapped lines to 80 chars on files where I was getting the 100 char warning

miri64

Mostly style and documentation stuff, as this is just renaming the macros and introduces the Kconfig file. Everything else should be uncovered by Murdock. Please squash immediately. I can't keep track of >20 commits anyways ;-P

sys/net/gnrc/netif/gnrc_netif.c

sys/include/net/gnrc/ipv6/nib/conf.h

sys/net/gnrc/Kconfig

sys/net/gnrc/network_layer/ipv6/nib/Kconfig

leandrolanzieri · 2020-03-30T20:23:47Z

@miri64 I think I addressed all comments. I squashed directly.

miri64

Minor error picked up by Murdock.

sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h

miri64

While you are fixing this anyway: how about some more warnings about experimental options.

sys/net/gnrc/network_layer/ipv6/nib/Kconfig

Also evaluate it using IS_ACTIVE macro.

Also evaluate it using IS_ACTIVE

Also evaluate it using IS_ACTIVE macro.

Also evaluate using IS_ACTIVE macro.

leandrolanzieri · 2020-03-31T16:39:42Z

Added a fixup to guard all configuration parameters from the header when using Kconfig, so it does not override booleans.

miri64

I tested with native and samr21-xpro:

examples/gcoap to test hosts (standard with native and 6LN with samr21-xpro)
examples/gnrc_networking to test routers (standard with native and 6LR with samr21-xpro)
examples/gnrc_border_router to test 6LBRs

Then I pinged both link-local addresses and global addresses. I did this without Kconfig and with Kconfig. To check the configuration with Kconfig, I deactivated router solicitations with examples/gcoap using CONFIG_GNRC_IPV6_NIB_NO_RTR_SOL=1 (which flashed the nice new warning).

It all worked. With the changed configuration the gcoap example did not send any router solicitation (making the global ping impossible on the samr21-xpro, as was expected).

ACK. Please squash your final change.

miri64 · 2020-03-31T18:14:48Z

🎉

leandrolanzieri added Area: network Area: Networking Type: new feature The issue requests / The PR implemements a new feature for RIOT TF: Config Marks issues and PRs related to the work of the Configuration Task Force Area: Kconfig Area: Kconfig integration labels Mar 12, 2020

leandrolanzieri requested review from jia200x and miri64 March 12, 2020 17:19

leandrolanzieri requested review from PeterKietzmann, aabadie, cgundogan, fjmolinas and haukepetersen as code owners March 12, 2020 17:19

leandrolanzieri mentioned this pull request Mar 12, 2020

[CTF-tracker] Kconfig: Configuration exposure list #12888

Open

71 tasks

leandrolanzieri force-pushed the pr/kconfig_migrate/gnrc/ipv6_nib_rebased branch 2 times, most recently from 63cb8a1 to a68bb55 Compare March 30, 2020 08:25

miri64 requested changes Mar 30, 2020

View reviewed changes

sys/include/net/gnrc/ipv6/nib/conf.h Outdated Show resolved Hide resolved

miri64 requested changes Mar 30, 2020

View reviewed changes

leandrolanzieri force-pushed the pr/kconfig_migrate/gnrc/ipv6_nib_rebased branch 3 times, most recently from 3df65ce to aa8319e Compare March 30, 2020 20:22

miri64 added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 31, 2020

miri64 requested changes Mar 31, 2020

View reviewed changes

sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h Outdated Show resolved Hide resolved

miri64 reviewed Mar 31, 2020

View reviewed changes

sys/net/gnrc/network_layer/ipv6/nib/Kconfig Show resolved Hide resolved

leandrolanzieri added 5 commits March 31, 2020 18:07

gnrc/nib: Move GNRC_IPV6_NIB_CONF_6LBR to 'CONFIG_' namespace

40c78f1

Also evaluate it using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_6LR to 'CONFIG_' namespace

398bb6d

Also evaluate it using IS_ACTIVE

gnrc/nib: Move GNRC_IPV6_NIB_CONF_6LN to 'CONFIG_' namespace

1acfe7a

Also evaluate it using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_ROUTER to 'CONFIG_' namespace

49ec288

Also evaluate it using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_SLAAC to 'CONFIG_' namespace

ce931f1

Also evaluate it using IS_ACTIVE macro.

leandrolanzieri added 15 commits March 31, 2020 18:07

gnrc/nib: Move GNRC_IPV6_NIB_CONF_QUEUE_PKT to 'CONFIG_' namespace

f23267b

Also evaluate it using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_ARSM to 'CONFIG_' namespace

e52b93c

Also evaluate it using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_DNS to 'CONFIG_' namespace

bad9abd

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_ADV_ROUTER to 'CONFIG_' namespace

42fb2fe

gnrc/nib: Move GNRC_IPV6_NIB_CONF_REDIRECT to 'CONFIG_' namspace

219d5a1

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_DC to 'CONFIG_' namespace

3ec2964

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_MULTIHOP_DAD to 'CONFIG_' namespace

22b4df9

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_MULTIHOP_P6C to 'CONFIG_' namespace

53a522d

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_CONF_NO_RTR_SOL to 'CONFIG_' namespace

1f20ffc

Also evaluate using IS_ACTIVE macro.

gnrc/nib: Move GNRC_IPV6_NIB_NUMOF to 'CONFIG_' namespace

07771de

gnrc/nib: Move GNRC_IPV6_NIB_CONF_REACH_TIME_RESET to 'CONFIG_'

acd789b

gnrc/nib: Move GNRC_IPV6_NIB_L2ADDR_MAX_LEN to 'CONFIG_' namespace

f2ed8b0

gnrc/nib: Move GNRC_IPV6_NIB_DEFAULT_ROUTER_NUMOF to 'CONFIG_' namespace

f6ee712

gnrc/nib: Move GNRC_IPV6_NIB_OFFL_NUMOF to 'CONFIG_' namespace

a77d0dd

gnrc/nib: Move GNRC_IPV6_NIB_ABR_NUMOF to 'CONFIG_' namespace

64dde8f

leandrolanzieri force-pushed the pr/kconfig_migrate/gnrc/ipv6_nib_rebased branch from aa8319e to 5833a3f Compare March 31, 2020 16:07

miri64 approved these changes Mar 31, 2020

View reviewed changes

leandrolanzieri added 4 commits March 31, 2020 19:02

gnrc/nib: Expose configurations to Kconfig

87ac1a6

gnrc/netif: Fix lines lengths

184bbd3

gnrc/uhcpc: Fix lines lengths

4476e06

gnrc/nib/conf.h: Align configuration values

aa2ec68

leandrolanzieri force-pushed the pr/kconfig_migrate/gnrc/ipv6_nib_rebased branch from f9b33d4 to aa2ec68 Compare March 31, 2020 17:03

miri64 merged commit eca9d3d into RIOT-OS:master Mar 31, 2020

leandrolanzieri deleted the pr/kconfig_migrate/gnrc/ipv6_nib_rebased branch March 31, 2020 18:15

leandrolanzieri mentioned this pull request Apr 1, 2020

gnrc/ipv6: Group IPv6 related Kconfig files #13782

Merged

leandrolanzieri added this to the Release 2020.04 milestone Apr 2, 2020

Conversation

leandrolanzieri commented Mar 12, 2020

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

miri64 commented Mar 30, 2020

Uh oh!

Uh oh!

leandrolanzieri commented Mar 30, 2020

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

leandrolanzieri commented Mar 30, 2020

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

leandrolanzieri commented Mar 31, 2020

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

miri64 commented Mar 31, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants