apps/nshlib: The 'ifconfig' command now uses /proc/net/stat to show network statistics. A consequence of this is that you cannot view network statistics if the procfs is not enabled and mounted at /proc

2025-10-19 19:44:35 +08:00 · 2015-11-27 13:04:11 -06:00
parent 0c03c1e840
commit 32b992971b
6 changed files with 232 additions and 303 deletions
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -274,187 +274,12 @@ errout:
 * Name: net_statistics
 ****************************************************************************/

-#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG)
+#if defined(CONFIG_NET_STATISTICS) && defined(CONFIG_FS_PROCFS) && \
+   !defined(CONFIG_FS_PROCFS_EXCLUDE_NET) && \
+   !defined(CONFIG_NSH_DISABLE_IFCONFIG)
 static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
 {
-  /* Headings */
-
-  nsh_output(vtbl, "           ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  IPv4");
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  IPv6");
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "   TCP");
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "   UDP");
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  ICMP");
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  ICMPv6");
-#endif
-  nsh_output(vtbl, "\n");
-
-  /* Received packets */
-
-  nsh_output(vtbl, "Received   ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  %04x", g_netstats.ipv4.recv);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  %04x", g_netstats.ipv6.recv);
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  %04x", g_netstats.tcp.recv);
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  %04x", g_netstats.udp.recv);
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  %04x", g_netstats.icmp.recv);
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  %04x", g_netstats.icmpv6.recv);
-#endif
-  nsh_output(vtbl, "\n");
-
-  /* Dropped packets */
-
-  nsh_output(vtbl, "Dropped    ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  %04x", g_netstats.ipv4.drop);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  %04x", g_netstats.ipv6.drop);
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  %04x", g_netstats.tcp.drop);
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  %04x", g_netstats.udp.drop);
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  %04x", g_netstats.icmp.drop);
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  %04x", g_netstats.icmpv6.drop);
-#endif
-  nsh_output(vtbl, "\n");
-
-  /* Dropped IP packets */
-
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  IPv4        VHL: %04x   Frg: %04x\n",
-             g_netstats.ipv4.vhlerr, g_netstats.ipv4.fragerr);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  IPv6        VHL: %04x\n",
-             g_netstats.ipv6.vhlerr);
-#endif
-
-  /* Checksum errors */
-
-  nsh_output(vtbl, "  Checksum ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  %04x", g_netstats.ipv4.chkerr);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  %04x", g_netstats.tcp.chkerr);
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  %04x", g_netstats.udp.chkerr);
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  ----");
-#endif
-  nsh_output(vtbl, "\n");
-
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  TCP         ACK: %04x   SYN: %04x\n",
-            g_netstats.tcp.ackerr, g_netstats.tcp.syndrop);
-  nsh_output(vtbl, "              RST: %04x  %04x\n",
-            g_netstats.tcp.rst, g_netstats.tcp.synrst);
-#endif
-
-  /* Prototype errors */
-
-  nsh_output(vtbl, "  Type     ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  %04x", g_netstats.ipv4.protoerr);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  %04x", g_netstats.ipv6.protoerr);
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  %04x", g_netstats.icmp.typeerr);
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  %04x", g_netstats.icmpv6.typeerr);
-#endif
-  nsh_output(vtbl, "\n");
-
-  /* Sent packets */
-
-  nsh_output(vtbl, "Sent       ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  %04x", g_netstats.ipv4.sent);
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  %04x", g_netstats.ipv6.sent);
-#endif
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  %04x", g_netstats.tcp.sent);
-#endif
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  %04x", g_netstats.udp.sent);
-#endif
-#ifdef CONFIG_NET_ICMP
-  nsh_output(vtbl, "  %04x", g_netstats.icmp.sent);
-#endif
-#ifdef CONFIG_NET_ICMPv6
-  nsh_output(vtbl, "  %04x", g_netstats.icmpv6.sent);
-#endif
-  nsh_output(vtbl, "\n");
-
-  /* TCP retransmissions */
-
-#ifdef CONFIG_NET_TCP
-  nsh_output(vtbl, "  Rexmit   ");
-#ifdef CONFIG_NET_IPv4
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_IPv6
-  nsh_output(vtbl, "  ----");
-#endif
-  nsh_output(vtbl, "  %04x", g_netstats.tcp.rexmit);
-#ifdef CONFIG_NET_UDP
-  nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_ICMP
-   nsh_output(vtbl, "  ----");
-#endif
-#ifdef CONFIG_NET_ICMPv6
-   nsh_output(vtbl, "  ----");
-#endif
-  nsh_output(vtbl, "\n");
-#endif /* CONFIG_NET_TCP */
+  (void)nsh_catfile(vtbl, "ifconfig", "/proc/net/stat");
 }
 #else
 # define net_statistics(vtbl)