Changeset 48483 in vbox for trunk

Timestamp:

Sep 16, 2013 6:56:38 AM (12 years ago)

Author:

vboxsync

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

88966

Message:

DHCP/Config.h: clean up. grouping data and functions.

File:

• trunk/src/VBox/NetworkServices/DHCP/Config.h (modified) (14 diffs)

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

@@ -119 +119 @@
 class ANDClientMatchCriteria: ClientMatchCriteria
 {
+public:
+    ANDClientMatchCriteria(ClientMatchCriteria *left, ClientMatchCriteria *right)
+    {
+        m_left = left;
+        m_right = right;
+    }
+
+    virtual bool check(const Client& client) const
+    {
+        return (m_left->check(client) && m_right->check(client));
+    }
+private:
     ClientMatchCriteria* m_left;
     ClientMatchCriteria* m_right;
-    ANDClientMatchCriteria(ClientMatchCriteria *left, ClientMatchCriteria *right)
-    {
-        m_left = left;
-        m_right = right;
-    }
-
+
+};
+
+
+class AnyClientMatchCriteria: public ClientMatchCriteria
+{
+public:
     virtual bool check(const Client& client) const
     {
-        return (m_left->check(client) && m_right->check(client));
-    }
-};
-
-
-class AnyClientMatchCriteria: public ClientMatchCriteria
-{
+        return true;
+    }
+};
+
+
+class MACClientMatchCriteria: public ClientMatchCriteria
+{
+public:
+    MACClientMatchCriteria(const RTMAC& mac):m_mac(mac){}
+
     virtual bool check(const Client& client) const
     {
-        return true;
-    }
-};
-
-
-class MACClientMatchCriteria: public ClientMatchCriteria
-{
-
-    public:
-    MACClientMatchCriteria(const RTMAC& mac):m_mac(mac){}
-
-    virtual bool check(const Client& client) const
-    {
         return (client == m_mac);
     }
-    private:
+private:
     RTMAC m_mac;
 };
@@ -198 +201 @@
     virtual int match(Client& client, BaseConfigEntity **cfg);
     virtual uint32_t expirationPeriod() const = 0;
-    protected:
+
+protected:
     const ClientMatchCriteria *m_criteria;
     int m_MatchLevel;
@@ -220 +224 @@
 class ConfigEntity: public BaseConfigEntity
 {
-    public:
-
+public:
     /* range */
     /* match conditions */
@@ -236 +239 @@
     }
 
-    std::string m_name;
-    const BaseConfigEntity *m_parentCfg;
     virtual uint32_t expirationPeriod() const
     {
@@ -247 +248 @@
 
     /* XXX: private:*/
+    std::string m_name;
+    const BaseConfigEntity *m_parentCfg;
     uint32_t m_u32ExpirationPeriod;
 };
@@ -256 +259 @@
 class NetworkConfigEntity:public ConfigEntity
 {
-    public:
+public:
     /* Address Pool matching with network declaration */
     NetworkConfigEntity(std::string name,
@@ -306 +309 @@
 class HostConfigEntity: public NetworkConfigEntity
 {
-
-    public:
+public:
     HostConfigEntity(const RTNETADDRIPV4& addr,
                      std::string name,
@@ -328 +330 @@
 class RootConfigEntity: public NetworkConfigEntity
 {
-    public:
+public:
     RootConfigEntity(std::string name, uint32_t expirationPeriod);
     virtual ~RootConfigEntity(){};
@@ -343 +345 @@
 class SharedNetworkConfigEntity: public NetworkEntity
 {
-    public:
+public:
     SharedNetworkConfigEntity(){}
     int match(const Client& client) const { return m_criteria.match(client)? 3 : 0;}
@@ -354 +356 @@
 
     std::vector<NetworkConfigEntity> Networks;
-
 };
 #endif
@@ -360 +361 @@
 class ConfigurationManager
 {
-    public:
+public:
     static ConfigurationManager* getConfigurationManager();
     static int extractRequestList(PCRTNETBOOTP pDhcpMsg, size_t cbDhcpMsg, RawOption& rawOpt);
@@ -430 +431 @@
 class NetworkManager
 {
-    public:
+public:
     static NetworkManager *getNetworkManager();
 
@@ -450 +451 @@
     PINTNETBUF m_pIfBuf;
 
-    private:
+private:
+    NetworkManager(){}
+    virtual ~NetworkManager(){}
+
     int prepareReplyPacket4Client(Client *client, uint32_t u32Xid);
     int doReply(Client *client);
@@ -464 +468 @@
     RTNETADDRIPV4 m_OurNetmask;
     RTMAC m_OurMac;
-
-    NetworkManager(){}
-    virtual ~NetworkManager(){}
 };