Changeset 16511 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 4, 2009 12:45:10 PM (16 years ago)

Author:

vboxsync

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

42430

Message:

NAT: cosmetics

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.h (modified) (1 diff)
• slirp.c (modified) (1 diff)
• socket.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -171 +171 @@
 void icmp_reflect _P((PNATState, struct mbuf *));
 
-struct icmp_msg{
+struct icmp_msg
+{
     LIST_ENTRY(icmp_msg) im_list;
     struct mbuf *im_m;

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

@@ -55 +55 @@
             /* This should not happen */                                                        \
             error = WSAGetLastError();                                                          \
-            LogRel(("WSAEventSelector (" #label ") error %d (so=%x, socket=%s, event=%x)\n",    \
+            LogRel(("WSAEventSelect (" #label ") error %d (so=%x, socket=%s, event=%x)\n",      \
                         error, (so), (so)->s, VBOX_SOCKET_EVENT));                              \
         }                                                                                       \
-    } while(0);                                                                                                 \
+    } while(0);                                                                                 \
     CONTINUE(label)
 

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

@@ -202 +202 @@
          * would be dangerous.
          */
-        int status = 0;
+        int status, ignored;
         unsigned long pending = 0;
-        int ignored;
         status = WSAIoctl(so->s, FIONREAD, NULL, 0, &pending, sizeof(unsigned long), &ignored, NULL, NULL);
-        if(status < 0) 
-        {
+        if (status < 0)
             Log2(("error in WSAIoctl: %d\n", WSAGetLastError()));
-        }
         if (nn == 0 && (pending != 0))
         {

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

@@ -161 +161 @@
      */
     if (   ntohs(uh->uh_dport) == TFTP_SERVER 
-            && CTL_CHECK(ntohl(ip->ip_dst.s_addr), CTL_TFTP))
+        && CTL_CHECK(ntohl(ip->ip_dst.s_addr), CTL_TFTP))
     {
         tftp_input(pData, m);