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

Timestamp:

Oct 7, 2013 9:41:00 PM (12 years ago)

Author:

vboxsync

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

89644

Message:

Devices: Whitespace and svn:keyword cleanups by scm.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevINIP.cpp (modified) (12 diffs)
• DrvIntNet.cpp (modified) (1 diff)
• DrvNAT.cpp (modified) (1 diff)
• SrvIntNetR0.cpp (modified) (13 diffs)
• slirp/dnsproxy/dnsproxy.c (modified) (13 diffs)
• slirp/slirp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -116 +116 @@
     bool                    fLnkUp;
 #ifndef VBOX_WITH_NEW_LWIP
-    /** 
-     * This hack-flag for spliting initialization logic in devINIPTcpipInitDone, 
+    /**
+     * This hack-flag for spliting initialization logic in devINIPTcpipInitDone,
      * this is the only place when during initialization we can be called from TCPIP
-     * thread. 
+     * thread.
      * This callback used for Initialization and Finalization with old lwip.
      */
@@ -127 +127 @@
      * In callback we're getting status of interface adding operation (TCPIP thread),
      * but we need inform constructing routine whether it was success or not(EMT thread).
-     */ 
+     */
     int rcInitialization;
 } DEVINTNETIP, *PDEVINTNETIP;
@@ -342 +342 @@
 #else
     netif->output = devINIPOutput;
-    
+
     lwip_etharp_init();
     TMTimerSetMillies(g_pDevINIPData->ARPTimer, ARP_TMR_INTERVAL);
@@ -363 +363 @@
         PDMDEV_SET_ERROR(pDevIns, rc,
                          N_("Configuration error: Failed to get the \"IP\" value"));
-        /* @todo: perhaps we should panic if IPv4 address isn't specify, with assumtion that 
-         * ISCSI target specified in IPv6 form.  
+        /* @todo: perhaps we should panic if IPv4 address isn't specify, with assumtion that
+         * ISCSI target specified in IPv6 form.
          */
         return rc;
@@ -490 +490 @@
 /**
  * Signals the end of lwIP TCPIP initialization.
- * 
+ *
  * @note: TCPIP thread, corresponding EMT waiting on semaphore.
  * @param   arg     opaque argument, here the pointer to the PDEVINTNETIP.
@@ -512 +512 @@
         {
             pThis->rcInitialization = VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
-            PDMDEV_SET_ERROR(pThis->pDevIns, 
+            PDMDEV_SET_ERROR(pThis->pDevIns,
                              pThis->rcInitialization,
                              N_("Configuration error: Invalid \"IP\" value"));
@@ -518 +518 @@
         }
         memcpy(&ipaddr, &ip, sizeof(ipaddr));
-        
+
         if (!inet_aton(pThis->pszNetmask, &ip))
         {
             pThis->rcInitialization = VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
-            PDMDEV_SET_ERROR(pThis->pDevIns, 
+            PDMDEV_SET_ERROR(pThis->pDevIns,
                              pThis->rcInitialization,
                              N_("Configuration error: Invalid \"Netmask\" value"));
@@ -534 +534 @@
             {
                 pThis->rcInitialization = VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
-                PDMDEV_SET_ERROR(pThis->pDevIns, 
+                PDMDEV_SET_ERROR(pThis->pDevIns,
                                  pThis->rcInitialization,
                                  N_("Configuration error: Invalid \"Gateway\" value"));
@@ -549 +549 @@
         pThis->IntNetIF.name[0] = 'I';
         pThis->IntNetIF.name[1] = 'N';
-    
+
         ret = netif_add(&pThis->IntNetIF, &ipaddr, &netmask, &gw, NULL,
                         devINIPInterface, lwip_tcpip_input);
@@ -555 +555 @@
         if (!ret)
         {
-           
+
             pThis->rcInitialization = VERR_NET_NO_NETWORK;
-            PDMDEV_SET_ERROR(pThis->pDevIns, 
+            PDMDEV_SET_ERROR(pThis->pDevIns,
                              pThis->rcInitialization,
                              N_("netif_add failed"));
@@ -565 +565 @@
         lwip_netif_set_default(&pThis->IntNetIF);
         lwip_netif_set_up(&pThis->IntNetIF);
-        
+
 #ifndef VBOX_WITH_NEW_LWIP
     }
@@ -581 +581 @@
  * XXX: We do it only for new LWIP, old LWIP will stay broken for now.
  */
