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

Timestamp:

Jul 13, 2013 7:53:57 AM (11 years ago)

Author:

vboxsync

Message:

server-id should be sent unconditionally for (DHCPOFFER, DHCPACK, DHCPNAK).

File:

• trunk/src/VBox/NetworkServices/DHCP/Config.cpp (modified) (2 diffs)

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

@@ -513 +513 @@
     client->rawOptions.push_back(opt);
 
-    opt.u8OptId = RTNET_DHCP_OPT_SERVER_ID;
-    ((PRTNETADDRIPV4)opt.au8RawOpt)->u = m_OurAddress.u;
-    opt.cbRawOpt = sizeof(RTNETADDRIPV4);
-    client->rawOptions.push_back(opt);
-
     opt.u8OptId = RTNET_DHCP_OPT_LEASE_TIME;
     *(uint32_t *)opt.au8RawOpt = RT_H2N_U32(ConfigurationManager::getConfigurationManager()->getLeaseTime());
@@ -567 +562 @@
     opt.au8RawOpt[0] = RTNET_DHCP_MT_ACK;
     opt.cbRawOpt = 1;
+    client->rawOptions.push_back(opt);
+
+    opt.u8OptId = RTNET_DHCP_OPT_LEASE_TIME;
+    *(uint32_t *)opt.au8RawOpt = RT_H2N_U32(ConfigurationManager::getConfigurationManager()->getLeaseTime());
+    opt.cbRawOpt = sizeof(RTNETADDRIPV4);
     client->rawOptions.push_back(opt);