Changeset 22404 in vbox

Timestamp:

Aug 24, 2009 7:36:24 AM (15 years ago)

Author:

vboxsync

Message:

NAT: some cleanings

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (2 diffs)
• slirp.c (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/counters.h

@@ -47 +47 @@
 #  define DEREGISTER_COUNTER(name) do {} while (0)
 # endif
+# undef COUNTERS_INIT
 #endif
 
@@ -124 +125 @@
 PROFILE_COUNTER(ALIAS_input, "ALIAS::input");
 PROFILE_COUNTER(ALIAS_output, "ALIAS::output");
+#endif /*!COUNTERS_INIT*/
 
+#ifdef DRV_COUNTING_COUNTER
 # undef DRV_COUNTING_COUNTER
+#endif
+
+#ifdef DRV_PROFILE_COUNTER
 # undef DRV_PROFILE_COUNTER
+#endif
 
+#ifdef COUNTING_COUNTER
 # undef COUNTING_COUNTER
+#endif
+
+#ifdef PROFILE_COUNTER
 # undef PROFILE_COUNTER
-#endif /*!COUNTERS_INIT*/
+#endif

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -574 +574 @@
 
 # undef COUNTER
-# undef PROFILE_COUNTER
-# undef COUNTING_COUNTER
 /** @todo register statistics for the variables dumped by:
  *  ipstats(pData); tcpstats(pData); udpstats(pData); icmpstats(pData);
@@ -592 +590 @@
 
 # include "counters.h"
-
-# undef COUNTING_COUNTER
-# undef PROFILE_COUNTER
 #endif /* VBOX_WITH_STATISTICS */
 }

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -251 +251 @@
 #include "counters.h"
 
-#undef PROFILE_COUNTER
-#undef COUNTING_COUNTER
-
 } NATState;