* [ GAM-6 ] enhace routing algorithm: changed the way the routing algorithm gets information from controller

8 files changed, 131 insertions, 119 deletions

diff --git a/AudioManagerDaemon/include/ControlSender.h b/AudioManagerDaemon/include/ControlSender.h
index 3021c3c..66db61c 100644
--- a/AudioManagerDaemon/include/ControlSender.h
+++ b/AudioManagerDaemon/include/ControlSender.h
@@ -83,7 +83,7 @@ public:
     void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error);
-    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats);
+    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats);
     uint16_t getInterfaceVersion() const;
 
 #ifdef UNIT_TEST
diff --git a/AudioManagerDaemon/include/Router.h b/AudioManagerDaemon/include/Router.h
index ab7efab..5af0cf7 100644
--- a/AudioManagerDaemon/include/Router.h
+++ b/AudioManagerDaemon/include/Router.h
@@ -36,12 +36,12 @@ class ControlSender;
 class Router
 {
 public:
-    Router(DatabaseHandler* iDatabaseHandler,ControlSender* iSender);
+    Router(DatabaseHandler* iDatabaseHandler, ControlSender* iSender);
     am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList);
     virtual ~Router();
 
 private:
-    am_Error_e findBestWay(std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator);
+    am_Error_e findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator);
     void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const;
     void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e>& listFormats) const;
     DatabaseHandler* mDatabaseHandler;
