This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch releases/12.12 in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fdedb5bccdd3078f8703b5f48eb83ccbce821f2f Author: zhanghongyu <[email protected]> AuthorDate: Fri Feb 21 15:34:50 2025 +0800 icmp/icmpv6: fix the level parameter type use a more standard definition Signed-off-by: zhanghongyu <[email protected]> --- include/sys/socket.h | 10 ++++++---- net/icmp/icmp_sockif.c | 8 ++++---- net/icmpv6/icmpv6_sockif.c | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index 70c42611880..bd477422280 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -230,10 +230,12 @@ /* Protocol-level socket operations. */ -#define SOL_IP IPPROTO_IP /* See options in include/netinet/ip.h */ -#define SOL_IPV6 IPPROTO_IPV6 /* See options in include/netinet/ip6.h */ -#define SOL_TCP IPPROTO_TCP /* See options in include/netinet/tcp.h */ -#define SOL_UDP IPPROTO_UDP /* See options in include/netinit/udp.h */ +#define SOL_IP IPPROTO_IP /* See options in include/netinet/in.h */ +#define SOL_IPV6 IPPROTO_IPV6 /* See options in include/netinet/in.h */ +#define SOL_TCP IPPROTO_TCP /* See options in include/netinet/in.h */ +#define SOL_UDP IPPROTO_UDP /* See options in include/netinet/in.h */ +#define SOL_RAW IPPROTO_RAW /* See options in include/netinet/in.h */ +#define SOL_ICMPV6 IPPROTO_ICMPV6 /* See options in include/netinet/in.h */ /* Bluetooth-level operations. */ diff --git a/net/icmp/icmp_sockif.c b/net/icmp/icmp_sockif.c index 5aedef1b2c6..a35611b5113 100644 --- a/net/icmp/icmp_sockif.c +++ b/net/icmp/icmp_sockif.c @@ -383,10 +383,10 @@ static int icmp_getsockopt(FAR struct socket *psock, int level, int option, { switch (level) { - case IPPROTO_IP: + case SOL_IP: return ipv4_getsockopt(psock, option, value, value_len); - case IPPROTO_ICMP: + case SOL_RAW: return icmp_getsockopt_internal(psock, option, value, value_len); default: @@ -486,10 +486,10 @@ static int icmp_setsockopt(FAR struct socket *psock, int level, int option, { switch (level) { - case IPPROTO_IP: + case SOL_IP: return ipv4_setsockopt(psock, option, value, value_len); - case IPPROTO_ICMP: + case SOL_RAW: return icmp_setsockopt_internal(psock, option, value, value_len); default: diff --git a/net/icmpv6/icmpv6_sockif.c b/net/icmpv6/icmpv6_sockif.c index e38ee9eb9bd..dfe1a6a7aa1 100644 --- a/net/icmpv6/icmpv6_sockif.c +++ b/net/icmpv6/icmpv6_sockif.c @@ -381,10 +381,10 @@ static int icmpv6_getsockopt(FAR struct socket *psock, int level, int option, { switch (level) { - case IPPROTO_IPV6: + case SOL_IPV6: return ipv6_getsockopt(psock, option, value, value_len); - case IPPROTO_ICMPV6: + case SOL_ICMPV6: return icmpv6_getsockopt_internal(psock, option, value, value_len); default: @@ -484,10 +484,10 @@ static int icmpv6_setsockopt(FAR struct socket *psock, int level, int option, { switch (level) { - case IPPROTO_IPV6: + case SOL_IPV6: return ipv6_setsockopt(psock, option, value, value_len); - case IPPROTO_ICMPV6: + case SOL_ICMPV6: return icmpv6_setsockopt_internal(psock, option, value, value_len); default:
