- libndp - Fedora mailing-lists

[patch libndp] Function for exposing ICMPv6 code
by Kyle Ouellette 13 Dec '25

13 Dec '25

Signed-off-by: Kyle Ouellette <kyleouellette22(a)gmail.com> --- include/ndp.h | 1 + libndp/libndp.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/ndp.h b/include/ndp.h index c3e04df..2369e50 100644 --- a/include/ndp.h +++ b/include/ndp.h @@ -76,6 +76,7 @@ struct ndp_msgns *ndp_msgns(struct ndp_msg *msg); struct ndp_msgna *ndp_msgna(struct ndp_msg *msg); struct ndp_msgr *ndp_msgr(struct ndp_msg *msg); enum ndp_msg_type ndp_msg_type(struct ndp_msg *msg); +uint8_t ndp_msg_code(struct ndp_msg *msg); struct in6_addr *ndp_msg_addrto(struct ndp_msg *msg); uint32_t ndp_msg_ifindex(struct ndp_msg *msg); void ndp_msg_ifindex_set(struct ndp_msg *msg, uint32_t ifindex); diff --git a/libndp/libndp.c b/libndp/libndp.c index fa20a31..82740f6 100644 --- a/libndp/libndp.c +++ b/libndp/libndp.c @@ -648,6 +648,20 @@ enum ndp_msg_type ndp_msg_type(struct ndp_msg *msg) return msg_type; } +/** + * ndp_msg_code: + * @msg: message structure + * + * Get code of message. + * + * Returns: Message code + **/ +NDP_EXPORT +uint8_t ndp_msg_code(struct ndp_msg *msg) +{ + return msg->icmp6_hdr->icmp6_code; +} + static void ndp_msg_type_set(struct ndp_msg *msg, enum ndp_msg_type msg_type) { msg->icmp6_hdr->icmp6_type = ndp_msg_type_info(msg_type)->raw_type; -- 2.43.0

2 3

Re: [patch libndp] Function for exposing ICMPv6 code
by Jiri Pirko 09 Dec '25

09 Dec '25

Mon, Dec 08, 2025 at 07:12:17PM +0100, kyleouellette22(a)gmail.com wrote: >Hello, > >Is there any way to track the status of this patch publicly? When I view >the list archive ( >https://lists.fedorahosted.org/archives/list/libndp@lists.fedorahosted.org/) I'm getting bounce messages whenever you send email to that list. Due to some odd internal mailing list bug, I can't release held messages. >it says that the list is inactive. I ask because I have an open merge List is active. Please subscribe and re-send the patch. >request ><https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_reques…> >in >the NetworkManager project that depends on this patch and was hoping to >provide a link to track the progress. Okay. Will review once you re-send. Thanks! > >Thanks, >Kyle > > >On Thu, Nov 13, 2025 at 2:35 PM Kyle Ouellette <kyleouellette22(a)gmail.com> >wrote: > >> Signed-off-by: Kyle Ouellette <kyleouellette22(a)gmail.com> >> --- >> include/ndp.h | 1 + >> libndp/libndp.c | 14 ++++++++++++++ >> 2 files changed, 15 insertions(+) >> >> diff --git a/include/ndp.h b/include/ndp.h >> index c3e04df..2369e50 100644 >> --- a/include/ndp.h >> +++ b/include/ndp.h >> @@ -76,6 +76,7 @@ struct ndp_msgns *ndp_msgns(struct ndp_msg *msg); >> struct ndp_msgna *ndp_msgna(struct ndp_msg *msg); >> struct ndp_msgr *ndp_msgr(struct ndp_msg *msg); >> enum ndp_msg_type ndp_msg_type(struct ndp_msg *msg); >> +uint8_t ndp_msg_code(struct ndp_msg *msg); >> struct in6_addr *ndp_msg_addrto(struct ndp_msg *msg); >> uint32_t ndp_msg_ifindex(struct ndp_msg *msg); >> void ndp_msg_ifindex_set(struct ndp_msg *msg, uint32_t ifindex); >> diff --git a/libndp/libndp.c b/libndp/libndp.c >> index fa20a31..82740f6 100644 >> --- a/libndp/libndp.c >> +++ b/libndp/libndp.c >> @@ -648,6 +648,20 @@ enum ndp_msg_type ndp_msg_type(struct ndp_msg *msg) >> return msg_type; >> } >> >> +/** >> + * ndp_msg_code: >> + * @msg: message structure >> + * >> + * Get code of message. >> + * >> + * Returns: Message code >> + **/ >> +NDP_EXPORT >> +uint8_t ndp_msg_code(struct ndp_msg *msg) >> +{ >> + return msg->icmp6_hdr->icmp6_code; >> +} >> + >> static void ndp_msg_type_set(struct ndp_msg *msg, enum ndp_msg_type >> msg_type) >> { >> msg->icmp6_hdr->icmp6_type = ndp_msg_type_info(msg_type)->raw_type; >> -- >> 2.43.0 >> >>

1 0

[PATCHv2 libndp 1/2] libndp: add support for PREF64 option
by Beniamino Galvani 28 Jun '24

28 Jun '24

Add support for the PREF64 option (RFC 8781), used in Router Advertisements to communicate NAT64 prefixes to hosts. Signed-off-by: Beniamino Galvani <bgalvani(a)redhat.com> --- Changes since v1: - split the changes into 2 patches - added comment to ndp_msg_opt_pref64_plen() include/ndp.h | 5 +++ libndp/libndp.c | 105 +++++++++++++++++++++++++++++++++++++++++++ libndp/ndp_private.h | 12 +++++ 3 files changed, 122 insertions(+) diff --git a/include/ndp.h b/include/ndp.h index 7bf8794..c3e04df 100644 --- a/include/ndp.h +++ b/include/ndp.h @@ -124,6 +124,7 @@ enum ndp_msg_opt_type { NDP_MSG_OPT_ROUTE, /* Route Information */ NDP_MSG_OPT_RDNSS, /* Recursive DNS Server */ NDP_MSG_OPT_DNSSL, /* DNS Search List */ + NDP_MSG_OPT_PREF64, /* NAT64 prefix */ }; int ndp_msg_next_opt_offset(struct ndp_msg *msg, int offset, @@ -159,6 +160,10 @@ uint32_t ndp_msg_opt_rdnss_lifetime(struct ndp_msg *msg, int offset); struct in6_addr *ndp_msg_opt_rdnss_addr(struct ndp_msg *msg, int offset, int addr_index); +uint16_t ndp_msg_opt_pref64_lifetime(struct ndp_msg *msg, int offset); +uint8_t ndp_msg_opt_pref64_prefix_length(struct ndp_msg *msg, int offset); +struct in6_addr *ndp_msg_opt_pref64_prefix(struct ndp_msg *msg, int offset); + #define ndp_msg_opt_rdnss_for_each_addr(addr, addr_index, msg, offset) \ for (addr_index = 0, \ addr = ndp_msg_opt_rdnss_addr(msg, offset, addr_index); \ diff --git a/libndp/libndp.c b/libndp/libndp.c index 72ec92e..fa20a31 100644 --- a/libndp/libndp.c +++ b/libndp/libndp.c @@ -1245,6 +1245,26 @@ static bool ndp_msg_opt_route_check_valid(void *opt_data) return true; } +static bool ndp_msg_opt_pref64_check_valid(void *opt_data) +{ + struct __nd_opt_pref64 *pref64 = opt_data; + uint16_t plc; + + /* rfc8781: the receiver MUST ignore the PREF64 option if the + * Length field value is not 2 */ + if (pref64->nd_opt_pref64_len != 2) + return false; + + /* The PLC field values 0, 1, 2, 3, 4, and 5 indicate the NAT64 + * prefix length. The receiver MUST ignore the PREF64 option if the + * Prefix Length Code field is not set to one of those values.*/ + plc = ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_PLC_MASK; + if (plc > 5) + return false; + + return true; +} + static struct ndp_msg_opt_type_info ndp_msg_opt_type_info_list[] = { [NDP_MSG_OPT_SLLADDR] = { @@ -1277,6 +1297,11 @@ static struct ndp_msg_opt_type_info ndp_msg_opt_type_info_list[] = .raw_type = __ND_OPT_DNSSL, .raw_struct_size = sizeof(struct __nd_opt_dnssl), }, + [NDP_MSG_OPT_PREF64] = { + .raw_type = __ND_OPT_PREF64, + .raw_struct_size = sizeof(struct __nd_opt_pref64), + .check_valid = ndp_msg_opt_pref64_check_valid, + }, }; #define NDP_MSG_OPT_TYPE_LIST_SIZE ARRAY_SIZE(ndp_msg_opt_type_info_list) @@ -1821,6 +1846,86 @@ char *ndp_msg_opt_dnssl_domain(struct ndp_msg *msg, int offset, return NULL; } +/** + * ndp_msg_opt_pref64_lifetime: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix lifetime. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix lifetime in seconds. + **/ +NDP_EXPORT +uint16_t ndp_msg_opt_pref64_lifetime(struct ndp_msg *msg, int offset) +{ + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + + return ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_LFT_MASK; +} + +static uint8_t ndp_msg_opt_pref64_plen(struct __nd_opt_pref64 *pref64) +{ + uint8_t plc; + + plc = ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_PLC_MASK; + + /* The PLC field values 0, 1, 2, 3, 4, and 5 indicate the NAT64 + * prefix length of 96, 64, 56, 48, 40, and 32 bits, respectively. */ + if (plc == 0) + return 96; + + return 72 - plc * 8; +} + +/** + * ndp_msg_opt_pref64_prefix_length: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix length. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix length (32, 40, 48, 56, 64 or 96). + **/ +NDP_EXPORT +uint8_t ndp_msg_opt_pref64_prefix_length(struct ndp_msg *msg, int offset) +{ + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + + return ndp_msg_opt_pref64_plen(pref64); +} + +/** + * ndp_msg_opt_pref64_prefix: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix. + **/ +NDP_EXPORT +struct in6_addr *ndp_msg_opt_pref64_prefix(struct ndp_msg *msg, int offset) +{ + static NDP_THREAD struct in6_addr addr; + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + uint8_t plen; + + plen = ndp_msg_opt_pref64_plen(pref64); + memset(&addr, 0, sizeof(addr)); + memcpy(&addr, pref64->nd_opt_pref64_prefix, plen / 8); + + return &addr; +} + static int ndp_call_handlers(struct ndp *ndp, struct ndp_msg *msg); static int ndp_sock_recv(struct ndp *ndp) diff --git a/libndp/ndp_private.h b/libndp/ndp_private.h index a75587f..e3ffb62 100644 --- a/libndp/ndp_private.h +++ b/libndp/ndp_private.h @@ -86,6 +86,7 @@ ndp_log_null(struct ndp *ndp, const char *format, ...) {} #define __ND_OPT_ROUTE_INFO 24 /* rfc4191 */ #define __ND_OPT_RDNSS 25 /* rfc6106 */ #define __ND_OPT_DNSSL 31 /* rfc6106 */ +#define __ND_OPT_PREF64 38 /* rfc8781 */ struct __nd_opt_route_info { /* route information */ uint8_t nd_opt_ri_type; @@ -112,5 +113,16 @@ struct __nd_opt_dnssl { /* DNS Search List */ char nd_opt_dnssl_domains[0]; }; +#define ND_OPT_PREF64_PLC_MASK 0x7 +#define ND_OPT_PREF64_LFT_SHIFT 3 +#define ND_OPT_PREF64_LFT_MASK (0x1FFF << ND_OPT_PREF64_LFT_SHIFT) + +struct __nd_opt_pref64 { /* NAT64 prefix */ + uint8_t nd_opt_pref64_type; + uint8_t nd_opt_pref64_len; + uint16_t nd_opt_pref64_lft_plc; + uint8_t nd_opt_pref64_prefix[12]; +}; + #endif /* _NDP_PRIVATE_H_ */ -- 2.45.2

2 2

[PATCH RESEND libndp] add support for PREF64 option
by Beniamino Galvani 27 Jun '24

27 Jun '24

Add support for the PREF64 option (RFC 8781), used in Router Advertisements to communicate NAT64 prefixes to hosts. Example: $ ndptool -i eth0 monitor NDP payload len 96, from addr: fe80::38e1:1bff:fe6a:e266, iface: eth0 Type: RA ... Prefix: 2001:db8::/64, valid_time: 1800s, ... NAT64 Prefix: 64:ff9b::/96, lifetime: 1800s Signed-off-by: Beniamino Galvani <bgalvani(a)redhat.com> --- include/ndp.h | 5 +++ libndp/libndp.c | 103 +++++++++++++++++++++++++++++++++++++++++++ libndp/ndp_private.h | 12 +++++ utils/ndptool.c | 15 +++++++ 4 files changed, 135 insertions(+) diff --git a/include/ndp.h b/include/ndp.h index 7bf8794..c3e04df 100644 --- a/include/ndp.h +++ b/include/ndp.h @@ -124,6 +124,7 @@ enum ndp_msg_opt_type { NDP_MSG_OPT_ROUTE, /* Route Information */ NDP_MSG_OPT_RDNSS, /* Recursive DNS Server */ NDP_MSG_OPT_DNSSL, /* DNS Search List */ + NDP_MSG_OPT_PREF64, /* NAT64 prefix */ }; int ndp_msg_next_opt_offset(struct ndp_msg *msg, int offset, @@ -159,6 +160,10 @@ uint32_t ndp_msg_opt_rdnss_lifetime(struct ndp_msg *msg, int offset); struct in6_addr *ndp_msg_opt_rdnss_addr(struct ndp_msg *msg, int offset, int addr_index); +uint16_t ndp_msg_opt_pref64_lifetime(struct ndp_msg *msg, int offset); +uint8_t ndp_msg_opt_pref64_prefix_length(struct ndp_msg *msg, int offset); +struct in6_addr *ndp_msg_opt_pref64_prefix(struct ndp_msg *msg, int offset); + #define ndp_msg_opt_rdnss_for_each_addr(addr, addr_index, msg, offset) \ for (addr_index = 0, \ addr = ndp_msg_opt_rdnss_addr(msg, offset, addr_index); \ diff --git a/libndp/libndp.c b/libndp/libndp.c index 72ec92e..860b785 100644 --- a/libndp/libndp.c +++ b/libndp/libndp.c @@ -1245,6 +1245,27 @@ static bool ndp_msg_opt_route_check_valid(void *opt_data) return true; } +static bool ndp_msg_opt_pref64_check_valid(void *opt_data) +{ + struct __nd_opt_pref64 *pref64 = opt_data; + uint16_t plc; + + /* rfc8781: the receiver MUST ignore the PREF64 option if the + * Length field value is not 2 */ + if (pref64->nd_opt_pref64_len != 2) + return false; + + /* The PLC field values 0, 1, 2, 3, 4, and 5 indicate the NAT64 + * prefix length of 96, 64, 56, 48, 40, and 32 bits, respectively. + * The receiver MUST ignore the PREF64 option if the Prefix + * Length Code field is not set to one of those values.*/ + plc = ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_PLC_MASK; + if (plc > 5) + return false; + + return true; +} + static struct ndp_msg_opt_type_info ndp_msg_opt_type_info_list[] = { [NDP_MSG_OPT_SLLADDR] = { @@ -1277,6 +1298,11 @@ static struct ndp_msg_opt_type_info ndp_msg_opt_type_info_list[] = .raw_type = __ND_OPT_DNSSL, .raw_struct_size = sizeof(struct __nd_opt_dnssl), }, + [NDP_MSG_OPT_PREF64] = { + .raw_type = __ND_OPT_PREF64, + .raw_struct_size = sizeof(struct __nd_opt_pref64), + .check_valid = ndp_msg_opt_pref64_check_valid, + }, }; #define NDP_MSG_OPT_TYPE_LIST_SIZE ARRAY_SIZE(ndp_msg_opt_type_info_list) @@ -1821,6 +1847,83 @@ char *ndp_msg_opt_dnssl_domain(struct ndp_msg *msg, int offset, return NULL; } +/** + * ndp_msg_opt_pref64_lifetime: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix lifetime. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix lifetime in seconds. + **/ +NDP_EXPORT +uint16_t ndp_msg_opt_pref64_lifetime(struct ndp_msg *msg, int offset) +{ + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + + return ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_LFT_MASK; +} + +static uint8_t ndp_msg_opt_pref64_plen(struct __nd_opt_pref64 *pref64) +{ + uint8_t plc; + + plc = ntohs(pref64->nd_opt_pref64_lft_plc) & ND_OPT_PREF64_PLC_MASK; + if (plc == 0) + return 96; + + return 72 - plc * 8; +} + +/** + * ndp_msg_opt_pref64_prefix_length: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix length. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix length (32, 40, 48, 56, 64 or 96). + **/ +NDP_EXPORT +uint8_t ndp_msg_opt_pref64_prefix_length(struct ndp_msg *msg, int offset) +{ + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + + return ndp_msg_opt_pref64_plen(pref64); +} + +/** + * ndp_msg_opt_pref64_prefix: + * @msg: message structure + * @offset: in-message offset + * + * Get the NAT64 prefix. + * User should use this function only inside ndp_msg_opt_for_each_offset() + * macro loop. + * + * Returns: the NAT64 prefix. + **/ +NDP_EXPORT +struct in6_addr *ndp_msg_opt_pref64_prefix(struct ndp_msg *msg, int offset) +{ + static NDP_THREAD struct in6_addr addr; + struct __nd_opt_pref64 *pref64 = + ndp_msg_payload_opts_offset(msg, offset); + uint8_t plen; + + plen = ndp_msg_opt_pref64_plen(pref64); + memset(&addr, 0, sizeof(addr)); + memcpy(&addr, pref64->nd_opt_pref64_prefix, plen / 8); + + return &addr; +} + static int ndp_call_handlers(struct ndp *ndp, struct ndp_msg *msg); static int ndp_sock_recv(struct ndp *ndp) diff --git a/libndp/ndp_private.h b/libndp/ndp_private.h index a75587f..e3ffb62 100644 --- a/libndp/ndp_private.h +++ b/libndp/ndp_private.h @@ -86,6 +86,7 @@ ndp_log_null(struct ndp *ndp, const char *format, ...) {} #define __ND_OPT_ROUTE_INFO 24 /* rfc4191 */ #define __ND_OPT_RDNSS 25 /* rfc6106 */ #define __ND_OPT_DNSSL 31 /* rfc6106 */ +#define __ND_OPT_PREF64 38 /* rfc8781 */ struct __nd_opt_route_info { /* route information */ uint8_t nd_opt_ri_type; @@ -112,5 +113,16 @@ struct __nd_opt_dnssl { /* DNS Search List */ char nd_opt_dnssl_domains[0]; }; +#define ND_OPT_PREF64_PLC_MASK 0x7 +#define ND_OPT_PREF64_LFT_SHIFT 3 +#define ND_OPT_PREF64_LFT_MASK (0x1FFF << ND_OPT_PREF64_LFT_SHIFT) + +struct __nd_opt_pref64 { /* NAT64 prefix */ + uint8_t nd_opt_pref64_type; + uint8_t nd_opt_pref64_len; + uint16_t nd_opt_pref64_lft_plc; + uint8_t nd_opt_pref64_prefix[12]; +}; + #endif /* _NDP_PRIVATE_H_ */ diff --git a/utils/ndptool.c b/utils/ndptool.c index 618f167..0042371 100644 --- a/utils/ndptool.c +++ b/utils/ndptool.c @@ -300,6 +300,21 @@ static int msgrcv_handler_func(struct ndp *ndp, struct ndp_msg *msg, void *priv) pr_out_lft(ndp_msg_opt_dnssl_lifetime(msg, offset)); pr_out("\n"); } + ndp_msg_opt_for_each_offset(offset, msg, NDP_MSG_OPT_PREF64) { + struct in6_addr *prefix; + uint16_t lft; + uint8_t plen; + + pr_out(" NAT64 Prefix: "); + + prefix = ndp_msg_opt_pref64_prefix(msg, offset); + plen = ndp_msg_opt_pref64_prefix_length(msg, offset); + lft = ndp_msg_opt_pref64_lifetime(msg, offset); + + pr_out("%s/%u", str_in6_addr(prefix, buf), plen); + pr_out(", lifetime: %us", lft); + pr_out("\n"); + } } else if (msg_type == NDP_MSG_NS) { pr_out(" Type: NS\n"); } else if (msg_type == NDP_MSG_NA) { -- 2.45.2

2 2

Re: [patch libndp] add support for PREF64 option
by Jiri Pirko 27 Jun '24

27 Jun '24

Fri, Jun 21, 2024 at 11:22:16AM CEST, bgalvani(a)redhat.com wrote: >Add support for the PREF64 option (RFC 8781), used in Router >Advertisements to communicate NAT64 prefixes to hosts. > >Example: > $ ndptool -i eth0 monitor > NDP payload len 96, from addr: fe80::38e1:1bff:fe6a:e266, iface: eth0 > Type: RA > ... > Prefix: 2001:db8::/64, valid_time: 1800s, ... > NAT64 Prefix: 64:ff9b::/96, lifetime: 1800s > >Signed-off-by: Beniamino Galvani <bgalvani(a)redhat.com> Hi. Is the resend patch you send yesterday different to this one?

2 1

Re: [PATCHv2 libndp] libndp: valid route information option length
by Jiri Pirko 05 Jun '24

05 Jun '24

Wed, Jun 05, 2024 at 05:57:43AM CEST, liuhangbin(a)gmail.com wrote: >RFC 4191 specifies that the Route Information Option Length should be 1, 2, >or 3, depending on the Prefix Length. A malicious node could potentially >trigger a buffer overflow and crash the tool by sending an IPv6 router >advertisement message containing the "Route Information" option with a >"Length" field larger than 3. > >To address this, add a check on the length field. > >Fixes: 8296a5bf0755 ("add support for Route Information Option (rfc4191)") >Reported-by: Evgeny Vereshchagin <evverx(a)gmail.com> >Suggested-by: Felix Maurer <fmaurer(a)redhat.com> >Signed-off-by: Hangbin Liu <liuhangbin(a)gmail.com> Applied, thanks!

1 0

Re: [PATCH] libndp: valid route information option
by Jiri Pirko 04 Jun '24

04 Jun '24

Fri, May 31, 2024 at 03:14:32PM CEST, liuhangbin(a)gmail.com wrote: >RFC 4191 specifies that the Route Information Option Length should be 1, 2, >or 3, depending on the Prefix Length. A malicious packet can potentially >trigger a buffer overflow and crash the tool by sending an IPv6 router >advertisement message containing the "Route Information" option with a >"Length" field larger than 3. To address this, add a check on the length >field. If the length is incorrect, the system should return a zero address. > >Reported-by: evverx(a)gmail.com A name please? >Signed-off-by: Hangbin Liu <liuhangbin(a)gmail.com> >--- > libndp/libndp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/libndp/libndp.c b/libndp/libndp.c >index 6314717df3ab..f3743e24cc39 100644 >--- a/libndp/libndp.c >+++ b/libndp/libndp.c >@@ -1618,7 +1618,8 @@ struct in6_addr *ndp_msg_opt_route_prefix(struct ndp_msg *msg, int offset) > ndp_msg_payload_opts_offset(msg, offset); > > memset(&prefix, 0, sizeof(prefix)); >- memcpy(&prefix, &ri->nd_opt_ri_prefix, (ri->nd_opt_ri_len - 1) << 3); >+ if (ri->nd_opt_ri_len <= 3) >+ memcpy(&prefix, &ri->nd_opt_ri_prefix, (ri->nd_opt_ri_len - 1) << 3); Wouldn't it be better to use max() ? > return &prefix; > } > >-- >2.43.0 >

1 0

Re: [patch libndp] add captive portal uri option
by Jiri Pirko 12 Dec '23

12 Dec '23

Also, please make sure to use new mailing list address: libndp(a)lists.fedorahosted.org Mon, Dec 11, 2023 at 02:51:08PM CET, mail(a)sandropischinger.de wrote: >--- >This patch adds support for handling the Captive Portal URI option as >described in rfc8910. Feel free to tell me a strategy on how to properly >test this. Ideally some unit-test could be introduced. Best wishes, >Sandro > include/ndp.h | 2 ++ > libndp/libndp.c | 38 ++++++++++++++++++++++++++++++++++++++ > libndp/ndp_private.h | 7 +++++++ > 3 files changed, 47 insertions(+) > >diff --git a/include/ndp.h b/include/ndp.h >index 7bf8794..3b3bf92 100644 >--- a/include/ndp.h >+++ b/include/ndp.h >@@ -124,6 +124,7 @@ enum ndp_msg_opt_type { > NDP_MSG_OPT_ROUTE, /* Route Information */ > NDP_MSG_OPT_RDNSS, /* Recursive DNS Server */ > NDP_MSG_OPT_DNSSL, /* DNS Search List */ >+ NDP_MSG_OPT_CAPTIVE_PORTAL, /* Captive Portal URI */ > }; > > int ndp_msg_next_opt_offset(struct ndp_msg *msg, int offset, >@@ -175,6 +176,7 @@ char *ndp_msg_opt_dnssl_domain(struct ndp_msg *msg, int offset, > domain; \ > domain = ndp_msg_opt_dnssl_domain(msg, offset, ++domain_index)) > >+char *ndp_msg_opt_captive_portal(struct ndp_msg *msg, int offset); > typedef int (*ndp_msgrcv_handler_func_t)(struct ndp *ndp, struct ndp_msg *msg, > void *priv); > int ndp_msgrcv_handler_register(struct ndp *ndp, ndp_msgrcv_handler_func_t func, >diff --git a/libndp/libndp.c b/libndp/libndp.c >index 6314717..744fae1 100644 >--- a/libndp/libndp.c >+++ b/libndp/libndp.c >@@ -1266,6 +1266,10 @@ static struct ndp_msg_opt_type_info ndp_msg_opt_type_info_list[] = > .raw_type = __ND_OPT_DNSSL, > .raw_struct_size = sizeof(struct __nd_opt_dnssl), > }, >+ [NDP_MSG_OPT_CAPTIVE_PORTAL] = { >+ .raw_type = __ND_OPT_CAPTIVE_PORTAL, >+ .raw_struct_size = sizeof(struct __nd_opt_captive_portal), >+ }, > }; > > #define NDP_MSG_OPT_TYPE_LIST_SIZE ARRAY_SIZE(ndp_msg_opt_type_info_list) >@@ -1810,6 +1814,40 @@ char *ndp_msg_opt_dnssl_domain(struct ndp_msg *msg, int offset, > return NULL; > } > >+/** >+ * ndp_msg_option_captive_portal: >+ * @msg: message structure >+ * @offset: in-message offset >+ * >+ * Get Captive-Portal URI. >+ * >+ * Returns: uri. >+ **/ >+NDP_EXPORT >+char *ndp_msg_opt_captive_portal(struct ndp_msg *msg, int offset) >+{ >+ static NDP_THREAD char buf[256]; >+ struct __nd_opt_captive_portal *cap_port = >+ ndp_msg_payload_opts_offset(msg, offset); >+ size_t len = cap_port->nd_opt_captive_portal_len << 3; /* convert to bytes */ >+ char *ptr; >+ >+ len -= in_struct_offset(struct __nd_opt_captive_portal, nd_opt_captive_portal_uri); >+ ptr = cap_port->nd_opt_captive_portal_uri; >+ >+ if (len + 1 > sizeof(buf)) { >+ return NULL; >+ } >+ >+ if (len > 0 && *ptr) { >+ memcpy(buf, ptr, len); >+ buf[len - 1] = '\0'; >+ return buf; >+ } >+ >+ return NULL; >+} >+ > static int ndp_call_handlers(struct ndp *ndp, struct ndp_msg *msg); > > static int ndp_sock_recv(struct ndp *ndp) >diff --git a/libndp/ndp_private.h b/libndp/ndp_private.h >index a75587f..bbadff1 100644 >--- a/libndp/ndp_private.h >+++ b/libndp/ndp_private.h >@@ -86,6 +86,7 @@ ndp_log_null(struct ndp *ndp, const char *format, ...) {} > #define __ND_OPT_ROUTE_INFO 24 /* rfc4191 */ > #define __ND_OPT_RDNSS 25 /* rfc6106 */ > #define __ND_OPT_DNSSL 31 /* rfc6106 */ >+#define __ND_OPT_CAPTIVE_PORTAL 37 /* rfc8910 */ > > struct __nd_opt_route_info { /* route information */ > uint8_t nd_opt_ri_type; >@@ -112,5 +113,11 @@ struct __nd_opt_dnssl { /* DNS Search List */ > char nd_opt_dnssl_domains[0]; > }; > >+struct __nd_opt_captive_portal { /* Captive Portal URI */ >+ uint8_t nd_opt_captive_portal_type; >+ uint8_t nd_opt_captive_portal_len; >+ char nd_opt_captive_portal_uri[0]; >+}; >+ > > #endif /* _NDP_PRIVATE_H_ */ >-- >2.43.0 >

1 0

【屯】猿人伴侣曙蓬亟希机免费在线琳琅满目
by nl279709 nl279709 11 Dec '21

11 Dec '21

猿人伴侣手机免费在线 --》点击后面地址进入看午@夜大片: http://esggcy525.aa234.cc/#fedoraproject1211 --》点击后面地址进入看午@夜视频: http://esggcy525.aa234.cc/#fedoraproject1211 猿人伴侣手机免费在线是谁慷慨解囊，雪中送炭；是谁两肋插刀，共苦同甘；是谁心心相惜，不离不弃；是谁促膝而谈，真诚相伴，高山流水，不管我们人生的舞台如何绚丽多彩，谢幕的，总是朋友的掌声，朋友的呐喊。朋友劝富兰克林说：“天天如此，是不是过于辛苦……”“你热爱生命吗？”富兰克林摆摆手，打断朋友的话说：“那么别浪费时间，因为时间是组成生命的材料。”【屯】猿人伴侣曙蓬亟希机免费在线琳琅满目而牵挂，在这块处女地上的原住民，自然应在这长久地住下去。人们不要天天用高科技来释放自己的牵挂，那样的牵挂不是牵挂而是习惯，相信长此以往，人们便不会再有“近乡情更怯，不敢问来人”的感觉，那是多么可怕！猿人伴侣手机免费在线

1 0

【瞎】79年属羊天上紫气东来,火命开什么颜色的车曲突徙薪
by hz279656 hz279656 11 Dec '21

11 Dec '21

79年属羊天上火命开什么颜色的车 --》点击后面地址进入看午@夜大片: http://lqfokh143.aa234.cc/#fedoraproject1211 --》点击后面地址进入看午@夜视频: http://lqfokh143.aa234.cc/#fedoraproject1211 79年属羊天上火命开什么颜色的车高科技是一种潮流，它就像潮起潮落一样无法避免。我们不应排斥高科技，反而应接受它，随着它的发展而发展。但是我们是否也应为传统留下一席之地呢？让那种传统的、原始的感觉在高科技泛滥的现代社会中，开辟出一块处女地，不被它侵扰，永久地保持下去。在纷繁的红尘世界中，因为有了一份爱的存在，不管距离远近，无论喧哗寂寞，我的心始终是安然从容的。【瞎】79年属羊天上紫气东来,火命开什么颜色的车曲突徙薪当人们牵挂亲友时，只需从口袋中搜出手机，输入对方的号码，再轻轻一按拨号键，对方接通时，便可听见他的声音。抑或是上网和他视频、语音聊天，十分方便、快捷，不必再饱尝相思之苦。79年属羊天上火命开什么颜色的车

1 0

2026

2025

2024

2023

2022

2021

libndp