Make Slirp statistics gathering and output conditional to LOG_ENABLED

Add 'info slirp' command to monitor to display statistics
Disable Slirp debugging code by default


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3451 c046a42c-6fe2-441c-8c8c-71466251a162

19 files changed, 268 insertions, 204 deletions

diff --git a/debug.c b/debug.c
index d52e3de..5030f06 100644
--- a/debug.c
+++ b/debug.c
@@ -20,6 +20,7 @@ extern char *strerror _P((int));
 
 /* Carry over one item from main.c so that the tty's restored.
  * Only done when the tty being used is /dev/tty --RedWolf */
+#ifndef CONFIG_QEMU
 extern struct termios slirp_tty_settings;
 extern int slirp_tty_restore;
 
@@ -66,7 +67,9 @@ int n;
     }
 }
 #endif
+#endif
 
+#ifdef LOG_ENABLED
 #if 0
 /*
  * Statistic routines
@@ -76,7 +79,7 @@ int n;
  * the link as well.
  */
 
-void
+static void
 ttystats(ttyp)
 	struct ttys *ttyp;
 {
@@ -115,8 +118,8 @@ ttystats(ttyp)
 	lprint("  %6d bad input packets\r\n", is->in_mbad);
 }
 
-void
-allttystats()
+static void
+allttystats(void)
 {
 	struct ttys *ttyp;
 
@@ -125,7 +128,7 @@ allttystats()
 }
 #endif
 
-void ipstats()
+static void ipstats(void)
 {
     lprint(" \r\n");
 
@@ -150,26 +153,25 @@ void ipstats()
     lprint("  %6d total packets delivered\r\n", ipstat.ips_delivered);
 }
 
-#if 0
-void
-vjstats()
+#ifndef CONFIG_QEMU
+static void vjstats(void)
 {
-	lprint(" \r\n");
+    lprint(" \r\n");
 
-	lprint("VJ compression stats:\r\n");
+    lprint("VJ compression stats:\r\n");
 
-	lprint("  %6d outbound packets (%d compressed)\r\n",
-	       comp_s.sls_packets, comp_s.sls_compressed);
-	lprint("  %6d searches for connection stats (%d misses)\r\n",
-	       comp_s.sls_searches, comp_s.sls_misses);
-	lprint("  %6d inbound uncompressed packets\r\n", comp_s.sls_uncompressedin);
-	lprint("  %6d inbound compressed packets\r\n", comp_s.sls_compressedin);
-	lprint("  %6d inbound unknown type packets\r\n", comp_s.sls_errorin);
-	lprint("  %6d inbound packets tossed due to error\r\n", comp_s.sls_tossed);
+    lprint("  %6d outbound packets (%d compressed)\r\n", comp_s.sls_packets,
+           comp_s.sls_compressed);
+    lprint("  %6d searches for connection stats (%d misses)\r\n",
+           comp_s.sls_searches, comp_s.sls_misses);
+    lprint("  %6d inbound uncompressed packets\r\n", comp_s.sls_uncompressedin);
+    lprint("  %6d inbound compressed packets\r\n", comp_s.sls_compressedin);
+    lprint("  %6d inbound unknown type packets\r\n", comp_s.sls_errorin);
+    lprint("  %6d inbound packets tossed due to error\r\n", comp_s.sls_tossed);
 }
 #endif
 
-void tcpstats()
+static void tcpstats(void)
 {
     lprint(" \r\n");
 
@@ -246,7 +248,7 @@ void tcpstats()
      * tcpstat.tcps_pawsdrop); */
 }
 
-void udpstats()
+static void udpstats(void)
 {
     lprint(" \r\n");
 
@@ -260,7 +262,7 @@ void udpstats()
     lprint("  %6d datagrams sent\r\n", udpstat.udps_opackets);
 }
 
-void icmpstats()
+static void icmpstats(void)
 {
     lprint(" \r\n");
     lprint("ICMP stats:\r\n");
@@ -272,7 +274,7 @@ void icmpstats()
     lprint("  %6d ICMP packets sent in reply\r\n", icmpstat.icps_reflect);
 }
 
-void mbufstats()
+static void mbufstats(void)
 {
     struct mbuf *m;
     int i;
@@ -295,7 +297,7 @@ void mbufstats()
     lprint("  %6d mbufs queued as packets\r\n\r\n", if_queued);
 }
 
-void sockstats()
+static void sockstats(void)
 {
     char buff[256];
     int n;
@@ -329,46 +331,58 @@ void sockstats()
                ntohs(so->so_fport), so->so_rcv.sb_cc, so->so_snd.sb_cc);
     }
 }
+#endif
 
-#if 0
-void
-slirp_exit(exit_status)
-	int exit_status;
+#ifndef CONFIG_QEMU
+void slirp_exit(exit_status) int exit_status;
 {
-	struct ttys *ttyp;
+    struct ttys *ttyp;
+
+    DEBUG_CALL("slirp_exit");
+    DEBUG_ARG("exit_status = %d", exit_status);
+
+    if (dostats) {
+        lprint_print = (int(*) _P((void *, const char *, va_list)))vfprintf;
+        if (!dfd)
+            debug_init("slirp_stats", 0xf);
+        lprint_arg = (char **)&dfd;
+
+        ipstats();
+        tcpstats();
+        udpstats();
+        icmpstats();
+        mbufstats();
+        sockstats();
+        allttystats();
+        vjstats();
+    }
 
-	DEBUG_CALL("slirp_exit");
-	DEBUG_ARG("exit_status = %d", exit_status);
-
-	if (dostats) {
-		lprint_print = (int (*) _P((void *, const char *, va_list)))vfprintf;
-		if (!dfd)
-		   debug_init("slirp_stats", 0xf);
-		lprint_arg = (char **)&dfd;
-
-		ipstats();
-		tcpstats();
-		udpstats();
-		icmpstats();
-		mbufstats();
-		sockstats();
-		allttystats();
-		vjstats();
-	}
+    for (ttyp = ttys; ttyp; ttyp = ttyp->next)
+        tty_detached(ttyp, 1);
 
-	for (ttyp = ttys; ttyp; ttyp = ttyp->next)
-	   tty_detached(ttyp, 1);
-
-	if (slirp_forked) {
-		/* Menendez time */
-		if (kill(getppid(), SIGQUIT) < 0)
-			lprint("Couldn't kill parent process %ld!\n",
-			    (long) getppid());
-    	}
-
-	/* Restore the terminal if we gotta */
-	if(slirp_tty_restore)
-	  tcsetattr(0,TCSANOW, &slirp_tty_settings);  /* NOW DAMMIT! */
-	exit(exit_status);
+    if (slirp_forked) {
+        /* Menendez time */
+        if (kill(getppid(), SIGQUIT) < 0)
+            lprint("Couldn't kill parent process %ld!\n", (long)getppid());
+    }
+
+    /* Restore the terminal if we gotta */
+    if (slirp_tty_restore)
+        tcsetattr(0, TCSANOW, &slirp_tty_settings); /* NOW DAMMIT! */
+    exit(exit_status);
 }
 #endif
