diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 12:48:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 12:48:02 -0600 |
| commit | 8ccaaec478c5c667db1e62c573895f70a98b2071 (patch) | |
| tree | 072c864c001d0a20e6e5d723a4dc2f3484503418 /nuttx | |
| parent | 91477eb5e4cd21c72fdf4fb4e3545bf0eea601a2 (diff) | |
| download | px4-nuttx-8ccaaec478c5c667db1e62c573895f70a98b2071.tar.gz px4-nuttx-8ccaaec478c5c667db1e62c573895f70a98b2071.tar.bz2 px4-nuttx-8ccaaec478c5c667db1e62c573895f70a98b2071.zip | |
IPv6 fixes: Both ICMPv6 autonomous auto-configuration and the ICMPv6 router function appear to be fully functional.
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/net/icmpv6/icmpv6_input.c | 4 | ||||
| -rw-r--r-- | nuttx/net/icmpv6/icmpv6_rnotify.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/net/icmpv6/icmpv6_input.c b/nuttx/net/icmpv6/icmpv6_input.c index f6e30008b..1e5cdca30 100644 --- a/nuttx/net/icmpv6/icmpv6_input.c +++ b/nuttx/net/icmpv6/icmpv6_input.c @@ -238,7 +238,7 @@ void icmpv6_input(FAR struct net_driver_s *dev) */ adv = ICMPv6RADVERTISE; - for (ndx = 0; ndx + sizeof(struct icmpv6_prefixinfo_s) < optlen; ) + for (ndx = 0; ndx + sizeof(struct icmpv6_prefixinfo_s) <= optlen; ) { FAR struct icmpv6_prefixinfo_s *opt = (FAR struct icmpv6_prefixinfo_s *)&adv->options[ndx]; @@ -313,7 +313,7 @@ void icmpv6_input(FAR struct net_driver_s *dev) default: { - nlldbg("Unknown ICMPv6 cmd: %d\n", icmp->type); + nlldbg("Unknown ICMPv6 type: %d\n", icmp->type); goto icmpv6_type_error; } } diff --git a/nuttx/net/icmpv6/icmpv6_rnotify.c b/nuttx/net/icmpv6/icmpv6_rnotify.c index 66d3370da..d2249d95f 100644 --- a/nuttx/net/icmpv6/icmpv6_rnotify.c +++ b/nuttx/net/icmpv6/icmpv6_rnotify.c @@ -152,8 +152,8 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev, for (i = 0; i < 7; i++) { - dev->d_ipv6addr[i] = (dev->d_ipv6addr[i] & dev->d_ipv6netmask[i]) | - (prefix[i] & ~dev->d_ipv6netmask[i]); + dev->d_ipv6addr[i] = (dev->d_ipv6addr[i] & ~dev->d_ipv6netmask[i]) | + (prefix[i] & dev->d_ipv6netmask[i]); } nvdbg("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", |