gnrc_netif2: add IEEE 802.15.4 support#7409

Merged

smlng merged 3 commits intoRIOT-OS:masterfrom

miri64:gnrc_netif2/feat/ieee802154

Oct 10, 2017

Member

miri64 commented Jul 25, 2017 •

edited

Loading

IEEE 802.15.4 support for gnrc_netif2.

~~Requires #7370.~~

This PR is part of the network layer remodelling effort:

miri64 added GNRC Area: network State: waiting for other PR labels

miri64 assigned aabadie

miri64 requested a review from aabadie

July 25, 2017 19:11

miri64 added a commit to miri64/RIOT that referenced this pull request


          Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into HEAD

d8021c0

miri64 mentioned this pull request

gnrc: integrate gnrc_netif2 #7424

Merged

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from 763d0b5 to 3f26117 Compare

July 30, 2017 18:43

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-…

b3c7168

…OS#7424

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from 3f26117 to eab9e4d Compare

August 1, 2017 14:13

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-…

fc561bd

…OS#7424

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from eab9e4d to c73b6d7 Compare

August 21, 2017 10:50

miri64 added a commit to miri64/RIOT that referenced this pull request


          Merge branch 'gnrc_netif2/feat/new-netif-api-for-gnrc' (RIOT-OS#7370)…

c8582a5

… into RIOT-OS#7409

Member Author

miri64 commented Aug 21, 2017

Rebased to current master and current dependencies

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch 2 times, most recently from 91c1c27 to fbadffe Compare

August 21, 2017 11:15

Member Author

miri64 commented Aug 21, 2017

(also adapted for changes in #7370)

miri64 added a commit to miri64/RIOT that referenced this pull request


          Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-O…

613aa2d

…S#7424

This was referenced Sep 6, 2017

LWMAC: avoid receiving duplicate broadcast packet. #7442

Closed

gnrc_netif_ieee802154: drop duplicate broadcast packets (optionally) #7577

Merged

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-…

198b937

…OS#7424

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from 63b9000 to d3a314a Compare

October 10, 2017 08:47

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/new-netif-api-for-gnrc' (RIOT-OS#7370)…

8cc8c0a

… into RIOT-OS#7409

Member Author

miri64 commented Oct 10, 2017 •

edited

Loading

Rebased to and adapted for changes in master and dependencies

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-…

f529793

…OS#7424

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from d3a314a to a190862 Compare

October 10, 2017 09:45

Member Author

miri64 commented Oct 10, 2017

Rebased to current master, no longer waiting for other PR

miri64 added CI: ready for build and removed State: waiting for other PR labels

miri64 added a commit to miri64/RIOT that referenced this pull request


           Merge branch 'gnrc_netif2/feat/ieee802154' (RIOT-OS#7409) into RIOT-…

c978b68

…OS#7424

bergzand mentioned this pull request

auto_init: upgrade bootstrap of Ethernet devices for gnrc_netif2 #7410

Merged

Member

bergzand commented Oct 10, 2017

I couldn't find anything comment worthy here. Changes between the old gnrc_netdev_ieee802154.c and gnrc_netif2_ieee802154.c look good to me.

Member Author

miri64 commented Oct 10, 2017

@kaspar030 made some comments about my usage of LOG_ERROR() in #7410. I will remove them here and in the other PRs.

OlegHahm reviewed

View reviewed changes

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  if ((dst_len < 0) || (src_len < 0)) {
+                      DEBUG("_make_netif_hdr: unable to get addresses\n");
+                      return NULL;
+                  }

Member

OlegHahm Oct 10, 2017

Is there a valid reason this should happen at runtime or could we go with an assert here?

Member Author

miri64 Oct 10, 2017

Sure, if the address mode field in the network received mhr is of an unexpected value (not 2 or 3) the functions above return a negative value.

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  size_t n, src_len, dst_len;
+                  uint8_t mhr[IEEE802154_MAX_HDR_LEN];
+                  uint8_t flags = (uint8_t)(state->flags & NETDEV_IEEE802154_SEND_MASK);
+                  le_uint16_t dev_pan = byteorder_btols(byteorder_htons(state->pan));

Member

OlegHahm Oct 10, 2017

What's the idea behind this double-swap?

Member Author

miri64 Oct 10, 2017

Getting it from host byte order to definitely little-endian (ideally it is optimized to 0-1 swaps).

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  if (pkt == NULL) {
+                      DEBUG("_send_ieee802154: pkt was NULL\n");
+                      return -EINVAL;
+                  }

Member

OlegHahm Oct 10, 2017

assert?

Member Author

miri64 Oct 10, 2017

The other (and gnrc_netdev equivalents) don't do that as well, so there might be a reason to not do it.

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c Outdated

+                  }
+                  netif_hdr = pkt->data;
+                  /* prepare destination address */
+                  if (netif_hdr->flags & /* If any of these flags is set so this is correct */

Member

OlegHahm Oct 10, 2017

I don't understand the comment.

Member Author

miri64 Oct 10, 2017

Addressed

miri64 commented

View reviewed changes

Member Author

miri64 left a comment

(Not an excuse, but) most of this was just copy-pasta'd from the already reviewed gnrc_netdev's IEEE 802.15.4 glue-code

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  if ((dst_len < 0) || (src_len < 0)) {
+                      DEBUG("_make_netif_hdr: unable to get addresses\n");
+                      return NULL;
+                  }

Member Author

miri64 Oct 10, 2017

Sure, if the address mode field in the network received mhr is of an unexpected value (not 2 or 3) the functions above return a negative value.

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  size_t n, src_len, dst_len;
+                  uint8_t mhr[IEEE802154_MAX_HDR_LEN];
+                  uint8_t flags = (uint8_t)(state->flags & NETDEV_IEEE802154_SEND_MASK);
+                  le_uint16_t dev_pan = byteorder_btols(byteorder_htons(state->pan));

Member Author

miri64 Oct 10, 2017

Getting it from host byte order to definitely little-endian (ideally it is optimized to 0-1 swaps).

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c

+                  if (pkt == NULL) {
+                      DEBUG("_send_ieee802154: pkt was NULL\n");
+                      return -EINVAL;
+                  }

Member Author

miri64 Oct 10, 2017

The other (and gnrc_netdev equivalents) don't do that as well, so there might be a reason to not do it.

sys/net/gnrc/netif2/gnrc_netif2_ieee802154.c Outdated

+                  }
+                  netif_hdr = pkt->data;
+                  /* prepare destination address */
+                  if (netif_hdr->flags & /* If any of these flags is set so this is correct */

Member Author

miri64 Oct 10, 2017

Addressed

OlegHahm approved these changes

View reviewed changes

miri64 added 3 commits

October 10, 2017 23:11


          gnrc_netif2: add IEEE 802.15.4 support

1d8dcae


          tests: add tests for IEEE 802.15.4 to gnrc_netif2 tests

60c18cf


          auto_init: upgrade bootstrap of IEEE 802.15.4 devices for gnrc_netif2

9f9737d

miri64 force-pushed the gnrc_netif2/feat/ieee802154 branch from 6e97db1 to 9f9737d Compare

October 10, 2017 21:12

smlng merged commit af616ac into RIOT-OS:master

Member

smlng commented Oct 10, 2017

ACK & GO

miri64 deleted the gnrc_netif2/feat/ieee802154 branch

October 10, 2017 21:19

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: network CI: ready for build