diff --git a/AudioManagerDaemon/src/ControlSender.cpp b/AudioManagerDaemon/src/ControlSender.cpp
index 816ed80..a334475 100644
--- a/AudioManagerDaemon/src/ControlSender.cpp
+++ b/AudioManagerDaemon/src/ControlSender.cpp
@@ -39,7 +39,7 @@ ControlSender::ControlSender(std::string controlPluginFile) :
     std::ifstream isfile(controlPluginFile.c_str());
     if (!isfile)
     {
-        logError("ControlSender::ControlSender: Controller plugin not found:",controlPluginFile);
+        logError("ControlSender::ControlSender: Controller plugin not found:", controlPluginFile);
     }
     else if (!controlPluginFile.empty())
     {
@@ -59,7 +59,8 @@ ControlSender::ControlSender(std::string controlPluginFile) :
 
 ControlSender::~ControlSender()
 {
-    if (mlibHandle) dlclose(mlibHandle);
+    if (mlibHandle)
+        dlclose(mlibHandle);
 }
 
 void ControlSender::hookAllPluginsLoaded()
@@ -267,9 +268,9 @@ void ControlSender::cbAckSetSourceSoundProperties(const am_Handle_s handle, cons
     mController->cbAckSetSourceSoundProperties(handle, error);
 }
 
-am_Error_e ControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
+am_Error_e am::ControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
 {
-    return mController->getConnectionFormatChoice(sourceID, sinkID, listPossibleConnectionFormats, listPrioConnectionFormats);
+    return mController->getConnectionFormatChoice(sourceID, sinkID, listRoute, listPossibleConnectionFormats, listPrioConnectionFormats);
 }
 
 uint16_t ControlSender::getInterfaceVersion() const
diff --git a/AudioManagerDaemon/src/Router.cpp b/AudioManagerDaemon/src/Router.cpp
index 9ed0f5b..c74989a 100644
--- a/AudioManagerDaemon/src/Router.cpp
+++ b/AudioManagerDaemon/src/Router.cpp
@@ -57,8 +57,14 @@ am_Error_e Router::getRoute(const bool onlyfree, const am_sourceID_t sourceID, c
         std::vector<am_ConnectionFormat_e> listFormats, listPriorityConnectionFormats;
         listPossibleConnectionFormats(sourceID, sinkID, listFormats);
 
+        //dummy route
+        am_Route_s route;
+        route.sinkID = sinkID;
+        route.sourceID = sourceID;
+        route.route.clear();
+
         //get the prio of the Controller:
-        mControlSender->getConnectionFormatChoice(sourceID, sinkID, listFormats, listPriorityConnectionFormats);
+        mControlSender->getConnectionFormatChoice(sourceID, sinkID, route, listFormats, listPriorityConnectionFormats);
 
         //no possible connection, so no route ! But we report OK since there is no fault ...
         if (listPriorityConnectionFormats.empty())
@@ -144,7 +150,7 @@ am_Error_e Router::getRoute(const bool onlyfree, const am_sourceID_t sourceID, c
         //Step through the routes and try to use always the best connectionFormat
         std::vector<am_RoutingElement_s>::iterator routingInterator = actualRoutingElement.begin();
         gatewayIterator = listGatewayID.begin();
-        if (findBestWay(actualRoutingElement, routingInterator, gatewayIterator) != E_OK)
+        if (findBestWay(sinkID, sourceID, actualRoutingElement, routingInterator, gatewayIterator) != E_OK)
         {
             continue;
         }
@@ -170,7 +176,7 @@ void Router::listPossibleConnectionFormats(const am_sourceID_t sourceID, const a
     set_intersection(listSourceFormats.begin(), listSourceFormats.end(), listSinkFormats.begin(), listSinkFormats.end(), inserter);
 }
 
-am_Error_e Router::findBestWay(std::vector<am_RoutingElement_s> & listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator)
+am_Error_e Router::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s> & listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator)
 {
     am_Error_e returnError = E_NOT_POSSIBLE;
     std::vector<am_ConnectionFormat_e> listConnectionFormats;
@@ -198,8 +204,13 @@ am_Error_e Router::findBestWay(std::vector<am_RoutingElement_s> & listRoute, std
         listMergeConnectionFormats = listConnectionFormats;
     }
 
+    am_Route_s route;
+    route.sinkID = sinkID;
+    route.sourceID = sourceID;
+    route.route = listRoute;
+
     //let the controller decide:
-    mControlSender->getConnectionFormatChoice(routeIterator->sourceID, routeIterator->sinkID, listMergeConnectionFormats, listPriorityConnectionFormats);
+    mControlSender->getConnectionFormatChoice(routeIterator->sourceID, routeIterator->sinkID, route, listMergeConnectionFormats, listPriorityConnectionFormats);
 
     //we have the list sorted after prios - now we try one after the other with the next part of the route
     std::vector<am_ConnectionFormat_e>::iterator connectionFormatIterator = listPriorityConnectionFormats.begin();
@@ -219,7 +230,7 @@ am_Error_e Router::findBestWay(std::vector<am_RoutingElement_s> & listRoute, std
     for (; connectionFormatIterator != listPriorityConnectionFormats.end(); ++connectionFormatIterator)
     {
         routeIterator->connectionFormat = *connectionFormatIterator;
-        if ((returnError = findBestWay(listRoute, nextIterator, gatewayIterator)) == E_OK)
+        if ((returnError = findBestWay(sinkID, sourceID, listRoute, nextIterator, gatewayIterator)) == E_OK)
         {
             break;
         }
diff --git a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h b/AudioManagerDaemon/test/controlInterface/MockInterfaces.h
index 746d70e..b49cae6 100644
--- a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h
+++ b/AudioManagerDaemon/test/controlInterface/MockInterfaces.h
@@ -156,14 +156,15 @@ class MockControlSendInterface : public ControlSendInterface {
       void(const am_Handle_s handle, const am_Error_e error));
   MOCK_METHOD2(cbAckSetSinkSoundProperty,
       void(const am_Handle_s handle, const am_Error_e error));
-  MOCK_METHOD4(getConnectionFormatChoice,
-      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
+  MOCK_METHOD5(getConnectionFormatChoice,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
   MOCK_CONST_METHOD0(getInterfaceVersion,
       uint16_t());
 };
 
 
 
+
 }  // namespace am
 
 
diff --git a/AudioManagerDaemon/test/routing/MockInterfaces.h b/AudioManagerDaemon/test/routing/MockInterfaces.h
index ac7b839..207fadd 100644
--- a/AudioManagerDaemon/test/routing/MockInterfaces.h
+++ b/AudioManagerDaemon/test/routing/MockInterfaces.h
@@ -77,98 +77,97 @@ class MockCommandSendInterface : public CommandSendInterface {
 };
 
 
-class MockControlSendInterface: public ControlSendInterface
-{
-public:
-    MOCK_METHOD1(startupController,
-        am_Error_e(ControlReceiveInterface* controlreceiveinterface));
-    MOCK_METHOD0(stopController,
-        am_Error_e());
-    MOCK_METHOD0(hookAllPluginsLoaded,
-        void());
-    MOCK_METHOD3(hookUserConnectionRequest,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
-    MOCK_METHOD1(hookUserDisconnectionRequest,
-        am_Error_e(const am_mainConnectionID_t connectionID));
-    MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
-        am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
-    MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
-        am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
-    MOCK_METHOD1(hookUserSetSystemProperty,
-        am_Error_e(const am_SystemProperty_s& property));
-    MOCK_METHOD2(hookUserVolumeChange,
-        am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
-    MOCK_METHOD2(hookUserVolumeStep,
-        am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
-    MOCK_METHOD2(hookUserSetSinkMuteState,
-        am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
-    MOCK_METHOD2(hookSystemRegisterDomain,
-        am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
-    MOCK_METHOD1(hookSystemDeregisterDomain,
-        am_Error_e(const am_domainID_t domainID));
-    MOCK_METHOD1(hookSystemDomainRegistrationComplete,
-        void(const am_domainID_t domainID));
-    MOCK_METHOD2(hookSystemRegisterSink,
-        am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
-    MOCK_METHOD1(hookSystemDeregisterSink,
-        am_Error_e(const am_sinkID_t sinkID));
-    MOCK_METHOD2(hookSystemRegisterSource,
-        am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
-    MOCK_METHOD1(hookSystemDeregisterSource,
-        am_Error_e(const am_sourceID_t sourceID));
-    MOCK_METHOD2(hookSystemRegisterGateway,
-        am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
-    MOCK_METHOD1(hookSystemDeregisterGateway,
-        am_Error_e(const am_gatewayID_t gatewayID));
-    MOCK_METHOD2(hookSystemRegisterCrossfader,
-        am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
-    MOCK_METHOD1(hookSystemDeregisterCrossfader,
-        am_Error_e(const am_crossfaderID_t crossfaderID));
-    MOCK_METHOD3(hookSystemSinkVolumeTick,
-        void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
-    MOCK_METHOD3(hookSystemSourceVolumeTick,
-        void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
-    MOCK_METHOD2(hookSystemInterruptStateChange,
-        void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
-    MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
-        void(const am_sinkID_t sinkID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
-        void(const am_sourceID_t sourceID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookSystemDomainStateChange,
-        void(const am_domainID_t domainID, const am_DomainState_e state));
-    MOCK_METHOD1(hookSystemReceiveEarlyData,
-        void(const std::vector<am_EarlyData_s>& data));
-    MOCK_METHOD1(hookSystemSpeedChange,
-        void(const am_speed_t speed));
-    MOCK_METHOD2(hookSystemTimingInformationChanged,
-        void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
-    MOCK_METHOD2(cbAckConnect,
-        void(const am_Handle_s handle, const am_Error_e errorID));
-    MOCK_METHOD2(cbAckDisconnect,
-        void(const am_Handle_s handle, const am_Error_e errorID));
-    MOCK_METHOD3(cbAckCrossFade,
-        void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
-    MOCK_METHOD3(cbAckSetSinkVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
-    MOCK_METHOD3(cbAckSetSourceVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceState,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSinkSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSinkSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD4(getConnectionFormatChoice,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
-    MOCK_CONST_METHOD0(getInterfaceVersion,
-        uint16_t());
-
+class MockControlSendInterface : public ControlSendInterface {
+ public:
+  MOCK_METHOD1(startupController,
+      am_Error_e(ControlReceiveInterface* controlreceiveinterface));
+  MOCK_METHOD0(stopController,
+      am_Error_e());
+  MOCK_METHOD0(hookAllPluginsLoaded,
+      void());
+  MOCK_METHOD3(hookUserConnectionRequest,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
+  MOCK_METHOD1(hookUserDisconnectionRequest,
+      am_Error_e(const am_mainConnectionID_t connectionID));
+  MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
+      am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
+  MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
+      am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
+  MOCK_METHOD1(hookUserSetSystemProperty,
+      am_Error_e(const am_SystemProperty_s& property));
+  MOCK_METHOD2(hookUserVolumeChange,
+      am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
+  MOCK_METHOD2(hookUserVolumeStep,
+      am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
+  MOCK_METHOD2(hookUserSetSinkMuteState,
+      am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
+  MOCK_METHOD2(hookSystemRegisterDomain,
+      am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
+  MOCK_METHOD1(hookSystemDeregisterDomain,
+      am_Error_e(const am_domainID_t domainID));
+  MOCK_METHOD1(hookSystemDomainRegistrationComplete,
+      void(const am_domainID_t domainID));
+  MOCK_METHOD2(hookSystemRegisterSink,
+      am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
+  MOCK_METHOD1(hookSystemDeregisterSink,
+      am_Error_e(const am_sinkID_t sinkID));
+  MOCK_METHOD2(hookSystemRegisterSource,
+      am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
+  MOCK_METHOD1(hookSystemDeregisterSource,
+      am_Error_e(const am_sourceID_t sourceID));
+  MOCK_METHOD2(hookSystemRegisterGateway,
+      am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
+  MOCK_METHOD1(hookSystemDeregisterGateway,
+      am_Error_e(const am_gatewayID_t gatewayID));
+  MOCK_METHOD2(hookSystemRegisterCrossfader,
+      am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
+  MOCK_METHOD1(hookSystemDeregisterCrossfader,
+      am_Error_e(const am_crossfaderID_t crossfaderID));
+  MOCK_METHOD3(hookSystemSinkVolumeTick,
+      void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
+  MOCK_METHOD3(hookSystemSourceVolumeTick,
+      void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
+  MOCK_METHOD2(hookSystemInterruptStateChange,
+      void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
+  MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
+      void(const am_sinkID_t sinkID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
+      void(const am_sourceID_t sourceID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookSystemDomainStateChange,
+      void(const am_domainID_t domainID, const am_DomainState_e state));
+  MOCK_METHOD1(hookSystemReceiveEarlyData,
+      void(const std::vector<am_EarlyData_s>& data));
+  MOCK_METHOD1(hookSystemSpeedChange,
+      void(const am_speed_t speed));
+  MOCK_METHOD2(hookSystemTimingInformationChanged,
+      void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
+  MOCK_METHOD2(cbAckConnect,
+      void(const am_Handle_s handle, const am_Error_e errorID));
+  MOCK_METHOD2(cbAckDisconnect,
+      void(const am_Handle_s handle, const am_Error_e errorID));
+  MOCK_METHOD3(cbAckCrossFade,
+      void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
+  MOCK_METHOD3(cbAckSetSinkVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
+  MOCK_METHOD3(cbAckSetSourceVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceState,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSinkSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSinkSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD5(getConnectionFormatChoice,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
+  MOCK_CONST_METHOD0(getInterfaceVersion,
+      uint16_t());
 };
 
+
 } // namespace am
 
 #endif /* MOCKROUTINGINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/routing/routingTest.cpp b/AudioManagerDaemon/test/routing/routingTest.cpp
index 02733a1..5b073d2 100644
--- a/AudioManagerDaemon/test/routing/routingTest.cpp
+++ b/AudioManagerDaemon/test/routing/routingTest.cpp
@@ -74,7 +74,7 @@ void routingTest::TearDown()
 }
 
 ACTION(returnConnectionFormat){
-arg3=arg2;
+arg4=arg3;
 }
 
 //test that checks just sinks and source in a domain but connectionformats do not match
@@ -82,7 +82,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1;
@@ -145,7 +145,7 @@ TEST_F(routingTest,simpleRoute2withDomain)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1;
@@ -209,7 +209,7 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(2);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(2);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2;
@@ -317,7 +317,7 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(2);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(2);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2;
@@ -441,7 +441,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(3);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(3);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3;
@@ -602,7 +602,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(3);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(3);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3;
@@ -759,7 +759,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(3);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(3);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3;
@@ -910,7 +910,7 @@ TEST_F(routingTest,simpleRoute4Domains2Routes)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(5);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(5);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3, domain4;
@@ -1146,7 +1146,7 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(3);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(3);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3;
@@ -1291,7 +1291,7 @@ TEST_F(routingTest,simpleRoute2Domains)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(2);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(2);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2;
@@ -1399,7 +1399,7 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(2);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(2);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2;
@@ -1505,7 +1505,7 @@ TEST_F(routingTest,simpleRoute3Domains)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(3);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(3);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3;
@@ -1652,7 +1652,7 @@ TEST_F(routingTest,simpleRoute4Domains)
 {
     EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(4);
     EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(4);
-    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
+    EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
 
     //initialize 2 domains
     am_Domain_s domain1, domain2, domain3, domain4;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10baaaa..d33ca05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ ENDIF(DAEMON_ERROR)
 message(STATUS "Build Version ${DAEMONVERSION}")
 
 FILE(READ "cmake/DoxyFile.in" DOXYFILE)
-STRING(REGEX REPLACE "(PROJECT_NUMBER = [0-9].[0-9].[0-9])" "PROJECT_NUMBER = ${DAEMONVERSION}" DOXYFILE ${DOXYFILE})
+STRING(REGEX REPLACE "(PROJECT_NUMBER = [0-9].[0-9].[0-9].[0-9])" "PROJECT_NUMBER = ${DAEMONVERSION}" DOXYFILE ${DOXYFILE})
 FILE(WRITE "cmake/DoxyFile.in" ${DOXYFILE} )
 
 execute_process(COMMAND git log --pretty=short WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}