summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-24 14:26:42 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-24 14:26:42 +0100
commite3fe78175fd25c2dd50c559c9436f706e0436a9c (patch)
treef1c0ba0e18ef736582a590bf8005ddb5f4d79e51
parent3983be135c14d355c36ee3d69424f03c73fc6a13 (diff)
downloaddabmux-e3fe78175fd25c2dd50c559c9436f706e0436a9c.tar.gz
dabmux-e3fe78175fd25c2dd50c559c9436f706e0436a9c.tar.bz2
dabmux-e3fe78175fd25c2dd50c559c9436f706e0436a9c.zip
change telnet rc config, add example to doc
-rw-r--r--doc/example.mux17
-rw-r--r--src/ParserConfigfile.cpp5
2 files changed, 18 insertions, 4 deletions
diff --git a/doc/example.mux b/doc/example.mux
index ac6842e..eed3c11 100644
--- a/doc/example.mux
+++ b/doc/example.mux
@@ -32,6 +32,23 @@ general {
; Enable timestamp definition necessary for SFN
; This also enables time encoding using the MNSC.
tist false
+
+ ; The statsserver is a simple TCP server that can present
+ ; statistics data (buffers, overruns, underruns, etc)
+ ; which can then be graphed a tool like Munin
+ ; The doc/stats_dabmux_multi.py tool is a suitable
+ ; plugin for that.
+ ; If the port is zero, or the line commented, the server
+ ; is not started.
+ statsserverport 12720
+}
+
+remotecontrol {
+ ; enable the telnet remote control server on the given port
+ ; This server allows you to read and define parameters that
+ ; some features export
+ ; Set the port to 0 to disable the server
+ telnetport 12721
}
; Some ensemble parameters
diff --git a/src/ParserConfigfile.cpp b/src/ParserConfigfile.cpp
index df83df7..3ac6537 100644
--- a/src/ParserConfigfile.cpp
+++ b/src/ParserConfigfile.cpp
@@ -190,10 +190,7 @@ void parse_configfile(string configuration_file,
/************** READ REMOTE CONTROL PARAMETERS *************/
ptree pt_rc = pt.get_child("remotecontrol");
- int telnetport = 0;
- if (pt_rc.get("telnet", 0)) {
- telnetport = pt_rc.get<int>("port", 0);
- }
+ int telnetport = pt_rc.get<int>("telnetport", 0);
if (telnetport != 0) {
rc = new RemoteControllerTelnet(telnetport);