* modify contructor of CAmTelnetMenuHelper

diff --git a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h
index 0025380..69bdb92 100644 (file)
--- a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h
+++ b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h
@@ -49,6 +49,7 @@ class ControlSender;
 class CommandReceiver;
 class RoutingReceiver;
 class ControlReceiver;
+
 class Router;
 class SocketHandler;
 
@@ -61,7 +62,7 @@ public:
         eRootState = 0, eListState, eInfoState, eGetState, eSetState
     };
 
-    CAmTelnetMenuHelper(SocketHandler *iSocketHandler, CommandSender *iCommandSender, CommandReceiver *iCommandReceiver, RoutingSender *iRoutingSender, RoutingReceiver *iRoutingReceiver, ControlSender *iControlSender, ControlReceiver *iControlReceiver, DatabaseHandler *iDatabasehandler, Router *iRouter);
+    CAmTelnetMenuHelper(SocketHandler *iSocketHandler, CommandSender *iCommandSender, CommandReceiver *iCommandReceiver, RoutingSender *iRoutingSender, RoutingReceiver *iRoutingReceiver, ControlSender *iControlSender, ControlReceiver *iControlReceiver, DatabaseHandler *iDatabasehandler, Router *iRouter, TelnetServer *iTelnetServer);
 
     ~CAmTelnetMenuHelper();
 

diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 5855b3e..f965a3b 100644 (file)
--- 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 (file)
--- 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;