Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

net/icmpv6/icmpv6_radvertise.c: Add option to manually specify router prefix

Browse Source
This commit is contained in:
Sakari Kapanen
2017-11-08 07:47:41 -06:00
committed by Gregory Nutt
parent 07b98ccbb5
commit 795e884aea
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/icmpv6/Kconfig
+11
View File
@@ -93,6 +93,16 @@ config NET_ICMPv6_ROUTER
if NET_ICMPv6_ROUTER if NET_ICMPv6_ROUTER
config NET_ICMPv6_ROUTER_MANUAL
bool "Manual router prefix"
default n
---help---
Select this to set the advertised router prefix manually. Otherwise, it
will be derived from the device IPv6 address and prefix length set in
the netdev structure.
if NET_ICMPv6_ROUTER_MANUAL
config NET_ICMPv6_PREFLEN config NET_ICMPv6_PREFLEN
int "Prefix length" int "Prefix length"
default 64 default 64
@@ -178,6 +188,7 @@ config NET_ICMPv6_PREFIX_8
Advertisement message. This is the last of the 8-values. The Advertisement message. This is the last of the 8-values. The
default for all eight values is fc00::0. default for all eight values is fc00::0.
endif # NET_ICMPv6_ROUTER_MANUAL
endif # NET_ICMPv6_ROUTER endif # NET_ICMPv6_ROUTER
if NET_ICMPv6_SOCKET if NET_ICMPv6_SOCKET
net/icmpv6/icmpv6_radvertise.c
+10
View File
@@ -74,6 +74,7 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NET_ICMPv6_ROUTER_MANUAL
static const net_ipv6addr_t g_ipv6_prefix = static const net_ipv6addr_t g_ipv6_prefix =
{ {
HTONS(CONFIG_NET_ICMPv6_PREFIX_1), HTONS(CONFIG_NET_ICMPv6_PREFIX_1),
@@ -85,6 +86,7 @@ static const net_ipv6addr_t g_ipv6_prefix =
HTONS(CONFIG_NET_ICMPv6_PREFIX_7), HTONS(CONFIG_NET_ICMPv6_PREFIX_7),
HTONS(CONFIG_NET_ICMPv6_PREFIX_8) HTONS(CONFIG_NET_ICMPv6_PREFIX_8)
}; };
#endif /* CONFIG_NET_ICMPv6_ROUTER_MANUAL */
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@@ -106,6 +108,7 @@ static const net_ipv6addr_t g_ipv6_prefix =
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NET_ICMPv6_ROUTER_MANUAL
static inline void ipv6addr_mask(FAR uint16_t *dest, FAR const uint16_t *src, static inline void ipv6addr_mask(FAR uint16_t *dest, FAR const uint16_t *src,
FAR const uint16_t *mask) FAR const uint16_t *mask)
{ {
@@ -116,6 +119,7 @@ static inline void ipv6addr_mask(FAR uint16_t *dest, FAR const uint16_t *src,
dest[i] = src[i] & mask[i]; dest[i] = src[i] & mask[i];
} }
} }
#endif /* !CONFIG_NET_ICMPv6_ROUTER_MANUAL */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@@ -219,10 +223,16 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev)
prefix->reserved[0] = 0; prefix->reserved[0] = 0;
prefix->reserved[1] = 0; prefix->reserved[1] = 0;
#ifdef CONFIG_NET_ICMPv6_ROUTER_MANUAL
/* Copy the configured prefex */
net_ipv6addr_copy(prefix->prefix, g_ipv6_prefix);
#else
/* Set the prefix and prefix length based on net driver IP and netmask */ /* Set the prefix and prefix length based on net driver IP and netmask */
prefix->preflen = net_ipv6_mask2pref(dev->d_ipv6netmask); prefix->preflen = net_ipv6_mask2pref(dev->d_ipv6netmask);
ipv6addr_mask(prefix->prefix, dev->d_ipv6addr, dev->d_ipv6netmask); ipv6addr_mask(prefix->prefix, dev->d_ipv6addr, dev->d_ipv6netmask);
#endif /* CONFIG_NET_ICMPv6_ROUTER_MANUAL */
/* Calculate the checksum over both the ICMP header and payload */ /* Calculate the checksum over both the ICMP header and payload */