Changeset 19981 in vbox for trunk/src

Timestamp:

May 25, 2009 7:00:41 AM (16 years ago)

Author:

vboxsync

Message:

NAT: warnings and style

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (2 diffs)
• ip_output.c (modified) (3 diffs)
• slirp_state.h (modified) (2 diffs)
• udp.c (modified) (1 diff)

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

@@ -32 +32 @@
     int i;
 
-    for(i = 0; i < NB_ADDR; i++)
+    for (i = 0; i < NB_ADDR; i++)
     {
         if (!bootp_clients[i].allocated)
@@ -67 +67 @@
     int i;
 
-    for(i = 0; i < NB_ADDR; i++)
+    for (i = 0; i < NB_ADDR; i++)
     {
         if (!memcmp(macaddr, bootp_clients[i].macaddr, 6))

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

@@ -46 +46 @@
 
 #ifdef VBOX_WITHOUT_SLIRP_CLIENT_ETHER
-char * rt_lookup_in_cache(PNATState pData, uint32_t dst)
+static const uint8_t* rt_lookup_in_cache(PNATState pData, uint32_t dst)
 {
     int i;
-   /* @todo (r - vasily) to quick ramp up on routing rails 
-    * we use information from DHCP server leasings, this 
-    * code couldn't detect any changes in network topology 
-    * and should be borrowed from other places 
+   /* @todo (r - vasily) to quick ramp up on routing rails
+    * we use information from DHCP server leasings, this
+    * code couldn't detect any changes in network topology
+    * and should be borrowed from other places
     */
-    for(i = 0; i < NB_ADDR; i++)
-    {
-        if (    bootp_clients[i].allocated 
+    for (i = 0; i < NB_ADDR; i++)
+    {
+        if (   bootp_clients[i].allocated
             && bootp_clients[i].addr.s_addr == dst)
-        {
             return &bootp_clients[i].macaddr[0];
-        }
-    }
+    }
+
     if (dst != 0)
-    {
         return pData->slirp_ethaddr;
-    }
-   return NULL; 
+
+    return NULL; 
 }
 #endif
@@ -86 +84 @@
     extern uint8_t zerro_ethaddr[ETH_ALEN];
     struct ethhdr *eh = NULL;
-    uint8_t *eth_dst = NULL;
+    const uint8_t *eth_dst = NULL;
 #endif
 
@@ -127 +125 @@
 #endif
 #ifdef VBOX_WITHOUT_SLIRP_CLIENT_ETHER
-      /* Current TCP/IP stack hasn't routing information at 
-       * all so we need to calculate destination ethernet address 
+      /* Current TCP/IP stack hasn't routing information at
+       * all so we need to calculate destination ethernet address
        */
      eh = (struct ethhdr *)MBUF_HEAD(m);
-     if (memcmp(eh->h_source, zerro_ethaddr, ETH_ALEN) == 0) {
+     if (memcmp(eh->h_source, zerro_ethaddr, ETH_ALEN) == 0)
          eth_dst = rt_lookup_in_cache(pData, ip->ip_dst.s_addr); 
-     }
-       
 #endif
 

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

@@ -132 +132 @@
     uint8_t client_ethaddr[6];
 #else
-    uint8_t *slirp_ethaddr;
+    const uint8_t *slirp_ethaddr;
 #endif
     struct ex_list *exec_list;
@@ -383 +383 @@
     QSOCKET_UNLOCK(__X(queue_## label ##_label));                     \
     if ((so) != &(_X(queue_## label ## _label))) SOCKET_LOCK((so));   \
-    for(;;)                                                           \
+    for (;;)                                                          \
     {                                                                 \
         if ((so) == &(_X(queue_## label ## _label)))                  \

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

@@ -583 +583 @@
                 u_short temp_port;
 
-                for(req = req_tbl; req; req = req->next)
+                for (req = req_tbl; req; req = req->next)
                     if (so == req->udp_so)
                         break;          /* found it */