diff options
| author | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-23 10:32:26 +0100 |
|---|---|---|
| committer | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-23 10:32:26 +0100 |
| commit | 26b122e62777dddff469fa53058ab26fe212d4cf (patch) | |
| tree | 9dbbea204304ab9c924f95bf09397f0994fdae70 | |
| parent | 52debd1d4a8749c910c13bad9c8bd6ad3af76bb3 (diff) | |
| download | audiomanager-26b122e62777dddff469fa53058ab26fe212d4cf.tar.gz | |
* remove dispensable method of CAmTelnetMenuHelper
| -rw-r--r-- | AudioManagerDaemon/include/CAmTelnetMenuHelper.h | 2 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 12 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/TelnetServer.cpp | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h index 73d302a..5322526 100644 --- a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h +++ b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h @@ -66,8 +66,6 @@ public: ~CAmTelnetMenuHelper(); - void setTelnetServer(TelnetServer* iTelnetServer); - void newSocketConnection(int filedescriptor); void socketConnectionsClosed(int filedescriptor); diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index a3180f3..2c9ea18 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -113,13 +113,6 @@ void CAmTelnetMenuHelper::createCommandMaps() } /****************************************************************************/ -void CAmTelnetMenuHelper::setTelnetServer(TelnetServer* iTelnetServer) -/****************************************************************************/ -{ - mpTelenetServer = iTelnetServer; -} - -/****************************************************************************/ void CAmTelnetMenuHelper::newSocketConnection(int filedescriptor) /****************************************************************************/ { @@ -275,7 +268,7 @@ void CAmTelnetMenuHelper::sendCurrentCmdPrompt(int & filedescriptor) } else { - logError("[TN] sendCurrentCmdPrompt, fd not found",filedescriptor); + logInfo("[TN] sendCurrentCmdPrompt, fd not found: ",filedescriptor); } } @@ -349,10 +342,9 @@ void CAmTelnetMenuHelper::exitCommandExec(std::queue<std::string> & CmdQueue, in it = mCurrentMainStateMap.find(filedescriptor); if (it != mCurrentMainStateMap.end()) { - logInfo("[TN] exitCommandExec, mpTelenetServer == NULL, fd ",filedescriptor); - if (NULL != mpTelenetServer) { + logInfo("[TN] exitCommandExec, removing fd ",filedescriptor); mpTelenetServer->disconnectClient(filedescriptor); mCurrentMainStateMap.erase(it); } diff --git a/AudioManagerDaemon/src/TelnetServer.cpp b/AudioManagerDaemon/src/TelnetServer.cpp index 06c75b7..1cae985 100644 --- a/AudioManagerDaemon/src/TelnetServer.cpp +++ b/AudioManagerDaemon/src/TelnetServer.cpp @@ -103,7 +103,7 @@ TelnetServer::TelnetServer(SocketHandler *iSocketHandler, CommandSender *iComman 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) + ioctl (mConnectFD, FIONBIO, (char *) &a); setsockopt (mConnectFD, SOL_SOCKET, SO_KEEPALIVE, (char *) &a, sizeof (a)); short events = 0; @@ -113,7 +113,6 @@ TelnetServer::TelnetServer(SocketHandler *iSocketHandler, CommandSender *iComman TelnetServer::~TelnetServer() { - mTelnetMenuHelper.setTelnetServer(NULL); } void TelnetServer::connectSocket(const pollfd pfd, const sh_pollHandle_t handle, void *userData) |