diff options
| author | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-14 16:47:51 +0100 |
|---|---|---|
| committer | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-14 16:47:51 +0100 |
| commit | 000b6cb9766473e76e3f7790c6579d44a09c81c0 (patch) | |
| tree | 65d6486fc2452472a601d5c79e91ac9747859581 /AudioManagerDaemon/src | |
| parent | dc3eb79e419cb53f1394300873c204a9a2912823 (diff) | |
| download | audiomanager-000b6cb9766473e76e3f7790c6579d44a09c81c0.tar.gz | |
* modify contructor of CAmTelnetMenuHelper
Diffstat (limited to 'AudioManagerDaemon/src')
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 5 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/TelnetServer.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 5855b3e..f965a3b 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -50,9 +50,10 @@ CAmTelnetMenuHelper::CAmTelnetMenuHelper(SocketHandler *iSocketHandler, ControlSender *iControlSender, ControlReceiver *iControlReceiver, DatabaseHandler *iDatabasehandler, - Router *iRouter) + Router *iRouter, + TelnetServer *iTelnetServer) /****************************************************************************/ -: mTelenetServer(NULL) +: mTelenetServer(iTelnetServer) , mSocketHandler(iSocketHandler) , mCommandSender(iCommandSender) , mCommandReceiver(iCommandReceiver) diff --git a/AudioManagerDaemon/src/TelnetServer.cpp b/AudioManagerDaemon/src/TelnetServer.cpp index edf2f62..e879066 100644 --- a/AudioManagerDaemon/src/TelnetServer.cpp +++ b/AudioManagerDaemon/src/TelnetServer.cpp @@ -66,7 +66,7 @@ TelnetServer::TelnetServer(SocketHandler *iSocketHandler, CommandSender *iComman mConnectFD(NULL), mServerPort(servPort), mMaxConnections(maxConnections), - mTelnetMenuHelper(iSocketHandler,iCommandSender,iCommandReceiver,iRoutingSender,iRoutingReceiver,iControlSender,iControlReceiver,iDatabasehandler,iRouter) + mTelnetMenuHelper(iSocketHandler,iCommandSender,iCommandReceiver,iRoutingSender,iRoutingReceiver,iControlSender,iControlReceiver,iDatabasehandler,iRouter,this) { assert(mSocketHandler!=NULL); assert(mCommandReceiver!=NULL); @@ -81,7 +81,7 @@ TelnetServer::TelnetServer(SocketHandler *iSocketHandler, CommandSender *iComman assert(mMaxConnections!=0); instance = this; - mTelnetMenuHelper.setTelnetServer(this); + //mTelnetMenuHelper.setTelnetServer(this); int yes = 1; struct sockaddr_in servAddr; |