Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-24 07:46:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/procfs: Simplify logic for tcp/udp stats

Browse Source 
By:
1. Take out net_ip_binding_laddr/raddr macro
2. INET6_ADDRSTRLEN is long enough for all address buffer and no need to
   add 0 to the end of buffer since inet_ntop will do so

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng
2023-08-07 12:01:48 +08:00
committed by Xiang Xiao
parent 858e43df91
commit 194d0cdec9
3 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/procfs/net_tcp.c
+6 -26
View File
@@ -60,17 +60,14 @@ static ssize_t netprocfs_tcpstats(FAR struct netprocfs_file_s *priv,
int addrlen = (domain == PF_INET) ?
INET_ADDRSTRLEN : INET6_ADDRSTRLEN;
FAR struct tcp_conn_s *conn = NULL;
char remote[INET6_ADDRSTRLEN + 1];
char local[INET6_ADDRSTRLEN + 1];
char remote[INET6_ADDRSTRLEN];
char local[INET6_ADDRSTRLEN];
int len = 0;
void *laddr;
void *raddr;
FAR void *laddr;
FAR void *raddr;
net_lock();
local[addrlen] = '\0';
remote[addrlen] = '\0';
while ((conn = tcp_nextconn(conn)) != NULL)
{
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
@@ -90,25 +87,8 @@ static ssize_t netprocfs_tcpstats(FAR struct netprocfs_file_s *priv,
break;
}
#ifdef CONFIG_NET_IPv4
# ifdef CONFIG_NET_IPv6
if (domain == PF_INET)
# endif /* CONFIG_NET_IPv6 */
{
laddr = &conn->u.ipv4.laddr;
raddr = &conn->u.ipv4.raddr;
}
#endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NET_IPv4
else
# endif /* CONFIG_NET_IPv4 */
{
laddr = &conn->u.ipv6.laddr;
raddr = &conn->u.ipv6.raddr;
}
#endif /* CONFIG_NET_IPv6 */
laddr = net_ip_binding_laddr(&conn->u, domain);
raddr = net_ip_binding_raddr(&conn->u, domain);
len += snprintf(buffer + len, buflen - len,
" %2" PRIu8
net/procfs/net_udp.c
+6 -26
View File
@@ -60,17 +60,14 @@ static ssize_t netprocfs_udpstats(FAR struct netprocfs_file_s *priv,
int addrlen = (domain == PF_INET) ?
INET_ADDRSTRLEN : INET6_ADDRSTRLEN;
FAR struct udp_conn_s *conn = NULL;
char remote[INET6_ADDRSTRLEN + 1];
char local[INET6_ADDRSTRLEN + 1];
char remote[INET6_ADDRSTRLEN];
char local[INET6_ADDRSTRLEN];
int len = 0;
void *laddr;
void *raddr;
FAR void *laddr;
FAR void *raddr;
net_lock();
local[addrlen] = '\0';
remote[addrlen] = '\0';
while ((conn = udp_nextconn(conn)) != NULL)
{
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
@@ -90,25 +87,8 @@ static ssize_t netprocfs_udpstats(FAR struct netprocfs_file_s *priv,
break;
}
#ifdef CONFIG_NET_IPv4
# ifdef CONFIG_NET_IPv6
if (domain == PF_INET)
# endif /* CONFIG_NET_IPv6 */
{
laddr = &conn->u.ipv4.laddr;
raddr = &conn->u.ipv4.raddr;
}
#endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NET_IPv4
else
# endif /* CONFIG_NET_IPv4 */
{
laddr = &conn->u.ipv6.laddr;
raddr = &conn->u.ipv6.raddr;
}
#endif /* CONFIG_NET_IPv6 */
laddr = net_ip_binding_laddr(&conn->u, domain);
raddr = net_ip_binding_raddr(&conn->u, domain);
len += snprintf(buffer + len, buflen - len,
" %2" PRIu8