This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1532596f6a6445c1d9d3fb3e331cc969e3168c70 Author: wenquan1 <[email protected]> AuthorDate: Wed Sep 16 20:17:48 2026 +0800 net: fix pre-existing coding style issues in timestamp-related files Fix coding style issues flagged by nxstyle in files touched by the SO_TIMESTAMPING series. These are pre-existing issues, not introduced by the SO_TIMESTAMPING patches: - inet_sockif.c: missing blank lines after declarations - ipv4_input.c: missing blank line after declaration, bad comment alignment - can_input.c: bad indentation inside #ifdef block - getsockopt.c: bad comment block alignment, bad brace alignment - setsockopt.c: wrong column position of comment - sim_netdriver.c: missing blank lines after declarations Signed-off-by: wenquan1 <[email protected]> --- arch/sim/src/sim/sim_netdriver.c | 3 + net/can/can_input.c | 2 +- net/can/can_recvmsg.c | 3 +- net/devif/ipv4_input.c | 5 +- net/inet/inet_sockif.c | 252 +++++++++++++++++++++------------------ net/pkt/pkt_recvmsg.c | 2 - net/pkt/pkt_sendmsg_buffered.c | 1 + net/pkt/pkt_sendmsg_unbuffered.c | 1 + net/pkt/pkt_sockif.c | 1 + net/socket/getsockopt.c | 8 +- net/socket/setsockopt.c | 2 +- net/udp/udp_callback.c | 2 +- net/utils/net_cmsg.c | 1 + 13 files changed, 157 insertions(+), 126 deletions(-) diff --git a/arch/sim/src/sim/sim_netdriver.c b/arch/sim/src/sim/sim_netdriver.c index 2266128f9fd..ee8310c7f02 100644 --- a/arch/sim/src/sim/sim_netdriver.c +++ b/arch/sim/src/sim/sim_netdriver.c @@ -317,12 +317,14 @@ static int netdriver_rmmac(struct netdev_lowerhalf_s *dev, static void netdriver_txdone_interrupt(void *priv) { struct netdev_lowerhalf_s *dev = (struct netdev_lowerhalf_s *)priv; + netdev_lower_txdone(dev); } static void netdriver_rxready_interrupt(void *priv) { struct netdev_lowerhalf_s *dev = (struct netdev_lowerhalf_s *)priv; + netdev_lower_rxready(dev); } @@ -415,6 +417,7 @@ void sim_netdriver_setmtu(int devidx, int mtu) void sim_netdriver_loop(void) { int devidx; + for (devidx = 0; devidx < CONFIG_SIM_NETDEV_NUMBER; devidx++) { if (sim_netdev_avail(devidx) diff --git a/net/can/can_input.c b/net/can/can_input.c index d84f4b247c7..315186c5852 100644 --- a/net/can/can_input.c +++ b/net/can/can_input.c @@ -322,7 +322,7 @@ int can_input(FAR struct net_driver_s *dev) if (ret < 0) { #ifdef CONFIG_NET_STATISTICS - g_netstats.can.drop++; + g_netstats.can.drop++; #endif } diff --git a/net/can/can_recvmsg.c b/net/can/can_recvmsg.c index 8dd4879ab3c..d69fbbc52d9 100644 --- a/net/can/can_recvmsg.c +++ b/net/can/can_recvmsg.c @@ -313,8 +313,7 @@ static uint32_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev, if (pstate) { -#if (defined(CONFIG_NET_CANPROTO_OPTIONS) && defined(CONFIG_NET_CAN_CANFD)) \ - || defined(CONFIG_NET_TIMESTAMP) +#if defined(CONFIG_NET_CANPROTO_OPTIONS) && defined(CONFIG_NET_CAN_CANFD) struct can_conn_s *conn = pstate->pr_conn; #endif diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c index 233e3105fce..15f1b62a842 100644 --- a/net/devif/ipv4_input.c +++ b/net/devif/ipv4_input.c @@ -149,6 +149,7 @@ static int ipv4_check_opt(FAR struct ipv4_hdr_s *ipv4) else if (optlen > 1) { int len = opt[1]; + if (len > optlen) { return -EINVAL; @@ -494,7 +495,7 @@ static int ipv4_in(FAR struct net_driver_s *dev) #endif #ifdef NET_ICMP_HAVE_STACK - /* Check for ICMP input */ + /* Check for ICMP input */ case IP_PROTO_ICMP: /* ICMP input */ icmp_input(dev); @@ -502,7 +503,7 @@ static int ipv4_in(FAR struct net_driver_s *dev) #endif #ifdef CONFIG_NET_IGMP - /* Check for IGMP input */ + /* Check for IGMP input */ case IP_PROTO_IGMP: /* IGMP input */ igmp_input(dev); diff --git a/net/inet/inet_sockif.c b/net/inet/inet_sockif.c index 61962a9b459..db3fccbe4c3 100644 --- a/net/inet/inet_sockif.c +++ b/net/inet/inet_sockif.c @@ -72,48 +72,62 @@ static void inet_addref(FAR struct socket *psock); static int inet_bind(FAR struct socket *psock, FAR const struct sockaddr *addr, socklen_t addrlen); + static int inet_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr, FAR socklen_t *addrlen); + static int inet_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr, FAR socklen_t *addrlen); + static int inet_listen(FAR struct socket *psock, int backlog); static int inet_connect(FAR struct socket *psock, FAR const struct sockaddr *addr, socklen_t addrlen); + static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr, FAR socklen_t *addrlen, FAR struct socket *newsock, int flags); + static int inet_poll(FAR struct socket *psock, FAR struct pollfd *fds, bool setup); + static ssize_t inet_send(FAR struct socket *psock, FAR const void *buf, size_t len, int flags); + static ssize_t inet_sendto(FAR struct socket *psock, FAR const void *buf, size_t len, int flags, FAR const struct sockaddr *to, socklen_t tolen); + static ssize_t inet_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg, int flags); + static ssize_t inet_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg, int flags); + static int inet_ioctl(FAR struct socket *psock, int cmd, unsigned long arg); + static int inet_socketpair(FAR struct socket *psocks[2]); static int inet_shutdown(FAR struct socket *psock, int how); #ifdef CONFIG_NET_SOCKOPTS static int inet_getsockopt(FAR struct socket *psock, int level, int option, FAR void *value, FAR socklen_t *value_len); + static int inet_setsockopt(FAR struct socket *psock, int level, int option, FAR const void *value, socklen_t value_len); + #endif #ifdef CONFIG_NET_SENDFILE static ssize_t inet_sendfile(FAR struct socket *psock, FAR struct file *infile, FAR off_t *offset, size_t count); + #endif /**************************************************************************** @@ -165,6 +179,7 @@ static int inet_tcp_alloc(FAR struct socket *psock) /* Allocate the TCP connection structure */ FAR struct tcp_conn_s *conn = tcp_alloc(psock->s_domain); + if (conn == NULL) { /* Failed to reserve a connection structure */ @@ -207,6 +222,7 @@ static int inet_udp_alloc(FAR struct socket *psock) /* Allocate the UDP connection structure */ FAR struct udp_conn_s *conn = udp_alloc(psock->s_domain); + if (conn == NULL) { /* Failed to reserve a connection structure */ @@ -362,6 +378,7 @@ static void inet_addref(FAR struct socket *psock) if (psock->s_type == SOCK_STREAM) { FAR struct tcp_conn_s *conn = psock->s_conn; + DEBUGASSERT(conn->crefs > 0 && conn->crefs < 255); conn->crefs++; } @@ -371,6 +388,7 @@ static void inet_addref(FAR struct socket *psock) if (psock->s_type == SOCK_DGRAM) { FAR struct udp_conn_s *conn = psock->s_conn; + DEBUGASSERT(conn->crefs > 0 && conn->crefs < 255); conn->crefs++; } @@ -412,20 +430,20 @@ static int inet_bind(FAR struct socket *psock, switch (addr->sa_family) { #ifdef CONFIG_NET_IPv4 - case AF_INET: - minlen = sizeof(struct sockaddr_in); - break; + case AF_INET: + minlen = sizeof(struct sockaddr_in); + break; #endif #ifdef CONFIG_NET_IPv6 - case AF_INET6: - minlen = sizeof(struct sockaddr_in6); - break; + case AF_INET6: + minlen = sizeof(struct sockaddr_in6); + break; #endif - default: - nerr("ERROR: Unrecognized address family: %d\n", addr->sa_family); - return -EAFNOSUPPORT; + default: + nerr("ERROR: Unrecognized address family: %d\n", addr->sa_family); + return -EAFNOSUPPORT; } if (addrlen < minlen) @@ -517,17 +535,17 @@ static int inet_getsockname(FAR struct socket *psock, switch (psock->s_domain) { #ifdef CONFIG_NET_IPv4 - case PF_INET: - return ipv4_getsockname(psock, addr, addrlen); + case PF_INET: + return ipv4_getsockname(psock, addr, addrlen); #endif #ifdef CONFIG_NET_IPv6 - case PF_INET6: - return ipv6_getsockname(psock, addr, addrlen); + case PF_INET6: + return ipv6_getsockname(psock, addr, addrlen); #endif - default: - return -EAFNOSUPPORT; + default: + return -EAFNOSUPPORT; } } @@ -568,17 +586,17 @@ static int inet_getpeername(FAR struct socket *psock, switch (psock->s_domain) { #ifdef CONFIG_NET_IPv4 - case PF_INET: - return ipv4_getpeername(psock, addr, addrlen); + case PF_INET: + return ipv4_getpeername(psock, addr, addrlen); #endif #ifdef CONFIG_NET_IPv6 - case PF_INET6: - return ipv6_getpeername(psock, addr, addrlen); + case PF_INET6: + return ipv6_getpeername(psock, addr, addrlen); #endif - default: - return -EAFNOSUPPORT; + default: + return -EAFNOSUPPORT; } } @@ -637,6 +655,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option, if (psock->s_type == SOCK_STREAM) { FAR struct tcp_conn_s *tcp = psock->s_conn; + *(FAR int *)value = tcp->rcv_bufs; } else @@ -645,6 +664,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option, if (psock->s_type == SOCK_DGRAM) { FAR struct udp_conn_s *udp = psock->s_conn; + *(FAR int *)value = udp->rcvbufs; } else @@ -668,6 +688,7 @@ static int inet_get_socketlevel_option(FAR struct socket *psock, int option, if (psock->s_type == SOCK_STREAM) { FAR struct tcp_conn_s *tcp = psock->s_conn; + *(FAR int *)value = tcp->snd_bufs; } else @@ -767,7 +788,7 @@ static int inet_getsockopt(FAR struct socket *psock, int level, int option, #ifdef CONFIG_NET_IPv6 case IPPROTO_IPV6:/* IPv6 protocol socket options (see include/netinet/in.h) */ - return ipv6_getsockopt(psock, option, value, value_len); + return ipv6_getsockopt(psock, option, value, value_len); #endif default: @@ -1088,6 +1109,7 @@ static int inet_listen(FAR struct socket *psock, int backlog) #if defined(CONFIG_NET_TCP) && defined(NET_TCP_HAVE_STACK) FAR struct tcp_conn_s *conn; int ret; + #endif /* Verify that the sockfd corresponds to a connected SOCK_STREAM */ @@ -1212,33 +1234,33 @@ static int inet_connect(FAR struct socket *psock, switch (inaddr->sin_family) { #ifdef CONFIG_NET_IPv4 - case AF_INET: - { - if (addrlen < sizeof(struct sockaddr_in)) - { - return -EINVAL; - } - } - break; + case AF_INET: + { + if (addrlen < sizeof(struct sockaddr_in)) + { + return -EINVAL; + } + } + break; #endif #ifdef CONFIG_NET_IPv6 - case AF_INET6: - { - if (addrlen < sizeof(struct sockaddr_in6)) - { - return -EINVAL; - } - } - break; + case AF_INET6: + { + if (addrlen < sizeof(struct sockaddr_in6)) + { + return -EINVAL; + } + } + break; #endif - case AF_UNSPEC: - break; + case AF_UNSPEC: + break; - default: - DEBUGPANIC(); - return -EAFNOSUPPORT; + default: + DEBUGPANIC(); + return -EAFNOSUPPORT; } /* Perform the connection depending on the protocol type */ @@ -1373,6 +1395,7 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr, { #if defined(CONFIG_NET_TCP) && defined(NET_TCP_HAVE_STACK) int ret; + #endif /* Is the socket a stream? */ @@ -1398,30 +1421,30 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr, switch (psock->s_domain) { #ifdef CONFIG_NET_IPv4 - case PF_INET: - { - if (*addrlen < sizeof(struct sockaddr_in)) - { - return -EINVAL; - } - } - break; + case PF_INET: + { + if (*addrlen < sizeof(struct sockaddr_in)) + { + return -EINVAL; + } + } + break; #endif /* CONFIG_NET_IPv4 */ #ifdef CONFIG_NET_IPv6 - case PF_INET6: - { - if (*addrlen < sizeof(struct sockaddr_in6)) - { - return -EINVAL; - } - } - break; + case PF_INET6: + { + if (*addrlen < sizeof(struct sockaddr_in6)) + { + return -EINVAL; + } + } + break; #endif /* CONFIG_NET_IPv6 */ - default: - DEBUGPANIC(); - return -EINVAL; + default: + DEBUGPANIC(); + return -EINVAL; } } @@ -1446,9 +1469,9 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr, return ret; } - /* Begin monitoring for TCP connection events on the newly connected - * socket - */ + /* Begin monitoring for TCP connection events on the newly connected + * socket + */ ret = tcp_start_monitor(newsock); if (ret < 0) @@ -1592,9 +1615,9 @@ static int inet_poll(FAR struct socket *psock, FAR struct pollfd *fds, return inet_pollteardown(psock, fds); } #else - { - return -ENOSYS; - } + { + return -ENOSYS; + } #endif /* NET_TCP_HAVE_STACK || !NET_UDP_HAVE_STACK */ } @@ -1623,6 +1646,7 @@ static ssize_t inet_send(FAR struct socket *psock, FAR const void *buf, { #ifdef NET_UDP_HAVE_STACK FAR struct socket_conn_s *conn = psock->s_conn; + #endif ssize_t ret; @@ -1658,9 +1682,9 @@ static ssize_t inet_send(FAR struct socket *psock, FAR const void *buf, case SOCK_DGRAM: { #if defined(CONFIG_NET_6LOWPAN) - /* Try 6LoWPAN UDP packet send */ + /* Try 6LoWPAN UDP packet send */ - ret = psock_6lowpan_udp_send(psock, buf, len); + ret = psock_6lowpan_udp_send(psock, buf, len); #ifdef NET_UDP_HAVE_STACK if (ret < 0) @@ -1733,20 +1757,20 @@ static ssize_t inet_sendto(FAR struct socket *psock, FAR const void *buf, switch (to->sa_family) { #ifdef CONFIG_NET_IPv4 - case AF_INET: - minlen = sizeof(struct sockaddr_in); - break; + case AF_INET: + minlen = sizeof(struct sockaddr_in); + break; #endif #ifdef CONFIG_NET_IPv6 - case AF_INET6: - minlen = sizeof(struct sockaddr_in6); - break; + case AF_INET6: + minlen = sizeof(struct sockaddr_in6); + break; #endif - default: - nerr("ERROR: Unrecognized address family: %d\n", to->sa_family); - return -EAFNOSUPPORT; + default: + nerr("ERROR: Unrecognized address family: %d\n", to->sa_family); + return -EAFNOSUPPORT; } if (tolen < minlen) @@ -1913,8 +1937,10 @@ static int inet_socketpair(FAR struct socket *psocks[2]) { #if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP) FAR struct socket *pserver = psocks[1]; + #if defined(CONFIG_NET_TCP) FAR struct socket server; + #endif union sockaddr_u addr[2]; socklen_t len; @@ -2153,24 +2179,24 @@ static ssize_t inet_recvmsg(FAR struct socket *psock, switch (psock->s_domain) { #ifdef CONFIG_NET_IPv4 - case PF_INET: - { - minlen = sizeof(struct sockaddr_in); - } - break; + case PF_INET: + { + minlen = sizeof(struct sockaddr_in); + } + break; #endif #ifdef CONFIG_NET_IPv6 - case PF_INET6: - { - minlen = sizeof(struct sockaddr_in6); - } - break; + case PF_INET6: + { + minlen = sizeof(struct sockaddr_in6); + } + break; #endif - default: - DEBUGPANIC(); - return -EINVAL; + default: + DEBUGPANIC(); + return -EINVAL; } if (msg->msg_namelen < minlen) @@ -2186,35 +2212,35 @@ static ssize_t inet_recvmsg(FAR struct socket *psock, switch (psock->s_type) { #ifdef CONFIG_NET_TCP - case SOCK_STREAM: - { + case SOCK_STREAM: + { #ifdef NET_TCP_HAVE_STACK - ret = psock_tcp_recvfrom(psock, msg, flags); + ret = psock_tcp_recvfrom(psock, msg, flags); #else - ret = -ENOSYS; + ret = -ENOSYS; #endif - } - break; + } + break; #endif /* CONFIG_NET_TCP */ #ifdef CONFIG_NET_UDP - case SOCK_DGRAM: - { + case SOCK_DGRAM: + { #ifdef NET_UDP_HAVE_STACK - ret = psock_udp_recvfrom(psock, msg, flags); + ret = psock_udp_recvfrom(psock, msg, flags); #else - ret = -ENOSYS; + ret = -ENOSYS; #endif - } - break; + } + break; #endif /* CONFIG_NET_UDP */ - default: - { - nerr("ERROR: Unsupported socket type: %d\n", psock->s_type); - ret = -ENOSYS; - } - break; + default: + { + nerr("ERROR: Unsupported socket type: %d\n", psock->s_type); + ret = -ENOSYS; + } + break; } return ret; @@ -2382,9 +2408,9 @@ inet_sockif(sa_family_t family, int type, int protocol) return &g_inet_sockif; } #else - { - return NULL; - } + { + return NULL; + } #endif } diff --git a/net/pkt/pkt_recvmsg.c b/net/pkt/pkt_recvmsg.c index ad488064ec7..df1e4eea384 100644 --- a/net/pkt/pkt_recvmsg.c +++ b/net/pkt/pkt_recvmsg.c @@ -384,8 +384,6 @@ static inline int pkt_readdata(FAR struct pkt_recvfrom_s *pstate, { DEBUGASSERT(iob->io_pktlen > 0); - - /* Copy to user */ if (pstate->pr_type == SOCK_DGRAM) diff --git a/net/pkt/pkt_sendmsg_buffered.c b/net/pkt/pkt_sendmsg_buffered.c index cb2d9f05b83..40b46051dbc 100644 --- a/net/pkt/pkt_sendmsg_buffered.c +++ b/net/pkt/pkt_sendmsg_buffered.c @@ -336,6 +336,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg, { FAR struct eth_hdr_s *ethhdr = (FAR struct eth_hdr_s *)(IOB_DATA(iob) - NET_LL_HDRLEN(dev)); + memcpy(ethhdr->dest, addr->sll_addr, ETHER_ADDR_LEN); memcpy(ethhdr->src, &dev->d_mac.ether, ETHER_ADDR_LEN); ethhdr->type = addr->sll_protocol; diff --git a/net/pkt/pkt_sendmsg_unbuffered.c b/net/pkt/pkt_sendmsg_unbuffered.c index ac4be4c91d5..5e9982c9bbb 100644 --- a/net/pkt/pkt_sendmsg_unbuffered.c +++ b/net/pkt/pkt_sendmsg_unbuffered.c @@ -142,6 +142,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, if (pstate->snd_sock->s_type == SOCK_DGRAM) { FAR struct eth_hdr_s *ethhdr = NETLLBUF; + memcpy(ethhdr->dest, pstate->addr->sll_addr, ETHER_ADDR_LEN); memcpy(ethhdr->src, &dev->d_mac.ether, ETHER_ADDR_LEN); ethhdr->type = pstate->addr->sll_protocol; diff --git a/net/pkt/pkt_sockif.c b/net/pkt/pkt_sockif.c index b2a3c2ced3c..1a3b386efdd 100644 --- a/net/pkt/pkt_sockif.c +++ b/net/pkt/pkt_sockif.c @@ -108,6 +108,7 @@ static int pkt_sockif_alloc(FAR struct socket *psock) */ FAR struct pkt_conn_s *conn = pkt_alloc(); + if (conn == NULL) { /* Failed to reserve a connection structure */ diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c index 2d0d876986e..99b64f6f843 100644 --- a/net/socket/getsockopt.c +++ b/net/socket/getsockopt.c @@ -104,8 +104,8 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, } /* Get the timeout value. This is a atomic operation and should - * require no special operation. - */ + * require no special operation. + */ if (option == SO_RCVTIMEO) { @@ -150,7 +150,7 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, #ifdef CONFIG_NET_TIMESTAMP case SO_TIMESTAMP: /* Generates a timestamp in us for each incoming packet */ case SO_TIMESTAMPNS: /* Generates a timestamp in ns for each incoming packet */ - case SO_TIMESTAMPING: /* Timestamping options */ + case SO_TIMESTAMPING:/* Timestamping options */ #endif { sockopt_t optionset; @@ -162,7 +162,7 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, if (*value_len < sizeof(int)) { return -EINVAL; - } + } /* Sample the current options. This is atomic operation and so * should not require any special steps for thread safety. We diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c index ca0bcb8bd66..7a3de8f0ede 100644 --- a/net/socket/setsockopt.c +++ b/net/socket/setsockopt.c @@ -140,7 +140,7 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, #ifdef CONFIG_NET_TIMESTAMP case SO_TIMESTAMP: /* Generates a timestamp in us for each incoming packet */ case SO_TIMESTAMPNS: /* Generates a timestamp in ns for each incoming packet */ - case SO_TIMESTAMPING: /* Timestamp all packets */ + case SO_TIMESTAMPING:/* Timestamp all packets */ #endif { int setting; diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 58f872cf4f9..462910cd85f 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -259,7 +259,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, * read-ahead buffers to retain the data -- drop the packet. */ - ninfo("Dropped %d bytes\n", dev->d_len); + ninfo("Dropped %d bytes\n", dev->d_len); #ifdef CONFIG_NET_STATISTICS g_netstats.udp.drop++; diff --git a/net/utils/net_cmsg.c b/net/utils/net_cmsg.c index 0cbfb41bc2e..935e9fb6e27 100644 --- a/net/utils/net_cmsg.c +++ b/net/utils/net_cmsg.c @@ -110,6 +110,7 @@ void cmsg_store_timestamp(FAR struct msghdr *msg, if (_SO_GETOPT(opt, SO_TIMESTAMP)) { struct timeval tv; + TIMESPEC_TO_TIMEVAL(&tv, tstamp); cmsg_append(msg, SOL_SOCKET, SO_TIMESTAMP, &tv, sizeof(struct timeval));
