Changeset 23369 in vbox for trunk/src

Timestamp:

Sep 28, 2009 12:41:20 PM (15 years ago)

Author:

vboxsync

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

52893

Message:

NAT: small cosmetics, trailing spaces

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (24 diffs)
• cksum.c (modified) (5 diffs)
• debug.c (modified) (7 diffs)
• if.c (modified) (2 diffs)
• if.h (modified) (1 diff)
• ip_icmp.c (modified) (1 diff)
• ip_input.c (modified) (2 diffs)
• ip_output.c (modified) (8 diffs)
• libslirp.h (modified) (1 diff)
• mbuf.c (modified) (2 diffs)
• misc.c (modified) (9 diffs)
• sbuf.c (modified) (2 diffs)
• slirp.c (modified) (12 diffs)
• slirp.h (modified) (3 diffs)
• slirp_state.h (modified) (3 diffs)
• socket.c (modified) (17 diffs)
• socket.h (modified) (2 diffs)
• tcp_output.c (modified) (4 diffs)
• tcp_subr.c (modified) (1 diff)
• tcp_timer.c (modified) (1 diff)
• tftp.c (modified) (2 diffs)
• udp.c (modified) (6 diffs)

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

@@ -47 +47 @@
     uint8_t len;
     /*@todo magic validation */
-    q += 4; /*magic*/ 
+    q += 4; /*magic*/
     while(*q != RFC1533_END)
     {
@@ -56 +56 @@
         q++;
         len = *q;
-        q += 1 + len; 
-    }
-    return NULL; 
+        q += 1 + len;
+    }
+    return NULL;
 }
 static BOOTPClient *bc_alloc_client(PNATState pData)
@@ -135 +135 @@
  *            name or options      name or options
  * 'options'  options              options
- * 
+ *
  * Option                    DHCPOFFER    DHCPACK            DHCPNAK
  * ------                    ---------    -------            -------
@@ -265 +265 @@
     }while(0)
 
-    
-    
+
     FILL_BOOTP_EXT(q, RFC1533_NETMASK, 4, &netmask);
     FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr);
-    
+
     if (pData->use_dns_proxy || pData->use_host_resolver)
     {
@@ -276 +275 @@
         goto skip_dns_servers;
     }
-    
-    if (!TAILQ_EMPTY(&pData->dns_list_head)) 
+
+    if (!TAILQ_EMPTY(&pData->dns_list_head))
     {
         de = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
@@ -283 +282 @@
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
     }
-    
+
     TAILQ_FOREACH_REVERSE(de, &pData->dns_list_head, dns_list_head, de_list)
     {
@@ -296 +295 @@
             /* Microsoft dhcp client doen't like domain-less dhcp and trimmed packets*/
             /* dhcpcd client very sad if no domain name is passed */
-            FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " "); 
+            FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " ");
     }
     if (pData->fPassDomain && !pData->use_host_resolver)
@@ -302 +301 @@
         LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
         {
-            
+
             if (dd->dd_pszDomain == NULL)
                 continue;
             /* never meet valid separator here in RFC1533*/
-            if (added != 0) 
-                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, ","); 
+            if (added != 0)
+                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, ",");
             else
                 added = 1;
@@ -314 +313 @@
         }
     }
-    
+
     FILL_BOOTP_EXT(q, RFC2132_LEASE_TIME, 4, &lease_time);
-    
+
     if (*slirp_hostname)
     {
@@ -332 +331 @@
 
     dhcp_create_msg(pData, bp, m, DHCPNAK);
-    
+
     return 7;
 }
@@ -408 +407 @@
             /*see table 4 rfc2131*/
             if (bp->bp_flags & DHCP_FLAGS_B)
-                dhcp_stat = REBINDING; 
-            else 
-                dhcp_stat = RENEWING; 
+                dhcp_stat = REBINDING;
+            else
+                dhcp_stat = RENEWING;
         }
     }