+
+void slirp_stats(void)
+{
+#ifdef LOG_ENABLED
+    ipstats();
+    tcpstats();
+    udpstats();
+    icmpstats();
+    mbufstats();
+    sockstats();
+#else
+    lprint("SLIRP statistics code not compiled.\n");
+#endif
+}
diff --git a/debug.h b/debug.h
index ad800e4..5c7cc7f 100644
--- a/debug.h
+++ b/debug.h
@@ -59,13 +59,3 @@ extern int slirp_debug;
 #endif
 
 void debug_init _P((char *, int));
-// void ttystats _P((struct ttys *));
-void allttystats _P((void));
-void ipstats _P((void));
-void vjstats _P((void));
-void tcpstats _P((void));
-void udpstats _P((void));
-void icmpstats _P((void));
-void mbufstats _P((void));
-void sockstats _P((void));
-void slirp_exit _P((int));
diff --git a/icmp_var.h b/icmp_var.h
index b3ae200..e29fa50 100644
--- a/icmp_var.h
+++ b/icmp_var.h
@@ -63,6 +63,8 @@ struct icmpstat {
         { 0, 0 }, { "maskrepl", CTLTYPE_INT }, { "stats", CTLTYPE_STRUCT }, \
     }
 
+#ifdef LOG_ENABLED
 extern struct icmpstat icmpstat;
+#endif
 
 #endif
diff --git a/if.h b/if.h
index 26f536a..5092730 100644
--- a/if.h
+++ b/if.h
@@ -29,6 +29,7 @@ extern struct mbuf *next_m;
 
 #define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
 
+#ifdef LOG_ENABLED
 /* Interface statistics */
 struct slirp_ifstats {
     u_int out_pkts; /* Output packets */
@@ -46,5 +47,6 @@ struct slirp_ifstats {
 
     u_int in_mbad; /* Bad incoming packets */
 };
+#endif
 
 #endif
diff --git a/ip.h b/ip.h
index b7bb9b9..bc9d706 100644
--- a/ip.h
+++ b/ip.h
@@ -270,6 +270,7 @@ struct ipoption {
     int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */
 };
 
+#ifdef LOG_ENABLED
 /*
  * Structure attached to inpcb.ip_moptions and
  * passed to ip_output when IP multicast options are in use.
@@ -304,8 +305,11 @@ struct ipstat {
 };
 
 extern struct ipstat ipstat;
+#endif
+
 extern struct ipq ipq; /* ip reass. queue */
 extern u_int16_t ip_id; /* ip packet ctr, for ids */
+
 extern int ip_defttl; /* default IP ttl */
 
 #endif
diff --git a/ip_icmp.c b/ip_icmp.c
index 0e97af9..ad2384a 100644
--- a/ip_icmp.c
+++ b/ip_icmp.c
@@ -37,7 +37,9 @@
 #include "slirp.h"
 #include "ip_icmp.h"
 
+#ifdef LOG_ENABLED
 struct icmpstat icmpstat;
+#endif
 
 /* The message sent when emulating PING */
 /* Be nice and tell them it's just a psuedo-ping packet */
@@ -82,14 +84,14 @@ int hlen;
     DEBUG_ARG("m = %lx", (long)m);
     DEBUG_ARG("m_len = %d", m->m_len);
 
-    icmpstat.icps_received++;
+    STAT(icmpstat.icps_received++);
 
     /*
      * Locate icmp structure in mbuf, and check
      * that its not corrupted and of at least minimum length.
      */
     if (icmplen < ICMP_MINLEN) { /* min 8 bytes payload */
-        icmpstat.icps_tooshort++;
+        STAT(icmpstat.icps_tooshort++);
     freeit:
         m_freem(m);
         goto end_error;
@@ -99,7 +101,7 @@ int hlen;
     m->m_data += hlen;
     icp = mtod(m, struct icmp *);
     if (cksum(m, icmplen)) {
-        icmpstat.icps_checksum++;
+        STAT(icmpstat.icps_checksum++);
         goto freeit;
     }
     m->m_len += hlen;
@@ -172,12 +174,12 @@ int hlen;
     case ICMP_TSTAMP:
     case ICMP_MASKREQ:
     case ICMP_REDIRECT:
-        icmpstat.icps_notsupp++;
+        STAT(icmpstat.icps_notsupp++);
         m_freem(m);
         break;
 
     default:
-        icmpstat.icps_badtype++;
+        STAT(icmpstat.icps_badtype++);
         m_freem(m);
     } /* swith */
 
@@ -324,7 +326,7 @@ char *message;
 
     (void)ip_output((struct socket *)NULL, m);
 
-    icmpstat.icps_reflect++;
+    STAT(icmpstat.icps_reflect++);
 
 end_error:
     return;
@@ -379,5 +381,5 @@ void icmp_reflect(m) struct mbuf *m;
 
     (void)ip_output((struct socket *)NULL, m);
 
-    icmpstat.icps_reflect++;
+    STAT(icmpstat.icps_reflect++);
 }
