Changeset 10221 for trunk/FACT++/src

Timestamp:

03/03/11 19:30:44 (14 years ago)

Author:

tbretz

Message:

Added the --dns option and proper environment variable mapping of DIM_DNS_NODE

Location:

trunk/FACT++/src

Files:

• dclient5.cc (modified) (2 diffs)
• test3.cc (modified) (3 diffs)

trunk/FACT++/src/dclient5.cc

@@ -466 +466 @@
     const string n = conf.GetName()+".log";
 
-    po::options_description config("Configuration");
+    po::options_description config("Program options");
     config.add_options()
+        ("dns",       var<string>("localhost"),  "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
         ("log,l",     var<string>(n), "Write log-file")
-        ("no-dim,d",  po_switch(), "Disable dim services")
-        ("console,c", var<int>(),    "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("no-dim,d",  po_switch(),    "Disable dim services")
+        ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
         ;
 
-    conf.AddOptionsCommandline(config);
+    conf.AddEnv("dns", "DIM_DNS_NODE");
+
+    conf.AddOptions(config);
 }
 
 int main(int argc, char* argv[])
 {
-    setenv("DIM_DNS_NODE", "localhost", 0);
-
     Configuration conf(argv[0]);
     SetupConfiguration(conf);
@@ -503 +504 @@
         return -1;
 
+    // To allow overwriting of DIM_DNS_NODE set 0 to 1
+    setenv("DIM_DNS_NODE", conf.Get<string>("dns").c_str(), 1);
+
     try
     {

trunk/FACT++/src/test3.cc

@@ -36 +36 @@
     const string n = conf.GetName()+".log";
 
-    po::options_description config("Configuration");
+    po::options_description config("Program options");
     config.add_options()
+        ("dns",       var<string>("localhost"), "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
         ("log,l",     var<string>(n), "Write log-file")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
         ;
 
-    conf.AddOptionsCommandline(config);
+    conf.AddEnv("dns", "DIM_DNS_NODE");
+
+    conf.AddOptions(config);
 }
 
@@ -48 +51 @@
 {
     cout << "Starting " << argv[0] << "..." << endl;
-
-    // We could use putenv to make the Configure class change the value...
-    setenv("DIM_DNS_NODE", "localhost", 0);
 
     Configuration conf(argv[0]);
@@ -75 +75 @@
         return -1;
 
+    // To allow overwriting of DIM_DNS_NODE set 0 to 1
+    setenv("DIM_DNS_NODE", conf.Get<string>("dns").c_str(), 1);
+
     if (conf.Get<int>("console")==0)
         RunShell<RemoteShell>(conf);