-static DECLCALLBACK(void) devINIPTcpipFiniDone(void *arg) 
+static DECLCALLBACK(void) devINIPTcpipFiniDone(void *arg)
 {
     PDEVINTNETIP pThis = (PDEVINTNETIP)arg;

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -1089 +1089 @@
                 Frame.Hdr.DstMac.au16[2] = 0xffff;
                 Frame.Hdr.EtherType      = RT_H2BE_U16_C(0x801e);
-                int rc = pThis->pIAboveConfigR3->pfnGetMac(pThis->pIAboveConfigR3, 
+                int rc = pThis->pIAboveConfigR3->pfnGetMac(pThis->pIAboveConfigR3,
                                                            &Frame.Hdr.SrcMac);
                 if (RT_SUCCESS(rc))
                     rc = drvR3IntNetResumeSend(pThis, &Frame, sizeof(Frame));
                 if (RT_FAILURE(rc))
-                    LogRel(("IntNet#%u: Sending dummy frame failed: %Rrc\n", 
+                    LogRel(("IntNet#%u: Sending dummy frame failed: %Rrc\n",
                             pDrvIns->iInstance, rc));
             }

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1050 +1050 @@
              */
 #ifndef RT_OS_DARWIN
-            pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig, 
+            pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig,
                                                   PDMNETWORKLINKSTATE_DOWN_RESUME);
 #endif

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -1272 +1272 @@
             break;
         case kIntNetAddrType_IPv6:
-            Log(("intnetR0IfAddrCacheAddIt: hIf=%#x MAC=%.6Rhxs IPv6 added #%d %RTnaipv6 %s\n", 
+            Log(("intnetR0IfAddrCacheAddIt: hIf=%#x MAC=%.6Rhxs IPv6 added #%d %RTnaipv6 %s\n",
                  pIf->hIf, &pIf->MacAddr, pCache->cEntries, pAddr->IPv6, pszMsg));
             break;
@@ -2858 +2858 @@
         }
         else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6))
-        { 
+        {
             /*
-             * IPV6 ICMP Neighbor Discovery : replace 
+             * IPV6 ICMP Neighbor Discovery : replace
              * 1) the advertised source mac address in outgoing neighbor sollicitations
              *    with the HW MAC address of the trunk interface,
@@ -2868 +2868 @@
              * Note that this only applies to traffic going out on the trunk. Incoming
              * NS/NA will never advertise any VM mac address, so we do not need to touch
-             * them. Other VMs on this bridge as well as the host will see and use the VM's 
+             * them. Other VMs on this bridge as well as the host will see and use the VM's
              * actual mac addresses.
              *
@@ -2874 +2874 @@
 
             PRTNETIPV6 pIPv6            = (PRTNETIPV6)(pEthHdr + 1);
-            PRTNETNDP pNd               = (PRTNETNDP)(pIPv6 + 1); 
-            PRTNETNDP_SLLA_OPT pLLAOpt  = (PRTNETNDP_SLLA_OPT)(pNd + 1); 
+            PRTNETNDP pNd               = (PRTNETNDP)(pIPv6 + 1);
+            PRTNETNDP_SLLA_OPT pLLAOpt  = (PRTNETNDP_SLLA_OPT)(pNd + 1);
 
             /* make sure we have enough bytes to work with */
@@ -2882 +2882 @@
                pIPv6->ip6_hlim == 0xff &&
                /* protocol has to be icmpv6 */
-                pIPv6->ip6_nxt == RTNETIPV6_PROT_ICMPV6 && 
+                pIPv6->ip6_nxt == RTNETIPV6_PROT_ICMPV6 &&
                /* we either have a sollicitation with source link layer addr. opt, or */
                 ((pNd->icmp6_type == RTNETIPV6_ICMP_NS_TYPE &&
@@ -2900 +2900 @@
                 pNd->icmp6_cksum = computeIPv6FullChecksum(pIPv6);
             }
-            
+
         }
     }
@@ -2933 +2933 @@
  * @param   pNetwork        The network the frame is being sent to.
  * @param   pSG             Pointer to the gather list for the frame.
- * @param   pEthHdr         Pointer to the ethernet header. 
+ * @param   pEthHdr         Pointer to the ethernet header.
  */
 static bool intnetR0NetworkDetectAndFixNdBroadcast(PINTNETNETWORK pNetwork, PINTNETSG pSG, PRTNETETHERHDR pEthHdr)
@@ -2943 +2943 @@
      * using the temporary buffer if necessary.
      */
-    if (RT_UNLIKELY(pSG->cbTotal < sizeof(RTNETETHERHDR) + sizeof(RTNETIPV6) + 
+    if (RT_UNLIKELY(pSG->cbTotal < sizeof(RTNETETHERHDR) + sizeof(RTNETIPV6) +
                                             sizeof(RTNETNDP)))
         return false;
@@ -2998 +2998 @@
  * @param   pNetwork        The network the frame is being sent to.
  * @param   pSG             Pointer to the gather list for the frame.
- * @param   pEthHdr         Pointer to the ethernet header. 
+ * @param   pEthHdr         Pointer to the ethernet header.
  */
 static void intnetR0NetworkSnoopNAFromWire(PINTNETNETWORK pNetwork, PINTNETSG pSG, PRTNETETHERHDR pEthHdr)
@@ -3006 +3006 @@
      * using the temporary buffer if necessary.
      */
-    if (RT_UNLIKELY(pSG->cbTotal < sizeof(RTNETETHERHDR) + sizeof(RTNETIPV6) + 
+    if (RT_UNLIKELY(pSG->cbTotal < sizeof(RTNETETHERHDR) + sizeof(RTNETIPV6) +
                                             sizeof(RTNETNDP)))
         return;
@@ -3037 +3037 @@
         &&  pIPv6->ip6_src.QWords.qw1 == 0)
     {
-        
-        intnetR0NetworkAddrCacheDelete(pNetwork, (PCRTNETADDRU) &pNd->target_address, 
+
+        intnetR0NetworkAddrCacheDelete(pNetwork, (PCRTNETADDRU) &pNd->target_address,
                                         kIntNetAddrType_IPv6, sizeof(RTNETADDRIPV6), "tif/ip6");
     }
@@ -5263 +5263 @@
         case kIntNetTrunkType_WhateverNone:
 #ifdef VBOX_WITH_NAT_SERVICE
-            /* 
+            /*
              * Well, here we don't want load anything special,
-             * just communicate between processes via internal network. 
+             * just communicate between processes via internal network.
              */
         case kIntNetTrunkType_SrvNat:
@@ -5288 +5288 @@
 #endif /* VBOXNETADP_DO_NOT_USE_NETFLT */
             break;
-#ifndef VBOX_WITH_NAT_SERVICE   
+#ifndef VBOX_WITH_NAT_SERVICE
         case kIntNetTrunkType_SrvNat:
             pszName = "VBoxSrvNat";

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

@@ -120 +120 @@
     /* be paranoid */
     AssertPtrReturnVoid(arg);
-    
+
     de = TAILQ_PREV(req->dns_server, dns_list_head, de_list);
-    
+
     if (de == NULL)
     {
@@ -137 +137 @@
         struct mbuf *m = NULL;
         char *data;
-        
+
         m = slirpDnsMbufAlloc(pData);
         if (m == NULL)
@@ -168 +168 @@
 
         /* expiration will be bumped in dnsproxy_query */
-        
+
         dnsproxy_query(pData, so, m, iphlen);
         /* should we free so->so_m ? */
         return;
     }
- 
- socket_clean_up:   
+
+ socket_clean_up:
     /* This socket (so) will be detached, so we need to remove timeout(&_arg) references
-     * before leave 
+     * before leave
      */
     so->so_timeout = NULL;
@@ -309 +309 @@
 #else /* VBOX */
     AssertPtr(pData);
-    
+
     /* m->m_data points to IP header */
 #if 0
@@ -340 +340 @@
 
 
-    req = so->so_timeout_arg; 
+    req = so->so_timeout_arg;
 
     if (!req)
@@ -347 +347 @@
         Assert(!so->so_timeout_arg);
 
-        if ((req = RTMemAllocZ(sizeof(struct request) + byte)) == NULL) 
+        if ((req = RTMemAllocZ(sizeof(struct request) + byte)) == NULL)
         {
             LogRel(("calloc failed\n"));
@@ -382 +382 @@
 
     req->recursion = 0;
-        
+
     DPRINTF(("External query RD=%d\n", RD(buf)));
-        
+
     if (retransmit == 0)
         hash_add_request(pData, req);
@@ -394 +394 @@
     /* let's slirp to care about expiration */
     so->so_expire = curtime + recursive_timeout * 1000;
- 
+
     memset(&addr, 0, sizeof(struct sockaddr_in));
     addr.sin_family = AF_INET;
@@ -408 +408 @@
     /* send it to our authoritative server */
     Log2(("NAT: request will be sent to %RTnaipv4 on %R[natsock]\n", addr.sin_addr, so));
-    
+
     byte = sendto(so->s, buf, (unsigned int)byte, 0,
                   (struct sockaddr *)&addr,
                   sizeof(struct sockaddr_in));
-    if (byte == -1) 
+    if (byte == -1)
     {
         /* XXX: is it really enough? */
@@ -425 +425 @@
     ++authoritative_queries;
 
-# if 0    
-    /* XXX: this stuff for _debugging_ only, 
-     * first enforce guest to send next request 
-     * and second for faster getting timeout callback 
-     * other option is adding couple entries in resolv.conf with 
+# if 0
+    /* XXX: this stuff for _debugging_ only,
+     * first enforce guest to send next request
+     * and second for faster getting timeout callback
+     * other option is adding couple entries in resolv.conf with
      * invalid nameservers.
      *
-     * For testing purposes could be used 
-     * namebench -S -q 10000 -m random or -m chunk 
+     * For testing purposes could be used
+     * namebench -S -q 10000 -m random or -m chunk
      */
     /* RTThreadSleep(3000); */
@@ -497 +497 @@
         LogRel(("sendto failed: %s\n", strerror(errno)));
         ++dropped_answers;
-    } 
+    }
     else
         ++answered_queries;
@@ -509 +509 @@
 
     AssertPtr(pData);
-    
+
     /* XXX: mbuf->data points to ??? */
     byte = m->m_len;
@@ -524 +524 @@
 
     /* find corresponding query */
-    if (query == NULL) 
+    if (query == NULL)
     {
-        /* XXX: if we haven't found anything for this request ... 
+        /* XXX: if we haven't found anything for this request ...
          * What we are expecting later?
          */

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

@@ -354 +354 @@
     /* set default addresses */
     inet_aton("127.0.0.1", &loopback_addr);
-    
+
     if (!fUseHostResolver)
     {
@@ -744 +744 @@
                 if (so->so_timeout != NULL)
                 {
-                    /* so_timeout - might change the so_expire value or 
-                     * drop so_timeout* from so. 
+                    /* so_timeout - might change the so_expire value or
+                     * drop so_timeout* from so.
                      */
                     so->so_timeout(pData, so, so->so_timeout_arg);
-                    /* on 4.2 so->  
+                    /* on 4.2 so->
                      */
                     if (   so_next->so_prev != so /* so_timeout freed the socket */