diff --git a/ip_input.c b/ip_input.c
index 3b12b8f..7c65e8b 100644
--- a/ip_input.c
+++ b/ip_input.c
@@ -46,7 +46,11 @@
 #include "ip_icmp.h"
 
 int ip_defttl;
+
+#ifdef LOG_ENABLED
 struct ipstat ipstat;
+#endif
+
 struct ipq ipq;
 
 /*
@@ -75,23 +79,23 @@ void ip_input(m) struct mbuf *m;
     DEBUG_ARG("m = %lx", (long)m);
     DEBUG_ARG("m_len = %d", m->m_len);
 
-    ipstat.ips_total++;
+    STAT(ipstat.ips_total++);
 
     if (m->m_len < sizeof(struct ip)) {
-        ipstat.ips_toosmall++;
+        STAT(ipstat.ips_toosmall++);
         return;
     }
 
     ip = mtod(m, struct ip *);
 
     if (ip->ip_v != IPVERSION) {
-        ipstat.ips_badvers++;
+        STAT(ipstat.ips_badvers++);
         goto bad;
     }
 
     hlen = ip->ip_hl << 2;
     if (hlen < sizeof(struct ip) || hlen > m->m_len) { /* min header length */
-        ipstat.ips_badhlen++; /* or packet too short */
+        STAT(ipstat.ips_badhlen++); /* or packet too short */
         goto bad;
     }
 
@@ -100,7 +104,7 @@ void ip_input(m) struct mbuf *m;
      * if (ip->ip_sum) {
      */
     if (cksum(m, hlen)) {
-        ipstat.ips_badsum++;
+        STAT(ipstat.ips_badsum++);
         goto bad;
     }
 
@@ -109,7 +113,7 @@ void ip_input(m) struct mbuf *m;
      */
     NTOHS(ip->ip_len);
     if (ip->ip_len < hlen) {
-        ipstat.ips_badlen++;
+        STAT(ipstat.ips_badlen++);
         goto bad;
     }
     NTOHS(ip->ip_id);
@@ -122,7 +126,7 @@ void ip_input(m) struct mbuf *m;
      * Drop packet if shorter than we expect.
      */
     if (m->m_len < ip->ip_len) {
-        ipstat.ips_tooshort++;
+        STAT(ipstat.ips_tooshort++);
         goto bad;
     }
     /* Should drop packet if mbuf too long? hmmm... */
@@ -189,11 +193,11 @@ void ip_input(m) struct mbuf *m;
          * attempt reassembly; if it succeeds, proceed.
          */
         if (((struct ipasfrag *)ip)->ipf_mff & 1 || ip->ip_off) {
-            ipstat.ips_fragments++;
+            STAT(ipstat.ips_fragments++);
             ip = ip_reass((struct ipasfrag *)ip, fp);
             if (ip == 0)
                 return;
-            ipstat.ips_reassembled++;
+            STAT(ipstat.ips_reassembled++);
             m = dtom(ip);
         } else if (fp)
             ip_freef(fp);
@@ -204,7 +208,7 @@ void ip_input(m) struct mbuf *m;
     /*
      * Switch out to protocol's input routine.
      */
-    ipstat.ips_delivered++;
+    STAT(ipstat.ips_delivered++);
     switch (ip->ip_p) {
     case IPPROTO_TCP:
         tcp_input(m, hlen, (struct socket *)NULL);
@@ -216,7 +220,7 @@ void ip_input(m) struct mbuf *m;
         icmp_input(m, hlen);
         break;
     default:
-        ipstat.ips_noproto++;
+        STAT(ipstat.ips_noproto++);
         m_free(m);
     }
     return;
@@ -380,7 +384,7 @@ insert:
     return ((struct ip *)ip);
 
 dropfrag:
-    ipstat.ips_fragdropped++;
+    STAT(ipstat.ips_fragdropped++);
     m_freem(m);
     return (0);
 }
@@ -445,7 +449,7 @@ void ip_slowtimo()
         --fp->ipq_ttl;
         fp = (struct ipq *)fp->next;
         if (((struct ipq *)(fp->prev))->ipq_ttl == 0) {
-            ipstat.ips_fragtimeout++;
+            STAT(ipstat.ips_fragtimeout++);
             ip_freef((struct ipq *)fp->prev);
         }
     }
@@ -646,7 +650,7 @@ bad :
     /* Not yet */
     icmp_error(m, type, code, 0, 0);
 
-ipstat.ips_badoptions++;
+STAT(ipstat.ips_badoptions++);
 return (1);
 }
 
diff --git a/ip_output.c b/ip_output.c
index 897bd6b..6cafc55 100644
--- a/ip_output.c
+++ b/ip_output.c
@@ -78,7 +78,7 @@ struct mbuf *m0;
     ip->ip_off &= IP_DF;
     ip->ip_id = htons(ip_id++);
     ip->ip_hl = hlen >> 2;
-    ipstat.ips_localout++;
+    STAT(ipstat.ips_localout++);
 
     /*
      * Verify that we have any chance at all of being able to queue
@@ -110,7 +110,7 @@ struct mbuf *m0;
      */
     if (ip->ip_off & IP_DF) {
         error = -1;
-        ipstat.ips_cantfrag++;
+        STAT(ipstat.ips_cantfrag++);
         goto bad;
     }
 
@@ -135,7 +135,7 @@ struct mbuf *m0;
             m = m_get();
             if (m == 0) {
                 error = -1;
-                ipstat.ips_odropped++;
+                STAT(ipstat.ips_odropped++);
                 goto sendorfree;
             }
             m->m_data += if_maxlinkhdr;
@@ -168,7 +168,7 @@ struct mbuf *m0;
             mhip->ip_sum = cksum(m, mhlen);
             *mnext = m;
             mnext = &m->m_nextpkt;
