diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-13 10:43:05 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-13 10:43:05 +0100 |
| commit | d31807abef3e8f02de5ae4452527769f6c35b3db (patch) | |
| tree | 955f7452d5eaff87be11548a1e2117ef16bc52e5 /AudioManagerDaemon/src | |
| parent | 2aa9d80d254f3b599d01e70c4901ec78f799546e (diff) | |
| download | audiomanager-d31807abef3e8f02de5ae4452527769f6c35b3db.tar.gz | |
* change includes in CAmTelnetMenuHelper
Diffstat (limited to 'AudioManagerDaemon/src')
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 13 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/TelnetServer.cpp | 12 |
2 files changed, 15 insertions, 10 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 3e21e03..5855b3e 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -23,15 +23,22 @@ */ #include "CAmTelnetMenuHelper.h" -#include <dlt/dlt.h> +#include "TelnetServer.h" +#include "DatabaseHandler.h" +#include "ControlSender.h" +#include "CommandSender.h" +#include "RoutingSender.h" +#include "RoutingReceiver.h" +#include "CommandReceiver.h" +#include "ControlReceiver.h" +#include "Router.h" +#include "config.h" #include <cassert> #define DEBUG_ON false using namespace am; -DLT_IMPORT_CONTEXT(AudioManager) - CAmTelnetMenuHelper* CAmTelnetMenuHelper::instance = NULL; /****************************************************************************/ diff --git a/AudioManagerDaemon/src/TelnetServer.cpp b/AudioManagerDaemon/src/TelnetServer.cpp index 8b51af3..edf2f62 100644 --- a/AudioManagerDaemon/src/TelnetServer.cpp +++ b/AudioManagerDaemon/src/TelnetServer.cpp @@ -23,14 +23,12 @@ */ #include "TelnetServer.h" -#include "CAmTelnetMenuHelper.h" -#include <assert.h> +#include <cassert> #include <sys/socket.h> #include <arpa/inet.h> #include <sys/ioctl.h> #include <string.h> #include <netdb.h> -#include <dlt/dlt.h> #include <config.h> #include <errno.h> #include <sstream> @@ -39,11 +37,11 @@ #include <iterator> #include "DatabaseHandler.h" #include "RoutingSender.h" +#include "DLTWrapper.h" +#include "CAmTelnetMenuHelper.h" using namespace am; -DLT_IMPORT_CONTEXT(AudioManager) - TelnetServer* TelnetServer::instance = NULL; #define PRINT_BOOL(var) var ? output+="true\t\t" : output+="false\t\t"; @@ -99,10 +97,10 @@ TelnetServer::TelnetServer(SocketHandler *iSocketHandler, CommandSender *iComman if (listen(mConnectFD,mMaxConnections) < 0) { - DLT_LOG(AudioManager, DLT_LOG_ERROR, DLT_STRING("TelnetServer::TelnetServerk cannot listen "),DLT_INT(errno)); + logError("TelnetServer::TelnetServerk cannot listen ",errno); } else - DLT_LOG(AudioManager, DLT_LOG_INFO, DLT_STRING("TelnetServer::TelnetServer started listening on port"),DLT_INT(mServerPort)); + logInfo("TelnetServer::TelnetServer started listening on port", mServerPort); int a=1; ioctl (mConnectFD, FIONBIO, (char *) &a); // should we use the posix call fcntl(mConnectFD, F_SETFL, O_NONBLOCK) |