@@ -416 +415 @@
     switch (dhcp_stat)
     {
-        case RENEWING: 
-        {
-            Assert((   server_ip == NULL 
+        case RENEWING:
+        {
+            Assert((   server_ip == NULL
                 && req_ip == NULL
                 && bp->bp_ciaddr.s_addr != INADDR_ANY));
@@ -428 +427 @@
             else
             {
-               if ((bp->bp_ciaddr.s_addr & htonl(pData->netmask)) != special_addr.s_addr) 
+               if ((bp->bp_ciaddr.s_addr & htonl(pData->netmask)) != special_addr.s_addr)
                {
                     off = dhcp_send_nack(pData, bp, bc, m);
@@ -441 +440 @@
                Assert((bp->bp_hlen == ETH_ALEN));
                memcpy(bc->macaddr, bp->bp_hwaddr, bp->bp_hlen);
-               bc->addr.s_addr = bp->bp_ciaddr.s_addr; 
+               bc->addr.s_addr = bp->bp_ciaddr.s_addr;
                slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
             }
@@ -450 +449 @@
             Assert(req_ip != NULL);
             ui32 = *(uint32_t *)(req_ip + 2);
-            if ((ui32 & htonl(pData->netmask)) != special_addr.s_addr) 
+            if ((ui32 & htonl(pData->netmask)) != special_addr.s_addr)
             {
                 LogRel(("NAT: address %R[IP4] has been req.\n", &ui32));
@@ -464 +463 @@
             Assert((bp->bp_hlen == ETH_ALEN));
             memcpy(bc->macaddr, bp->bp_hwaddr, bp->bp_hlen);
-            bc->addr.s_addr = ui32; 
+            bc->addr.s_addr = ui32;
             slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
         break;
@@ -499 +498 @@
         bc->xid = bp->bp_xid;
         /*bc isn't NULL */
-        off = dhcp_send_offer(pData, bp, bc, m); 
+        off = dhcp_send_offer(pData, bp, bc, m);
         return off;
-    } 
+    }
     else
     {
@@ -511 +510 @@
             return -1;
         }
-        off = dhcp_send_ack(pData, bp, bc, m, 0); 
+        off = dhcp_send_ack(pData, bp, bc, m, 0);
         return off;
     }
@@ -584 +583 @@
  * Site-specific              MAY           MAY              MUST NOT
  * All others                 MAY           MAY              MUST NOT
- * 
+ *
  */
 static void dhcp_decode(PNATState pData, struct bootp_t *bp, const uint8_t *buf, int size)
@@ -590 +589 @@
     const uint8_t *p, *p_end;
     int rc;
-    int pmsg_type; 
+    int pmsg_type;
     struct in_addr req_ip;
     int flag = 0;
@@ -655 +654 @@
 static void bootp_reply(PNATState pData, struct mbuf *m, int off, uint16_t flags)
 {
-    struct sockaddr_in saddr, daddr; 
+    struct sockaddr_in saddr, daddr;
     struct bootp_t *rbp = NULL;
     uint8_t *q = NULL;
@@ -674 +673 @@
     FILL_BOOTP_EXT(q, RFC2132_SRV_ID, 4, &saddr.sin_addr);
 
-    
+
     *q++ = RFC1533_END; /*end of message */
-    
+
 
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
@@ -708 +707 @@
 {
     int rc = 1;
-    uint32_t ip = INADDR_ANY; 
+    uint32_t ip = INADDR_ANY;
     int i;
     if (ether == NULL || pip == NULL)
@@ -746 +745 @@
 
 /*
- * Initialize dhcp server 
+ * Initialize dhcp server
  * @returns 0 - if initialization is ok, non-zero otherwise
  */

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

@@ -42 +42 @@
  * This routine is very heavily used in the network
  * code and should be modified for each CPU to be as fast as possible.
- * 
+ *
  * XXX Since we will never span more than 1 mbuf, we can optimise this
  */
@@ -66 +66 @@
         u_int32_t l;
     } l_util;
-        
+
     if (m->m_len == 0)
         goto cont;
@@ -72 +72 @@
 
     mlen = m->m_len;
-        
+
     if (len < mlen)
         mlen = len;
@@ -114 +114 @@
         sum += *w++;
     }
-        
+
     if (byte_swapped)
     {
@@ -131 +131 @@
     else if (mlen == -1)
         s_util.c[0] = *(u_int8_t *)w;
-        
+
 cont:
 #ifdef DEBUG

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

@@ -249 +249 @@
     AssertReturn(strcmp(pszType, "ether") == 0, 0);
     if (ether != NULL)
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, 
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
             "[ether %hhx:%hhx:%hhx:%hhx:%hhx:%hhx]",
-            ether[0], ether[1], ether[2], 
+            ether[0], ether[1], ether[2],
             ether[3], ether[4], ether[5]);
     else
@@ -271 +271 @@
 
     AssertReturn(strcmp(pszType, "natsock") == 0, 0);
-    if (so == NULL) 
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, 
+    if (so == NULL)
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                 "socket is null");
-    if (so->so_state == SS_NOFDREF || so->s == -1) 
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, 
+    if (so->so_state == SS_NOFDREF || so->s == -1)
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                 "socket(%d) SS_NODREF",so->s);
     status = getsockname(so->s, &addr, &socklen);
@@ -281 +281 @@
     if(status != 0 || addr.sa_family != AF_INET)
     {
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, 
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                 "socket(%d) is invalid(probably closed)",so->s);
     }
@@ -290 +290 @@
             "state=%04x ip=" IP4_ADDR_PRINTF_FORMAT ":%d "
             "name=" IP4_ADDR_PRINTF_FORMAT ":%d",
-            so->s, so->so_type, so->so_state, IP4_ADDR_PRINTF_DECOMP(ip), 
-            ntohs(so->so_fport), 
+            so->s, so->so_type, so->so_state, IP4_ADDR_PRINTF_DECOMP(ip),
+            ntohs(so->so_fport),
             IP4_ADDR_PRINTF_DECOMP(ntohl(in_addr->sin_addr.s_addr)),
             ntohs(in_addr->sin_port));
