Changeset 49918 in vbox

Timestamp:

Dec 16, 2013 7:56:51 AM (11 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP: Leases shouldn't cache settings which are could be changed at run-time, e.g. DNS settings.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

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

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

@@ -773 +773 @@
     RT_ZERO(opt);
 
-    std::vector<RawOption> extra(2);
+    std::vector<RawOption> extra;
     opt.u8OptId = RTNET_DHCP_OPT_MSG_TYPE;
     opt.au8RawOpt[0] = RTNET_DHCP_MT_OFFER;
@@ -789 +789 @@
     extra.push_back(opt);
 
-    processParameterReqList(client, pu8ReqList, cReqList);
+    processParameterReqList(client, pu8ReqList, cReqList, extra);
 
     return doReply(client, extra);
@@ -826 +826 @@
     RT_ZERO(opt);
 
-    std::vector<RawOption> extra(2);
+    std::vector<RawOption> extra;
     opt.u8OptId = RTNET_DHCP_OPT_MSG_TYPE;
     opt.au8RawOpt[0] = RTNET_DHCP_MT_ACK;
@@ -841 +841 @@
     extra.push_back(opt);
 
-    processParameterReqList(client, pu8ReqList, cReqList);
+    processParameterReqList(client, pu8ReqList, cReqList, extra);
 
     return doReply(client, extra);
@@ -979 +979 @@
 
 
-int NetworkManager::processParameterReqList(const Client& client, uint8_t *pu8ReqList, int cReqList)
-{
+int NetworkManager::processParameterReqList(const Client& client, const uint8_t *pu8ReqList, 
+                                            int cReqList, std::vector<RawOption>& extra)
+{
+    const Lease l = client.lease();
+    
+    const NetworkConfigEntity *pNetCfg = l.getConfig();
+
     /* request parameter list */
     RawOption opt;
-    int idxParam = 0;
-
-    uint8_t *pReqList = pu8ReqList;
-    
-    const Lease const_l = client.lease();
-    Lease l = Lease(const_l);
-    
-    const NetworkConfigEntity *pNetCfg = l.getConfig();
-
-    for (idxParam = 0; idxParam < cReqList; ++idxParam)
-    {
-
-        bool fIgnore = false;
+    bool fIgnore;
+    uint8_t u8Req;
+    for (int idxParam = 0; idxParam < cReqList; ++idxParam)
+    {
+        fIgnore = false;
         RT_ZERO(opt);
-        opt.u8OptId = pReqList[idxParam];
-
-        switch(pReqList[idxParam])
+        u8Req = opt.u8OptId = pu8ReqList[idxParam];
+
+        switch(u8Req)
         {
             case RTNET_DHCP_OPT_SUBNET_MASK:
@@ -1011 +1008 @@
                 {
                     const Ipv4AddressContainer lst =
-                      g_ConfigurationManager->getAddressList(pReqList[idxParam]);
+                      g_ConfigurationManager->getAddressList(u8Req);
                     PRTNETADDRIPV4 pAddresses = (PRTNETADDRIPV4)&opt.au8RawOpt[0];
 
@@ -1029 +1026 @@
             case RTNET_DHCP_OPT_DOMAIN_NAME:
                 {
-                    std::string domainName = g_ConfigurationManager->getString(pReqList[idxParam]);
+                    std::string domainName = g_ConfigurationManager->getString(u8Req);
                     if (domainName == g_ConfigurationManager->m_noString)
                     {
@@ -1043 +1040 @@
                 break;
             default:
-                Log(("opt: %d is ignored\n", pReqList[idxParam]));
+                Log(("opt: %d is ignored\n", u8Req));
                 fIgnore = true;
                 break;
@@ -1049 +1046 @@
 
         if (!fIgnore)
-            l.options().insert(std::map<uint8_t, RawOption>::value_type(opt.u8OptId, opt));
+            extra.push_back(opt);
 
     }
@@ -1220 +1217 @@
 
 const MapOptionId2RawOption& Lease::options() const
-{
-    return m->options;
-}
-
-
-MapOptionId2RawOption& Lease::options()
 {
     return m->options;

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

@@ -133 +133 @@
 
     const MapOptionId2RawOption& options() const;
-    MapOptionId2RawOption& options();
 
     bool toXML(xml::ElementNode *) const;
@@ -516 +515 @@
     int prepareReplyPacket4Client(const Client& client, uint32_t u32Xid);
     int doReply(const Client& client, const std::vector<RawOption>& extra);
-    int processParameterReqList(const Client& client, uint8_t *pu8ReqList, int cReqList);
+    int processParameterReqList(const Client& client, const uint8_t *pu8ReqList, int cReqList, std::vector<RawOption>& extra);
 
 private: