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

NET: Move statistcs from uip.h to new netstats.h to remove nasty circular inclusion problem.

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-26 09:32:39 -06:00
parent 6348f1c79a
commit 9009a21fd9
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/uip/cgi.c
View File

@ -40,6 +40,7 @@
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <nuttx/net/netstats.h>
#include <apps/netutils/httpd.h> #include <apps/netutils/httpd.h>
#include "cgi.h" #include "cgi.h"
@ -70,9 +71,9 @@ static void net_stats(struct httpd_state *pstate, char *ptr)
char buffer[16]; char buffer[16];
int i; int i;
for (i = 0; i < sizeof(uip_stat) / sizeof(uip_stats_t); i++) for (i = 0; i < sizeof(g_netstats) / sizeof(net_stats_t); i++)
{ {
snprintf(buffer, 16, "%5u\n", ((uip_stats_t *)&uip_stat)[i]); snprintf(buffer, 16, "%5u\n", ((net_stats_t *)&g_netstats)[i]);
send(pstate->ht_sockfd, buffer, strlen(buffer), 0); send(pstate->ht_sockfd, buffer, strlen(buffer), 0);
} }
} }

54
nshlib/nsh_netcmds.c
View File

@ -61,6 +61,7 @@
#include <nuttx/clock.h> #include <nuttx/clock.h>
#include <nuttx/net/uip.h> #include <nuttx/net/uip.h>
#include <nuttx/net/netdev.h> #include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
#ifdef CONFIG_NET_STATISTICS #ifdef CONFIG_NET_STATISTICS
# include <nuttx/net/uip.h> # include <nuttx/net/uip.h>
@ -162,11 +163,11 @@ static inline uint16_t ping_newid(void)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: uip_statistics * Name: net_statistics
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG) #if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG)
static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl) static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
{ {
nsh_output(vtbl, "uIP IP "); nsh_output(vtbl, "uIP IP ");
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
@ -182,43 +183,43 @@ static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl)
/* Received packets */ /* Received packets */
nsh_output(vtbl, "Received %04x",uip_stat.ip.recv); nsh_output(vtbl, "Received %04x", g_netstats.ip.recv);
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " %04x",uip_stat.tcp.recv); nsh_output(vtbl, " %04x", g_netstats.tcp.recv);
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
nsh_output(vtbl, " %04x",uip_stat.udp.recv); nsh_output(vtbl, " %04x", g_netstats.udp.recv);
#endif #endif
#ifdef CONFIG_NET_ICMP #ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " %04x",uip_stat.icmp.recv); nsh_output(vtbl, " %04x", g_netstats.icmp.recv);
#endif #endif
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
/* Dropped packets */ /* Dropped packets */
nsh_output(vtbl, "Dropped %04x",uip_stat.ip.drop); nsh_output(vtbl, "Dropped %04x", g_netstats.ip.drop);
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " %04x",uip_stat.tcp.drop); nsh_output(vtbl, " %04x", g_netstats.tcp.drop);
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
nsh_output(vtbl, " %04x",uip_stat.udp.drop); nsh_output(vtbl, " %04x", g_netstats.udp.drop);
#endif #endif
#ifdef CONFIG_NET_ICMP #ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " %04x",uip_stat.icmp.drop); nsh_output(vtbl, " %04x", g_netstats.icmp.drop);
#endif #endif
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
nsh_output(vtbl, " IP VHL: %04x HBL: %04x\n", nsh_output(vtbl, " IP VHL: %04x HBL: %04x\n",
uip_stat.ip.vhlerr, uip_stat.ip.hblenerr); g_netstats.ip.vhlerr, g_netstats.ip.hblenerr);
nsh_output(vtbl, " LBL: %04x Frg: %04x\n", nsh_output(vtbl, " LBL: %04x Frg: %04x\n",
uip_stat.ip.lblenerr, uip_stat.ip.fragerr); g_netstats.ip.lblenerr, g_netstats.ip.fragerr);
nsh_output(vtbl, " Checksum %04x",uip_stat.ip.chkerr); nsh_output(vtbl, " Checksum %04x",g_netstats.ip.chkerr);
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " %04x",uip_stat.tcp.chkerr); nsh_output(vtbl, " %04x", g_netstats.tcp.chkerr);
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
nsh_output(vtbl, " %04x",uip_stat.udp.chkerr); nsh_output(vtbl, " %04x", g_netstats.udp.chkerr);
#endif #endif
#ifdef CONFIG_NET_ICMP #ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " ----"); nsh_output(vtbl, " ----");
@ -227,12 +228,12 @@ static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl)
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " TCP ACK: %04x SYN: %04x\n", nsh_output(vtbl, " TCP ACK: %04x SYN: %04x\n",
uip_stat.tcp.ackerr, uip_stat.tcp.syndrop); g_netstats.tcp.ackerr, g_netstats.tcp.syndrop);
nsh_output(vtbl, " RST: %04x %04x\n", nsh_output(vtbl, " RST: %04x %04x\n",
uip_stat.tcp.rst, uip_stat.tcp.synrst); g_netstats.tcp.rst, g_netstats.tcp.synrst);
#endif #endif
nsh_output(vtbl, " Type %04x",uip_stat.ip.protoerr); nsh_output(vtbl, " Type %04x", g_netstats.ip.protoerr);
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " ----"); nsh_output(vtbl, " ----");
#endif #endif
@ -240,26 +241,26 @@ static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl)
nsh_output(vtbl, " ----"); nsh_output(vtbl, " ----");
#endif #endif
#ifdef CONFIG_NET_ICMP #ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " %04x",uip_stat.icmp.typeerr); nsh_output(vtbl, " %04x", g_netstats.icmp.typeerr);
#endif #endif
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
/* Sent packets */ /* Sent packets */
nsh_output(vtbl, "Sent ----",uip_stat.ip.sent); nsh_output(vtbl, "Sent ----", g_netstats.ip.sent);
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " %04x",uip_stat.tcp.sent); nsh_output(vtbl, " %04x", g_netstats.tcp.sent);
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
nsh_output(vtbl, " %04x",uip_stat.udp.sent); nsh_output(vtbl, " %04x", g_netstats.udp.sent);
#endif #endif
#ifdef CONFIG_NET_ICMP #ifdef CONFIG_NET_ICMP
nsh_output(vtbl, " %04x",uip_stat.icmp.sent); nsh_output(vtbl, " %04x", g_netstats.icmp.sent);
#endif #endif
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
nsh_output(vtbl, " Rexmit ---- %04x",uip_stat.tcp.rexmit); nsh_output(vtbl, " Rexmit ---- %04x", g_netstats.tcp.rexmit);
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
nsh_output(vtbl, " ----"); nsh_output(vtbl, " ----");
#endif #endif
@ -271,10 +272,9 @@ static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl)
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
} }
#else #else
# define uip_statistics(vtbl) # define net_statistics(vtbl)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: ifconfig_callback * Name: ifconfig_callback
****************************************************************************/ ****************************************************************************/
@ -607,7 +607,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
if (argc <= 2) if (argc <= 2)
{ {
netdev_foreach(ifconfig_callback, vtbl); netdev_foreach(ifconfig_callback, vtbl);
uip_statistics(vtbl); net_statistics(vtbl);
return OK; return OK;
} }