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

Timestamp:

Mar 15, 2018 2:11:55 PM (7 years ago)

Author:

vboxsync

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

121304

Message:

NetworkServices/Dhcpd: stub for reading the config from a file.

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

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

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

@@ -193 +193 @@
 
 
+static const RTGETOPTDEF g_aOptions[] =
+{
+    { "--config",       'c',    RTGETOPT_REQ_STRING },
+};
+
+
+Config *Config::create(int argc, char **argv)
+{
+    RTGETOPTSTATE State;
+    int rc;
+
+    rc = RTGetOptInit(&State, argc, argv,
+                      g_aOptions, RT_ELEMENTS(g_aOptions), 1,
+                      RTGETOPTINIT_FLAGS_NO_STD_OPTS);
+    AssertRCReturn(rc, NULL);
+
+    std::unique_ptr<Config> config;
+    for (;;)
+    {
+        RTGETOPTUNION Val;
+
+        rc = RTGetOpt(&State, &Val);
+        if (rc == 0)            /* done */
+            break;
+
+        switch (rc)
+        {
+            case 'c': /* --config */
+                if (config.get() != NULL)
+                {
+                    printf("Duplicate option: --config '%s'\n", Val.psz);
+                    return NULL;
+                }
+
+                printf("reading config from %s\n", Val.psz);
+                config.reset(Config::read(Val.psz));
+                if (config.get() == NULL)
+                    return NULL;
+
+                break;
+
+            case VINF_GETOPT_NOT_OPTION:
+                RTMsgError("Unexpected command line argument: '%s'", Val.psz);
+                return NULL;
+
+            default:
+                RTGetOptPrintError(rc, &Val);
+                return NULL;
+        }
+    }
+
+    if (config.get() == NULL)
+        return NULL;
+
+    if (!config->isSane())
+        return NULL;
+
+    config->sanitizeBaseName();
+
+    return config.release();
+}
+
+
 Config *Config::read(const char *pszFileName)
 {
+    std::unique_ptr<Config> config(new Config());
+
     RT_NOREF(pszFileName);
-    return NULL;                /* not yet */
+    return config.release();
 }
 

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

@@ -54 +54 @@
 public: /* factory methods */
     static Config *hardcoded();                   /* for testing */
+    static Config *create(int argc, char **argv); /* --config */
     static Config *compat(int argc, char **argv); /* old VBoxNetDHCP flags */
-    static Config *read(const char *pszFileName);
 
 public: /* accessors */
@@ -79 +79 @@
 
 private:
+    static Config *read(const char *pszFileName);
+
     void sanitizeBaseName();
 

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

@@ -580 +580 @@
     if (argc < 2)
         m_Config = Config::hardcoded();
+    else if (strcmp(argv[1], "--config") == 0)
+        m_Config = Config::create(argc, argv);
     else
         m_Config = Config::compat(argc, argv);