Changeset 20716 in vbox

Timestamp:

Jun 19, 2009 12:00:41 PM (16 years ago)

Author:

vboxsync

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

48829

Message:

DrvNAT: nit picking

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (13 diffs)

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

@@ -43 +43 @@
 # include <fcntl.h>
 # include <poll.h>
-#endif
-#include <errno.h>
+# include <errno.h>
+#endif
 #include <iprt/semaphore.h>
 #include <iprt/req.h>
@@ -140 +140 @@
 }
 
+
 /**
  * Send data to the network.
@@ -218 +219 @@
 }
 
+
 /**
  * Worker function for drvNATNotifyLinkChanged().
@@ -243 +245 @@
     }
 }
+
 
 /**
@@ -418 +421 @@
 }
 
- /**
- *  Unblock the send thread so it can respond to a state change.
- *
- *  @returns VBox status code.
- *  @param   pDevIns     The pcnet device instance.
- *  @param   pThread     The send thread.
+
+/**
+ * Unblock the send thread so it can respond to a state change.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns     The pcnet device instance.
+ * @param   pThread     The send thread.
  */
 static DECLCALLBACK(int) drvNATAsyncIoWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
@@ -442 +446 @@
 
 #ifdef VBOX_WITH_SLIRP_MT
+
 static DECLCALLBACK(int) drvNATAsyncIoGuest(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
@@ -454 +459 @@
 }
 
+
 static DECLCALLBACK(int) drvNATAsyncIoGuestWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
@@ -460 +466 @@
     return VINF_SUCCESS;
 }
+
 #endif /* VBOX_WITH_SLIRP_MT */
-
 
 /**
@@ -513 +519 @@
     RTMemFree((void *)pu8Buf);
 }
+
 
 /**
@@ -551 +558 @@
 }
 
+
 /**
  * Queries an interface to the driver.
@@ -577 +585 @@
 
 /**
- * Destruct a driver instance.
- *
- * Most VM resources are freed by the VM. This callback is provided so that any non-VM
- * resources can be freed correctly.
- *
- * @param   pDrvIns     The driver instance data.
- */
-static DECLCALLBACK(void) drvNATDestruct(PPDMDRVINS pDrvIns)
+ * Get the MAC address into the slirp stack.
+ *
+ * Called by drvNATLoadDone and drvNATPowerOn.
+ */
+static void drvNATSetMac(PDRVNAT pThis)
+{
+    if (pThis->pConfig)
+    {
+        RTMAC Mac;
+        pThis->pConfig->pfnGetMac(pThis->pConfig, &Mac);
+        slirp_set_ethaddr(pThis->pNATState, Mac.au8);
+    }
+}
+
+
+/**
+ * After loading we have to pass the MAC address of the ethernet device to the slirp stack.
+ * Otherwise the guest is not reachable until it performs a DHCP request or an ARP request
+ * (usually done during guest boot).
+ */
+static DECLCALLBACK(int) drvNATLoadDone(PPDMDRVINS pDrvIns, PSSMHANDLE pSSMHandle)
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-
-    LogFlow(("drvNATDestruct:\n"));
-
-    slirp_term(pThis->pNATState);
-    slirp_deregister_statistics(pThis->pNATState, pDrvIns);
-    pThis->pNATState = NULL;
-#ifdef VBOX_WITH_STATISTICS
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktSent);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktDropped);
-#endif
+    drvNATSetMac(pThis);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Some guests might not use DHCP to retrieve an IP but use a static IP.
+ */
+static DECLCALLBACK(void) drvNATPowerOn(PPDMDRVINS pDrvIns)
+{
+    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+    drvNATSetMac(pThis);
 }
 
@@ -680 +703 @@
 }
 
-/**
- * Get the MAC address into the slirp stack.
- */
-static void drvNATSetMac(PDRVNAT pThis)
-{
-    if (pThis->pConfig)
-    {
-        RTMAC Mac;
-        pThis->pConfig->pfnGetMac(pThis->pConfig, &Mac);
-        slirp_set_ethaddr(pThis->pNATState, Mac.au8);
-    }
-}
-
-
-/**
- * After loading we have to pass the MAC address of the ethernet device to the slirp stack.
- * Otherwise the guest is not reachable until it performs a DHCP request or an ARP request
- * (usually done during guest boot).
- */
-static DECLCALLBACK(int) drvNATLoadDone(PPDMDRVINS pDrvIns, PSSMHANDLE pSSMHandle)
+
+/**
+ * Destruct a driver instance.
+ *
+ * Most VM resources are freed by the VM. This callback is provided so that any non-VM
+ * resources can be freed correctly.
+ *
+ * @param   pDrvIns     The driver instance data.
+ */
+static DECLCALLBACK(void) drvNATDestruct(PPDMDRVINS pDrvIns)
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    drvNATSetMac(pThis);
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Some guests might not use DHCP to retrieve an IP but use a static IP.
- */
-static DECLCALLBACK(void) drvNATPowerOn(PPDMDRVINS pDrvIns)
-{
-    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    drvNATSetMac(pThis);
+
+    LogFlow(("drvNATDestruct:\n"));
+
+    slirp_term(pThis->pNATState);
+    slirp_deregister_statistics(pThis->pNATState, pDrvIns);
+    pThis->pNATState = NULL;
+#ifdef VBOX_WITH_STATISTICS
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktSent);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktDropped);
+#endif
 }
 
@@ -955 +966 @@
     NULL
 };
+