-            ipstat.ips_ofragments++;
+            STAT(ipstat.ips_ofragments++);
         }
         /*
          * Update first fragment by trimming what's been copied out
@@ -191,7 +191,7 @@ struct mbuf *m0;
         }
 
         if (error == 0)
-            ipstat.ips_fragmented++;
+            STAT(ipstat.ips_fragmented++);
     }
 
 done:
diff --git a/libslirp.h b/libslirp.h
index 7ea9250..792c9a8 100644
--- a/libslirp.h
+++ b/libslirp.h
@@ -26,6 +26,8 @@ int slirp_add_exec(int do_pty, const char *args, int addr_low_byte,
 extern const char *tftp_prefix;
 extern char slirp_hostname[33];
 
+void slirp_stats(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/misc.c b/misc.c
index 3c0a438..7f1e477 100644
--- a/misc.c
+++ b/misc.c
@@ -580,6 +580,16 @@ relay(s)
 }
 #endif
 
+#ifdef CONFIG_QEMU
+void lprint(const char *format, ...)
+{
+    va_list args;
+
+    va_start(args, format);
+    term_vprintf(format, args);
+    va_end(args);
+}
+#else
 int(*lprint_print) _P((void *, const char *, va_list));
 char *lprint_ptr, *lprint_ptr2, **lprint_arg;
 
@@ -730,6 +740,7 @@ void add_emu(buff) char *buff;
     lprint("Adding emulation for %s to port %d/%d\r\n", buff1, emup->lport,
            emup->fport);
 }
+#endif
 
 #ifdef BAD_SPRINTF
 
diff --git a/slirp.c b/slirp.c
index eb73862..6b4feb8 100644
--- a/slirp.c
+++ b/slirp.c
@@ -91,7 +91,9 @@ static int get_dns_addr(struct in_addr *pdns_addr)
     if (!f)
         return -1;
 
+#ifdef DEBUG
     lprint("IP address of your DNS(s): ");
+#endif
     while (fgets(buff, 512, f) != NULL) {
         if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) {
             if (!inet_aton(buff2, &tmp_addr))
@@ -101,13 +103,20 @@ static int get_dns_addr(struct in_addr *pdns_addr)
             /* If it's the first one, set it to dns_addr */
             if (!found)
                 *pdns_addr = tmp_addr;
+#ifdef DEBUG
             else
                 lprint(", ");
+#endif
             if (++found > 3) {
+#ifdef DEBUG
                 lprint("(more)");
+#endif
                 break;
-            } else
+            }
+#ifdef DEBUG
+            else
                 lprint("%s", inet_ntoa(tmp_addr));
+#endif
         }
     }
     fclose(f);
diff --git a/slirp.h b/slirp.h
index fba59c1..1e57ddd 100644
--- a/slirp.h
+++ b/slirp.h
@@ -3,7 +3,18 @@
 
 #define CONFIG_QEMU
 
-#define DEBUG 1
+//#define DEBUG 1
+
+// Uncomment the following line to enable SLIRP statistics printing in Qemu
+//#define LOG_ENABLED
+
+#ifdef LOG_ENABLED
+#define STAT(expr) expr
+#else
+#define STAT(expr) \
+    do {           \
+    } while (0)
+#endif
 
 #ifndef CONFIG_QEMU
 #include "version.h"
diff --git a/tcp_input.c b/tcp_input.c
index 48b4dca..ca6767d 100644
--- a/tcp_input.c
+++ b/tcp_input.c
@@ -69,51 +69,51 @@ tcp_seq tcp_iss; /* tcp initial send seq # */
  * when segments are out of order (so fast retransmit can work).
  */
 #ifdef TCP_ACK_HACK
