Changeset 48461 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Sep 12, 2013 6:14:50 PM (11 years ago)

Author:

vboxsync

Message:

DHCP + lwip_nat: Domain Name passing on demand.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.cpp (modified) (2 diffs)
• Config.h (modified) (1 diff)
• VBoxNetDHCP.cpp (modified) (1 diff)

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

@@ -432 +432 @@
 }
 
+int ConfigurationManager::setString(uint8_t u8OptId, const std::string& str)
+{
+    switch (u8OptId)
+    {
+        case RTNET_DHCP_OPT_DOMAIN_NAME:
+            m_domainName = str;
+            break;
+        default:
+            break;
+    }
+
+    return VINF_SUCCESS;
+}
+
+const std::string& ConfigurationManager::getString(uint8_t u8OptId)
+{
+    switch (u8OptId)
+    {
+        case RTNET_DHCP_OPT_DOMAIN_NAME:
+            if (m_domainName.length())
+                return m_domainName;
+            else
+                return m_noString;
+        default:
+            break;
+    }
+
+    return m_noString;
+}
+
 /**
  * Network manager
@@ -726 +756 @@
                 break;
             case RTNET_DHCP_OPT_DOMAIN_NAME:
+                {
+                    std::string domainName = g_ConfigurationManager->getString(pReqList[idxParam]);
+                    if (domainName == g_ConfigurationManager->m_noString)
+                        break;
+
+                    char *pszDomainName = (char *)&opt.au8RawOpt[0];
+
+                    strcpy(pszDomainName, domainName.c_str());
+                    opt.cbRawOpt = domainName.length();
+                    client->rawOptions.push_back(opt);
+                }
                 break;
             default:

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

@@ -398 +398 @@
     int addToAddressList(uint8_t u8OptId, RTNETADDRIPV4& address);
     int flushAddressList(uint8_t u8OptId);
+    int setString(uint8_t u8OptId, const std::string& str);
+    const std::string& getString(uint8_t u8OptId);
     const Ipv4AddressContainer& getAddressList(uint8_t u8OptId);
 
-    private:
+private:
     ConfigurationManager(){}
     virtual ~ConfigurationManager(){}
-
     bool isAddressTaken(const RTNETADDRIPV4& addr, Lease** ppLease = NULL);
+
+public:
+    /* nulls */
+    const Ipv4AddressContainer m_empty;
+    const std::string    m_noString;
+
+private:
     MapLease2Ip4Address m_allocations;
     /**
      * Here we can store expired Leases to do not re-allocate them latter.
      */
+
     /* XXX: MapLease2Ip4Address m_freed; */
-    /*
-     *
-     */
+    /* XXX: more universal storages are required. */
     Ipv4AddressContainer m_nameservers;
     Ipv4AddressContainer m_routers;
-    Ipv4AddressContainer m_empty;
+
+
+    std::string          m_domainName;
     VecClient m_clients;
 

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

@@ -463 +463 @@
             }
             strs.setNull();
-
-            Bstr domain;
-            if (SUCCEEDED(host->COMGETTER(DomainName)(domain.asOutPutParam())))
-            {
-                /* XXX: todo. */
-            }
 #endif
+            com::Bstr domain;
+            if (SUCCEEDED(host->COMGETTER(DomainName)(domain.asOutParam())))
+                confManager->setString(RTNET_DHCP_OPT_DOMAIN_NAME, std::string(com::Utf8Str(domain).c_str()));
+            
+
         }
     }