Changeset 49567 in vbox

Timestamp:

Nov 20, 2013 8:52:10 AM (11 years ago)

Author:

vboxsync

Message:

DHCP/NetworkManager: visibility (ack,nak, offer4Client) from public to private.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.cpp (modified) (2 diffs)
• Config.h (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/Config.cpp

@@ -698 +698 @@
 
 
+const RTNETADDRIPV4& NetworkManager::getOurAddress() const
+{
+    return m->m_OurAddress;
+}
+
+
+const RTNETADDRIPV4& NetworkManager::getOurNetmask() const
+{
+    return m->m_OurNetmask;
+}
+
+
+const RTMAC& NetworkManager::getOurMac() const
+{
+    return m->m_OurMac;
+}
+
+
+void NetworkManager::setOurAddress(const RTNETADDRIPV4& aAddress)
+{
+    m->m_OurAddress = aAddress;
+}
+
+
+void NetworkManager::setOurNetmask(const RTNETADDRIPV4& aNetmask)
+{
+    m->m_OurNetmask = aNetmask;
+}
+
+
+void NetworkManager::setOurMac(const RTMAC& aMac)
+{
+    m->m_OurMac = aMac;
+}
+
+
+void NetworkManager::setSession(PSUPDRVSESSION aSession)
+{
+    m->m_pSession = aSession;
+}
+
+
+void NetworkManager::setInterface(INTNETIFHANDLE aIf)
+{
+    m->m_hIf = aIf;
+}
+
+
+void NetworkManager::setRingBuffer(PINTNETBUF aBuf)
+{
+    m->m_pIfBuf = aBuf;
+}
 /**
  * Network manager creates DHCPOFFER datagramm
@@ -824 +876 @@
 
     return doReply(client, extra);
-}
-
-
-const RTNETADDRIPV4& NetworkManager::getOurAddress() const
-{
-    return m->m_OurAddress;
-}
-
-
-const RTNETADDRIPV4& NetworkManager::getOurNetmask() const
-{
-    return m->m_OurNetmask;
-}
-
-
-const RTMAC& NetworkManager::getOurMac() const
-{
-    return m->m_OurMac;
-}
-
-
-void NetworkManager::setOurAddress(const RTNETADDRIPV4& aAddress)
-{
-    m->m_OurAddress = aAddress;
-}
-
-
-void NetworkManager::setOurNetmask(const RTNETADDRIPV4& aNetmask)
-{
-    m->m_OurNetmask = aNetmask;
-}
-
-
-void NetworkManager::setOurMac(const RTMAC& aMac)
-{
-    m->m_OurMac = aMac;
-}
-
-
-void NetworkManager::setSession(PSUPDRVSESSION aSession)
-{
-    m->m_pSession = aSession;
-}
-
-
-void NetworkManager::setInterface(INTNETIFHANDLE aIf)
-{
-    m->m_hIf = aIf;
-}
-
-
-void NetworkManager::setRingBuffer(PINTNETBUF aBuf)
-{
-    m->m_pIfBuf = aBuf;
 }
 

trunk/src/VBox/NetworkServices/DHCP/Config.h

@@ -502 +502 @@
     static NetworkManager *getNetworkManager();
 
-    int offer4Client(const Client& lease, uint32_t u32Xid, uint8_t *pu8ReqList, int cReqList);
-    int ack(const Client& lease, uint32_t u32Xid, uint8_t *pu8ReqList, int cReqList);
-    int nak(const Client& lease, uint32_t u32Xid);
-
     const RTNETADDRIPV4& getOurAddress() const;
     const RTNETADDRIPV4& getOurNetmask() const;
@@ -525 +521 @@
     NetworkManager();
     ~NetworkManager();
+
+    int offer4Client(const Client& lease, uint32_t u32Xid, uint8_t *pu8ReqList, int cReqList);
+    int ack(const Client& lease, uint32_t u32Xid, uint8_t *pu8ReqList, int cReqList);
+    int nak(const Client& lease, uint32_t u32Xid);
 
     int prepareReplyPacket4Client(const Client& client, uint32_t u32Xid);