-#define TCP_REASS(tp, ti, m, so, flags)             \
-    {                                               \
-        if ((ti)->ti_seq == (tp)->rcv_nxt &&        \
-            (tp)->seg_next == (tcpiphdrp_32)(tp) && \
-            (tp)->t_state == TCPS_ESTABLISHED) {    \
-            if (ti->ti_flags & TH_PUSH)             \
-                tp->t_flags |= TF_ACKNOW;           \
-            else                                    \
-                tp->t_flags |= TF_DELACK;           \
-            (tp)->rcv_nxt += (ti)->ti_len;          \
-            flags = (ti)->ti_flags & TH_FIN;        \
-            tcpstat.tcps_rcvpack++;                 \
-            tcpstat.tcps_rcvbyte += (ti)->ti_len;   \
-            if (so->so_emu) {                       \
-                if (tcp_emu((so), (m)))             \
-                    sbappend((so), (m));            \
-            } else                                  \
-                sbappend((so), (m));                \
-            /*               sorwakeup(so); */      \
-        } else {                                    \
-            (flags) = tcp_reass((tp), (ti), (m));   \
-            tp->t_flags |= TF_ACKNOW;               \
-        }                                           \
+#define TCP_REASS(tp, ti, m, so, flags)                 \
+    {                                                   \
+        if ((ti)->ti_seq == (tp)->rcv_nxt &&            \
+            (tp)->seg_next == (tcpiphdrp_32)(tp) &&     \
+            (tp)->t_state == TCPS_ESTABLISHED) {        \
+            if (ti->ti_flags & TH_PUSH)                 \
+                tp->t_flags |= TF_ACKNOW;               \
+            else                                        \
+                tp->t_flags |= TF_DELACK;               \
+            (tp)->rcv_nxt += (ti)->ti_len;              \
+            flags = (ti)->ti_flags & TH_FIN;            \
+            STAT(tcpstat.tcps_rcvpack++);               \
+            STAT(tcpstat.tcps_rcvbyte += (ti)->ti_len); \
+            if (so->so_emu) {                           \
+                if (tcp_emu((so), (m)))                 \
+                    sbappend((so), (m));                \
+            } else                                      \
+                sbappend((so), (m));                    \
+            /*               sorwakeup(so); */          \
+        } else {                                        \
+            (flags) = tcp_reass((tp), (ti), (m));       \
+            tp->t_flags |= TF_ACKNOW;                   \
+        }                                               \
     }
 #else
-#define TCP_REASS(tp, ti, m, so, flags)             \
-    {                                               \
-        if ((ti)->ti_seq == (tp)->rcv_nxt &&        \
-            (tp)->seg_next == (tcpiphdrp_32)(tp) && \
-            (tp)->t_state == TCPS_ESTABLISHED) {    \
-            tp->t_flags |= TF_DELACK;               \
-            (tp)->rcv_nxt += (ti)->ti_len;          \
-            flags = (ti)->ti_flags & TH_FIN;        \
-            tcpstat.tcps_rcvpack++;                 \
-            tcpstat.tcps_rcvbyte += (ti)->ti_len;   \
-            if (so->so_emu) {                       \
-                if (tcp_emu((so), (m)))             \
-                    sbappend(so, (m));              \
-            } else                                  \
-                sbappend((so), (m));                \
-            /*		sorwakeup(so); */                   \
-        } else {                                    \
-            (flags) = tcp_reass((tp), (ti), (m));   \
-            tp->t_flags |= TF_ACKNOW;               \
-        }                                           \
+#define TCP_REASS(tp, ti, m, so, flags)                 \
+    {                                                   \
+        if ((ti)->ti_seq == (tp)->rcv_nxt &&            \
+            (tp)->seg_next == (tcpiphdrp_32)(tp) &&     \
+            (tp)->t_state == TCPS_ESTABLISHED) {        \
+            tp->t_flags |= TF_DELACK;                   \
+            (tp)->rcv_nxt += (ti)->ti_len;              \
+            flags = (ti)->ti_flags & TH_FIN;            \
+            STAT(tcpstat.tcps_rcvpack++);               \
+            STAT(tcpstat.tcps_rcvbyte += (ti)->ti_len); \
+            if (so->so_emu) {                           \
+                if (tcp_emu((so), (m)))                 \
+                    sbappend(so, (m));                  \
+            } else                                      \
+                sbappend((so), (m));                    \
+            /*		sorwakeup(so); */                       \
+        } else {                                        \
+            (flags) = tcp_reass((tp), (ti), (m));       \
+            tp->t_flags |= TF_ACKNOW;                   \
+        }                                               \
     }
 #endif
 
@@ -152,8 +152,8 @@ struct mbuf *m;
         i = q->ti_seq + q->ti_len - ti->ti_seq;
         if (i > 0) {
             if (i >= ti->ti_len) {
-                tcpstat.tcps_rcvduppack++;
-                tcpstat.tcps_rcvdupbyte += ti->ti_len;
+                STAT(tcpstat.tcps_rcvduppack++);
+                STAT(tcpstat.tcps_rcvdupbyte += ti->ti_len);
                 m_freem(m);
                 /*
                  * Try to present any queued data
@@ -169,8 +169,8 @@ struct mbuf *m;
         }
         q = (struct tcpiphdr *)(q->ti_next);
     }
-    tcpstat.tcps_rcvoopack++;
-    tcpstat.tcps_rcvoobyte += ti->ti_len;
+    STAT(tcpstat.tcps_rcvoopack++);
+    STAT(tcpstat.tcps_rcvoobyte += ti->ti_len);
     REASS_MBUF(ti) = (mbufp_32)m; /* XXX */
 
     /*
@@ -276,7 +276,7 @@ struct socket *inso;
     }
 
 
-    tcpstat.tcps_rcvtotal++;
+    STAT(tcpstat.tcps_rcvtotal++);
     /*
      * Get IP and TCP header together in first mbuf.
      * Note: IP leaves IP header in first mbuf.
@@ -309,7 +309,7 @@ struct socket *inso;
      * ti->ti_sum = cksum(m, len);
      * if (ti->ti_sum) { */
     if (cksum(m, len)) {
-        tcpstat.tcps_rcvbadsum++;
+        STAT(tcpstat.tcps_rcvbadsum++);
         goto drop;
     }
 
@@ -319,7 +319,7 @@ struct socket *inso;
      */
     off = ti->ti_off << 2;
     if (off < sizeof(struct tcphdr) || off > tlen) {
-        tcpstat.tcps_rcvbadoff++;
+        STAT(tcpstat.tcps_rcvbadoff++);
         goto drop;
     }
     tlen -= off;
@@ -374,7 +374,7 @@ findso:
         so = solookup(&tcb, ti->ti_src, ti->ti_sport, ti->ti_dst, ti->ti_dport);
         if (so)
             tcp_last_so = so;
-        ++tcpstat.tcps_socachemiss;
+        STAT(tcpstat.tcps_socachemiss++);
     }
 
     /*
@@ -501,7 +501,7 @@ findso:
                 /*
                  * this is a pure ack for outstanding data.
                  */
-                ++tcpstat.tcps_predack;
+                STAT(tcpstat.tcps_predack++);
                 /*				if (ts_present)
                  *					tcp_xmit_timer(tp,
                  *tcp_now-ts_ecr+1); else
@@ -509,8 +509,8 @@ findso:
                 if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq))
                     tcp_xmit_timer(tp, tp->t_rtt);
                 acked = ti->ti_ack - tp->snd_una;
-                tcpstat.tcps_rcvackpack++;
-                tcpstat.tcps_rcvackbyte += acked;
+                STAT(tcpstat.tcps_rcvackpack++);
+                STAT(tcpstat.tcps_rcvackbyte += acked);
                 sbdrop(&so->so_snd, acked);
                 tp->snd_una = ti->ti_ack;
                 m_freem(m);
@@ -554,10 +554,10 @@ findso:
              * with nothing on the reassembly queue and
              * we have enough buffer space to take it.
              */
-            ++tcpstat.tcps_preddat;
+            STAT(tcpstat.tcps_preddat++);
             tp->rcv_nxt += ti->ti_len;
-            tcpstat.tcps_rcvpack++;
-            tcpstat.tcps_rcvbyte += ti->ti_len;
+            STAT(tcpstat.tcps_rcvpack++);
+            STAT(tcpstat.tcps_rcvbyte += ti->ti_len);
             /*
              * Add data to socket buffer.
              */
@@ -729,7 +729,7 @@ findso:
         tp->t_flags |= TF_ACKNOW;
         tp->t_state = TCPS_SYN_RECEIVED;
         tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
-        tcpstat.tcps_accepts++;
+        STAT(tcpstat.tcps_accepts++);
         goto trimthenstep6;
     } /* case TCPS_LISTEN */
 
@@ -769,7 +769,7 @@ findso:
         tcp_rcvseqinit(tp);
         tp->t_flags |= TF_ACKNOW;
         if (tiflags & TH_ACK && SEQ_GT(tp->snd_una, tp->iss)) {
-            tcpstat.tcps_connects++;
+            STAT(tcpstat.tcps_connects++);
             soisfconnected(so);
             tp->t_state = TCPS_ESTABLISHED;
 
@@ -801,8 +801,8 @@ findso:
             m_adj(m, -todrop);
             ti->ti_len = tp->rcv_wnd;
             tiflags &= ~TH_FIN;
-            tcpstat.tcps_rcvpackafterwin++;
-            tcpstat.tcps_rcvbyteafterwin += todrop;
+            STAT(tcpstat.tcps_rcvpackafterwin++);
+            STAT(tcpstat.tcps_rcvbyteafterwin += todrop);
         }
         tp->snd_wl1 = ti->ti_seq - 1;
         tp->rcv_up = ti->ti_seq;
@@ -873,11 +873,11 @@ findso:
              */
             tp->t_flags |= TF_ACKNOW;
             todrop = ti->ti_len;
-            tcpstat.tcps_rcvduppack++;
-            tcpstat.tcps_rcvdupbyte += todrop;
+            STAT(tcpstat.tcps_rcvduppack++);
+            STAT(tcpstat.tcps_rcvdupbyte += todrop);
         } else {
-            tcpstat.tcps_rcvpartduppack++;
-            tcpstat.tcps_rcvpartdupbyte += todrop;
+            STAT(tcpstat.tcps_rcvpartduppack++);
+            STAT(tcpstat.tcps_rcvpartdupbyte += todrop);
         }
         m_adj(m, todrop);
         ti->ti_seq += todrop;
@@ -896,7 +896,7 @@ findso:
     if ((so->so_state & SS_NOFDREF) && tp->t_state > TCPS_CLOSE_WAIT &&
         ti->ti_len) {
         tp = tcp_close(tp);
-        tcpstat.tcps_rcvafterclose++;
+        STAT(tcpstat.tcps_rcvafterclose++);
         goto dropwithreset;
     }
 
@@ -906,9 +906,9 @@ findso:
      */
     todrop = (ti->ti_seq + ti->ti_len) - (tp->rcv_nxt + tp->rcv_wnd);
     if (todrop > 0) {
-        tcpstat.tcps_rcvpackafterwin++;
+        STAT(tcpstat.tcps_rcvpackafterwin++);
         if (todrop >= ti->ti_len) {
-            tcpstat.tcps_rcvbyteafterwin += ti->ti_len;
+            STAT(tcpstat.tcps_rcvbyteafterwin += ti->ti_len);
             /*
              * If a new connection request is received
              * while in TIME_WAIT, drop the old connection
@@ -930,11 +930,11 @@ findso:
              */
             if (tp->rcv_wnd == 0 && ti->ti_seq == tp->rcv_nxt) {
                 tp->t_flags |= TF_ACKNOW;
-                tcpstat.tcps_rcvwinprobe++;
+                STAT(tcpstat.tcps_rcvwinprobe++);
             } else
                 goto dropafterack;
         } else
-            tcpstat.tcps_rcvbyteafterwin += todrop;
+            STAT(tcpstat.tcps_rcvbyteafterwin += todrop);
         m_adj(m, -todrop);
         ti->ti_len -= todrop;
         tiflags &= ~(TH_PUSH | TH_FIN);
@@ -975,7 +975,7 @@ findso:
             /*		so->so_error = ECONNRESET; */
         close:
             tp->t_state = TCPS_CLOSED;
-            tcpstat.tcps_drops++;
+            STAT(tcpstat.tcps_drops++);
             tp = tcp_close(tp);
             goto drop;
 
@@ -1014,7 +1014,7 @@ findso:
 
         if (SEQ_GT(tp->snd_una, ti->ti_ack) || SEQ_GT(ti->ti_ack, tp->snd_max))
             goto dropwithreset;
-        tcpstat.tcps_connects++;
+        STAT(tcpstat.tcps_connects++);
         tp->t_state = TCPS_ESTABLISHED;
         /*
          * The sent SYN is ack'ed with our sequence number +1
@@ -1071,7 +1071,7 @@ findso:
 
         if (SEQ_LEQ(ti->ti_ack, tp->snd_una)) {
             if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
-                tcpstat.tcps_rcvdupack++;
+                STAT(tcpstat.tcps_rcvdupack++);
                 DEBUG_MISC(
                     (dfd, " dup ack  m = %lx  so = %lx \n", (long)m, (long)so));
                 /*
@@ -1136,12 +1136,12 @@ findso:
             tp->snd_cwnd = tp->snd_ssthresh;
         tp->t_dupacks = 0;
         if (SEQ_GT(ti->ti_ack, tp->snd_max)) {
-            tcpstat.tcps_rcvacktoomuch++;
+            STAT(tcpstat.tcps_rcvacktoomuch++);
             goto dropafterack;
         }
         acked = ti->ti_ack - tp->snd_una;
-        tcpstat.tcps_rcvackpack++;
-        tcpstat.tcps_rcvackbyte += acked;
+        STAT(tcpstat.tcps_rcvackpack++);
+        STAT(tcpstat.tcps_rcvackbyte += acked);
 
         /*
          * If we have a timestamp reply, update smoothed
@@ -1279,7 +1279,7 @@ step6:
            (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
         /* keep track of pure window updates */
         if (ti->ti_len == 0 && tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd)
-            tcpstat.tcps_rcvwinupd++;
+            STAT(tcpstat.tcps_rcvwinupd++);
         tp->snd_wnd = tiwin;
         tp->snd_wl1 = ti->ti_seq;
         tp->snd_wl2 = ti->ti_ack;
@@ -1603,7 +1603,7 @@ int rtt;
     DEBUG_ARG("tp = %lx", (long)tp);
     DEBUG_ARG("rtt = %d", rtt);
 
-    tcpstat.tcps_rttupdated++;
+    STAT(tcpstat.tcps_rttupdated++);
     if (tp->t_srtt != 0) {
         /*
          * srtt is stored as fixed point with 3 bits after the
diff --git a/tcp_output.c b/tcp_output.c
index de048e6..e533605 100644
--- a/tcp_output.c
+++ b/tcp_output.c
@@ -261,7 +261,7 @@ again:
     /*
      * No reason to send a segment, just return.
      */
-    tcpstat.tcps_didnuttin++;
+    STAT(tcpstat.tcps_didnuttin++);
 
     return (0);
 
@@ -335,13 +335,13 @@ send:
      */
     if (len) {
         if (tp->t_force && len == 1)
-            tcpstat.tcps_sndprobe++;
+            STAT(tcpstat.tcps_sndprobe++);
         else if (SEQ_LT(tp->snd_nxt, tp->snd_max)) {
-            tcpstat.tcps_sndrexmitpack++;
-            tcpstat.tcps_sndrexmitbyte += len;
+            STAT(tcpstat.tcps_sndrexmitpack++);
+            STAT(tcpstat.tcps_sndrexmitbyte += len);
         } else {
-            tcpstat.tcps_sndpack++;
-            tcpstat.tcps_sndbyte += len;
+            STAT(tcpstat.tcps_sndpack++);
+            STAT(tcpstat.tcps_sndbyte += len);
         }
 
         m = m_get();
@@ -377,13 +377,13 @@ send:
             flags |= TH_PUSH;
     } else {
         if (tp->t_flags & TF_ACKNOW)
-            tcpstat.tcps_sndacks++;
+            STAT(tcpstat.tcps_sndacks++);
         else if (flags & (TH_SYN | TH_FIN | TH_RST))
-            tcpstat.tcps_sndctrl++;
+            STAT(tcpstat.tcps_sndctrl++);
         else if (SEQ_GT(tp->snd_up, tp->snd_una))
-            tcpstat.tcps_sndurg++;
+            STAT(tcpstat.tcps_sndurg++);
         else
-            tcpstat.tcps_sndwinup++;
+            STAT(tcpstat.tcps_sndwinup++);
 
         m = m_get();
         if (m == NULL) {
@@ -495,7 +495,7 @@ send:
                 if (tp->t_rtt == 0) {
                     tp->t_rtt = 1;
                     tp->t_rtseq = startseq;
-                    tcpstat.tcps_segstimed++;
+                    STAT(tcpstat.tcps_segstimed++);
                 }
             }
 
@@ -559,7 +559,7 @@ send:
              */
             return (error);
         }
-        tcpstat.tcps_sndtotal++;
+        STAT(tcpstat.tcps_sndtotal++);
 
         /*
          * Data sent (as far as we can tell).
diff --git a/tcp_subr.c b/tcp_subr.c
index 3be2083..0160f49 100644
--- a/tcp_subr.c
+++ b/tcp_subr.c
@@ -254,9 +254,9 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err)
     if (TCPS_HAVERCVDSYN(tp->t_state)) {
         tp->t_state = TCPS_CLOSED;
         (void)tcp_output(tp);
-        tcpstat.tcps_drops++;
+        STAT(tcpstat.tcps_drops++);
     } else
-        tcpstat.tcps_conndrops++;
+        STAT(tcpstat.tcps_conndrops++);
     /*	if (errno == ETIMEDOUT && tp->t_softerror)
      *		errno = tp->t_softerror;
      */
@@ -302,7 +302,7 @@ struct tcpcb *tcp_close(tp) register struct tcpcb *tp;
     sbfree(&so->so_rcv);
     sbfree(&so->so_snd);
     sofree(so);
-    tcpstat.tcps_closed++;
+    STAT(tcpstat.tcps_closed++);
     return ((struct tcpcb *)0);
 }
 
@@ -519,7 +519,7 @@ void tcp_connect(inso) struct socket *inso;
      */
 
     /*	soisconnecting(so); */ /* NOFDREF used instead */
-    tcpstat.tcps_connattempt++;
+    STAT(tcpstat.tcps_connattempt++);
 
     tp->t_state = TCPS_SYN_SENT;
     tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
@@ -843,7 +843,7 @@ struct mbuf *m;
 
                 /*soisfconnecting(ns);*/
 
-				tcpstat.tcps_connattempt++;
+				STAT(tcpstat.tcps_connattempt++);
 
 				tp->t_state = TCPS_SYN_SENT;
 				tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
diff --git a/tcp_timer.c b/tcp_timer.c
index 9b984f6..61d0c79 100644
--- a/tcp_timer.c
+++ b/tcp_timer.c
@@ -41,7 +41,10 @@ int tcp_keepintvl = TCPTV_KEEPINTVL;
 int tcp_maxidle;
 int so_options = DO_KEEPALIVE;
 
+#ifdef LOG_ENABLED
 struct tcpstat tcpstat; /* tcp statistics */
+#endif
+
 u_int32_t tcp_now; /* for RFC 1323 timestamps */
 
 /*
@@ -61,7 +64,7 @@ void tcp_fasttimo()
                 (tp->t_flags & TF_DELACK)) {
                 tp->t_flags &= ~TF_DELACK;
                 tp->t_flags |= TF_ACKNOW;
-                tcpstat.tcps_delack++;
+                STAT(tcpstat.tcps_delack++);
                 (void)tcp_output(tp);
             }
 }
@@ -183,7 +186,7 @@ int timer;
                  * We tried our best, now the connection must die!
                  */
                 tp->t_rxtshift = TCP_MAXRXTSHIFT;
-                tcpstat.tcps_timeoutdrop++;
+                STAT(tcpstat.tcps_timeoutdrop++);
                 tp = tcp_drop(tp, tp->t_softerror);
                 /* tp->t_softerror : ETIMEDOUT); */ /* XXX */
                 return (tp); /* XXX */
@@ -195,7 +198,7 @@ int timer;
              */
             tp->t_rxtshift = 6;
         }
-        tcpstat.tcps_rexmttimeo++;
+        STAT(tcpstat.tcps_rexmttimeo++);
         rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
         TCPT_RANGESET(tp->t_rxtcur, rexmt, (short)tp->t_rttmin,
                       TCPTV_REXMTMAX); /* XXX */
@@ -258,7 +261,7 @@ int timer;
      * Force a byte to be output, if possible.
      */
     case TCPT_PERSIST:
-        tcpstat.tcps_persisttimeo++;
+        STAT(tcpstat.tcps_persisttimeo++);
         tcp_setpersist(tp);
         tp->t_force = 1;
         (void)tcp_output(tp);
@@ -270,7 +273,7 @@ int timer;
      * or drop connection if idle for too long.
      */
     case TCPT_KEEP:
-        tcpstat.tcps_keeptimeo++;
+        STAT(tcpstat.tcps_keeptimeo++);
         if (tp->t_state < TCPS_ESTABLISHED)
             goto dropit;
 
@@ -290,7 +293,7 @@ int timer;
              * by the protocol spec, this requires the
              * correspondent TCP to respond.
              */
-            tcpstat.tcps_keepprobe++;
+            STAT(tcpstat.tcps_keepprobe++);
 #ifdef TCP_COMPAT_42
             /*
              * The keepalive packet must have nonzero length
@@ -308,7 +311,7 @@ int timer;
         break;
 
     dropit:
-        tcpstat.tcps_keepdrops++;
+        STAT(tcpstat.tcps_keepdrops++);
         tp = tcp_drop(tp, 0); /* ETIMEDOUT); */
         break;
     }
