Skip to content

gnrc_ipv6_nib: port to gnrc_netif2#7456

Merged
miri64 merged 6 commits intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_ipv6_nib/feat/port-to-gnrc_netif2
Nov 11, 2017
Merged

gnrc_ipv6_nib: port to gnrc_netif2#7456
miri64 merged 6 commits intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_ipv6_nib/feat/port-to-gnrc_netif2

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Aug 7, 2017 •
edited
Loading

This ports the NIB to the new network interface API (since I don't want to make the unnecessary effort to port the old neighbor discovery to gnrc_netif2 I did it this way around).

Depends on #7014 (merged) and #7424 (merged).

This PR is part of the network layer remodelling effort:
PR dependencies

@miri64 miri64 added GNRC Area: network Area: Networking Type: new feature The issue requests / The PR implemements a new feature for RIOT State: waiting for other PR State: The PR requires another PR to be merged first labels Aug 7, 2017
@miri64 miri64 requested a review from cgundogan August 7, 2017 15:46
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 7, 2017

All later PRs after #7014 in the NIB series I will port directly to gnrc_netif2, so all NDP-related parts will be based on this PR.

@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from 3d16e16 to 299e1dc Compare August 21, 2017 13:14
miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/ndp-link-local' (RIOT-OS#7014) into R…
d2e065f 
…IOT-OS#7456
miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2017
@miri64
Merge branch 'gnrc_netif2/feat/gnrc-integration' (RIOT-OS#7424) into R…
5b4edb3 
…IOT-OS#7456
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2017

Rebased and adapted to current master and current dependencies

miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/port-to-gnrc_netif2' (RIOT-OS#7456) …
5caadd9 
…into RIOT-OS#7479
@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from bd4a96a to 1f630df Compare October 6, 2017 16:37
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/ndp-link-local' (RIOT-OS#7014) into R…
e1adcb0 
…IOT-OS#7456
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_netif2/feat/gnrc-integration' (RIOT-OS#7424) into R…
e5e8973 
…IOT-OS#7456
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 6, 2017

Rebased to current master and dependencies.

miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/port-to-gnrc_netif2' (RIOT-OS#7456)…
44e9ebe 
… into RIOT-OS#7479
@miri64 miri64 mentioned this pull request Oct 6, 2017
Merged
2 tasks
@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from 1f630df to ba47e37 Compare October 6, 2017 21:54
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/ndp-link-local' (RIOT-OS#7014) into R…
c2ab125 
…IOT-OS#7456
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_netif2/feat/gnrc-integration' (RIOT-OS#7424) into R…
888179e 
…IOT-OS#7456
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 6, 2017

Rebased to current master and current dependencies (again...)

miri64 added a commit to miri64/RIOT that referenced this pull request Oct 6, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/port-to-gnrc_netif2' (RIOT-OS#7456) …
0d0d996 
…into RIOT-OS#7479
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

Oh boy rebasing this will be .... fun...

@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from ba47e37 to c906f98 Compare October 10, 2017 12:31
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 10, 2017
@miri64
Merge branch 'gnrc_netif2/feat/gnrc-integration' (RIOT-OS#7424) into R…
67247fe 
…IOT-OS#7456
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

Rebased to current master and dependencies.

miri64 added a commit to miri64/RIOT that referenced this pull request Oct 10, 2017
@miri64
Merge branch 'gnrc_ipv6_nib/feat/port-to-gnrc_netif2' (RIOT-OS#7456)…
518ce17 
… into RIOT-OS#7479
@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from 8bdd49f to a586ff0 Compare October 10, 2017 21:38
miri64 added a commit to miri64/RIOT that referenced this pull request Oct 10, 2017
@miri64
Merge branch 'gnrc_netif2/feat/gnrc-integration' (RIOT-OS#7424) into R…
944ae1f 
…IOT-OS#7456
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 7, 2017

Addressed comments

@bergzand
Copy link
Copy Markdown
Member

bergzand commented Nov 7, 2017

Thanks!

Should this already result in a functional gnrc_networking example? From what I've tested so far, it refuses to do ndp.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 7, 2017

Should this already result in a functional gnrc_networking example? From what I've tested so far, it refuses to do ndp.

Link-local should work with this PR, global and everything involved with routers (except routing protocols) with #7479.

@bergzand
Copy link
Copy Markdown
Member

bergzand commented Nov 7, 2017

Link-local should work with this PR, global and everything involved with routers (except routing protocols) with #7479.

Okay, then everything behaves as expected :)

You've got my ACK, code looks good to me overall, but I'm not going to claim that I have enough insight in the subtleties of the NDP code to spot the more difficult functional errors.

bergzand
bergzand previously approved these changes Nov 7, 2017
View reviewed changes
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

Wait! I think I need to fix something I messed up in the rebase of #7424.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

Let me squash my work so far and work from there.

@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from 0173d3f to 256a5e8 Compare November 8, 2017 13:53
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

I somehow managed to forget about the embargo on Monday and merged #7722. That's what is causing the conflict in #7925. #7960 should take care of it so let's see what other issues Murdock reveals here ;-)

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

I added two commits to fix some issues in applications I overlooked in #7424. I hope it is alright to add them here instead of adding an extra PR.

@bergzand
Copy link
Copy Markdown
Member

bergzand commented Nov 8, 2017

As long as it is not yet squashed, I don't mind the extra fixes here. Makes my work easier if I can trust the CI output on these PRs again :)

I have time to recheck this PR this evening.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

As long as it is not yet squashed, I don't mind the extra fixes here. Makes my work easier if I can trust the CI output on these PRs again :)

That won't be the case. #7414, #7417, and #7462 are also required to build properly. And there is some nasty bug in tests/gnrc_ipv6_ext (i.e. it does not work... not sure this is the case because RPL isn't ported to gnrc_netif2 yet)... can't fix that now however. I will give a follow-up for that

@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from 8f1d935 to e5838c6 Compare November 8, 2017 18:07
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

I decided to take out the application fixes after all (see #7966 for that). As I said: they won't fix the Murdock state and need some work anyway.

bergzand
bergzand approved these changes Nov 8, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@bergzand bergzand left a comment

Choose a reason for hiding this comment

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

ACK

@bergzand
Copy link
Copy Markdown
Member

bergzand commented Nov 8, 2017

I decided to take out the application fixes after all (see #7966 for that). As I said: they won't fix the Murdock state and need some work anyway.

Okay, still looks good and the static-test is now also (almost) happy with the PR.

@miri64 miri64 force-pushed the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch from e5838c6 to 56d1f06 Compare November 8, 2017 19:19
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 8, 2017

Squashed

@miri64 miri64 mentioned this pull request Nov 8, 2017
Merged
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 11, 2017

Ok. All errors seem to be unrelated. Let's merge this and fix the rest later.

@miri64 miri64 merged commit b83bc1b into RIOT-OS:gnrc_netif2_integration/master Nov 11, 2017
@miri64 miri64 deleted the gnrc_ipv6_nib/feat/port-to-gnrc_netif2 branch November 11, 2017 18:16
@miri64 miri64 mentioned this pull request Nov 16, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergzand bergzand bergzand approved these changes

@cgundogan cgundogan Awaiting requested review from cgundogan

Assignees

@cgundogan cgundogan

@bergzand bergzand

Labels

Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: new feature The issue requests / The PR implemements a new feature for RIOT

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@miri64 @bergzand @benpicco @cgundogan