Changeset 10647 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

05/10/11 14:10:02 (14 years ago)

Author:

tbretz

Message:

Initialize DIM's environment variables through Dim::Setup; made command line switches in a way they give reasonable defaults.

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (4 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -10 +10 @@
 #include <boost/asio/deadline_timer.hpp>
 
+#include "Dim.h"
 #include "Event.h"
 #include "Shell.h"
@@ -1546 +1547 @@
         SetEndpoint(conf.Get<string>("addr"));
 
-        fFTM.SetVerbose(conf.Get<bool>("verbose"));
+        fFTM.SetVerbose(!conf.Get<bool>("quiet"));
         fFTM.SetHexOutput(conf.Get<bool>("hex-out"));
         fFTM.SetDynamicOut(conf.Get<bool>("dynamic-out"));
@@ -1655 +1656 @@
     control.add_options()
         ("addr,a",      var<string>("localhost:5000"),  "Network address of FTM")
-        ("verbose,v",   po_switch(),  "Enable printing contents of all received messages (except dynamic data) in clear text.")
-        ("hex-out",     po_switch(),  "Enable printing contents of all printed messages also as hex data.")
-        ("dynamic-out", po_switch(),  "Enable printing received dynamic data.")
+        ("quiet,q",     po_switch(), "Disable printing contents of all received messages (except dynamic data) in clear text.")
+        ("hex-out",     po_switch(), "Enable printing contents of all printed messages also as hex data.")
+        ("dynamic-out", po_switch(), "Enable printing received dynamic data.")
         ;
 
@@ -1814 +1815 @@
     }
 
-    // To allow overwriting of DIM_DNS_NODE set 0 to 1
-    setenv("DIM_DNS_NODE", conf.Get<string>("dns").c_str(), 1);
-    //setenv("DIM_HOST_NODE", GetLocalIp().c_str(), 1);
+    Dim::Setup(conf.Get<string>("dns"));
 
     //try