Changeset 76190 in vbox

Timestamp:

Dec 12, 2018 4:58:55 PM (6 years ago)

Author:

vboxsync

Message:

Main/DHCPServer: (bugref:9288) Added --comment command line option to simplify identification of VBoxNetDHCP instanced in the process list

Location:

trunk/src/VBox

Files:

• Main/include/DHCPServerImpl.h (modified) (1 diff)
• Main/src-server/DHCPServerImpl.cpp (modified) (2 diffs)
• NetworkServices/Dhcpd/Config.cpp (modified) (2 diffs)
• NetworkServices/Dhcpd/VBoxNetDhcpd.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/DHCPServerImpl.h

@@ -51 +51 @@
     static const std::string kDsrKeyUpperIp;
     static const std::string kDsrKeyConfig;
+    static const std::string kDsrKeyComment;
 };
 

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -42 +42 @@
 const std::string DHCPServerRunner::kDsrKeyUpperIp = "--upper-ip";
 const std::string DHCPServerRunner::kDsrKeyConfig  = "--config";
+const std::string DHCPServerRunner::kDsrKeyComment = "--comment";
 
 
@@ -786 +787 @@
 
     m->dhcp.setOption(DHCPServerRunner::kDsrKeyConfig, m->tempConfigFileName);
+    m->dhcp.setOption(DHCPServerRunner::kDsrKeyComment, m->networkName.c_str());
 #else /* !VBOX_WITH_DHCPD */
     /* Main is needed for NATNetwork */

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

@@ -454 +454 @@
 
 
+#define DHCPD_GETOPT_COMMENT 256 /* No short option for --comment */
 static const RTGETOPTDEF g_aOptions[] =
 {
-    { "--config",       'c',    RTGETOPT_REQ_STRING },
+    { "--config",       'c',                  RTGETOPT_REQ_STRING },
+    { "--comment",      DHCPD_GETOPT_COMMENT, RTGETOPT_REQ_STRING }
 };
 
@@ -494 +496 @@
 
                 break;
+
+            case DHCPD_GETOPT_COMMENT: /* --comment */
+                /* The sole purpose of this option is to allow identification of DHCP
+                 * server instances in the process list. We ignore the required string
+                 * argument of this option.
+                 */
+                continue;
 
             case VINF_GETOPT_NOT_OPTION:

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

@@ -631 +631 @@
     ClientId::registerFormat();
 
+    /* XXX: We no longer need hardcoded and compat methods. We should remove them soon. */
     if (argc < 2)
         m_Config = Config::hardcoded();
-    else if (strcmp(argv[1], "--config") == 0)
+    else if (   strcmp(argv[1], "--config") == 0
+             || strcmp(argv[1], "--comment") == 0)
         m_Config = Config::create(argc, argv);
     else