Changeset 87386 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Jan 22, 2021 11:04:50 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Collect all data members in one place.

File:

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

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

@@ -138 +138 @@
     friend class NATNetworkListener;
 
+    struct proxy_options m_ProxyOptions;
+    struct sockaddr_in m_src4;
+    struct sockaddr_in6 m_src6;
+    /**
+     * place for registered local interfaces.
+     */
+    ip4_lomap m_lo2off[10];
+    ip4_lomap_desc m_loOptDescriptor;
+
+    uint16_t m_u16Mtu;
+    netif m_LwipNetIf;
+
+    /* Our NAT network descriptor in Main */
+    ComPtr<INATNetwork> m_net;
+    ComPtr<IHost> m_host;
+
+    ComNatListenerPtr m_NatListener;
+    ComNatListenerPtr m_VBoxListener;
+    ComNatListenerPtr m_VBoxClientListener;
+
+    /* Only for debug needs, by default NAT service should load rules from SVC
+     * on startup, and then on sync them on events.
+     */
+    bool fDontLoadRulesOnStartup;
+
+    VECNATSERVICEPF m_vecPortForwardRule4;
+    VECNATSERVICEPF m_vecPortForwardRule6;
+
+    static INTNETSEG aXmitSeg[64];
+
+
   public:
     VBoxNetLwipNAT(SOCKET icmpsock4, SOCKET icmpsock6);
@@ -154 +185 @@
     virtual int processUDP(void *, size_t) { return VERR_IGNORED; }
 
-   private:
-    struct proxy_options m_ProxyOptions;
-    struct sockaddr_in m_src4;
-    struct sockaddr_in6 m_src6;
-    /**
-     * place for registered local interfaces.
-     */
-    ip4_lomap m_lo2off[10];
-    ip4_lomap_desc m_loOptDescriptor;
-
-    uint16_t m_u16Mtu;
-    netif m_LwipNetIf;
-
-    /* Our NAT network descriptor in Main */
-    ComPtr<INATNetwork> m_net;
-    ComPtr<IHost> m_host;
-
-    ComNatListenerPtr m_NatListener;
-    ComNatListenerPtr m_VBoxListener;
-    ComNatListenerPtr m_VBoxClientListener;
-    static INTNETSEG aXmitSeg[64];
-
     HRESULT HandleEvent(VBoxEventType_T aEventType, IEvent *pEvent);
 
     const char **getHostNameservers();
 
-    /* Only for debug needs, by default NAT service should load rules from SVC
-     * on startup, and then on sync them on events.
-     */
-    bool fDontLoadRulesOnStartup;
     static DECLCALLBACK(void) onLwipTcpIpInit(void *arg);
     static DECLCALLBACK(void) onLwipTcpIpFini(void *arg);
@@ -189 +194 @@
     static err_t netifLinkoutput(netif *pNetif, pbuf *pBuf) RT_NOTHROW_PROTO;
     /* static int intNetThreadRecv(RTTHREAD, void *); - unused */
-
-    VECNATSERVICEPF m_vecPortForwardRule4;
-    VECNATSERVICEPF m_vecPortForwardRule6;
 
     static int natServicePfRegister(NATSERVICEPORTFORWARDRULE& natServicePf);