Changeset 87375 in vbox

Timestamp:

Jan 22, 2021 6:26:45 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: In various callback functions consistently use the callback
cookie to access the VBoxNetLwipNAT object - not the wild and
confusing mixture of both the cookie and the global singleton
variable. Consistently call it "self". No functional change
intended.

File:

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

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

@@ -425 +425 @@
 {
     AssertPtrReturnVoid(arg);
-    VBoxNetLwipNAT *pNat = static_cast<VBoxNetLwipNAT *>(arg);
+    VBoxNetLwipNAT *self = static_cast<VBoxNetLwipNAT *>(arg);
 
     HRESULT hrc = com::Initialize();
@@ -438 +438 @@
     /* lwip thread */
     RTNETADDRIPV4 network;
-    RTNETADDRIPV4 address = g_pLwipNat->getIpv4Address();
-    RTNETADDRIPV4 netmask = g_pLwipNat->getIpv4Netmask();
+    RTNETADDRIPV4 address = self->getIpv4Address();
+    RTNETADDRIPV4 netmask = self->getIpv4Netmask();
     network.u = address.u & netmask.u;
 
@@ -448 +448 @@
     memcpy(&LwipIpNetwork, &network, sizeof(ip_addr));
 
-    netif *pNetif = netif_add(&g_pLwipNat->m_LwipNetIf /* Lwip Interface */,
+    netif *pNetif = netif_add(&self->m_LwipNetIf /* Lwip Interface */,
                               &LwipIpAddr /* IP address*/,
                               &LwipIpNetMask /* Network mask */,
                               &LwipIpAddr /* gateway address, @todo: is self IP acceptable? */,
-                              g_pLwipNat /* state */,
+                              self /* state */,
                               VBoxNetLwipNAT::netifInit /* netif_init_fn */,
                               tcpip_input /* netif_input_fn */);
@@ -475 +475 @@
     netif_set_link_up(pNetif);
 
-    if (pNat->m_ProxyOptions.ipv6_enabled) {
+    if (self->m_ProxyOptions.ipv6_enabled) {
         /*
          * XXX: lwIP currently only ever calls mld6_joingroup() in
@@ -508 +508 @@
     }
 
-    proxy_init(&g_pLwipNat->m_LwipNetIf, &g_pLwipNat->m_ProxyOptions);
-
-    natServiceProcessRegisteredPf(g_pLwipNat->m_vecPortForwardRule4);
-    natServiceProcessRegisteredPf(g_pLwipNat->m_vecPortForwardRule6);
+    proxy_init(&self->m_LwipNetIf, &self->m_ProxyOptions);
+
+    natServiceProcessRegisteredPf(self->m_vecPortForwardRule4);
+    natServiceProcessRegisteredPf(self->m_vecPortForwardRule6);
 }
 
@@ -518 +518 @@
 {
     AssertPtrReturnVoid(arg);
+    VBoxNetLwipNAT *self = static_cast<VBoxNetLwipNAT *>(arg);
 
     /* XXX: proxy finalization */
-    netif_set_link_down(&g_pLwipNat->m_LwipNetIf);
-    netif_set_down(&g_pLwipNat->m_LwipNetIf);
-    netif_remove(&g_pLwipNat->m_LwipNetIf);
+    netif_set_link_down(&self->m_LwipNetIf);
+    netif_set_down(&self->m_LwipNetIf);
+    netif_remove(&self->m_LwipNetIf);
 
 }
@@ -535 +536 @@
     AssertPtrReturn(pNetif, ERR_ARG);
 
-    VBoxNetLwipNAT *pNat = static_cast<VBoxNetLwipNAT *>(pNetif->state);
-    AssertPtrReturn(pNat, ERR_ARG);
+    VBoxNetLwipNAT *self = static_cast<VBoxNetLwipNAT *>(pNetif->state);
+    AssertPtrReturn(self, ERR_ARG);
 
     LogFlowFunc(("ENTER: pNetif[%c%c%d]\n", pNetif->name[0], pNetif->name[1], pNetif->num));
@@ -545 +546 @@
 
     pNetif->hwaddr_len = sizeof(RTMAC);
-    RTMAC mac = g_pLwipNat->getMacAddress();
+    RTMAC mac = self->getMacAddress();
     memcpy(pNetif->hwaddr, &mac, sizeof(RTMAC));
 
-    pNat->m_u16Mtu = 1500; // XXX: FIXME
-    pNetif->mtu = pNat->m_u16Mtu;
+    self->m_u16Mtu = 1500; // XXX: FIXME
+    pNetif->mtu = self->m_u16Mtu;
 
     pNetif->flags = NETIF_FLAG_BROADCAST
@@ -558 +559 @@
     pNetif->output = etharp_output;       /* ip-pipe */
 
-    if (pNat->m_ProxyOptions.ipv6_enabled) {
+    if (self->m_ProxyOptions.ipv6_enabled) {
         pNetif->output_ip6 = ethip6_output;
 
@@ -945 +946 @@
     /* end of COM initialization */
 
-    rc = g_pLwipNat->tryGoOnline();
+    rc = tryGoOnline();
     if (RT_FAILURE(rc))
         return rc;