diff --git a/tcp_var.h b/tcp_var.h
index 0dd19c8..63e811b 100644
--- a/tcp_var.h
+++ b/tcp_var.h
@@ -184,6 +184,7 @@ typedef u_int32_t mbufp_32;
 #endif
 #define REASS_MBUF(ti) (*(mbufp_32 *)&((ti)->ti_t))
 
+#ifdef LOG_ENABLED
 /*
  * TCP statistics.
  * Many of these should be kept per connection,
@@ -246,6 +247,8 @@ struct tcpstat {
 };
 
 extern struct tcpstat tcpstat; /* tcp statistics */
+#endif
+
 extern u_int32_t tcp_now; /* for RFC 1323 timestamps */
 
 #endif
diff --git a/udp.c b/udp.c
index 9bd5f6d..29bb72b 100644
--- a/udp.c
+++ b/udp.c
@@ -45,7 +45,9 @@
 #include <slirp.h>
 #include "ip_icmp.h"
 
+#ifdef LOG_ENABLED
 struct udpstat udpstat;
+#endif
 
 struct socket udb;
 
@@ -83,7 +85,7 @@ int iphlen;
     DEBUG_ARG("m = %lx", (long)m);
     DEBUG_ARG("iphlen = %d", iphlen);
 
-    udpstat.udps_ipackets++;
+    STAT(udpstat.udps_ipackets++);
 
     /*
      * Strip IP options, if any; should skip this,
@@ -110,7 +112,7 @@ int iphlen;
 
     if (ip->ip_len != len) {
         if (len > ip->ip_len) {
-            udpstat.udps_badlen++;
+            STAT(udpstat.udps_badlen++);
             goto bad;
         }
         m_adj(m, len - ip->ip_len);
@@ -137,7 +139,7 @@ int iphlen;
          * if (uh->uh_sum) {
          */
         if (cksum(m, len + sizeof(struct ip))) {
-            udpstat.udps_badsum++;
+            STAT(udpstat.udps_badsum++);
             goto bad;
         }
     }
