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

net/icmpv6: Fix value of SIZEOF_ICMPV6_ECHO_xxx_S

Browse Source 
The `SIZEOF_ICMPV6_ECHO_REQUEST_S` and `SIZEOF_ICMPV6_ECHO_REPLY_S`
macro are intended to be `8+n`, but actually becomes `10-1+n` and causes
the packet sent by `ping6` one byte more than expected.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-08-10 11:27:20 +08:00 committed by Xiang Xiao
parent c1eecd7c4f
commit 264283c5a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/nuttx/net/icmpv6.h
View File

@ -269,7 +269,7 @@ struct icmpv6_router_advertise_s
/* This the message format for the ICMPv6 Echo Request message */ /* This the message format for the ICMPv6 Echo Request message */
struct icmpv6_echo_request_s begin_packed_struct struct icmpv6_echo_request_s
{ {
uint8_t type; /* Message Type: ICMPv6_ECHO_REQUEST */ uint8_t type; /* Message Type: ICMPv6_ECHO_REQUEST */
uint8_t code; /* Further qualifies the ICMP messages */ uint8_t code; /* Further qualifies the ICMP messages */
@ -277,14 +277,14 @@ struct icmpv6_echo_request_s
uint16_t id; /* Identifier */ uint16_t id; /* Identifier */
uint16_t seqno; /* Sequence Number */ uint16_t seqno; /* Sequence Number */
uint8_t data[1]; /* Data follows */ uint8_t data[1]; /* Data follows */
}; } end_packed_struct;
#define SIZEOF_ICMPV6_ECHO_REQUEST_S(n) \ #define SIZEOF_ICMPV6_ECHO_REQUEST_S(n) \
(sizeof(struct icmpv6_echo_request_s) - 1 + (n)) (sizeof(struct icmpv6_echo_request_s) - 1 + (n))
/* This the message format for the ICMPv6 Echo Reply message */ /* This the message format for the ICMPv6 Echo Reply message */
struct icmpv6_echo_reply_s begin_packed_struct struct icmpv6_echo_reply_s
{ {
uint8_t type; /* Message Type: ICMPv6_ECHO_REQUEST */ uint8_t type; /* Message Type: ICMPv6_ECHO_REQUEST */
uint8_t code; /* Further qualifies the ICMP messages */ uint8_t code; /* Further qualifies the ICMP messages */
@ -292,7 +292,7 @@ struct icmpv6_echo_reply_s
uint16_t id; /* Identifier */ uint16_t id; /* Identifier */
uint16_t seqno; /* Sequence Number */ uint16_t seqno; /* Sequence Number */
uint8_t data[1]; /* Data follows */ uint8_t data[1]; /* Data follows */
}; } end_packed_struct;
#define SIZEOF_ICMPV6_ECHO_REPLY_S(n) \ #define SIZEOF_ICMPV6_ECHO_REPLY_S(n) \
(sizeof(struct icmpv6_echo_reply_s) - 1 + (n)) (sizeof(struct icmpv6_echo_reply_s) - 1 + (n))