sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/icmpv6: Fix ipv6->len in icmpv6_reply

Browse Source 
The `ipv6->len` is the length excluding the IPv6 header, so need to be `dev->d_len - IPv6_HDRLEN`.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2022-11-24 17:17:13 +08:00 committed by Xiang Xiao
parent a26ea96f3b
commit 869c93638d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/icmpv6/icmpv6_reply.c
View File

@ -88,6 +88,7 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data)
FAR struct ipv6_hdr_s *ipv6 = IPv6BUF; FAR struct ipv6_hdr_s *ipv6 = IPv6BUF;
FAR struct icmpv6_hdr_s *icmpv6 = (FAR struct icmpv6_hdr_s *)(ipv6 + 1); FAR struct icmpv6_hdr_s *icmpv6 = (FAR struct icmpv6_hdr_s *)(ipv6 + 1);
uint16_t datalen; uint16_t datalen;
uint16_t paylen;
if (net_ipv6addr_cmp(ipv6->destipaddr, g_ipv6_unspecaddr) if (net_ipv6addr_cmp(ipv6->destipaddr, g_ipv6_unspecaddr)
# ifdef CONFIG_NET_BROADCAST # ifdef CONFIG_NET_BROADCAST
@ -111,6 +112,7 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data)
} }
dev->d_len = ipicmplen + datalen; dev->d_len = ipicmplen + datalen;
paylen = dev->d_len - IPv6_HDRLEN;
/* Copy fields from original packet */ /* Copy fields from original packet */
@ -121,8 +123,8 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data)
ipv6->vtc = 0x60; /* Version/traffic class (MS) */ ipv6->vtc = 0x60; /* Version/traffic class (MS) */
ipv6->tcf = 0; /* Traffic class(LS)/Flow label(MS) */ ipv6->tcf = 0; /* Traffic class(LS)/Flow label(MS) */
ipv6->flow = 0; /* Flow label (LS) */ ipv6->flow = 0; /* Flow label (LS) */
ipv6->len[0] = (dev->d_len >> 8); /* Length excludes the IPv6 header */ ipv6->len[0] = (paylen >> 8); /* Length excludes the IPv6 header */
ipv6->len[1] = (dev->d_len & 0xff); ipv6->len[1] = (paylen & 0xff);
ipv6->proto = IP_PROTO_ICMP6; /* Next header */ ipv6->proto = IP_PROTO_ICMP6; /* Next header */
ipv6->ttl = 255; /* Hop limit */ ipv6->ttl = 255; /* Hop limit */