add support to reload TG and RID lists via REST API for the FNE;

src/common/lookups/LookupTable.h

@@ -96,6 +96,13 @@ namespace lookups
             return ret;
         }
 
+        /// <summary>Reads the lookup table from the specified lookup table file.</summary>
+        /// <returns>True, if lookup table was read, otherwise false.</returns>
+        virtual bool reload()
+        {
+            return load();
+        }
+
         /// <summary>Clears all entries from the lookup table.</summary>
         virtual void clear()
         {

src/common/lookups/TalkgroupRulesLookup.h

@@ -395,6 +395,9 @@ namespace lookups
         /// <summary>Reads the lookup table from the specified lookup table file.</summary>
         /// <returns>True, if lookup table was read, otherwise false.</returns>
         bool read();
+        /// <summary>Reads the lookup table from the specified lookup table file.</summary>
+        /// <returns>True, if lookup table was read, otherwise false.</returns>
+        bool reload() { return load(); }
         /// <summary>Clears all entries from the lookup table.</summary>
         void clear();
 

src/fne/network/FNENetwork.cpp

@@ -281,6 +281,13 @@ void FNENetwork::clock(uint32_t ms)
 
     uint64_t now = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 
+    if (m_forceListUpdate) {
+        for (auto peer : m_peers) {
+            peerACLUpdate(peer.first);
+        }
+        m_forceListUpdate = false;
+    }
+
     m_maintainenceTimer.clock(ms);
     if (m_maintainenceTimer.isRunning() && m_maintainenceTimer.hasExpired()) {
         // check to see if any peers have been quiet (no ping) longer than allowed

src/fne/network/FNENetwork.h

@@ -310,6 +310,8 @@ namespace network
         bool m_filterHeaders;
         bool m_filterTerminators;
 
+        bool m_forceListUpdate;
+
         std::vector<uint32_t> m_dropU2UPeerTable;
 
         bool m_enableInfluxDB;

src/fne/network/RESTAPI.cpp

@@ -582,6 +582,9 @@ void RESTAPI::initializeEndpoints()
 
     m_dispatcher.match(FNE_GET_FORCE_UPDATE).get(REST_API_BIND(RESTAPI::restAPI_GetForceUpdate, this));
 
+    m_dispatcher.match(FNE_GET_RELOAD_TGS).get(REST_API_BIND(RESTAPI::restAPI_GetReloadTGs, this));
+    m_dispatcher.match(FNE_GET_RELOAD_RIDS).get(REST_API_BIND(RESTAPI::restAPI_GetReloadRIDs, this));
+
     m_dispatcher.match(FNE_GET_AFF_LIST).get(REST_API_BIND(RESTAPI::restAPI_GetAffList, this));
 
     /*
@@ -1171,11 +1174,55 @@ void RESTAPI::restAPI_GetForceUpdate(const HTTPPayload& request, HTTPPayload& re
 
     json::object response = json::object();
     setResponseDefaultStatus(response);
-/*
+
     if (m_network != nullptr) {
         m_network->m_forceListUpdate = true;
     }
-*/
+
+    reply.payload(response);
+}
+
+/// <summary>
+///
+/// </summary>
+/// <param name="request"></param>
+/// <param name="reply"></param>
+/// <param name="match"></param>
+void RESTAPI::restAPI_GetReloadTGs(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
+{
+    if (!validateAuth(request, reply)) {
+        return;
+    }
+
+    json::object response = json::object();
+    setResponseDefaultStatus(response);
+
+    if (m_network != nullptr) {
+        m_network->m_tidLookup->reload();
+    }
+
+    reply.payload(response);
+}
+
+/// <summary>
+///
+/// </summary>
+/// <param name="request"></param>
+/// <param name="reply"></param>
+/// <param name="match"></param>
+void RESTAPI::restAPI_GetReloadRIDs(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
+{
+    if (!validateAuth(request, reply)) {
+        return;
+    }
+
+    json::object response = json::object();
+    setResponseDefaultStatus(response);
+
+    if (m_network != nullptr) {
+        m_network->m_ridLookup->reload();
+    }
+
     reply.payload(response);
 }
 

src/fne/network/RESTAPI.h

@@ -127,6 +127,11 @@ private:
     /// <summary></summary>
     void restAPI_GetForceUpdate(const HTTPPayload& request, HTTPPayload& reply, const network::rest::RequestMatch& match);
 
+    /// <summary></summary>
+    void restAPI_GetReloadTGs(const HTTPPayload& request, HTTPPayload& reply, const network::rest::RequestMatch& match);
+    /// <summary></summary>
+    void restAPI_GetReloadRIDs(const HTTPPayload& request, HTTPPayload& reply, const network::rest::RequestMatch& match);
+
     /// <summary></summary>
     void restAPI_GetAffList(const HTTPPayload& request, HTTPPayload& reply, const network::rest::RequestMatch& match);
 

src/fne/network/RESTDefines.h

@@ -35,6 +35,9 @@
 
 #define FNE_GET_FORCE_UPDATE            "/force-update"
 
+#define FNE_GET_RELOAD_TGS              "/reload-tgs"
+#define FNE_GET_RELOAD_RIDS             "/reload-rids"
+
 #define FNE_GET_AFF_LIST                "/report-affiliations"
 
 #endif // __FNE_REST_DEFINES_H__

src/remote/RESTClientMain.cpp

@@ -45,6 +45,8 @@
 #define RCD_FNE_GET_TGIDLIST            "fne-tgidlist"
 #define RCD_FNE_GET_FORCEUPDATE         "fne-force-update"
 #define RCD_FNE_GET_AFFLIST             "fne-affs"
+#define RCD_FNE_GET_RELOADTGS           "fne-reload-tgs"
+#define RCD_FNE_GET_RELOADRIDS          "fne-reload-rids"
 
 #define RCD_MODE                        "mdm-mode"
 #define RCD_MODE_OPT_IDLE               "idle"
@@ -200,6 +202,8 @@ void usage(const char* message, const char* arg)
     reply += "  fne-tgidlist                Retrieves the list of configured TGIDs (Converged FNE only)\r\n";
     reply += "  fne-force-update            Forces the FNE to send list update (Converged FNE only)\r\n";
     reply += "  fne-affs                    Retrieves the list of currently affiliated SUs (Converged FNE only)\r\n";
+    reply += "  fne-reload-tgs              Forces the FNE to reload its TGID list from disk (Converged FNE only)\r\n";
+    reply += "  fne-reload-rids             Forces the FNE to reload its RID list from disk (Converged FNE only)\r\n";
     reply += "\r\n";
     reply += "  mdm-mode <mode>             Set current mode of host (idle, lockout, dmr, p25, nxdn)\r\n";
     reply += "  mdm-kill                    Causes the host to quit\r\n";
@@ -811,6 +815,12 @@ int main(int argc, char** argv)
         else if (rcom == RCD_FNE_GET_AFFLIST) {
             retCode = client->send(HTTP_GET, FNE_GET_AFF_LIST, json::object(), response);
         }
+        else if (rcom == RCD_FNE_GET_RELOADTGS) {
+            retCode = client->send(HTTP_GET, FNE_GET_RELOAD_TGS, json::object(), response);
+        }
+        else if (rcom == RCD_FNE_GET_RELOADRIDS) {
+            retCode = client->send(HTTP_GET, FNE_GET_RELOAD_RIDS, json::object(), response);
+        }
         else {
             args.clear();
             LogError(LOG_REST, BAD_CMD_STR " (\"%s\")", rcom.c_str());