engage-engine 1.246.90860015 → 1.248.90880016

package/include/ConfigurationObjects.h

@@ -571,6 +571,12 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default false] If true, requests the crypto engine module to run in debugging mode. */
         bool                        debug;
 
+        /** @brief [Optional] Specifies the NIST-approved curves to be used for FIPS  */
+        std::string                 curves;
+
+        /** @brief [Optional] Specifies the NIST-approved ciphers to be used for FIPS  */
+        std::string                 ciphers;
+
         FipsCryptoSettings()
         {
             clear();
@@ -581,6 +587,8 @@ namespace AppConfigurationObjects
             enabled = false;
             path.clear();
             debug = false;
+            curves.clear();
+            ciphers.clear();
         }
 
         virtual void initForDocumenting()
@@ -594,7 +602,9 @@ namespace AppConfigurationObjects
         j = nlohmann::json{
             TOJSON_IMPL(enabled),
             TOJSON_IMPL(path),
-            TOJSON_IMPL(debug)
+            TOJSON_IMPL(debug),
+            TOJSON_IMPL(curves),
+            TOJSON_IMPL(ciphers)
         };
     }
     static void from_json(const nlohmann::json& j, FipsCryptoSettings& p)
@@ -603,6 +613,8 @@ namespace AppConfigurationObjects
         FROMJSON_IMPL_SIMPLE(enabled);
         FROMJSON_IMPL_SIMPLE(path);
         FROMJSON_IMPL_SIMPLE(debug);
+        FROMJSON_IMPL_SIMPLE(curves);
+        FROMJSON_IMPL_SIMPLE(ciphers);
     }
 
 
@@ -8081,14 +8093,12 @@ namespace AppConfigurationObjects
         /** @brief Enables IGMP.  Default is false. */
         bool                            enabled;
 
-        /** @brief TODO */
+        /** @brief [Optional, Default 125000] Interval between sending IGMP membership queries.  If 0, no queries are sent. */
         int                             queryIntervalMs;
 
-        /** @brief TODO */
-        int                             lastMemberQueryIntervalMs;
+        /** @brief [Optional, Default 0] Typically calculated according to RFC specifications.  Set a value here to manually force (or delay) timeouts. */
+        int                             subscriptionTimeoutMs;
 
-        /** @brief TODO */
-        int                             lastMemberQueryCount;
 
         IgmpSnooping()
         {
@@ -8098,9 +8108,8 @@ namespace AppConfigurationObjects
         void clear()
         {
             enabled = false;
-            queryIntervalMs = 60000;
-            lastMemberQueryIntervalMs = 1000;
-            lastMemberQueryCount = 1;
+            queryIntervalMs = 125000;
+            subscriptionTimeoutMs = 0;
         }
     };
 
@@ -8109,17 +8118,15 @@ namespace AppConfigurationObjects
         j = nlohmann::json{
             TOJSON_IMPL(enabled),
             TOJSON_IMPL(queryIntervalMs),
-            TOJSON_IMPL(lastMemberQueryIntervalMs),
-            TOJSON_IMPL(lastMemberQueryCount)
+            TOJSON_IMPL(subscriptionTimeoutMs)
         };
     }
     static void from_json(const nlohmann::json& j, IgmpSnooping& p)
     {
         p.clear();
         getOptional<bool>("enabled", p.enabled, j);
-        getOptional<int>("queryIntervalMs", p.queryIntervalMs, j, 60000);
-        getOptional<int>("lastMemberQueryIntervalMs", p.lastMemberQueryIntervalMs, j, 1000);
-        getOptional<int>("lastMemberQueryCount", p.lastMemberQueryCount, j, 1);
+        getOptional<int>("queryIntervalMs", p.queryIntervalMs, j, 125000);
+        getOptional<int>("subscriptionTimeoutMs", p.subscriptionTimeoutMs, j, 0);
     }
 
 
@@ -10408,6 +10415,9 @@ namespace AppConfigurationObjects
         /** @brief Milliseconds until next connection attempt */
         uint64_t                                        msToNextConnectionAttempt;
 
+        /** @brief Server processing time in milliseconds - used for roundtrip reports */
+        float                                           serverProcessingMs;
+
         RallypointConnectionDetail()
         {
             clear();
@@ -10419,6 +10429,7 @@ namespace AppConfigurationObjects
             host.clear();
             port = 0;
             msToNextConnectionAttempt = 0;
+            serverProcessingMs = -1.0f;
         }
     };
 
@@ -10434,6 +10445,11 @@ namespace AppConfigurationObjects
         {
             j["msToNextConnectionAttempt"] = p.msToNextConnectionAttempt;
         }
+
+        if(p.serverProcessingMs >= 0.0)
+        {
+            j["serverProcessingMs"] = p.serverProcessingMs;
+        }
     }
     static void from_json(const nlohmann::json& j, RallypointConnectionDetail& p)
     {
@@ -10442,6 +10458,7 @@ namespace AppConfigurationObjects
         getOptional<std::string>("host", p.host, j, EMPTY_STRING);
         getOptional<int>("port", p.port, j, 0);
         getOptional<uint64_t>("msToNextConnectionAttempt", p.msToNextConnectionAttempt, j, 0);
+        getOptional<float>("serverProcessingMs", p.serverProcessingMs, j, -1.0);
     }
 
     //-----------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engage-engine",
-  "version": "1.246.90860015",
+  "version": "1.248.90880016",
   "description": "Use Engage to communicate with everyone, everywhere, from any device",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"