diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-09 13:17:11 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-09 13:17:11 +0100 |
| commit | 66ce11e941986259e4c403364e3ee7c8b09864f4 (patch) | |
| tree | 967806ccc6a48f0cb06d2ebcc7a21992daeeb9b8 | |
| parent | d4627908f2f405b7b184bd47b2216adf5d4df486 (diff) | |
| download | audiomanager-66ce11e941986259e4c403364e3ee7c8b09864f4.tar.gz | |
* fix list domains in telnetserver
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 9 | ||||
| -rw-r--r-- | CHANGELOG | 27 | ||||
| -rw-r--r-- | includes/config.h | 4 |
3 files changed, 34 insertions, 6 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index f901fa8..d62b289 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -659,22 +659,23 @@ void CAmTelnetMenuHelper::listDomainsCommandExec(std::queue<std::string> & CmdQu /****************************************************************************/ { std::vector<am_Domain_s> listDomains; - std::vector<am_Domain_s>::iterator it; std::stringstream line; mDatabasehandler->getListDomains(listDomains); - line << "Current domains: " << listDomains.size(); + line << "\tCurrent domains: " << listDomains.size()<<std::endl; sendTelnetLine(filedescriptor,line); + std::vector<am_Domain_s>::iterator it(listDomains.begin()); while(it != listDomains.end()) { - line.clear(); + line.str(""); line << "\tID: " << it->domainID << "\tName: " << it->name << "\tBusname: " << it->busname << "\tNodename: " << it->nodename - << "\tState: " << it->state; + << "\tState: " << static_cast<int>(it->state) + << std::endl; sendTelnetLine(filedescriptor,line); it++; @@ -1,3 +1,24 @@ +commit d4627908f2f405b7b184bd47b2216adf5d4df486 +Merge: 84b9046 40ade5d +Author: christian mueller <christian.ei.mueller@bmw.de> + + Merge branch 'telnetserver' + +commit 84b90467e8e9dcaafaf75738f4bf9840365424b9 +Author: christian mueller <christian.ei.mueller@bmw.de> + + * adoption of RoutinInterfaceAsync to testHMI + * adoption of projekttypes.h to HMI + * comment out wrapper dlt messages because too much pollution + +commit 40ade5d852e6d4c781f33a20d8e4340d59ec07a8 +Author: Frank Herchet <frank.fh.herchet@bmw.de> + + * remove duplicate current command prompt + * remove debug output of TelnetServer.h + * fix compile error in main.cpp + * remove unused methods in TelnetServer.h + commit 8d3ad577f57e0a45ef9c0e2f1ce99957445f0eb8 Author: christian mueller <christian.ei.mueller@bmw.de> @@ -20,6 +41,12 @@ Author: christian mueller <christian.ei.mueller@bmw.de> * renaming of databasetest - copy paste fault +commit 3a11cd051607c19d91a0eb8118fac87e937de929 +Author: Grape R5 <demo@ubuntu.(none)> + + * TelnetServer Implementation. + * TelnetServerTest Implementation + commit 8a2db276ede7516038eb5d2bf13b89cc3ff185a7 Author: christian mueller <christian.ei.mueller@bmw.de> diff --git a/includes/config.h b/includes/config.h index 67879cc..3622741 100644 --- a/includes/config.h +++ b/includes/config.h @@ -1,13 +1,13 @@ #ifndef _CONFIG_H #define _CONFIG_H -#define DAEMONVERSION "ver-0.0.9-7-g8d3ad57" +#define DAEMONVERSION "ver-0.0.9-11-gd462790" #define WITH_DBUS_WRAPPER #define WITH_SOCKETHANDLER_LOOP /* #undef WITH_SIMPLEDBUS_LOOP */ #define WITH_PPOLL -/* #undef WITH_TELNET */ +#define WITH_TELNET #define GLIB_DBUS_TYPES_TOLERANT #define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/AudioManager/bin/plugins/command" |