@@ -309 +309 @@
     AssertReturn(strcmp(pszType, "natwinnetevents") == 0, 0);
 
-    cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "events=%02x (", 
+    cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "events=%02x (",
             pNetworkEvents->lNetworkEvents);
 # define DO_BIT(bit) \
@@ -354 +354 @@
     {
         /*
-         * XXX(r - frank): Move this to IPRT using RTNETADDRIPV4. 
+         * XXX(r - frank): Move this to IPRT using RTNETADDRIPV4.
          * Use the specifier %RNAipv4.
          */
@@ -363 +363 @@
         rc = RTStrFormatTypeRegister("natsock", print_socket, NULL);
         AssertRC(rc);
-        rc = RTStrFormatTypeRegister("natwinnetevents", 
+        rc = RTStrFormatTypeRegister("natwinnetevents",
             print_networkevents, NULL);
         AssertRC(rc);

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

@@ -146 +146 @@
         ifq = TAILQ_LAST(&if_batchq, if_queue);
     }
-    
+
     /* queue already created */
 #endif
@@ -282 +282 @@
         if_encap(pData, ETH_P_IP, ifm);
 
-        if (!if_queued) 
+        if (!if_queued)
         {
             return;

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

@@ -1 +1 @@
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- * 
- * Please read the file COPYRIGHT for the 
+ *
+ * Please read the file COPYRIGHT for the
  * terms and conditions of the copyright.
  */

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

@@ -555 +555 @@
     {
         size = MCLBYTES;
-    } 
+    }
     else if (new_m_size < MCLBYTES)
     {

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

@@ -79 +79 @@
     if (t = m_tag_find(m, PACKET_TAG_ALIAS, NULL) != 0)
     {
-        return (struct libalias *)&t[1]; 
+        return (struct libalias *)&t[1];
     }
 #endif
@@ -234 +234 @@
     return;
 bad:
-    Log2(("NAT: IP datagram to %R[IP4] with size(%d) claimed as bad\n", 
+    Log2(("NAT: IP datagram to %R[IP4] with size(%d) claimed as bad\n",
         &ip->ip_dst, ip->ip_len));
     m_freem(pData, m);

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

@@ -65 +65 @@
     if (rc == 0)
         return rc;
-    /* 
-     * no chance to send this packet, sorry, we will request ether address via ARP 
-     */
-    slirp_arp_who_has(pData, dst); 
-    return rc; 
+    /*
+     * no chance to send this packet, sorry, we will request ether address via ARP
+     */
+    slirp_arp_who_has(pData, dst);
+    return rc;
 }
 
@@ -152 +152 @@
     }
 #else
-    /* 
+    /*
      * (vvl) Assumption is that m_data points at the IP header and only
      * in case of dhcp we know and have header before IP.
@@ -170 +170 @@
         ip->ip_sum = 0;
         ip->ip_sum = cksum(m, hlen);
-    
+
         {
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF
             STAM_PROFILE_START(&pData->StatALIAS_output, a);
-            rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias), 
+            rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias),
                 mtod(m, char *), m->m_len);
             Log2(("NAT: LibAlias return %d\n", rc));
@@ -186 +186 @@
             else
             {
-                rc = LibAliasOut(pData->proxy_alias, mtod(m, char *), 
+                rc = LibAliasOut(pData->proxy_alias, mtod(m, char *),
                                  m_length(m, NULL));
-            } 
+            }
             if (rc == PKT_ALIAS_IGNORED)
             {
@@ -198 +198 @@
         }
 
-        memcpy(eh->h_source, eth_dst, ETH_ALEN); 
+        memcpy(eh->h_source, eth_dst, ETH_ALEN);
 
         if_output(pData, so, m);
@@ -240 +240 @@
                 ip->ip_sum = cksum(m, hlen);
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF
-                rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias), 
+                rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias),
                     mtod(m, char *), m->m_len);
 #else
@@ -264 +264 @@
                 {
                     rc = LibAliasOut(pData->proxy_alias, tmpbuf, tmplen);
-                } 
+                }
                 if (m->m_next != NULL)
                 {
@@ -379 +379 @@
                 m->m_data += ETH_HLEN;
 #endif
-                memcpy(eh->h_source, eth_dst, ETH_ALEN); 
+                memcpy(eh->h_source, eth_dst, ETH_ALEN);
 
                 if_output(pData, so, m);
             }
-            else 
+            else
             {
                 m_freem(pData, m);

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

@@ -57 +57 @@
 
 int slirp_redir(PNATState pData, int is_udp, struct in_addr host_addr,
-                int host_port, struct in_addr guest_addr, 
+                int host_port, struct in_addr guest_addr,
                 int guest_port, const uint8_t *);
 int slirp_add_exec(PNATState pData, int do_pty, const char *args, int addr_low_byte,

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

@@ -34 +34 @@
      * Find a nice value for msize
      */
-    msize = (if_mtu>if_mru ? if_mtu : if_mru) 
+    msize = (if_mtu>if_mru ? if_mtu : if_mru)
           + sizeof(struct m_hdr) + sizeof(void *)   /*pointer to the backstore*/
           + if_maxlinkhdr ;
@@ -244 +244 @@
         else
         {
-            if (   (char *)dat >=  m->m_dat 
+            if (   (char *)dat >=  m->m_dat
                 && (char *)dat <  (m->m_dat + m->m_size))
                 return m;

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

@@ -117 +117 @@
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
 #define ITEM_MAGIC 0xdead0001
-struct item 
+struct item
 {
     uint32_t magic;
@@ -146 +146 @@
 
 
-static void *slirp_uma_alloc(uma_zone_t zone, 
+static void *slirp_uma_alloc(uma_zone_t zone,
     int size, uint8_t *pflags, int wait)
 {
@@ -155 +155 @@
     {
         /*
-         * @todo (r=vvl) here should be some 
-         * accounting of extra items in case 
+         * @todo (r=vvl) here should be some
+         * accounting of extra items in case
          * breakthrough barrier
          */
         if (LIST_EMPTY(&zone->free_items))
-            return NULL; 
+            return NULL;
         it = LIST_FIRST(&zone->free_items);
-        LIST_REMOVE(it, list); 
+        LIST_REMOVE(it, list);
         LIST_INSERT_HEAD(&zone->used_items, it, list);
         goto allocated;
@@ -188 +188 @@
     struct item *it;
     uma_zone_t zone;
-    Assert(item); 
+    Assert(item);
     it = &((struct item *)item)[-1];
     Assert(it->magic == ITEM_MAGIC);
     zone = it->zone;
     Assert(zone->magic == ZONE_MAGIC);
-    LIST_REMOVE(it, list); 
+    LIST_REMOVE(it, list);
     LIST_INSERT_HEAD(&zone->free_items, it, list);
 }
 
-uma_zone_t uma_zcreate(PNATState pData, char *name, size_t size, 
+uma_zone_t uma_zcreate(PNATState pData, char *name, size_t size,
     ctor_t ctor, dtor_t dtor, zinit_t init, zfini_t fini, int flags1, int flags2)
 {
@@ -213 +213 @@
     zone->pfFree = slirp_uma_free;
     return zone;
-    
-}
-uma_zone_t uma_zsecond_create(char *name, ctor_t ctor, 
+
+}
+uma_zone_t uma_zsecond_create(char *name, ctor_t ctor,
     dtor_t dtor, zinit_t init, zfini_t fini, uma_zone_t master)
 {
     uma_zone_t zone;
 #if 0
-    if (master->pfAlloc != NULL) 
+    if (master->pfAlloc != NULL)
         zone = (uma_zone_t)master->pfAlloc(master, sizeof(struct uma_zone), NULL, 0);
-#endif        
+#endif
     zone = RTMemAllocZ(sizeof(struct uma_zone));
-    if (zone == NULL) 
+    if (zone == NULL)
     {
         return NULL;
@@ -247 +247 @@
 void uma_zone_set_allocf(uma_zone_t zone, uma_alloc_t pfAlloc)
 {
-   zone->pfAlloc = pfAlloc; 
+   zone->pfAlloc = pfAlloc;
 }
 void uma_zone_set_freef(uma_zone_t zone, uma_free_t pfFree)
 {
-   zone->pfFree = pfFree; 
+   zone->pfFree = pfFree;
 }
 
 uint32_t *uma_find_refcnt(uma_zone_t zone, void *mem)
 {
-    /*@todo (r-vvl) this function supposed to work with special zone storing 
-    reference counters */ 
+    /*@todo (r-vvl) this function supposed to work with special zone storing
+    reference counters */
     struct item *it = (struct item *)mem; /* 1st element */
     Assert(zone->magic == ZONE_MAGIC);
@@ -288 +288 @@
         return;
     Assert((mem));
-    it = &((struct item *)mem)[-1]; 
+    it = &((struct item *)mem)[-1];
     if (it->magic != ITEM_MAGIC)
     {
@@ -296 +296 @@
     }
     Assert((zone->magic == ZONE_MAGIC && zone == it->zone));
-     
+
     if (zone->pfDtor)
         zone->pfDtor(zone->pData, mem, zone->size, flags);
@@ -307 +307 @@
 void zone_drain(uma_zone_t zone)
 {
-    
 }
 

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

@@ -92 +92 @@
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF
     if (m->m_len <= 0)
-#else 
+#else
     mlen = m_length(m, NULL);
     if (mlen <= 0)
@@ -127 +127 @@
         ret = 0;
         goto no_sent;
-    }    
+    }
     m_copydata(m, 0, mlen, buf);
     if(!so->so_rcv.sb_cc)

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

@@ -274 +274 @@
                 return VERR_NO_MEMORY;
             }
-            LogRel(("NAT: adding %R[IP4] to DNS server list\n", 
+            LogRel(("NAT: adding %R[IP4] to DNS server list\n",
                     &((struct sockaddr_in *)saddr)->sin_addr));
-            if ((((  struct sockaddr_in *)saddr)->sin_addr.s_addr & htonl(IN_CLASSA_NET)) == 
+            if ((((  struct sockaddr_in *)saddr)->sin_addr.s_addr & htonl(IN_CLASSA_NET)) ==
                      ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
                 da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
@@ -341 +341 @@
     char *pu8Buf = (char *)pvBuf;
     *pcbRead = 0;
-    while(   RT_SUCCESS(rc = RTFileRead(File, &bTest, 1, &cbRead)) 
+    while(   RT_SUCCESS(rc = RTFileRead(File, &bTest, 1, &cbRead))
           && (pu8Buf - (char *)pvBuf) < cbBufSize)
     {
@@ -549 +549 @@
     {
         LogRel(("NAT: DHCP server initialization was failed\n"));
-        return VINF_NAT_DNS; 
+        return VINF_NAT_DNS;
     }
     debug_init();
@@ -684 +684 @@
     if (pData->use_host_resolver)
         dns_alias_unload(pData);
-    while(!LIST_EMPTY(&instancehead)) 
+    while(!LIST_EMPTY(&instancehead))
     {
         struct libalias *la = LIST_FIRST(&instancehead);
@@ -690 +690 @@
         LibAliasUninit(la);
     }
-    while(!LIST_EMPTY(&pData->arp_cache)) 
+    while(!LIST_EMPTY(&pData->arp_cache))
     {
         struct arp_cache_entry *ac = LIST_FIRST(&pData->arp_cache);
@@ -1439 +1439 @@
                 &&  memcmp(eh->h_dest, broadcast_ethaddr, ETH_ALEN) == 0)
             {
-                /* we've received anounce about address asignment 
+                /* we've received anounce about address asignment
                  * Let's do ARP cache update
                  */
-                if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]) == 0) 
+                if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]) == 0)
                 {
                     m_free(pData, mr);
@@ -1448 +1448 @@
                     break;
                 }
-                slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]);     
+                slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]);
                 /* good opportunity to activate port-forwarding on address (self)asignment*/
                 activate_port_forwarding(pData, eh);
@@ -1463 +1463 @@
             /*after/save restore we need up port forwarding again*/
             if (pData->port_forwarding_activated == 0)
-                activate_port_forwarding(pData, eh); 
+                activate_port_forwarding(pData, eh);
             m_free(pData, m);
         }
@@ -1504 +1504 @@
     {
         size = MCLBYTES;
-    } 
+    }
     else if (pkt_len < MCLBYTES)
     {
@@ -1898 +1898 @@
         Log2(("NAT: DNS proxy switched %s\n", (fDNSProxy ? "on" : "off")));
         pData->use_dns_proxy = fDNSProxy;
-    } 
+    }
     else
     {
@@ -2032 +2032 @@
 }
 
-/* updates the arp cache 
+/* updates the arp cache
  * @returns 0 - if has found and updated
  *          1 - if hasn't found.
@@ -2072 +2072 @@
         mtu = 1500;
     }
-    if_mtu = 
+    if_mtu =
     if_mru = mtu;
 }

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

@@ -383 +383 @@
 
 # define strncasecmp RTStrNICmp
-# define stderr NULL 
-# define stdout NULL 
+# define stderr NULL
+# define stdout NULL
 
 # ifdef DEBUG
@@ -395 +395 @@
 
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
-/* @todo might be useful to make it configurable, 
+/* @todo might be useful to make it configurable,
  * especially in terms of Intnet behind NAT
  */
-# define maxusers 32 
+# define maxusers 32
 # define max_protohdr 0
 /* @todo (r=vvl) for now ignore value,
@@ -416 +416 @@
     void *newptr;
 };
-  
+
 #define SYSCTL_HANDLER_ARGS PNATState pData, void *oidp, struct dummy_req *req
 

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

@@ -38 +38 @@
 
 /*
- * ARP cache this is naive implementaion of ARP 
- * cache of mapping 4 byte IPv4 address to 6 byte 
+ * ARP cache this is naive implementaion of ARP
+ * cache of mapping 4 byte IPv4 address to 6 byte
  * ethernet one.
  */
@@ -228 +228 @@
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
 # ifdef zone_mbuf
-#  undef zone_mbuf 
+#  undef zone_mbuf
 # endif
     uma_zone_t zone_mbuf;
@@ -261 +261 @@
     uma_zone_t zone_ext_refcnt;
 #endif
-    int use_host_resolver; 
+    int use_host_resolver;
     /* from dnsproxy/dnsproxy.h*/
     unsigned int authoritative_port;

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

@@ -62 +62 @@
 
     so = (struct socket *)RTMemAllocZ(sizeof(struct socket));
-    if(so)
+    if (so)
     {
         so->so_state = SS_NOFDREF;
@@ -91 +91 @@
         m_free(pData, so->so_m);
 #ifndef VBOX_WITH_SLIRP_MT
-    if(so->so_next && so->so_prev)
+    if (so->so_next && so->so_prev)
     {
         remque(pData, so);  /* crashes if so is not in a queue */
@@ -167 +167 @@
             iov[1].iov_base = sb->sb_data;
             iov[1].iov_len = sb->sb_rptr - sb->sb_data;
-            if(iov[1].iov_len > len)
+            if (iov[1].iov_len > len)
                 iov[1].iov_len = len;
             total = iov[0].iov_len + iov[1].iov_len;
@@ -224 +224 @@
         }
 #endif
-        if (nn < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+        if (   nn < 0
+            && (   errno == EINTR
+                || errno == EAGAIN
+                || errno == EWOULDBLOCK))
         {
             SOCKET_UNLOCK(so);
@@ -272 +275 @@
             nn += ret;
         STAM_STATS(
-            if(ret > 0)
+            if (ret > 0)
             {
                 STAM_COUNTER_INC(&pData->StatIORead_in_2);
@@ -482 +485 @@
 #endif
     /* This should never happen, but people tell me it does *shrug* */
-    if (nn < 0 && (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK))
+    if (   nn < 0
+        && (   errno == EAGAIN
+            || errno == EINTR
+            || errno == EWOULDBLOCK))
     {
         SOCKET_UNLOCK(so);
@@ -569 +575 @@
         int size;
 #endif
-            int rc = 0;
+        int rc = 0;
         static int signaled = 0;
 
@@ -593 +599 @@
         {
             rc = ioctlsocket(so->s, FIONREAD, &n);
-            if (   (rc == -1)
-                && (errno == EAGAIN
+            if (   rc == -1
+                && (  errno == EAGAIN
                    || errno == EWOULDBLOCK
                    || errno == EINPROGRESS
@@ -608 +614 @@
                 m_free(pData, m);
                 return;
-            } 
+            }
 
             if (rc > 0 && n > len)
@@ -629 +635 @@
         */
         rc = ioctlsocket(so->s, FIONREAD, &n);
-        
         if (rc == -1 && signaled == 0)
         {
             LogRel(("NAT: can't fetch amount of bytes on socket %R[natsock], so message will be truncated.\n", so));
             signaled = 1;
-        } 
+        }
 
         len = sizeof(struct udpiphdr) + ETH_HLEN;
         len += n;
-        
+
         if (len < MSIZE)
         {
             size = MCLBYTES;
-        } 
+        }
         else if (len < MCLBYTES)
         {
             size = MCLBYTES;
         }
-        else if(len < MJUM9BYTES)
+        else if (len < MJUM9BYTES)
         {
             size = MJUM9BYTES;
@@ -660 +665 @@
         }
         m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
-        m->m_data += ETH_HLEN; 
+        m->m_data += ETH_HLEN;
         m->m_pkthdr.header = mtod(m, void *);
-        m->m_data += sizeof(struct udpiphdr); 
+        m->m_data += sizeof(struct udpiphdr);
         ret = recvfrom(so->s, mtod(m, char *), n, 0,
                             (struct sockaddr *)&addr, &addrlen);
@@ -668 +673 @@
 #endif
         m->m_len = ret;
-        if(ret < 0)
+        if (ret < 0)
         {
             u_char code = ICMP_UNREACH_PORT;
@@ -674 +679 @@
             if (errno == EHOSTUNREACH)
                 code = ICMP_UNREACH_HOST;
-            else if(errno == ENETUNREACH)
+            else if (errno == ENETUNREACH)
                 code = ICMP_UNREACH_NET;
 
@@ -750 +755 @@
     DEBUG_ARG("so = %lx", (long)so);
     DEBUG_ARG("m = %lx", (long)m);
-    
+
     memset(&addr, 0, sizeof(struct sockaddr));
 #ifdef RT_OS_DARWIN
@@ -1271 +1276 @@
     int rc = 0;
     static int signalled = 0;
+
     rc = ioctlsocket(so->s, FIONREAD, &len);
-    if (   rc == -1 
-        && (errno == EAGAIN
-        || errno == EWOULDBLOCK
-        || errno == EINPROGRESS
-        || errno == ENOTCONN))
+    if (   rc == -1
+        && (   errno == EAGAIN
+            || errno == EWOULDBLOCK
+            || errno == EINPROGRESS
+            || errno == ENOTCONN))
     {
         return;
@@ -1296 +1302 @@
     {
         u_char code;
-        if (   len == -1 
+        if (   len == -1
             && (errno == EAGAIN
             || errno == EWOULDBLOCK
@@ -1308 +1314 @@
         if (errno == EHOSTUNREACH)
             code = ICMP_UNREACH_HOST;
-        else if(errno == ENETUNREACH)
+        else if (errno == ENETUNREACH)
             code = ICMP_UNREACH_NET;
 

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

@@ -75 +75 @@
 #else /* !RT_OS_WINDOWS */
     /*
-     * FD_CLOSE event has been occurred on socket 
+     * FD_CLOSE event has been occurred on socket
      */
-    int so_close; 
+    int so_close;
 #endif /* RT_OS_WINDOWS */
 
@@ -85 +85 @@
 #ifdef VBOX_WITH_NAT_SERVICE
     /* storage of source ether address */
-    unsigned char so_ethaddr[6]; 
+    unsigned char so_ethaddr[6];
 #endif
     /* required for port-forwarding */

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

@@ -216 +216 @@
          * TCP_MAXWIN << tp->rcv_scale.
          */
-        long adv = min(win, 
-                       (long)TCP_MAXWIN << tp->rcv_scale) - 
+        long adv = min(win,
+                       (long)TCP_MAXWIN << tp->rcv_scale) -
                        (tp->rcv_adv - tp->rcv_nxt);
 
@@ -378 +378 @@
         {
             size = MCLBYTES;
-        } 
+        }
         else if ((len + hdrlen + ETH_HLEN) < MCLBYTES)
         {
@@ -460 +460 @@
         {
             size = MCLBYTES;
-        } 
+        }
         else if ((hdrlen + ETH_HLEN) < MCLBYTES)
         {
@@ -574 +574 @@
      * the retransmit.  In persist state, just set snd_max.
      */
-    if (tp->t_force == 0 || tp->t_timer[TCPT_PERSIST] == 0) 
+    if (tp->t_force == 0 || tp->t_timer[TCPT_PERSIST] == 0)
     {
         tcp_seq startseq = tp->snd_nxt;

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

@@ -447 +447 @@
     socklen_t addrlen = sizeof(struct sockaddr_in);
     struct tcpcb *tp;
-    int s, opt; 
+    int s, opt;
     int status;
     socklen_t optlen;

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

@@ -86 +86 @@
         return;
     QSOCKET_FOREACH(ip, ipnxt, tcp)
-    /* { */ 
+    /* { */
         ipnxt = ip->so_next;
         tp = sototcpcb(ip);

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

@@ -187 +187 @@
     nobytes = 2;
 
-    m->m_len = sizeof(struct tftp_t) 
+    m->m_len = sizeof(struct tftp_t)
              - 514
-             + 3 
+             + 3
              + strlen(msg)
-             - sizeof(struct ip) 
+             - sizeof(struct ip)
              - sizeof(struct udphdr);
 
@@ -242 +242 @@
     }
 
-    m->m_len = sizeof(struct tftp_t) 
-             - (512 - nobytes) 
-             - sizeof(struct ip) 
+    m->m_len = sizeof(struct tftp_t)
+             - (512 - nobytes)
+             - sizeof(struct ip)
              - sizeof(struct udphdr);
 

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

@@ -162 +162 @@
     }
 
-    if (   pData->use_host_resolver 
+    if (   pData->use_host_resolver
         && ntohs(uh->uh_dport) == 53
         && CTL_CHECK(ntohl(ip->ip_dst.s_addr), CTL_DNS))
@@ -172 +172 @@
         dst.sin_port = uh->uh_sport;
         /* udp_output2 will do opposite operations on mbuf*/
-        
+
         m->m_data += sizeof(struct udpiphdr);
         m->m_len -= sizeof(struct udpiphdr);
@@ -260 +260 @@
     if (   pData->use_dns_proxy
         && (ip->ip_dst.s_addr == htonl(ntohl(special_addr.s_addr) | CTL_DNS))
-        && (ntohs(uh->uh_dport) == 53)) 
+        && (ntohs(uh->uh_dport) == 53))
     {
         dnsproxy_query(pData, so, m, iphlen);
@@ -287 +287 @@
         m->m_data -= iphlen;
         *ip = save_ip;
-        DEBUG_MISC((dfd,"NAT: UDP tx errno = %d-%s (on sent to %R[IP4])\n", errno, 
+        DEBUG_MISC((dfd,"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*/
-        so->so_m = NULL; 
+        so->so_m = NULL;
     }
 
@@ -306 +306 @@
 
 bad:
-    Log2(("NAT: UDP(id: %hd) datagram to %R[IP4] with size(%d) claimed as bad\n", 
+    Log2(("NAT: UDP(id: %hd) datagram to %R[IP4] with size(%d) claimed as bad\n",
         ip->ip_id, &ip->ip_dst, ip->ip_len));
-done: 
+done:
     /* some services like bootp(built-in), dns(buildt-in) and dhcp don't need sockets
-     * and create new m'buffers to send them to guest, so we'll free their incomming 
-     * buffers here. 
+     * and create new m'buffers to send them to guest, so we'll free their incomming
+     * buffers here.
      */
     m_freem(pData, m);
@@ -343 +343 @@
     memset(ui->ui_x1, 0, 9);
     ui->ui_pr = IPPROTO_UDP;
-    ui->ui_len = htons(m->m_len - sizeof(struct ip)); 
+    ui->ui_len = htons(m->m_len - sizeof(struct ip));
     /* XXXXX Check for from-one-location sockets, or from-any-location sockets */
     ui->ui_src = saddr->sin_addr;