Changeset 49568 in vbox for trunk/src/VBox/NetworkServices/DHCP

Timestamp:

Nov 20, 2013 8:56:59 AM (11 years ago)

Author:

vboxsync

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

90763

Message:

DHCP: hides implementations requiring internals of ClientData from Client and Lease classes (warning: -Wdelete-incomplete).

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

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

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

@@ -56 +56 @@
 
 static NetworkManager *g_NetworkManager = NetworkManager::getNetworkManager();
+
+bool MACClientMatchCriteria::check(const Client& client) const
+{
+    return (client == m_mac);
+}
+
 
 int BaseConfigEntity::match(Client& client, BaseConfigEntity **cfg)
@@ -508 +514 @@
 
 
+bool ConfigurationManager::isAddressTaken(const RTNETADDRIPV4& addr)
+{
+    Lease ignore;
+    return isAddressTaken(addr, ignore);
+}
+
+
+
 NetworkConfigEntity *ConfigurationManager::addNetwork(NetworkConfigEntity *,
                                     const RTNETADDRIPV4& networkId,

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

@@ -229 +229 @@
     MACClientMatchCriteria(const RTMAC& mac):m_mac(mac){}
 
-    virtual bool check(const Client& client) const
-    {
-        return (client == m_mac);
-    }
+    virtual bool check(const Client& client) const;
 
 private:
@@ -480 +477 @@
     ~ConfigurationManager();
     bool isAddressTaken(const RTNETADDRIPV4& addr, Lease& lease);
-    bool isAddressTaken(const RTNETADDRIPV4& addr)
-    {
-        Lease ignore;
-        return isAddressTaken(addr, ignore);
-    }
+    bool isAddressTaken(const RTNETADDRIPV4& addr);
 
 public: