Changeset 79763 in vbox for trunk/src/VBox/NetworkServices/Dhcpd

Timestamp:

Jul 14, 2019 3:59:56 AM (6 years ago)

Author:

vboxsync

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

132128

Message:

Main/DHCPServer,Dhcpd,VBoxManage: Added --log option to the DHCP server so we can start logging early. Added log rotation and limits. Put the config file next to the log and leases file. Validate DHCP options by reusing the parser code from the server, adding a bunch more DHCP options to the parser. Removed legacy and hardcoded configuration options from the dhcp server, it's all config file now. Fixed a bug in the option parsing of the VBoxManage dhcpserver add/modify commands. [build fix] bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• DhcpOptions.cpp (modified) (3 diffs)
• DhcpOptions.h (modified) (1 diff)
• DhcpdInternal.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp

@@ -22 +22 @@
 #include "DhcpdInternal.h"
 #include "DhcpOptions.h"
-#include "DhcpMessage.h"
+#ifndef IN_VBOXSVC
+# include "DhcpMessage.h"
+#endif
 
 #include <iprt/cidr.h>
 
+
+#ifndef IN_VBOXSVC
 
 optmap_t &operator<<(optmap_t &optmap, DhcpOption *option)
@@ -54 +58 @@
 }
 
+#endif /* !IN_VBOXSVC */
+
 
 int DhcpOption::encode(octets_t &dst) const
@@ -102 +108 @@
 
 
+#ifndef IN_VBOXSVC
 int DhcpOption::decode(const DhcpClientMessage &req)
 {
     return decode(req.rawopts());
 }
+#endif
 
 

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.h

@@ -211 +211 @@
 
 
+#ifndef IN_VBOXSVC
 optmap_t &operator<<(optmap_t &optmap, DhcpOption *option);
 optmap_t &operator<<(optmap_t &optmap, const std::shared_ptr<DhcpOption> &option);
+#endif
 
 

trunk/src/VBox/NetworkServices/Dhcpd/DhcpdInternal.h

@@ -49 +49 @@
 typedef std::map<uint8_t, octets_t> rawopts_t;
 
+#ifndef IN_VBOXSVC
 class DhcpOption;
 /** DHCP option map (keyed by option number, DhcpOption value). */
 typedef std::map<uint8_t, std::shared_ptr<DhcpOption> > optmap_t;
+#endif