Changeset 34103 in vbox for trunk

Timestamp:

Nov 16, 2010 11:18:55 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67804

Message:

NAT: (debug) logging fixes

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• cksum.c (modified) (1 diff)
• debug.c (modified) (5 diffs)
• debug.h (modified) (2 diffs)
• dnsproxy/dnsproxy.c (modified) (11 diffs)
• ip_icmp.c (modified) (10 diffs)
• ip_input.c (modified) (2 diffs)
• ip_output.c (modified) (2 diffs)
• sbuf.c (modified) (2 diffs)
• slirp.c (modified) (6 diffs)
• slirp.h (modified) (1 diff)
• socket.c (modified) (22 diffs)
• tcp_input.c (modified) (11 diffs)
• tcp_output.c (modified) (2 diffs)
• tcp_subr.c (modified) (7 diffs)
• tcp_timer.c (modified) (3 diffs)
• udp.c (modified) (4 diffs)

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

@@ -154 +154 @@
 #ifdef DEBUG
     if (len)
-    {
-        DEBUG_ERROR((dfd, "cksum: out of data\n"));
-        DEBUG_ERROR((dfd, " len = %d\n", len));
-    }
+        Log(("cksum: out of data: len = %d\n", len));
 #endif
     if (mlen == -1)

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

@@ -61 +61 @@
 ipstats(PNATState pData)
 {
-    lprint(" \n");
+    lprint("\n");
 
     lprint("IP stats:\n");
@@ -85 +85 @@
 tcpstats(PNATState pData)
 {
-    lprint(" \n");
+    lprint("\n");
 
     lprint("TCP stats:\n");
@@ -152 +152 @@
 udpstats(PNATState pData)
 {
-    lprint(" \n");
+    lprint("\n");
 
     lprint("UDP stats:\n");
@@ -166 +166 @@
 icmpstats(PNATState pData)
 {
-    lprint(" \n");
+    lprint("\n");
     lprint("ICMP stats:\n");
     lprint("  %6d ICMP packets received\n", icmpstat.icps_received);
@@ -192 +192 @@
     struct socket *so, *so_next;
 
-    lprint(" \n");
+    lprint("\n");
 
     lprint(

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

@@ -25 +25 @@
  */
 
-#define PRN_STDERR      1
-#define PRN_SPRINTF     2
-
-/* Unused anyway, using VBox Log facility. */
-#define dfd NULL
-
-#define DBG_CALL 0x1
-#define DBG_MISC 0x2
-#define DBG_ERROR 0x4
-#define DEBUG_DEFAULT DBG_CALL|DBG_MISC|DBG_ERROR
+#ifndef _DEBUG_H_
+#define _DEBUG_H_
 
 #include <VBox/log.h>
 /* we've excluded stdio.h */
-# define FILE void
-
-#ifdef LOG_ENABLED
-#define DEBUG_CALL(x)       LogFlow(("%s:\n", x))
-#define DEBUG_ARG(x, y)     do { LogFlow((x, y)); LogFlow(("\n")); } while (0)
-#define DEBUG_ARGS(x)       __debug_flow x
-#define DEBUG_MISC(x)       __debug_log2 x
-#define DEBUG_ERROR(x)      __debug_log x
-
-DECLINLINE(void) __debug_flow(FILE *pIgnore, const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    LogFlow(("%Nv\n", pszFormat, &args));
-    va_end(args);
-}
-
-DECLINLINE(void) __debug_log2(FILE *pIgnore, const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    Log2(("%Nv\n", pszFormat, &args));
-    va_end(args);
-}
-
-DECLINLINE(void) __debug_log(FILE *pIgnore, const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    Log(("%Nv\n", pszFormat, &args));
-    va_end(args);
-}
-
-#else  /* !LOG_ENABLED */
-
-#define DEBUG_CALL(x)       do {} while (0)
-#define DEBUG_ARG(x, y)     do {} while (0)
-#define DEBUG_ARGS(x)       do {} while (0)
-#define DEBUG_MISC(x)       do {} while (0)
-#define DEBUG_ERROR(x)      do {} while (0)
-
-#endif  /* !LOG_ENABLED */
+#define FILE void
 
 int debug_init (void);
@@ -89 +40 @@
 void sockstats (PNATState);
 
+#endif

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

@@ -124 +124 @@
         if (so1 == NULL)
         {
-            LogRel(("NAT: can't create DNS socket \n"));
+            LogRel(("NAT: can't create DNS socket\n"));
             return;
         }
@@ -214 +214 @@
     if ((byte = recvfrom(fd, buf, sizeof(buf), 0,
                 (struct sockaddr *)&fromaddr, &fromlen)) == -1) {
-        LogRel(("recvfrom failed: %s", strerror(errno)));
+        LogRel(("recvfrom failed: %s\n", strerror(errno)));
         ++dropped_queries;
         return;
@@ -234 +234 @@
     /* check for minimum dns packet length */
     if (byte < 12) {
-        LogRel(("query too short from %s",
-            inet_ntoa(fromaddr.sin_addr)));
+        LogRel(("query too short from %s\n", inet_ntoa(fromaddr.sin_addr)));
         ++dropped_queries;
         return;
@@ -243 +242 @@
     /* allocate new request */
     if ((req = calloc(1, sizeof(struct request))) == NULL) {
-        LogRel(("calloc: %s", strerror(errno)));
+        LogRel(("calloc failed\n"));
         ++dropped_queries;
         return;
@@ -257 +256 @@
     {
         if ((req = RTMemAllocZ(sizeof(struct request) + byte)) == NULL) {
-            LogRel(("calloc: %s", strerror(errno)));
+            LogRel(("calloc failed\n"));
             ++dropped_queries;
             return;
@@ -328 +327 @@
                     (struct sockaddr *)&recursive_addr,
                     sizeof(struct sockaddr_in))) == -1) {
-            LogRel(("sendto failed: %s", strerror(errno)));
+            LogRel(("sendto failed: %s\n", strerror(errno)));
             ++dropped_queries;
             return;
@@ -346 +345 @@
                     (struct sockaddr *)&authoritative_addr,
                     sizeof(struct sockaddr_in))) == -1) {
-            LogRel(("sendto failed: %s", strerror(errno)));
+            LogRel(("sendto failed: %s\n", strerror(errno)));
             ++dropped_queries;
             return;
@@ -363 +362 @@
                     (struct sockaddr *)&addr,
                     sizeof(struct sockaddr_in))) == -1) {
-            LogRel(("sendto failed: %s", strerror(errno)));
+            LogRel(("sendto failed: %s\n", strerror(errno)));
             ++dropped_queries;
             return;
@@ -403 +402 @@
     /* read packet from socket */
     if ((byte = recvfrom(fd, buf, sizeof(buf), 0, NULL, NULL)) == -1) {
-        LogRel(("recvfrom failed: %s", strerror(errno)));
+        LogRel(("recvfrom failed: %s\n", strerror(errno)));
         ++dropped_answers;
         return;
@@ -417 +416 @@
     /* check for minimum dns packet length */
     if (byte < 12) {
-        LogRel(("answer too short"));
+        LogRel(("answer too short\n"));
         ++dropped_answers;
         return;
@@ -452 +451 @@
                 (struct sockaddr *)&query->client,
                 sizeof(struct sockaddr_in)) == -1) {
-        LogRel(("sendto failed: %s", strerror(errno)));
+        LogRel(("sendto failed: %s\n", strerror(errno)));
         ++dropped_answers;
     } else

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

@@ -120 +120 @@
         if (pData->pfGetAdaptersAddresses == NULL)
         {
-            LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll"));
+            LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll\n"));
         }
     }
@@ -335 +335 @@
     /* int code; */
 
-    DEBUG_CALL("icmp_input");
-    DEBUG_ARG("m = %lx", (long )m);
-    DEBUG_ARG("m_len = %d", m ? m->m_len : 0);
+    LogFlow(("icmp_input: m = %lx, m_len = %d\n", (long)m, m ? m->m_len : 0));
 
     icmpstat.icps_received++;
@@ -381 +379 @@
     /* code = icp->icmp_code; */
 
-    DEBUG_ARG("icmp_type = %d", icp->icmp_type);
+    LogFlow(("icmp_type = %d\n", icp->icmp_type));
     switch (icp->icmp_type)
     {
@@ -442 +440 @@
                     if (!fIcmpSocketErrorReported)
                     {
-                        LogRel((dfd,"icmp_input udp sendto tx errno = %d-%s\n",
+                        LogRel(("icmp_input udp sendto tx errno = %d (%s)\n",
                                 errno, strerror(errno)));
                         fIcmpSocketErrorReported = true;
@@ -552 +550 @@
     int size = 0;
 
-    DEBUG_CALL("icmp_error");
-    DEBUG_ARG("msrc = %lx", (long )msrc);
-    DEBUG_ARG("msrc_len = %d", msrc ? msrc->m_len : 0);
+    LogFlow(("icmp_error: msrc = %lx, msrc_len = %d\n", (long)msrc, msrc ? msrc->m_len : 0));
     if (msrc != NULL)
         M_ASSERTPKTHDR(msrc);
@@ -573 +569 @@
         strcpy(bufa, inet_ntoa(ip->ip_src));
         strcpy(bufb, inet_ntoa(ip->ip_dst));
-        DEBUG_MISC((dfd, " %.16s to %.16s\n", bufa, bufb));
+        Log2((" %.16s to %.16s\n", bufa, bufb));
     }
 #endif
@@ -626 +622 @@
     /* make the header of the reply packet */
     ip   = mtod(m, struct ip *);
-    hlen = sizeof(struct ip );             /* no options in reply */
+    hlen = sizeof(struct ip);             /* no options in reply */
 
     /* fill in icmp */
@@ -682 +678 @@
     ip->ip_src = alias_addr;
 
-    (void ) ip_output0(pData, (struct socket *)NULL, m, 1);
+    (void) ip_output0(pData, (struct socket *)NULL, m, 1);
 
     icmpstat.icps_reflect++;
@@ -712 +708 @@
     register struct ip *ip = mtod(m, struct ip *);
     int hlen = ip->ip_hl << 2;
-    int optlen = hlen - sizeof(struct ip );
+    int optlen = hlen - sizeof(struct ip);
     register struct icmp *icp;
 
@@ -729 +725 @@
     m->m_len += hlen;
 
-    (void ) ip_output(pData, (struct socket *)NULL, m);
+    (void) ip_output(pData, (struct socket *)NULL, m);
 
     icmpstat.icps_reflect++;

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

@@ -111 +111 @@
     STAM_PROFILE_START(&pData->StatIP_input, a);
 
-    DEBUG_CALL("ip_input");
-    DEBUG_ARG("m = %lx", (long)m);
+    LogFlow(("ip_input: m = %lx\n", (long)m));
     ip = mtod(m, struct ip *);
     Log2(("ip_dst=%R[IP4](len:%d) m_len = %d\n", &ip->ip_dst, RT_N2H_U16(ip->ip_len), m->m_len));
@@ -579 +578 @@
      */
     int i;
-    DEBUG_CALL("ip_slowtimo");
+    LogFlow(("ip_slowtimo:\n"));
     for (i = 0; i < IPREASS_NHASH; i++)
     {

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

@@ -111 +111 @@
     register struct ip *ip;
     register struct mbuf *m = m0;
-    register int hlen = sizeof(struct ip );
+    register int hlen = sizeof(struct ip);
     int len, off, error = 0;
     extern uint8_t zerro_ethaddr[ETH_ALEN];
@@ -120 +120 @@
     STAM_PROFILE_START(&pData->StatIP_output, a);
 
-    DEBUG_CALL("ip_output");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m0 = %lx", (long)m0);
+    LogFlow(("ip_output: so = %lx, m0 = %lx\n", (long)so, (long)m0));
 
     M_ASSERTPKTHDR(m);

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

@@ -114 +114 @@
 
     STAM_PROFILE_START(&pData->StatIOSBAppend_pf, a);
-    DEBUG_CALL("sbappend");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m = %lx", (long)m);
-    DEBUG_ARG("m->m_len = %d", m ? m->m_len : 0);
+    LogFlow(("sbappend: so = %lx, m = %lx, m->m_len = %d\n", (long)so, (long)m, m ? m->m_len : 0));
 
     STAM_COUNTER_INC(&pData->StatIOSBAppend);
@@ -287 +284 @@
 
     STAM_PROFILE_START(&pData->StatIOSBAppend_pf, a);
-    DEBUG_CALL("sbappend");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m = %lx", (long)m);
-    DEBUG_ARG("m->m_len = %d", m ? m->m_len : 0);
+    LogFlow(("sbappend: so = %lx, m = %lx, m->m_len = %d\n", (long)so, (long)m, m ? m->m_len : 0));
 
     STAM_COUNTER_INC(&pData->StatIOSBAppend);

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

@@ -298 +298 @@
     if (!pAdapterAddr)
     {
-        Log(("NAT: No memory available \n"));
+        Log(("NAT: No memory available\n"));
         return -1;
     }
@@ -1196 +1196 @@
                 else
                 {
-                    Log2(("%R[natsock] errno %d:%s\n", so, errno, strerror(errno)));
+                    Log2(("%R[natsock] errno %d (%s)\n", so, errno, strerror(errno)));
                     break;
                 }
@@ -1570 +1570 @@
     if (m->m_next)
     {
-        Log(("NAT: if_encap's recived the chain, dropping..."));
+        Log(("NAT: if_encap's recived the chain, dropping...\n"));
         m_freem(pData, m);
         goto done;
@@ -1864 +1864 @@
 void slirp_set_dhcp_TFTP_prefix(PNATState pData, const char *tftpPrefix)
 {
-    Log2(("tftp_prefix:%s\n", tftpPrefix));
+    Log2(("tftp_prefix: %s\n", tftpPrefix));
     tftp_prefix = tftpPrefix;
 }
@@ -1870 +1870 @@
 void slirp_set_dhcp_TFTP_bootfile(PNATState pData, const char *bootFile)
 {
-    Log2(("bootFile:%s\n", bootFile));
+    Log2(("bootFile: %s\n", bootFile));
     bootp_filename = bootFile;
 }
@@ -1876 +1876 @@
 void slirp_set_dhcp_next_server(PNATState pData, const char *next_server)
 {
-    Log2(("next_server:%s\n", next_server));
+    Log2(("next_server: %s\n", next_server));
     if (next_server == NULL)
         pData->tftp_server.s_addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_TFTP);

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

@@ -389 +389 @@
 
 # define ip_next(ip) (void *)((uint8_t *)(ip) + ((ip)->ip_hl << 2))
-# define udp_next(udp) (void *)((uint8_t *)&((struct udphdr *)(udp))[1] )
+# define udp_next(udp) (void *)((uint8_t *)&((struct udphdr *)(udp))[1])
 # define bcopy(src, dst, len) memcpy((dst), (src), (len))
 # define bcmp(a1, a2, len) memcmp((a1), (a2), (len))

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

@@ -152 +152 @@
     QSOCKET_UNLOCK(tcb);
 
-    DEBUG_CALL("soread");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("soread: so = %lx\n", (long)so));
 
     /*
@@ -217 +216 @@
 #ifdef HAVE_READV
     nn = readv(so->s, (struct iovec *)iov, n);
-    DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
+    Log2((" ... read nn = %d bytes\n", nn));
 #else
     nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
@@ -253 +252 @@
         {
             /* nn == 0 means peer has performed an orderly shutdown */
-            DEBUG_MISC((dfd, " --- soread() disconnected, nn = %d, errno = %d-%s\n",
-                        nn, errno, strerror(errno)));
+            Log2((" --- soread() disconnected, nn = %d, errno = %d (%s)\n",
+                  nn, errno, strerror(errno)));
             sofcantrcvmore(so);
             tcp_sockclosed(pData, sototcpcb(so));
@@ -300 +299 @@
     }
 
-    DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
+    Log2((" ... read nn = %d bytes\n", nn));
 #endif
 
@@ -330 +329 @@
     QSOCKET_UNLOCK(tcb);
 
-    DEBUG_CALL("soread");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("soread: so = %lx\n", (long)so));
 
     if (len > mss)
@@ -376 +374 @@
         else
         {
-            DEBUG_MISC((dfd, " --- soread() disconnected, n = %d, errno = %d-%s\n",
-                        n, errno, strerror(errno)));
+            Log2((" --- soread() disconnected, n = %d, errno = %d (%s)\n",
+                  n, errno, strerror(errno)));
             sofcantrcvmore(so);
             tcp_sockclosed(pData, sototcpcb(so));
@@ -406 +404 @@
     ssize_t ret;
 
-    DEBUG_CALL("sorecvoob");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("sorecvoob: so = %lx\n", (long)so));
 
     /*
@@ -436 +433 @@
     int n, len;
 
-    DEBUG_CALL("sosendoob");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("sosendoob so = %lx\n", (long)so));
 
     if (so->so_urgc > sizeof(buff))
@@ -448 +444 @@
         so->so_urgc -= n;
 
-        DEBUG_MISC((dfd, " --- sent %d bytes urgent data, %d urgent bytes left\n",
-                    n, so->so_urgc));
+        Log2((" --- sent %d bytes urgent data, %d urgent bytes left\n",
+              n, so->so_urgc));
     }
     else
@@ -475 +471 @@
 #ifdef DEBUG
         if (n != len)
-            DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
-#endif
-        DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n",
-                    n, so->so_urgc));
+            Log(("Didn't send all data urgently XXXXX\n"));
+#endif
+        Log2((" ---2 sent %d bytes urgent data, %d urgent bytes left\n",
+              n, so->so_urgc));
     }
 
@@ -510 +506 @@
     STAM_COUNTER_RESET(&pData->StatIOWrite_rest);
     STAM_COUNTER_RESET(&pData->StatIOWrite_rest_bytes);
-    DEBUG_CALL("sowrite");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("sowrite: so = %lx\n", (long)so));
     QSOCKET_LOCK(tcb);
     SOCKET_LOCK(so);
@@ -577 +572 @@
 #ifdef HAVE_READV
     nn = writev(so->s, (const struct iovec *)iov, n);
-    DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
+    Log2(("  ... wrote nn = %d bytes\n", nn));
 #else
     nn = send(so->s, iov[0].iov_base, iov[0].iov_len, 0);
@@ -594 +589 @@
     if (nn < 0 || (nn == 0 && iov[0].iov_len > 0))
     {
-        DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n",
-                   so->so_state, errno));
+        Log2((" --- sowrite disconnected, so->so_state = %x, errno = %d\n",
+              so->so_state, errno));
         sofcantsendmore(so);
         tcp_sockclosed(pData, sototcpcb(so));
@@ -618 +613 @@
         });
     }
-    DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
+    Log2(("  ... wrote nn = %d bytes\n", nn));
 #endif
 
@@ -646 +641 @@
     int n, len;
 
-    DEBUG_CALL("sosendoob");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("sosendoob: so = %lx\n", (long)so));
 
     len = sbuf_len(sb);
@@ -702 +696 @@
     socklen_t addrlen = sizeof(struct sockaddr_in);
 
-    DEBUG_CALL("sorecvfrom");
-    DEBUG_ARG("so = %lx", (long)so);
+    LogFlow(("sorecvfrom: so = %lx\n", (long)so));
 
     if (so->so_type == IPPROTO_ICMP)
@@ -793 +786 @@
                  */
                 if(ret < slirp_size(pData) && !m->m_next)
-                    Log(("NAT:udp: Expected size(%d) lesser than real(%d) and less minimal mbuf size(%d) \n",
+                    Log(("NAT:udp: Expected size(%d) lesser than real(%d) and less minimal mbuf size(%d)\n",
                          n, ret, slirp_size(pData)));
             }
@@ -880 +873 @@
     int mlen;
 
-    DEBUG_CALL("sosendto");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m = %lx", (long)m);
+    LogFlow(("sosendto: so = %lx, m = %lx\n", (long)so, (long)m));
 
     memset(&addr, 0, sizeof(struct sockaddr));
@@ -926 +917 @@
     paddr->sin_port = so->so_fport;
 
-    DEBUG_MISC((dfd, " sendto()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n",
-                RT_N2H_U16(paddr->sin_port), inet_ntoa(paddr->sin_addr)));
+    Log2((" sendto()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n",
+          RT_N2H_U16(paddr->sin_port), inet_ntoa(paddr->sin_addr)));
 
     /* Don't care what port we get */
@@ -968 +959 @@
     int status;
 
-    DEBUG_CALL("solisten");
-    DEBUG_ARG("port = %d", port);
-    DEBUG_ARG("laddr = %x", laddr);
-    DEBUG_ARG("lport = %d", lport);
-    DEBUG_ARG("flags = %x", flags);
+    LogFlow(("solisten: port = %d, laddr = %x, lport = %d, flags = %x\n", port, laddr, lport, flags));
 
     if ((so = socreate()) == NULL)
@@ -1490 +1477 @@
             code = ICMP_UNREACH_NET;
 
-        LogRel((" udp icmp rx errno = %d-%s\n",
-                    errno, strerror(errno)));
+        LogRel((" udp icmp rx errno = %d (%s)\n", errno, strerror(errno)));
         icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, strerror(errno));
         m_freem(pData, so->so_m);
         so->so_m = NULL;
-        Log(("sorecvfrom_icmp_unix: 1 - step can't read IP datagramm \n"));
+        Log(("sorecvfrom_icmp_unix: 1 - step can't read IP datagramm\n"));
         return;
     }
@@ -1505 +1491 @@
         )
     {
-        Log(("sorecvfrom_icmp_unix: 1 - step IP isn't IPv4 \n"));
+        Log(("sorecvfrom_icmp_unix: 1 - step IP isn't IPv4\n"));
         return;
     }

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

@@ -296 +296 @@
     STAM_PROFILE_START(&pData->StatTCP_input, counter_input);
 
-    DEBUG_CALL("tcp_input");
-    DEBUG_ARGS((dfd," m = %8lx  iphlen = %2d  inso = %lx\n",
-                (long )m, iphlen, (long )inso ));
+    LogFlow(("tcp_input: m = %8lx, iphlen = %2d, inso = %lx\n",
+             (long)m, iphlen, (long)inso));
 
     if (inso != NULL)
@@ -342 +341 @@
      */
     ti = mtod(m, struct tcpiphdr *);
-    if (iphlen > sizeof(struct ip ))
+    if (iphlen > sizeof(struct ip))
     {
         ip_stripoptions(m, (struct mbuf *)0);
-        iphlen = sizeof(struct ip );
+        iphlen = sizeof(struct ip);
     }
     /* XXX Check if too short */
@@ -369 +368 @@
     memset(ti->ti_x1, 0, 9);
     ti->ti_len = RT_H2N_U16((u_int16_t)tlen);
-    len = sizeof(struct ip ) + tlen;
+    len = sizeof(struct ip) + tlen;
     /* keep checksum for ICMP reply
      * ti->ti_sum = cksum(m, len);
@@ -772 +771 @@
             {
                 u_char code = ICMP_UNREACH_NET;
-                DEBUG_MISC((dfd," tcp fconnect errno = %d-%s\n",
-                            errno, strerror(errno)));
+                Log2((" tcp fconnect errno = %d (%s)\n", errno, strerror(errno)));
                 if (errno == ECONNREFUSED)
                 {
@@ -927 +925 @@
             tp->snd_wl1 = ti->ti_seq - 1;
             tp->rcv_up = ti->ti_seq;
-            Log2(("hit6"));
+            Log2(("hit6\n"));
             goto step6;
     } /* switch tp->t_state */
@@ -1212 +1210 @@
                 {
                     tcpstat.tcps_rcvdupack++;
-                    DEBUG_MISC((dfd," dup ack  m = %lx  so = %lx \n",
-                                (long )m, (long )so));
+                    Log2((" dup ack  m = %lx, so = %lx\n", (long)m, (long)so));
                     /*
                      * If we have outstanding data (other than
@@ -1337 +1334 @@
                 tp->snd_wnd -= SBUF_LEN(&so->so_snd);
 #ifndef VBOX_WITH_SLIRP_BSD_SBUF
-                sbdrop(&so->so_snd, (int )so->so_snd.sb_cc);
+                sbdrop(&so->so_snd, (int)so->so_snd.sb_cc);
 #else
                 sbuf_clear(&so->so_snd);
@@ -1695 +1692 @@
     int opt, optlen;
 
-    DEBUG_CALL("tcp_dooptions");
-    DEBUG_ARGS((dfd," tp = %lx  cnt=%i \n", (long )tp, cnt));
+    LogFlow(("tcp_dooptions: tp = %lx, cnt=%i\n", (long)tp, cnt));
 
     for (; cnt > 0; cnt -= optlen, cp += optlen)
@@ -1807 +1803 @@
     register short delta;
 
-    DEBUG_CALL("tcp_xmit_timer");
-    DEBUG_ARG("tp = %lx", (long)tp);
-    DEBUG_ARG("rtt = %d", rtt);
+    LogFlow(("tcp_xmit_timer: tp = %lx rtt = %d\n", (long)tp, rtt));
 
     tcpstat.tcps_rttupdated++;
@@ -1899 +1893 @@
     int mss;
 
-    DEBUG_CALL("tcp_mss");
-    DEBUG_ARG("tp = %lx", (long)tp);
-    DEBUG_ARG("offer = %d", offer);
+    LogFlow(("tcp_mss: tp = %lx, offet = %d\n", (long)tp, offer));
 
     mss = min(if_mtu, if_mru) - sizeof(struct tcpiphdr);
@@ -1920 +1912 @@
 #endif
 
-    DEBUG_MISC((dfd, " returning mss = %d\n", mss));
+    Log2((" returning mss = %d\n", mss));
 
     return mss;

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

@@ -102 +102 @@
     int size;
 
-    DEBUG_CALL("tcp_output");
-    DEBUG_ARG("tp = %lx", (long )tp);
+    LogFlow(("tcp_output: tp = %lx\n", (long)tp));
 
     /*
@@ -127 +126 @@
     flags = tcp_outflags[tp->t_state];
 
-    DEBUG_MISC((dfd, " --- tcp_output flags = 0x%x\n",flags));
+    Log2((" --- tcp_output flags = 0x%x\n", flags));
 
     /*

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

@@ -129 +129 @@
     int win = 0;
 
-    DEBUG_CALL("tcp_respond");
-    DEBUG_ARG("tp = %lx", (long)tp);
-    DEBUG_ARG("ti = %lx", (long)ti);
-    DEBUG_ARG("m = %lx", (long)m);
-    DEBUG_ARG("ack = %u", ack);
-    DEBUG_ARG("seq = %u", seq);
-    DEBUG_ARG("flags = %x", flags);
+    LogFlow(("tcp_respond: tp = %lx, ti = %lx, m = %lx, ack = %u, seq = %u, flags = %x\n",
+              (long)tp, (long)ti, (long)m, ack, seq, flags));
 
     if (tp)
@@ -249 +244 @@
 {
 */
-    DEBUG_CALL("tcp_drop");
-    DEBUG_ARG("tp = %lx", (long)tp);
-    DEBUG_ARG("errno = %d", errno);
+    LogFlow(("tcp_drop: tp = %lx, errno = %d\n", (long)tp, errno));
 
     if (TCPS_HAVERCVDSYN(tp->t_state))
@@ -283 +276 @@
 
     struct tseg_qent *te = NULL;
-    DEBUG_CALL("tcp_close");
-    DEBUG_ARG("tp = %lx", (long )tp);
+    LogFlow(("tcp_close: tp = %lx\n", (long)tp));
     so_next = so_prev = NULL;
     /*XXX: freeing the reassembly queue */
@@ -361 +353 @@
 tcp_sockclosed(PNATState pData, struct tcpcb *tp)
 {
-    DEBUG_CALL("tcp_sockclosed");
-    DEBUG_ARG("tp = %lx", (long)tp);
+    LogFlow(("tcp_sockclosed: tp = %lx\n", (long)tp));
 
     switch (tp->t_state)
@@ -412 +403 @@
     int ret = 0;
 
-    DEBUG_CALL("tcp_fconnect");
-    DEBUG_ARG("so = %lx", (long )so);
+    LogFlow(("tcp_fconnect: so = %lx\n", (long)so));
 
     if ((ret = so->s = socket(AF_INET, SOCK_STREAM, 0)) >= 0)
@@ -443 +433 @@
         addr.sin_port = so->so_fport;
 
-        DEBUG_MISC((dfd, " connect()ing, addr.sin_port=%d, "
-                         "addr.sin_addr.s_addr=%.16s\n",
-                         RT_N2H_U16(addr.sin_port), inet_ntoa(addr.sin_addr)));
+        Log2((" connect()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n",
+             RT_N2H_U16(addr.sin_port), inet_ntoa(addr.sin_addr)));
         /* We don't care what port we get */
         ret = connect(s,(struct sockaddr *)&addr,sizeof (addr));
@@ -483 +472 @@
     static int cVerbose = 1;
 
-    DEBUG_CALL("tcp_connect");
-    DEBUG_ARG("inso = %lx", (long)inso);
+    LogFlow(("tcp_connect: inso = %lx\n", (long)inso));
 
     /*

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

@@ -66 +66 @@
     register struct tcpcb *tp;
 
-    DEBUG_CALL("tcp_fasttimo");
+    LogFlow(("tcp_fasttimo:\n"));
 
     so = tcb.so_next;
@@ -96 +96 @@
     register int i;
 
-    DEBUG_CALL("tcp_slowtimo");
+    LogFlow(("tcp_slowtimo:\n"));
 
     /*
@@ -159 +159 @@
     register int rexmt;
 
-    DEBUG_CALL("tcp_timers");
+    LogFlow(("tcp_timers:\n"));
 
     switch (timer)

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

@@ -95 +95 @@
     int ttl;
 
-    DEBUG_CALL("udp_input");
-    DEBUG_ARG("m = %lx", (long)m);
+    LogFlow(("udp_input: m = %lx, iphlen = %d\n", (long)m, iphlen));
     ip = mtod(m, struct ip *);
-    DEBUG_ARG("iphlen = %d", iphlen);
     Log2(("%R[IP4] iphlen = %d\n", &ip->ip_dst, iphlen));
 
@@ -247 +245 @@
         if (udp_attach(pData, so, 0) == -1)
         {
-            Log2(("NAT: IP(id: %hd) udp_attach errno = %d-%s\n",
+            Log2(("NAT: IP(id: %hd) udp_attach errno = %d (%s)\n",
                         ip->ip_id, errno, strerror(errno)));
             sofree(pData, so);
@@ -297 +295 @@
         m->m_data -= iphlen;
         *ip = save_ip;
-        DEBUG_MISC((dfd,"NAT: UDP tx errno = %d-%s (on sent to %R[IP4])\n", errno,
-                   strerror(errno), &ip->ip_dst));
+        Log2(("NAT: UDP tx errno = %d (%s) on sent to %R[IP4]\n",
+              errno, strerror(errno), &ip->ip_dst));
         icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
         /* in case we receive ICMP on this socket we'll aware that ICMP has been already sent to host*/
@@ -340 +338 @@
     int mlen = 0;
 
-    DEBUG_CALL("udp_output");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m = %lx", (long)m);
-    DEBUG_ARG("saddr = %lx", (long)saddr->sin_addr.s_addr);
-    DEBUG_ARG("daddr = %lx", (long)daddr->sin_addr.s_addr);
+    LogFlow(("udp_output: so = %lx, m = %lx, saddr = %lx, daddr = %lx\n",
+            (long)so, (long)m, (long)saddr->sin_addr.s_addr, (long)daddr->sin_addr.s_addr));
 
     /*