Skip to content
New issue

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

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

Already on GitHub? # to your account

ng_ipv6: initial import #2454

Merged
merged 1 commit into from
Apr 22, 2015
Merged

ng_ipv6: initial import #2454

merged 1 commit into from
Apr 22, 2015

Conversation

@miri64 miri64 added this to the Network Stack Task Force milestone Feb 13, 2015
@miri64 miri64 added NSTF Process: API change Integration Process: PR contains or issue proposes an API change. Should be handled with care. State: WIP State: The PR is still work-in-progress and its code is not in its final presentable form yet State: waiting for other PR State: The PR requires another PR to be merged first Area: network Area: Networking labels Feb 13, 2015
@miri64 miri64 mentioned this pull request Feb 13, 2015
@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch 2 times, most recently from 5cced28 to 19a67f5 Compare February 13, 2015 18:58
@miri64 miri64 mentioned this pull request Feb 19, 2015
36 tasks
@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch from 8fa3e88 to db2208e Compare February 20, 2015 18:42
@miri64 miri64 added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Feb 20, 2015
@miri64
Copy link
Member Author

miri64 commented Feb 20, 2015

Rebased to master and depending PRs

@miri64
Copy link
Member Author

miri64 commented Mar 3, 2015

Rebased to current master and the depending PRs

@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch from d5bc04c to cca046a Compare March 4, 2015 20:58
@miri64
Copy link
Member Author

miri64 commented Mar 5, 2015

ng_ipv6.h line 14 and onwards contains my idea of how to document NETAPI behavior. @haukepetersen, @jfischer-phytec-iot, @LudwigOrtmann, @Lotterleben, @OlegHahm, @PeterKietzmann, @thomaseichinger what do you think?

@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch 4 times, most recently from c96df1e to beeca50 Compare March 7, 2015 17:16
@miri64
Copy link
Member Author

miri64 commented Mar 7, 2015

No longer WIP, squashed and rebased to master and depending PRs.

@miri64 miri64 removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable State: WIP State: The PR is still work-in-progress and its code is not in its final presentable form yet labels Mar 7, 2015
@miri64
Copy link
Member Author

miri64 commented Mar 7, 2015

(tests are still missing)

@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch 2 times, most recently from 62e7134 to 9f57476 Compare March 7, 2015 17:24
@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch 2 times, most recently from f242596 to 6f1d810 Compare April 21, 2015 15:38
@miri64
Copy link
Member Author

miri64 commented Apr 21, 2015

Rebased to current master.

@@ -58,6 +58,20 @@ ifneq (,$(filter ng_ipv6_hdr,$(USEMODULE)))
USEMODULE += ng_pktbuf
endif

ifneq (,$(filter ng_ipv6_router,$(USEMODULE)))
USEMODULE += ng_ipv6
USEMODULE += ng_fib
Copy link
Member

Choose a reason for hiding this comment

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

Why is this dependency? (I understand the conceptional dependency, but I couldn't find the implementational dependency.)

Copy link
Member Author

Choose a reason for hiding this comment

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

You're right. Since I kept routing out for now (and it will become part of the neighbor discovery anyways), this whole ifneq can be removed. Will do.

@miri64
Copy link
Member Author

miri64 commented Apr 22, 2015

Addressed comments so far.

ng_pktsnip_t *tmp = ng_pktbuf_start_write(pkt);

if (tmp == NULL) {
ng_pktbuf_release(pkt);
Copy link
Member

Choose a reason for hiding this comment

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

Why is this released here again?

@miri64
Copy link
Member Author

miri64 commented Apr 22, 2015

Addressed more comments

@OlegHahm
Copy link
Member

ACK. Please squash.

@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch from 1a51135 to a719a3f Compare April 22, 2015 19:53
@miri64
Copy link
Member Author

miri64 commented Apr 22, 2015

Squashed

@miri64 miri64 force-pushed the ng_ipv6/feat/initial branch from a719a3f to a0c6db6 Compare April 22, 2015 20:12
@miri64
Copy link
Member Author

miri64 commented Apr 22, 2015

Applied the following bugfix and squashed immediately:

diff --git a/sys/net/network_layer/ng_ipv6/ng_ipv6.c b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
index 1be5142..b53d5d3 100644
--- a/sys/net/network_layer/ng_ipv6/ng_ipv6.c
+++ b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
@@ -236,7 +236,8 @@ static int _fill_ipv6_hdr(kernel_pid_t iface, ng_pktsnip_t *ipv6,
     return 0;
 }

-static inline void _send_multicast_over_iface(kernel_pid_t iface, ng_pktsnip_t *pkt)
+static inline void _send_multicast_over_iface(kernel_pid_t iface, ng_pktsnip_t *pkt,
+                                              ng_pktsnip_t *netif)
 {
     DEBUG("ipv6: send multicast over interface %" PRIkernel_pid "\n", ifs[i]);
     /* mark as multicast */
@@ -299,7 +300,7 @@ static void _send_multicast(kernel_pid_t iface, ng_pktsnip_t *pkt,

             LL_PREPEND(pkt, netif);

-            _send_multicast_over_iface(iface, pkt);
+            _send_multicast_over_iface(iface, pkt, netif);
         }
     }
     else {
@@ -312,7 +313,7 @@ static void _send_multicast(kernel_pid_t iface, ng_pktsnip_t *pkt,
             }
         }

-        _send_multicast_over_iface(iface, pkt);
+        _send_multicast_over_iface(iface, pkt, netif);
     }
 }

@miri64 miri64 removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Apr 22, 2015
miri64 added a commit that referenced this pull request Apr 22, 2015
@miri64 miri64 merged commit 8e4edf2 into RIOT-OS:master Apr 22, 2015
@miri64 miri64 deleted the ng_ipv6/feat/initial branch April 22, 2015 23:10
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Area: network Area: Networking Process: API change Integration Process: PR contains or issue proposes an API change. Should be handled with care.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants