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

Networking: Clean up network status collection and presentation for IPv6

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-24 08:26:12 -06:00
parent 80c1704d85
commit beaa7b74a6
1 changed files with 111 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
nshlib/nsh_netcmds.c
View File

@ -273,7 +273,15 @@ errout:
#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG)
static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
{
nsh_output(vtbl, " IP ");
/* Headings */
nsh_output(vtbl, " ");
#ifdef CONFIG_NET_IPv4
nsh_output(vtbl, " IPv4");
#endif
#ifdef CONFIG_NET_IPv4
nsh_output(vtbl, " IPv6");
#endif
#ifdef CONFIG_NET_TCP
nsh_output(vtbl, " TCP");
#endif
@ -282,12 +290,21 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
#endif
#ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " ICMP");
#endif
#ifdef CONFIG_NET_ICMPv6
nsh_output(vtbl, " ICMP6");
#endif
nsh_output(vtbl, "\n");
/* Received packets */
nsh_output(vtbl, "Received %04x", g_netstats.ip.recv);
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
@ -296,12 +313,21 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
#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 %04x", g_netstats.ip.drop);
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
@ -310,15 +336,32 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
#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");
nsh_output(vtbl, " IP VHL: %04x HBL: %04x\n",
g_netstats.ip.vhlerr, g_netstats.ip.hblenerr);
nsh_output(vtbl, " LBL: %04x Frg: %04x\n",
g_netstats.ip.lblenerr, g_netstats.ip.fragerr);
/* Dropped IP packets */
nsh_output(vtbl, " Checksum %04x",g_netstats.ip.chkerr);
#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
@ -327,6 +370,9 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
#endif
#ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " ----");
#endif
#ifdef CONFIG_NET_ICMPv6
nsh_output(vtbl, " ----");
#endif
nsh_output(vtbl, "\n");
@ -337,7 +383,15 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
g_netstats.tcp.rst, g_netstats.tcp.synrst);
#endif
nsh_output(vtbl, " Type %04x", g_netstats.ip.protoerr);
/* 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
@ -346,12 +400,21 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *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 ----", g_netstats.ip.sent);
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
@ -360,20 +423,34 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
#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 ---- %04x", g_netstats.tcp.rexmit);
nsh_output(vtbl, " Rexmit ");
#ifdef CONFIG_NET_IPv4
nsh_output(vtbl, " ----");
#endif
#ifdef CONFIG_NET_IPv6
nsh_output(vtbl, " ----");
#endif
#ifdef CONFIG_NET_UDP
nsh_output(vtbl, " ----");
#endif
nsh_output(vtbl, " %04x", g_netstats.tcp.rexmit);
#ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " ----");
#endif
nsh_output(vtbl, "\n");
#ifdef CONFIG_NET_ICMPv6
nsh_output(vtbl, " ----");
#endif
nsh_output(vtbl, "\n");
#endif /* CONFIG_NET_TCP */
}
#else
# define net_statistics(vtbl)