Gateway discovery fixes.

commschamp · Jun 3, 2024 · e6f3c2d · e6f3c2d
1 parent ef1022d
commit e6f3c2d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/client/app/common/UdpSession.cpp b/client/app/common/UdpSession.cpp
@@ -8,7 +8,6 @@
 #include "UdpSession.h"
 
 #include <cassert>
-#include <iostream> // TODO: remove
 
 namespace cc_mqttsn_client_app
 {

diff --git a/client/app/gw_discover/GwDiscover.cpp b/client/app/gw_discover/GwDiscover.cpp
@@ -104,6 +104,10 @@ void GwDiscover::gwStatusReportInternal(CC_MqttsnGwStatus status, const CC_Mqtts
 
     std::cout << prefixSuffixInfo.first << ' ' << static_cast<unsigned>(infoTmp.m_gwId) << 
         ": " << addrToString(infoTmp) << prefixSuffixInfo.second << std::endl;
+
+    if (opts().discoverExitOnFirst()) {
+        doTerminate(0);
+    }
 }
 
 void GwDiscover::searchCompleteInternal(CC_MqttsnAsyncOpStatus status, [[maybe_unused]] const CC_MqttsnGatewayInfo* info)

diff --git a/client/lib/src/ClientImpl.cpp b/client/lib/src/ClientImpl.cpp
@@ -453,6 +453,9 @@ void ClientImpl::handle(AdvertiseMsg& msg)
                 monitorGatewayExpiry();
             });
 
+    // TODO: when advertise arrives before GWINFO and the search is present, 
+    // report search completion            
+
     auto iter = 
         std::find_if(
             m_clientState.m_gwInfos.begin(), m_clientState.m_gwInfos.end(),
@@ -584,14 +587,16 @@ void ClientImpl::handle(GwinfoMsg& msg)
 
     m_clientState.m_gwInfos.resize(m_clientState.m_gwInfos.size() + 1U);
     auto& info = m_clientState.m_gwInfos.back();
+    info.m_expiryTimestamp = m_clientState.m_timestamp + m_configState.m_gwAdvTimeoutMs + m_configState.m_retryPeriod;
+    info.m_duration = m_configState.m_gwAdvTimeoutMs;
 
     info.m_gwId = msg.field_gwId().value();
     info.m_allowedAdvLosses = m_configState.m_allowedAdvLosses;
     gwInfo = &info;
 
     auto& addr = msg.field_gwAdd().value();
     if (addr.empty()) {
-        gwStatus = CC_MqttsnGwStatus_Alive;
+        gwStatus = CC_MqttsnGwStatus_AddedByGateway;
         return; // Report gateway status on exit
     }    
 
@@ -601,10 +606,7 @@ void ClientImpl::handle(GwinfoMsg& msg)
         return;
     }
 
-
     info.m_addr.assign(addr.begin(), addr.end());
-    info.m_expiryTimestamp = m_clientState.m_timestamp + m_configState.m_gwAdvTimeoutMs + m_configState.m_retryCount;
-    info.m_duration = m_configState.m_gwAdvTimeoutMs;
     monitorGatewayExpiry();
 
     gwStatus = CC_MqttsnGwStatus_AddedByClient;

diff --git a/client/lib/src/op/SearchOp.cpp b/client/lib/src/op/SearchOp.cpp
@@ -88,8 +88,6 @@ void SearchOp::handle(GwinfoMsg& msg)
         comms::cast_assign(info.m_addrLen) = addr.size();
     }
 
-    // TODO: store gateway info
-
     completeOpInternal(CC_MqttsnAsyncOpStatus_Complete, &info);
 }
 

diff --git a/client/lib/templ/client.cpp.templ b/client/lib/templ/client.cpp.templ
@@ -168,7 +168,7 @@ CC_MqttsnErrorCode cc_mqttsn_##NAME##client_set_available_gateway_info(CC_Mqttsn
             gwInfos.begin(), gwInfos.end(),
             [info](auto& storedInfo)
             {
-                return storedInfo.m_gwId = info->m_gwId;
+                return storedInfo.m_gwId == info->m_gwId;
             });
 
     auto updateFunc = 

diff --git a/gateway/app/gateway/GatewayIoClientSocket_Udp.cpp b/gateway/app/gateway/GatewayIoClientSocket_Udp.cpp
@@ -38,6 +38,7 @@ bool GatewayIoClientSocket_Udp::startImpl()
     boost::asio::post(io(),
         [this]()
         {
+            m_started = true;
             reportPendingData();
         });