Changeset 87790 in vbox

Timestamp:

Feb 18, 2021 4:31:03 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Rename init methods so that related methods share common
prefix. bugref:9929.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (18 diffs)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -191 +191 @@
 
 private:
-    int comInit();
-    int homeInit();
-    int logInit();
-    int ipv4Init();
-    int ipv4LoopbackMapInit();
-    int ipv6Init();
-    int eventsInit();
+    int initCom();
+    int initHome();
+    int initLog();
+    int initIPv4();
+    int initIPv4LoopbackMap();
+    int initIPv6();
+    int initComEvents();
 
     int getExtraData(com::Utf8Str &strValueOut, const char *pcszKey);
@@ -210 +210 @@
     static void reportErrorInfo(const com::ErrorInfo &info);
 
-    void createRawSock4();
-    void createRawSock6();
+    void initIPv4RawSock();
+    void initIPv6RawSock();
 
     static DECLCALLBACK(void) onLwipTcpIpInit(void *arg);
@@ -351 +351 @@
 
     /* Get the COM API set up. */
-    rc = comInit();
+    rc = initCom();
     if (RT_FAILURE(rc))
         return rc;
 
     /* Get the home folder location.  It's ok if it fails. */
-    homeInit();
+    initHome();
 
     /*
@@ -375 +375 @@
      * indeed exists we can create the release log file.
      */
-    logInit();
+    initLog();
 
     // resolver changes are reported on vbox but are retrieved from
@@ -384 +384 @@
 
     /* Get the settings related to IPv4. */
-    rc = ipv4Init();
+    rc = initIPv4();
     if (RT_FAILURE(rc))
         return rc;
 
     /* Get the settings related to IPv6. */
-    rc = ipv6Init();
+    rc = initIPv6();
     if (RT_FAILURE(rc))
         return rc;
-
 
 
@@ -412 +411 @@
     m_ProxyOptions.nameservers = getHostNameservers();
 
-    eventsInit();
+    initComEvents();
     /* end of COM initialization */
 
@@ -441 +440 @@
  * it ourselves and do the refactoring later.
  */
-int VBoxNetLwipNAT::comInit()
+int VBoxNetLwipNAT::initCom()
 {
     HRESULT hrc;
@@ -489 +488 @@
  * and for the TFTP root location.
  */
-int VBoxNetLwipNAT::homeInit()
+int VBoxNetLwipNAT::initHome()
 {
     HRESULT hrc;
@@ -524 +523 @@
  * onLwipTcpIpInit().
  */
-int VBoxNetLwipNAT::ipv4Init()
+int VBoxNetLwipNAT::initIPv4()
 {
     HRESULT hrc;
@@ -590 +589 @@
 
     /* Raw socket for ICMP. */
-    createRawSock4();
+    initIPv4RawSock();
 
 
@@ -616 +615 @@
 
     /* Make host's loopback(s) available from inside the natnet */
-    ipv4LoopbackMapInit();
+    initIPv4LoopbackMap();
 
     return VINF_SUCCESS;
@@ -628 +627 @@
  * caching dns proxy on 127.0.1.1 or 127.0.0.53.
  */
-int VBoxNetLwipNAT::ipv4LoopbackMapInit()
+int VBoxNetLwipNAT::initIPv4LoopbackMap()
 {
     HRESULT hrc;
@@ -740 +739 @@
  * onLwipTcpIpInit().
  */
-int VBoxNetLwipNAT::ipv6Init()
+int VBoxNetLwipNAT::initIPv6()
 {
     HRESULT hrc;
@@ -836 +835 @@
 
     /* Raw socket for ICMP. */
-    createRawSock6();
+    initIPv6RawSock();
 
 
@@ -1006 +1005 @@
  * Create and register API event listeners.
  */
-int VBoxNetLwipNAT::eventsInit()
+int VBoxNetLwipNAT::initComEvents()
 {
     /**
@@ -1045 +1044 @@
  * Create raw IPv4 socket for sending and snooping ICMP.
  */
-void VBoxNetLwipNAT::createRawSock4()
+void VBoxNetLwipNAT::initIPv4RawSock()
 {
     SOCKET icmpsock4 = INVALID_SOCKET;
@@ -1092 +1091 @@
  * Create raw IPv6 socket for sending and snooping ICMP6.
  */
-void VBoxNetLwipNAT::createRawSock6()
+void VBoxNetLwipNAT::initIPv6RawSock()
 {
     SOCKET icmpsock6 = INVALID_SOCKET;
@@ -2007 +2006 @@
  */
 /* static */
-int VBoxNetLwipNAT::logInit()
+int VBoxNetLwipNAT::initLog()
 {
     size_t cch;