Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects 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 7bc244ec72
commit e1091251e6
60 changed files with 307 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/icmp/icmp_input.c
+10 -9
View File
@@ -52,6 +52,7 @@
#include <nuttx/net/netconfig.h>
#include <nuttx/net/uip.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
#include "uip/uip.h"
#include "icmp/icmp.h"
@@ -107,7 +108,7 @@ void icmp_input(FAR struct uip_driver_s *dev)
FAR struct icmp_iphdr_s *picmp = ICMPBUF;
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.recv++;
g_netstats.icmp.recv++;
#endif
#ifndef CONFIG_NET_IPv6
@@ -171,8 +172,8 @@ void icmp_input(FAR struct uip_driver_s *dev)
dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.sent++;
uip_stat.ip.sent++;
g_netstats.icmp.sent++;
g_netstats.ip.sent++;
#endif
}
@@ -199,8 +200,8 @@ void icmp_input(FAR struct uip_driver_s *dev)
typeerr:
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.typeerr++;
uip_stat.icmp.drop++;
g_netstats.icmp.typeerr++;
g_netstats.icmp.drop++;
#endif
dev->d_len = 0;
@@ -295,19 +296,19 @@ typeerr:
dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.sent++;
uip_stat.ip.sent++;
g_netstats.icmp.sent++;
g_netstats.ip.sent++;
#endif
return;
typeerr:
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.typeerr++;
g_netstats.icmp.typeerr++;
#endif
drop:
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.drop++;
g_netstats.icmp.drop++;
#endif
dev->d_len = 0;
net/icmp/icmp_ping.c
+1
View File
@@ -52,6 +52,7 @@
#include <nuttx/net/netconfig.h>
#include <nuttx/net/uip.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/icmp.h>
#include "uip/uip.h"
#include "icmp/icmp.h"
net/icmp/icmp_poll.c
+1
View File
@@ -45,6 +45,7 @@
#include <nuttx/net/netconfig.h>
#include <nuttx/net/uip.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/icmp.h>
#include "uip/uip.h"
net/icmp/icmp_send.c
+3 -2
View File
@@ -45,6 +45,7 @@
#include <nuttx/net/netconfig.h>
#include <nuttx/net/uip.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
#include "uip/uip.h"
#include "icmp/icmp.h"
@@ -160,8 +161,8 @@ void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr)
dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
#ifdef CONFIG_NET_STATISTICS
uip_stat.icmp.sent++;
uip_stat.ip.sent++;
g_netstats.icmp.sent++;
g_netstats.ip.sent++;
#endif
}
}