@@ -178,7 +180,7 @@ int iphlen;
         if (tmp == &udb) {
             so = NULL;
         } else {
-            udpstat.udpps_pcbcachemiss++;
+            STAT(udpstat.udpps_pcbcachemiss++);
             udp_last_so = so;
         }
     }
@@ -299,7 +301,7 @@ int udp_output2(struct socket *so, struct mbuf *m, struct sockaddr_in *saddr,
     ((struct ip *)ui)->ip_ttl = ip_defttl;
     ((struct ip *)ui)->ip_tos = iptos;
 
-    udpstat.udps_opackets++;
+    STAT(udpstat.udps_opackets++);
 
     error = ip_output(so, m);
 
diff --git a/udp.h b/udp.h
index b55a78d..be4161d 100644
--- a/udp.h
+++ b/udp.h
@@ -72,6 +72,7 @@ struct udpiphdr {
 #define ui_ulen ui_u.uh_ulen
 #define ui_sum ui_u.uh_sum
 
+#ifdef LOG_ENABLED
 struct udpstat {
     /* input statistics: */
     u_long udps_ipackets; /* total input packets */
@@ -85,6 +86,7 @@ struct udpstat {
     /* output statistics: */
     u_long udps_opackets; /* total output packets */
 };
+#endif
 
 /*
  * Names for UDP sysctl objects
@@ -92,7 +94,10 @@ struct udpstat {
 #define UDPCTL_CHECKSUM 1 /* checksum UDP packets */
 #define UDPCTL_MAXID 2
 
+#ifdef LOG_ENABLED
 extern struct udpstat udpstat;
+#endif
+
 extern struct socket udb;
 struct mbuf;