refactored KNX Tunneling, created new class IpTunnelServer

Author: Ing-Dom

src/knx/bau091A.cpp

@@ -17,13 +17,21 @@ Bau091A::Bau091A(Platform& platform)
     : BauSystemBCoupler(platform),
       _routerObj(memory(), 0x200, 0x2000),  // the Filtertable of 0x091A IP Routers is fixed at 0x200 and 0x2000 long
       _ipParameters(_deviceObj, platform),
-      _dlLayerPrimary(_deviceObj, _ipParameters, _netLayer.getPrimaryInterface(), _platform, *this, (DataLinkLayerCallbacks*) this),
+      _dlLayerPrimary(_deviceObj, _ipParameters, _netLayer.getPrimaryInterface(), _platform, *this,
+#ifdef KNX_TUNNELING
+                      _ipTunnelServer,
+#endif
+      (DataLinkLayerCallbacks*) this),
       _dlLayerSecondary(_deviceObj, _netLayer.getSecondaryInterface(), platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this),
       DataLinkLayerCallbacks()
 #ifdef USE_CEMI_SERVER
       ,
       _cemiServer(*this)
 #endif
+#ifdef KNX_TUNNELING
+      ,
+      _ipTunnelServer(_deviceObj, _ipParameters, platform, _cemiServer)
+#endif
 {
     // Before accessing anything of the router object they have to be initialized according to the used medium
     // Coupler model 1.x
@@ -159,6 +167,7 @@ void Bau091A::loop()
     _dlLayerPrimary.loop();
     _dlLayerSecondary.loop();
     BauSystemBCoupler::loop();
+    _ipTunnelServer.loop();
 }
 
 TPAckType Bau091A::isAckRequired(uint16_t address, bool isGrpAddr)
@@ -195,7 +204,7 @@ TPAckType Bau091A::isAckRequired(uint16_t address, bool isGrpAddr)
             }
         }
 #ifdef KNX_TUNNELING
-        if(_dlLayerPrimary.isSentToTunnel(address, isGrpAddr))
+        if(_ipTunnelServer.isSentToTunnel(address, isGrpAddr))
             ack = TPAckType::AckReqAck;
 #endif
     }
@@ -212,7 +221,7 @@ TPAckType Bau091A::isAckRequired(uint16_t address, bool isGrpAddr)
                 ack = TPAckType::AckReqNone;
 
 #ifdef KNX_TUNNELING
-        if(_dlLayerPrimary.isSentToTunnel(address, isGrpAddr))
+        if(_ipTunnelServer.isSentToTunnel(address, isGrpAddr))
             ack = TPAckType::AckReqAck;
 #endif
 

src/knx/bau091A.h

@@ -9,6 +9,7 @@
 #include "ip_data_link_layer.h"
 #include "tpuart_data_link_layer.h"
 #include "cemi_server_object.h"
+#include "ip_tunnel_server.h"
 
 class Bau091A : public BauSystemBCoupler, public ITpUartCallBacks, public DataLinkLayerCallbacks
 {
@@ -38,5 +39,8 @@ class Bau091A : public BauSystemBCoupler, public ITpUartCallBacks, public DataLi
     CemiServer _cemiServer;
     CemiServerObject _cemiServerObject;
 #endif
+#ifdef KNX_TUNNELING
+    IpTunnelServer _ipTunnelServer;
+#endif
 };
 #endif