Chg: update image tag in helm values to v2.9.0

https://telecominfraproject.atlassian.net/browse/WIFI-12342

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owprov VERSION 2.11.0)
+project(owprov VERSION 2.9.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -117,7 +117,6 @@ add_executable(owprov
         src/framework/MicroServiceExtra.h
         src/framework/ConfigurationValidator.cpp
         src/framework/ConfigurationValidator.h
-        src/framework/default_device_types.h
         src/UI_Prov_WebSocketNotifications.h
         src/UI_Prov_WebSocketNotifications.cpp
         src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp

build

@@ -1 +1 @@
-4
+21

docker-entrypoint.sh

@@ -42,7 +42,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owprov"} \
   STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owprov"} \
   STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  RRM_PROVIDERS=${RRM_PROVIDERS:-"owrrm"} \
   envsubst < /owprov.properties.tmpl > $OWPROV_CONFIG/owprov.properties
 fi
 

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owprov:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owprov
-    tag: v2.11.0-RC1
+    tag: v2.9.0
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

openapi/owprov.yaml

@@ -1331,6 +1331,12 @@ components:
             - $ref: '#/components/schemas/StringList'
             - $ref: '#/components/schemas/TagValuePairList'
 
+    SystemCommandResults:
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/StringList'
+        - $ref: '#/components/schemas/TagValuePairList'
+
     NoteInfo:
       type: object
       properties:
@@ -1370,33 +1376,6 @@ components:
                 type: integer
                 format: int64
 
-    SystemResources:
-      type: object
-      properties:
-        numberOfFileDescriptors:
-          type: integer
-          format: int64
-        currRealMem:
-          type: integer
-          format: int64
-        peakRealMem:
-          type: integer
-          format: int64
-        currVirtMem:
-          type: integer
-          format: int64
-        peakVirtMem:
-          type: integer
-          format: int64
-
-    SystemCommandResults:
-      type: object
-      oneOf:
-        - $ref: '#/components/schemas/SystemResources'
-        - $ref: '#/components/schemas/SystemInfoResults'
-        - $ref: '#/components/schemas/StringList'
-        - $ref: '#/components/schemas/TagValuePairList'
-
     Dashboard:
       type: object
       properties:
@@ -2279,7 +2258,7 @@ paths:
     get:
       tags:
         - Configuration Overrides
-      operationId: getConfigurationOverrides
+      operationId: getCponfigurationOverrides
       summary: retrieve a list of configuration overrides for a given device
       parameters:
         - in: path
@@ -2303,7 +2282,7 @@ paths:
     delete:
       tags:
         - Configuration Overrides
-      operationId: deleteConfigurationOverrides
+      operationId: deleteCponfigurationOverrides
       summary: delete all configuration overrides for a given device from a given source
       parameters:
         - in: path
@@ -4444,12 +4423,15 @@ paths:
             type: string
             enum:
               - info
-              - extraConfiguration
-              - resources
           required: true
       responses:
         200:
-          $ref: '#/components/schemas/SystemCommandResults'
+          description: Successful command execution
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/SystemInfoResults'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:

owprov.properties.tmpl

@@ -37,12 +37,10 @@ openwifi.system.data = ${SYSTEM_DATA}
 openwifi.system.debug = false
 openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
-openwifi.system.commandchannel = /tmp/app.owprov
+openwifi.system.commandchannel = /tmp/app.ucentralfms
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
 openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
 
-rrm.providers = ${RRM_PROVIDERS}
-
 #############################
 # Generic information for all micro services
 #############################

src/Kafka_ProvUpdater.h

@@ -41,7 +41,7 @@ namespace OpenWifi {
 		Payload.set("ObjectType", OT);
 		std::ostringstream OS;
 		Payload.stringify(OS);
-		KafkaManager()->PostMessage(KafkaTopics::PROVISIONING_CHANGE, Ops[op], std::make_shared<std::string>(OS.str()));
+		KafkaManager()->PostMessage(KafkaTopics::PROVISIONING_CHANGE, Ops[op], OS.str());
 
 		return true;
 	}

src/RESTAPI/RESTAPI_venue_handler.cpp

@@ -90,9 +90,9 @@ namespace OpenWifi {
 		}
 
 		if (!Existing.contacts.empty()) {
-			for (const auto &contact_uuid : Existing.contacts)
+			for (const auto &i : Existing.contacts)
 				StorageService()->ContactDB().DeleteInUse(
-					"id", contact_uuid, StorageService()->VenueDB().Prefix(), UUID);
+					"id", i, StorageService()->VenueDB().Prefix(), UUID);
 		}
 		if (!Existing.location.empty())
 			StorageService()->LocationDB().DeleteInUse("id", Existing.location,
@@ -101,9 +101,9 @@ namespace OpenWifi {
 			StorageService()->PolicyDB().DeleteInUse("id", Existing.managementPolicy,
 													 StorageService()->VenueDB().Prefix(), UUID);
 		if (!Existing.deviceConfiguration.empty()) {
-			for (auto &configuration_uuid : Existing.deviceConfiguration)
+			for (auto &i : Existing.deviceConfiguration)
 				StorageService()->ConfigurationDB().DeleteInUse(
-					"id", configuration_uuid, StorageService()->VenueDB().Prefix(), UUID);
+					"id", i, StorageService()->VenueDB().Prefix(), UUID);
 		}
 		if (!Existing.parent.empty())
 			StorageService()->VenueDB().DeleteChild("id", Existing.parent, UUID);
@@ -157,10 +157,6 @@ namespace OpenWifi {
 			return BadRequest(RESTAPI::Errors::EntityMustExist);
 		}
 
-        if(StorageService()->VenueDB().DoesVenueNameAlreadyExist(NewObject.info.name,NewObject.entity, NewObject.parent)) {
-            return BadRequest(RESTAPI::Errors::VenuesNameAlreadyExists);
-        }
-
 		if (!NewObject.contacts.empty()) {
 			for (const auto &i : NewObject.contacts) {
 				if (!StorageService()->ContactDB().Exists("id", i)) {
@@ -436,7 +432,7 @@ namespace OpenWifi {
 
 		std::string MoveFromEntity, MoveToEntity;
 		if (AssignIfPresent(RawObject, "entity", MoveToEntity)) {
-			if (MoveToEntity.empty() || !StorageService()->EntityDB().Exists("id", MoveToEntity)) {
+			if (!MoveToEntity.empty() && !StorageService()->EntityDB().Exists("id", MoveToEntity)) {
 				return BadRequest(RESTAPI::Errors::EntityMustExist);
 			}
 			MoveFromEntity = Existing.entity;
@@ -445,7 +441,7 @@ namespace OpenWifi {
 
 		std::string MoveToVenue, MoveFromVenue;
 		if (AssignIfPresent(RawObject, "venue", MoveToVenue)) {
-			if (MoveToVenue.empty() || !StorageService()->VenueDB().Exists("id", MoveToVenue)) {
+			if (!MoveToVenue.empty() && !StorageService()->VenueDB().Exists("id", MoveToVenue)) {
 				return BadRequest(RESTAPI::Errors::VenueMustExist);
 			}
 			MoveFromVenue = Existing.parent;
@@ -454,7 +450,7 @@ namespace OpenWifi {
 
 		std::string MoveFromLocation, MoveToLocation;
 		if (AssignIfPresent(RawObject, "location", MoveToLocation)) {
-			if (MoveToLocation.empty() ||
+			if (!MoveToLocation.empty() &&
 				!StorageService()->LocationDB().Exists("id", MoveToLocation)) {
 				return BadRequest(RESTAPI::Errors::LocationMustExist);
 			}
@@ -464,8 +460,8 @@ namespace OpenWifi {
 
 		Types::UUIDvec_t MoveFromContacts, MoveToContacts;
 		if (AssignIfPresent(RawObject, "contacts", MoveToContacts)) {
-			for (const auto &contact : NewObject.contacts) {
+			for (const auto &i : NewObject.contacts) {
-				if (!StorageService()->ContactDB().Exists("id", contact)) {
+				if (!StorageService()->ContactDB().Exists("id", i)) {
 					return BadRequest(RESTAPI::Errors::ContactMustExist);
 				}
 			}
@@ -475,7 +471,7 @@ namespace OpenWifi {
 
 		std::string MoveFromPolicy, MoveToPolicy;
 		if (AssignIfPresent(RawObject, "managementPolicy", MoveToPolicy)) {
-			if (MoveToPolicy.empty() || !StorageService()->PolicyDB().Exists("id", MoveToPolicy)) {
+			if (!MoveToPolicy.empty() && !StorageService()->PolicyDB().Exists("id", MoveToPolicy)) {
 				return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
 			}
 			MoveFromPolicy = Existing.managementPolicy;
@@ -485,8 +481,8 @@ namespace OpenWifi {
 		Types::UUIDvec_t MoveToConfigurations, MoveFromConfigurations;
 		if (RawObject->has("deviceConfiguration")) {
 			MoveToConfigurations = NewObject.deviceConfiguration;
-			for (auto &configuration : MoveToConfigurations) {
+			for (auto &i : MoveToConfigurations) {
-				if (!StorageService()->ConfigurationDB().Exists("id", configuration)) {
+				if (!StorageService()->ConfigurationDB().Exists("id", i)) {
 					return BadRequest(RESTAPI::Errors::ConfigurationMustExist);
 				}
 			}

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -13,7 +13,6 @@
 #ifdef TIP_GATEWAY_SERVICE
 #include "AP_WS_Server.h"
 #include "CapabilitiesCache.h"
-#include "RADIUSSessionTracker.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
@@ -30,7 +29,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
 		field_to_json(Obj, "deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
-		field_to_json(Obj, "hasRADIUSSessions", RADIUSSessionTracker()->HasSessions(SerialNumber));
 #endif
 		field_to_json(Obj, "macAddress", MACAddress);
 		field_to_json(Obj, "manufacturer", Manufacturer);
@@ -56,9 +54,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "pendingConfiguration", pendingConfiguration);
 		field_to_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
 		field_to_json(Obj, "restrictionDetails", restrictionDetails);
-		field_to_json(Obj, "pendingUUID", pendingUUID);
-		field_to_json(Obj, "simulated", simulated);
-		field_to_json(Obj, "lastRecordedContact", lastRecordedContact);
 	}
 
 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -68,7 +63,7 @@ namespace OpenWifi::GWObjects {
 		ConnectionState ConState;
 
 		if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
-			ConState.to_json(SerialNumber,Obj);
+			ConState.to_json(Obj);
 		} else {
 			field_to_json(Obj, "ipAddress", "");
 			field_to_json(Obj, "txBytes", (uint64_t)0);
@@ -80,13 +75,6 @@ namespace OpenWifi::GWObjects {
 			field_to_json(Obj, "associations_2G", (uint64_t)0);
 			field_to_json(Obj, "associations_5G", (uint64_t)0);
 			field_to_json(Obj, "associations_6G", (uint64_t)0);
-			field_to_json(Obj, "hasRADIUSSessions", false);
-			field_to_json(Obj, "hasGPS", ConState.hasGPS);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "memoryUsed", ConState.memoryUsed);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "load", ConState.load);
-			field_to_json(Obj, "temperature", ConState.temperature);
 		}
 #endif
 	}
@@ -96,32 +84,20 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj, "serialNumber", SerialNumber);
 			field_from_json(Obj, "deviceType", DeviceType);
 			field_from_json(Obj, "macAddress", MACAddress);
-			field_from_json(Obj, "manufacturer", Manufacturer);
-			field_from_json(Obj, "UUID", UUID);
 			field_from_json(Obj, "configuration", Configuration);
 			field_from_json(Obj, "notes", Notes);
-			field_from_json(Obj, "createdTimestamp", CreationTimestamp);
+			field_from_json(Obj, "manufacturer", Manufacturer);
-			field_from_json(Obj, "lastConfigurationChange", LastConfigurationChange);
-			field_from_json(Obj, "lastConfigurationDownload", LastConfigurationDownload);
-			field_from_json(Obj, "lastFWUpdate", LastFWUpdate);
 			field_from_json(Obj, "owner", Owner);
 			field_from_json(Obj, "location", Location);
 			field_from_json(Obj, "venue", Venue);
-			field_from_json(Obj, "firmware", Firmware);
 			field_from_json(Obj, "compatible", Compatible);
-			field_from_json(Obj, "fwUpdatePolicy", FWUpdatePolicy);
-			field_from_json(Obj, "devicePassword", DevicePassword);
 			field_from_json(Obj, "subscriber", subscriber);
 			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "modified", modified);
 			field_from_json(Obj, "locale", locale);
 			field_from_json(Obj, "restrictedDevice", restrictedDevice);
 			field_from_json(Obj, "pendingConfiguration", pendingConfiguration);
 			field_from_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
 			field_from_json(Obj, "restrictionDetails", restrictionDetails);
-			field_from_json(Obj, "pendingUUID", pendingUUID);
-			field_from_json(Obj, "simulated", simulated);
-			field_from_json(Obj, "lastRecordedContact", lastRecordedContact);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -189,8 +165,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "waitingForFile", WaitingForFile);
 		field_to_json(Obj, "attachFile", AttachDate);
 		field_to_json(Obj, "executionTime", executionTime);
-		field_to_json(Obj, "lastTry", lastTry);
-		field_to_json(Obj, "deferred", deferred);
 	}
 
 	bool DefaultConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -224,7 +198,7 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	void ConnectionState::to_json([[maybe_unused]] const std::string &SerialNumber, Poco::JSON::Object &Obj)  {
+	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "ipAddress", Address);
 		field_to_json(Obj, "txBytes", TX);
 		field_to_json(Obj, "rxBytes", RX);
@@ -246,20 +220,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "connectionCompletionTime", connectionCompletionTime);
 		field_to_json(Obj, "totalConnectionTime", Utils::Now() - started);
 		field_to_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-#ifdef TIP_GATEWAY_SERVICE
-		hasRADIUSSessions = RADIUSSessionTracker()->HasSessions(SerialNumber);
-		AP_WS_Server()->ExtendedAttributes(SerialNumber, hasGPS, sanity,
-										   memoryUsed,
-										   load,
-										   temperature);
-#endif
-		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
-		field_to_json(Obj, "hasGPS", hasGPS);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "memoryUsed", memoryUsed);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "load", load);
-		field_to_json(Obj, "temperature", temperature);
 
 		switch (VerifiedCertificate) {
 		case NO_CERTIFICATE:
@@ -274,9 +234,6 @@ namespace OpenWifi::GWObjects {
 		case VERIFIED:
 			field_to_json(Obj, "verifiedCertificate", "VERIFIED");
 			break;
-		case SIMULATED:
-			field_to_json(Obj, "verifiedCertificate", "SIMULATED");
-			break;
 		default:
 			field_to_json(Obj, "verifiedCertificate", "NO_CERTIFICATE");
 			break;
@@ -533,29 +490,6 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	void RangeOptions::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "NO_IR", NO_IR);
-		field_to_json(Obj, "AUTO_BW", AUTO_BW);
-		field_to_json(Obj, "DFS", DFS);
-		field_to_json(Obj, "NO_OUTDOOR", NO_OUTDOOR);
-		field_to_json(Obj, "wmmrule_ETSI", wmmrule_ETSI);
-		field_to_json(Obj, "NO_OFDM", NO_OFDM);
-	}
-
-	void FrequencyRange::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "from", from);
-		field_to_json(Obj, "to", to);
-		field_to_json(Obj, "channelWidth", channelWidth);
-		field_to_json(Obj, "powerDb", powerDb);
-		field_to_json(Obj, "options", options);
-	}
-
-	void RegulatoryCountryInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "country", country);
-		field_to_json(Obj, "domain", domain);
-		field_to_json(Obj, "ranges", ranges);
-	}
-
 	void DeviceRestrictionsKeyInfo::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "vendor", vendor);
 		field_to_json(Obj, "algo", algo);
@@ -610,42 +544,4 @@ namespace OpenWifi::GWObjects {
 				(T.commands != commands) || (T.developer != developer) || (T.ssh != ssh) ||
 				(T.key_info != key_info) || (T.country != country));
 	}
-
-	void RADIUSSession::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "lastTransaction", lastTransaction);
-		field_to_json(Obj, "destination", destination);
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "userName", userName);
-		field_to_json(Obj, "accountingSessionId", accountingSessionId);
-		field_to_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-		field_to_json(Obj, "inputPackets", inputPackets);
-		field_to_json(Obj, "outputPackets", outputPackets);
-		field_to_json(Obj, "inputOctets", inputOctets);
-		field_to_json(Obj, "outputOctets", outputOctets);
-		field_to_json(Obj, "inputGigaWords", inputGigaWords);
-		field_to_json(Obj, "outputGigaWords", outputGigaWords);
-		field_to_json(Obj, "sessionTime", sessionTime);
-		field_to_json(Obj, "callingStationId", callingStationId);
-		field_to_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-		field_to_json(Obj, "interface", interface);
-		field_to_json(Obj, "secret", secret);
-	}
-
-	void RADIUSSessionList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "sessions", sessions);
-	}
-
-	bool RadiusCoADMParameters::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "accountingSessionId", accountingSessionId);
-			field_from_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-			field_from_json(Obj, "callingStationId", callingStationId);
-			field_from_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 } // namespace OpenWifi::GWObjects

src/RESTObjects/RESTAPI_GWobjects.h

@@ -11,13 +11,9 @@
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
 
-#ifdef TIP_GATEWAY_SERVICE
-#include <RADIUS_helpers.h>
-#endif
-
 namespace OpenWifi::GWObjects {
 
-	enum CertificateValidation { NO_CERTIFICATE, VALID_CERTIFICATE, MISMATCH_SERIAL, VERIFIED, SIMULATED };
+	enum CertificateValidation { NO_CERTIFICATE, VALID_CERTIFICATE, MISMATCH_SERIAL, VERIFIED };
 
 	struct ConnectionState {
 		uint64_t MessageCount = 0;
@@ -42,14 +38,8 @@ namespace OpenWifi::GWObjects {
 		uint64_t sessionId = 0;
 		double connectionCompletionTime = 0.0;
 		std::uint64_t certificateExpiryDate = 0;
-		bool hasRADIUSSessions = false;
-		bool hasGPS = false;
-		std::uint64_t sanity=0;
-		std::double_t memoryUsed=0.0;
-		std::double_t load=0.0;
-		std::double_t temperature=0.0;
 
-		void to_json(const std::string &SerialNumber, Poco::JSON::Object &Obj) ;
+		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct DeviceRestrictionsKeyInfo {
@@ -106,9 +96,6 @@ namespace OpenWifi::GWObjects {
 		std::string pendingConfiguration;
 		std::string pendingConfigurationCmd;
 		DeviceRestrictions restrictionDetails;
-		std::uint64_t pendingUUID = 0;
-		bool simulated=false;
-		std::uint64_t lastRecordedContact=0;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
@@ -201,11 +188,7 @@ namespace OpenWifi::GWObjects {
 		uint64_t AttachSize = 0;
 		std::string AttachType;
 		double executionTime = 0.0;
-		std::uint64_t lastTry = 0;
-		bool deferred = false;
-
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct BlackListedDevice {
@@ -351,76 +334,4 @@ namespace OpenWifi::GWObjects {
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
-	struct RangeOptions {
-		bool NO_IR=false;
-		bool AUTO_BW=false;
-		bool DFS=false;
-		bool NO_OUTDOOR=false;
-		bool wmmrule_ETSI=false;
-		bool NO_OFDM=false;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct FrequencyRange {
-		float from = 0.0;
-		float to = 0.0;
-		int channelWidth = 0;
-		int powerDb = 0;
-		RangeOptions    options;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RegulatoryCountryInfo {
-		std::string country;
-		std::string domain;
-		std::vector<FrequencyRange>   ranges;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	using RegulatoryInfoCountryMap = std::map<std::string,RegulatoryCountryInfo>;
-
-	struct RADIUSSession {
-		std::uint64_t 			started=0,
-								lastTransaction=0;
-		std::string 			serialNumber,
-								destination,
-								userName,
-					 			accountingSessionId,
-								accountingMultiSessionId,
-					 			callingStationId,
-								chargeableUserIdentity,
-								secret,
-								interface;
-		std::uint64_t 			inputPackets = 0,
-								outputPackets = 0,
-								inputOctets = 0,
-								outputOctets = 0,
-								inputGigaWords = 0,
-								outputGigaWords = 0;
-		std::uint32_t 			sessionTime = 0;
-
-#ifdef TIP_GATEWAY_SERVICE
-		RADIUS::RadiusPacket	accountingPacket;
-#endif
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RADIUSSessionList {
-		std::vector<RADIUSSession>	sessions;
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RadiusCoADMParameters {
-		std::string 			accountingSessionId,
-								accountingMultiSessionId,
-								callingStationId,
-								chargeableUserIdentity;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 } // namespace OpenWifi::GWObjects

src/framework/ALBserver.cpp

@@ -4,19 +4,17 @@
 
 #include "ALBserver.h"
 
-#include "fmt/format.h"
-#include "framework/MicroServiceFuncs.h"
 #include "framework/utils.h"
+#include "framework/MicroServiceFuncs.h"
+#include "fmt/format.h"
 
 namespace OpenWifi {
 
-	void ALBRequestHandler::handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest &Request,
+	void ALBRequestHandler::handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) {
-										  Poco::Net::HTTPServerResponse &Response) {
 		Utils::SetThreadName("alb-request");
 		try {
-			if ((id_ % 100) == 0) {
+			if((id_ % 100) == 0) {
-				Logger_.debug(fmt::format("ALB-REQUEST({}): ALB Request {}.",
+				Logger_.debug(fmt::format("ALB-REQUEST({}): ALB Request {}.", Request.clientAddress().toString(), id_));
-										  Request.clientAddress().toString(), id_));
 			}
 			Response.setChunkedTransferEncoding(true);
 			Response.setContentType("text/html");
@@ -26,29 +24,33 @@ namespace OpenWifi {
 			Response.set("Connection", "keep-alive");
 			Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
 			std::ostream &Answer = Response.send();
-			Answer << ALBHealthCheckServer()->CallbackText();
+			Answer << "process Alive and kicking!";
 		} catch (...) {
+
 		}
 	}
 
-	ALBRequestHandlerFactory::ALBRequestHandlerFactory(Poco::Logger &L) : Logger_(L) {}
+	ALBRequestHandlerFactory::ALBRequestHandlerFactory(Poco::Logger & L):
+		Logger_(L) {
+	}
 
-	ALBRequestHandler *
+	ALBRequestHandler* ALBRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest& request) {
-	ALBRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest &request) {
 		if (request.getURI() == "/")
 			return new ALBRequestHandler(Logger_, req_id_++);
 		else
 			return nullptr;
 	}
 
-	ALBHealthCheckServer::ALBHealthCheckServer()
+	ALBHealthCheckServer::ALBHealthCheckServer() :
-		: SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb") {}
+		  SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb")
+	{
+	}
 
 	int ALBHealthCheckServer::Start() {
-		if (MicroServiceConfigGetBool("alb.enable", false)) {
+		if(MicroServiceConfigGetBool("alb.enable",false)) {
-			poco_information(Logger(), "Starting...");
+            poco_information(Logger(),"Starting...");
-			Running_ = true;
+			Running_=true;
-			Port_ = (int)MicroServiceConfigGetInt("alb.port", 15015);
+			Port_ = (int)MicroServiceConfigGetInt("alb.port",15015);
 			Poco::Net::IPAddress Addr(Poco::Net::IPAddress::wildcard(
 				Poco::Net::Socket::supportsIPv6() ? Poco::Net::AddressFamily::IPv6
 												  : Poco::Net::AddressFamily::IPv4));
@@ -58,8 +60,7 @@ namespace OpenWifi {
 			Socket_ = std::make_unique<Poco::Net::ServerSocket>(SockAddr, Port_);
 			auto Params = new Poco::Net::HTTPServerParams;
 			Params->setName("ws:alb");
-			Server_ = std::make_unique<Poco::Net::HTTPServer>(
+			Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger()), *Socket_, Params);
-				new ALBRequestHandlerFactory(Logger()), *Socket_, Params);
 			Server_->start();
 		}
 
@@ -67,10 +68,10 @@ namespace OpenWifi {
 	}
 
 	void ALBHealthCheckServer::Stop() {
-		poco_information(Logger(), "Stopping...");
+		poco_information(Logger(),"Stopping...");
-		if (Running_)
+		if(Running_)
 			Server_->stopAll(true);
-		poco_information(Logger(), "Stopped...");
+		poco_information(Logger(),"Stopped...");
 	}
 
 } // namespace OpenWifi

src/framework/ALBserver.h

@@ -7,38 +7,37 @@
 #include "framework/SubSystemServer.h"
 
 #include "Poco/Net/HTTPRequestHandler.h"
-#include "Poco/Net/HTTPRequestHandlerFactory.h"
-#include "Poco/Net/HTTPServer.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServer.h"
 
 namespace OpenWifi {
 
-	class ALBRequestHandler : public Poco::Net::HTTPRequestHandler {
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler {
 	  public:
-		explicit ALBRequestHandler(Poco::Logger &L, uint64_t id) : Logger_(L), id_(id) {}
+		explicit ALBRequestHandler(Poco::Logger & L, uint64_t id)
+                : Logger_(L), id_(id) {
+        }
 
-		void handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest &Request,
+		void handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) override;
-						   Poco::Net::HTTPServerResponse &Response) override;
 
 	  private:
-		Poco::Logger &Logger_;
+		Poco::Logger 	& Logger_;
-		uint64_t id_;
+		uint64_t 		id_;
 	};
 
-	class ALBRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+	class ALBRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+	{
 	  public:
-		explicit ALBRequestHandlerFactory(Poco::Logger &L);
+		explicit ALBRequestHandlerFactory(Poco::Logger & L);
-		ALBRequestHandler *
+		ALBRequestHandler* createRequestHandler(const Poco::Net::HTTPServerRequest& request) override;
-		createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
 
 	  private:
-		Poco::Logger &Logger_;
+		Poco::Logger	                            &Logger_;
-		inline static std::atomic_uint64_t req_id_ = 1;
+		inline static std::atomic_uint64_t 			req_id_=1;
 	};
 
-	typedef std::string ALBHealthMessageCallback();
-
 	class ALBHealthCheckServer : public SubSystemServer {
 	  public:
 		ALBHealthCheckServer();
@@ -50,26 +49,15 @@ namespace OpenWifi {
 
 		int Start() override;
 		void Stop() override;
-		inline void RegisterExtendedHealthMessage(ALBHealthMessageCallback *F) {
-			Callback_=F;
-		};
-
-		inline std::string CallbackText() {
-			if(Callback_== nullptr) {
-				return "process Alive and kicking!";
-			} else {
-				return Callback_();
-			}
-		}
 
 	  private:
-		std::unique_ptr<Poco::Net::HTTPServer> Server_;
+		std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
-		std::unique_ptr<Poco::Net::ServerSocket> Socket_;
+		std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
-		ALBHealthMessageCallback	*Callback_= nullptr;
+		int                                     	Port_ = 0;
-		int Port_ = 0;
+		mutable std::atomic_bool                    Running_=false;
-		mutable std::atomic_bool Running_ = false;
 	};
 
 	inline auto ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
 
 } // namespace OpenWifi
+

src/framework/API_Proxy.h

@@ -4,94 +4,96 @@
 
 #pragma once
 
-#include "Poco/JSON/Parser.h"
 #include "Poco/Logger.h"
-#include "Poco/Net/HTTPSClientSession.h"
+#include "Poco/JSON/Parser.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPSClientSession.h"
 #include "Poco/URI.h"
 
 #include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
-	inline void API_Proxy(Poco::Logger &Logger, Poco::Net::HTTPServerRequest *Request,
+    inline void API_Proxy( Poco::Logger &Logger,
-						  Poco::Net::HTTPServerResponse *Response, const char *ServiceType,
+                    Poco::Net::HTTPServerRequest *Request,
-						  const char *PathRewrite, uint64_t msTimeout_ = 10000) {
+                    Poco::Net::HTTPServerResponse *Response,
-		try {
+                    const char * ServiceType,
-			auto Services = MicroServiceGetServices(ServiceType);
+                    const char * PathRewrite,
-			for (auto const &Svc : Services) {
+                    uint64_t msTimeout_ = 10000 ) {
-				Poco::URI SourceURI(Request->getURI());
+        try {
-				Poco::URI DestinationURI(Svc.PrivateEndPoint);
+            auto Services = MicroServiceGetServices(ServiceType);
-				DestinationURI.setPath(PathRewrite);
+            for(auto const &Svc:Services) {
-				DestinationURI.setQuery(SourceURI.getQuery());
+                Poco::URI   SourceURI(Request->getURI());
+                Poco::URI	DestinationURI(Svc.PrivateEndPoint);
+                DestinationURI.setPath(PathRewrite);
+                DestinationURI.setQuery(SourceURI.getQuery());
 
-				// std::cout << "     Source: " << SourceURI.toString() << std::endl;
+                // std::cout << "     Source: " << SourceURI.toString() << std::endl;
-				// std::cout << "Destination: " << DestinationURI.toString() << std::endl;
+                // std::cout << "Destination: " << DestinationURI.toString() << std::endl;
 
-				Poco::Net::HTTPSClientSession Session(DestinationURI.getHost(),
+                Poco::Net::HTTPSClientSession Session(DestinationURI.getHost(), DestinationURI.getPort());
-													  DestinationURI.getPort());
+                Session.setKeepAlive(true);
-				Session.setKeepAlive(true);
+                Session.setTimeout(Poco::Timespan(msTimeout_/1000, msTimeout_ % 1000));
-				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+                Poco::Net::HTTPRequest ProxyRequest(Request->getMethod(),
-				Poco::Net::HTTPRequest ProxyRequest(Request->getMethod(),
+                                                    DestinationURI.getPathAndQuery(),
-													DestinationURI.getPathAndQuery(),
+                                                    Poco::Net::HTTPMessage::HTTP_1_1);
-													Poco::Net::HTTPMessage::HTTP_1_1);
+                if(Request->has("Authorization")) {
-				if (Request->has("Authorization")) {
+                    ProxyRequest.add("Authorization", Request->get("Authorization"));
-					ProxyRequest.add("Authorization", Request->get("Authorization"));
+                } else {
-				} else {
+                    ProxyRequest.add("X-API-KEY", Svc.AccessKey);
-					ProxyRequest.add("X-API-KEY", Svc.AccessKey);
+                    ProxyRequest.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
-					ProxyRequest.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
+                }
-				}
 
-				if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE) {
+                if(Request->getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE) {
-					Session.sendRequest(ProxyRequest);
+                    Session.sendRequest(ProxyRequest);
-					Poco::Net::HTTPResponse ProxyResponse;
+                    Poco::Net::HTTPResponse ProxyResponse;
-					Session.receiveResponse(ProxyResponse);
+                    Session.receiveResponse(ProxyResponse);
-					Response->setStatus(ProxyResponse.getStatus());
+                    Response->setStatus(ProxyResponse.getStatus());
-					Response->send();
+                    Response->send();
-					return;
+                    return;
-				} else {
+                } else {
-					Poco::JSON::Parser P;
+                    Poco::JSON::Parser P;
-					std::stringstream SS;
+                    std::stringstream SS;
-					try {
+                    try {
-						auto Body = P.parse(Request->stream()).extract<Poco::JSON::Object::Ptr>();
+                        auto Body = P.parse(Request->stream()).extract<Poco::JSON::Object::Ptr>();
-						Poco::JSON::Stringifier::condense(Body, SS);
+                        Poco::JSON::Stringifier::condense(Body,SS);
-						SS << "\r\n\r\n";
+                        SS << "\r\n\r\n";
-					} catch (const Poco::Exception &E) {
+                    } catch(const Poco::Exception &E) {
-						Logger.log(E);
+                        Logger.log(E);
-					}
+                    }
 
-					if (SS.str().empty()) {
+                    if(SS.str().empty()) {
-						Session.sendRequest(ProxyRequest);
+                        Session.sendRequest(ProxyRequest);
-					} else {
+                    } else {
-						ProxyRequest.setContentType("application/json");
+                        ProxyRequest.setContentType("application/json");
-						ProxyRequest.setContentLength(SS.str().size());
+                        ProxyRequest.setContentLength(SS.str().size());
-						std::ostream &os = Session.sendRequest(ProxyRequest);
+                        std::ostream & os = Session.sendRequest(ProxyRequest);
-						os << SS.str();
+                        os << SS.str() ;
-					}
+                    }
 
-					Poco::Net::HTTPResponse ProxyResponse;
+                    Poco::Net::HTTPResponse ProxyResponse;
-					std::stringstream SSR;
+                    std::stringstream SSR;
-					try {
+                    try {
-						std::istream &ProxyResponseStream = Session.receiveResponse(ProxyResponse);
+                        std::istream &ProxyResponseStream = Session.receiveResponse(ProxyResponse);
-						Poco::JSON::Parser P2;
+                        Poco::JSON::Parser  P2;
-						auto ProxyResponseBody =
+                        auto ProxyResponseBody = P2.parse(ProxyResponseStream).extract<Poco::JSON::Object::Ptr>();
-							P2.parse(ProxyResponseStream).extract<Poco::JSON::Object::Ptr>();
+                        Poco::JSON::Stringifier::condense(ProxyResponseBody,SSR);
-						Poco::JSON::Stringifier::condense(ProxyResponseBody, SSR);
+                        Response->setContentType("application/json");
-						Response->setContentType("application/json");
+                        Response->setContentLength(SSR.str().size());
-						Response->setContentLength(SSR.str().size());
+                        Response->setStatus(ProxyResponse.getStatus());
-						Response->setStatus(ProxyResponse.getStatus());
+                        Response->sendBuffer(SSR.str().c_str(),SSR.str().size());
-						Response->sendBuffer(SSR.str().c_str(), SSR.str().size());
+                        return;
-						return;
+                    } catch( const Poco::Exception & E) {
-					} catch (const Poco::Exception &E) {
-					}
-					Response->setStatus(ProxyResponse.getStatus());
-					Response->send();
-					return;
-				}
-			}
 
-		} catch (const Poco::Exception &E) {
+                    }
-			Logger.log(E);
+                    Response->setStatus(ProxyResponse.getStatus());
-		}
+                    Response->send();
-	}
+                    return;
-} // namespace OpenWifi
+                }
+            }
+
+        } catch (const Poco::Exception &E) {
+            Logger.log(E);
+        }
+    }
+}

src/framework/AppServiceRegistry.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
+#include <string>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <string>
 
-#include "Poco/File.h"
 #include "Poco/StreamCopier.h"
+#include "Poco/File.h"
 
 #include "framework/MicroServiceFuncs.h"
 
@@ -18,6 +18,7 @@
 
 namespace OpenWifi {
 
+
 	class AppServiceRegistry {
 	  public:
 		AppServiceRegistry() {
@@ -25,9 +26,9 @@ namespace OpenWifi {
 			Poco::File F(FileName);
 
 			try {
-				if (F.exists()) {
+				if(F.exists()) {
-					std::ostringstream OS;
+					std::ostringstream  OS;
-					std::ifstream IF(FileName);
+					std::ifstream       IF(FileName);
 					Poco::StreamCopier::copyStream(IF, OS);
 					Registry_ = nlohmann::json::parse(OS.str());
 				}
@@ -36,53 +37,55 @@ namespace OpenWifi {
 			}
 		}
 
-		static AppServiceRegistry &instance() {
+		static AppServiceRegistry & instance() {
-			static auto instance_ = new AppServiceRegistry;
+			static auto instance_= new AppServiceRegistry;
 			return *instance_;
 		}
 
-		inline ~AppServiceRegistry() { Save(); }
+		inline ~AppServiceRegistry() {
+			Save();
+		}
 
 		inline void Save() {
-			std::istringstream IS(to_string(Registry_));
+			std::istringstream  IS( to_string(Registry_));
-			std::ofstream OF;
+			std::ofstream       OF;
-			OF.open(FileName, std::ios::binary | std::ios::trunc);
+			OF.open(FileName,std::ios::binary | std::ios::trunc);
 			Poco::StreamCopier::copyStream(IS, OF);
 		}
 
-		inline void Set(const char *Key, uint64_t Value) {
+		inline void Set(const char *Key, uint64_t Value ) {
 			Registry_[Key] = Value;
 			Save();
 		}
 
-		inline void Set(const char *Key, const std::string &Value) {
+		inline void Set(const char *Key, const std::string &Value ) {
 			Registry_[Key] = Value;
 			Save();
 		}
 
-		inline void Set(const char *Key, bool Value) {
+		inline void Set(const char *Key, bool Value ) {
 			Registry_[Key] = Value;
 			Save();
 		}
 
-		inline bool Get(const char *Key, bool &Value) {
+		inline bool Get(const char *Key, bool & Value ) {
-			if (Registry_[Key].is_boolean()) {
+			if(Registry_[Key].is_boolean()) {
 				Value = Registry_[Key].get<bool>();
 				return true;
 			}
 			return false;
 		}
 
-		inline bool Get(const char *Key, uint64_t &Value) {
+		inline bool Get(const char *Key, uint64_t & Value ) {
-			if (Registry_[Key].is_number_unsigned()) {
+			if(Registry_[Key].is_number_unsigned()) {
 				Value = Registry_[Key].get<uint64_t>();
 				return true;
 			}
 			return false;
 		}
 
-		inline bool Get(const char *Key, std::string &Value) {
+		inline bool Get(const char *Key, std::string & Value ) {
-			if (Registry_[Key].is_string()) {
+			if(Registry_[Key].is_string()) {
 				Value = Registry_[Key].get<std::string>();
 				return true;
 			}
@@ -90,10 +93,10 @@ namespace OpenWifi {
 		}
 
 	  private:
-		std::string FileName;
+		std::string         FileName;
-		nlohmann::json Registry_;
+		nlohmann::json      Registry_;
 	};
 
 	inline auto AppServiceRegistry() { return AppServiceRegistry::instance(); }
 
-} // namespace OpenWifi
+}

src/framework/AuthClient.cpp

@@ -4,40 +4,41 @@
 
 #include "Poco/Net/HTTPServerResponse.h"
 
-#include "fmt/format.h"
 #include "framework/AuthClient.h"
 #include "framework/MicroServiceNames.h"
 #include "framework/OpenAPIRequests.h"
 #include "framework/utils.h"
+#include "fmt/format.h"
 
 namespace OpenWifi {
 
-	bool AuthClient::RetrieveTokenInformation(const std::string &SessionToken,
+	bool AuthClient::RetrieveTokenInformation(const std::string & SessionToken,
-											  SecurityObjects::UserInfoAndPolicy &UInfo,
+										 SecurityObjects::UserInfoAndPolicy & UInfo,
-											  std::uint64_t TID, bool &Expired, bool &Contacted,
+										 std::uint64_t TID,
-											  bool Sub) {
+										 bool & Expired, bool & Contacted, bool Sub) {
 		try {
 			Types::StringPairVec QueryData;
-			QueryData.push_back(std::make_pair("token", SessionToken));
+			QueryData.push_back(std::make_pair("token",SessionToken));
-			std::string AlternateURIForLogging = fmt::format(
+            std::string     AlternateURIForLogging = fmt::format("{}?token={}",  Sub ? "/api/v1/validateSubToken" : "/api/v1/validateToken", Utils::SanitizeToken(SessionToken));
-				"{}?token={}", Sub ? "/api/v1/validateSubToken" : "/api/v1/validateToken",
+			OpenAPIRequestGet	Req(    uSERVICE_SECURITY,
-				Utils::SanitizeToken(SessionToken));
-			OpenAPIRequestGet Req(uSERVICE_SECURITY,
 								  Sub ? "/api/v1/validateSubToken" : "/api/v1/validateToken",
-								  QueryData, 10000, AlternateURIForLogging);
+								  QueryData,
+								  10000,
+								  AlternateURIForLogging
+                                  );
 			Poco::JSON::Object::Ptr Response;
 
 			auto StatusCode = Req.Do(Response);
-			if (StatusCode == Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT) {
+			if(StatusCode==Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT) {
 				Contacted = false;
 				return false;
 			}
 
 			Contacted = true;
-			if (StatusCode == Poco::Net::HTTPServerResponse::HTTP_OK) {
+			if(StatusCode==Poco::Net::HTTPServerResponse::HTTP_OK) {
-				if (Response->has("tokenInfo") && Response->has("userInfo")) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
 					UInfo.from_json(Response);
-					if (IsTokenExpired(UInfo.webtoken)) {
+					if(IsTokenExpired(UInfo.webtoken)) {
 						Expired = true;
 						return false;
 					}
@@ -49,19 +50,18 @@ namespace OpenWifi {
 				}
 			}
 		} catch (...) {
-			poco_error(Logger(), fmt::format("Failed to retrieve token={} for TID={}",
+			poco_error(Logger(),fmt::format("Failed to retrieve token={} for TID={}", Utils::SanitizeToken(SessionToken), TID));
-											 Utils::SanitizeToken(SessionToken), TID));
 		}
 		Expired = false;
 		return false;
 	}
 
-	bool AuthClient::IsAuthorized(const std::string &SessionToken,
+	bool AuthClient::IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo,
-								  SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+							 std::uint64_t TID,
-								  bool &Expired, bool &Contacted, bool Sub) {
+							 bool & Expired, bool & Contacted, bool Sub) {
 		auto User = Cache_.get(SessionToken);
-		if (!User.isNull()) {
+		if(!User.isNull()) {
-			if (IsTokenExpired(User->webtoken)) {
+			if(IsTokenExpired(User->webtoken)) {
 				Expired = true;
 				Cache_.remove(SessionToken);
 				return false;
@@ -73,60 +73,57 @@ namespace OpenWifi {
 		return RetrieveTokenInformation(SessionToken, UInfo, TID, Expired, Contacted, Sub);
 	}
 
-	bool AuthClient::RetrieveApiKeyInformation(const std::string &SessionToken,
+    bool AuthClient::RetrieveApiKeyInformation(const std::string & SessionToken,
-											   SecurityObjects::UserInfoAndPolicy &UInfo,
+                                              SecurityObjects::UserInfoAndPolicy & UInfo,
-											   std::uint64_t TID, bool &Expired, bool &Contacted,
+                                              std::uint64_t TID,
-											   [[maybe_unused]] bool &Suspended) {
+                                              bool & Expired, bool & Contacted, [[maybe_unused]] bool & Suspended) {
-		try {
+        try {
-			Types::StringPairVec QueryData;
+            Types::StringPairVec QueryData;
-			QueryData.push_back(std::make_pair("apikey", SessionToken));
+            QueryData.push_back(std::make_pair("apikey",SessionToken));
-			std::string AlternateURIForLogging =
+            std::string     AlternateURIForLogging = fmt::format("/api/v1/validateApiKey?apiKey={}", Utils::SanitizeToken(SessionToken));
-				fmt::format("/api/v1/validateApiKey?apiKey={}", Utils::SanitizeToken(SessionToken));
+            OpenAPIRequestGet	Req(    uSERVICE_SECURITY,
-			OpenAPIRequestGet Req(uSERVICE_SECURITY, "/api/v1/validateApiKey", QueryData, 10000,
+                                         "/api/v1/validateApiKey" ,
-								  AlternateURIForLogging);
+                                         QueryData,
-			Poco::JSON::Object::Ptr Response;
+                                         10000,
+                                         AlternateURIForLogging);
+            Poco::JSON::Object::Ptr Response;
 
-			auto StatusCode = Req.Do(Response);
+            auto StatusCode = Req.Do(Response);
-			if (StatusCode == Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT) {
+            if(StatusCode==Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT) {
-				Contacted = false;
+                Contacted = false;
-				return false;
+                return false;
-			}
+            }
 
-			Contacted = true;
+            Contacted = true;
-			if (StatusCode == Poco::Net::HTTPServerResponse::HTTP_OK) {
+            if(StatusCode==Poco::Net::HTTPServerResponse::HTTP_OK) {
-				if (Response->has("tokenInfo") && Response->has("userInfo") &&
+                if(Response->has("tokenInfo") && Response->has("userInfo") && Response->has("expiresOn")) {
-					Response->has("expiresOn")) {
+                    UInfo.from_json(Response);
-					UInfo.from_json(Response);
+                    Expired = false;
-					Expired = false;
+                    ApiKeyCache_.update(SessionToken, ApiKeyCacheEntry{ .UserInfo = UInfo, .ExpiresOn = Response->get("expiresOn")});
-					ApiKeyCache_.update(SessionToken,
+                    return true;
-										ApiKeyCacheEntry{.UserInfo = UInfo,
+                } else {
-														 .ExpiresOn = Response->get("expiresOn")});
+                    return false;
-					return true;
+                }
-				} else {
+            }
-					return false;
+        } catch (...) {
-				}
+            poco_error(Logger(),fmt::format("Failed to retrieve api key={} for TID={}", Utils::SanitizeToken(SessionToken), TID));
-			}
+        }
-		} catch (...) {
+        Expired = false;
-			poco_error(Logger(), fmt::format("Failed to retrieve api key={} for TID={}",
+        return false;
-											 Utils::SanitizeToken(SessionToken), TID));
+    }
-		}
-		Expired = false;
-		return false;
-	}
 
-	bool AuthClient::IsValidApiKey(const std::string &SessionToken,
+    bool AuthClient::IsValidApiKey(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy &UInfo,
-								   SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+                                   std::uint64_t TID, bool &Expired, bool &Contacted, bool & Suspended) {
-								   bool &Expired, bool &Contacted, bool &Suspended) {
+        auto User = ApiKeyCache_.get(SessionToken);
-		auto User = ApiKeyCache_.get(SessionToken);
+        if (!User.isNull()) {
-		if (!User.isNull()) {
+            if(User->ExpiresOn < Utils::Now()) {
-			if (User->ExpiresOn < Utils::Now()) {
+                Expired = false;
-				Expired = false;
+                UInfo = User->UserInfo;
-				UInfo = User->UserInfo;
+                return true;
-				return true;
+            }
-			}
 			ApiKeyCache_.remove(SessionToken);
-		}
+        }
-		return RetrieveApiKeyInformation(SessionToken, UInfo, TID, Expired, Contacted, Suspended);
+        return RetrieveApiKeyInformation(SessionToken, UInfo, TID, Expired, Contacted, Suspended);
-	}
+    }
 
 } // namespace OpenWifi

src/framework/AuthClient.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "Poco/ExpireLRUCache.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
 #include "framework/SubSystemServer.h"
+#include "RESTObjects/RESTAPI_SecurityObjects.h"
+#include "Poco/ExpireLRUCache.h"
 #include "framework/utils.h"
 
 namespace OpenWifi {
@@ -14,59 +14,66 @@ namespace OpenWifi {
 	class AuthClient : public SubSystemServer {
 
 	  public:
-		explicit AuthClient() noexcept
+		explicit AuthClient() noexcept:
-			: SubSystemServer("Authentication", "AUTH-CLNT", "authentication") {}
+			 SubSystemServer("Authentication", "AUTH-CLNT", "authentication")
+		{
+		}
 
 		static auto instance() {
 			static auto instance_ = new AuthClient;
 			return instance_;
 		}
 
-		struct ApiKeyCacheEntry {
+        struct ApiKeyCacheEntry {
-			OpenWifi::SecurityObjects::UserInfoAndPolicy UserInfo;
+            OpenWifi::SecurityObjects::UserInfoAndPolicy    UserInfo;
-			std::uint64_t ExpiresOn;
+            std::uint64_t                                   ExpiresOn;
-		};
+        };
 
-		inline int Start() override { return 0; }
+        inline int Start() override {
+			return 0;
+		}
 
 		inline void Stop() override {
-			poco_information(Logger(), "Stopping...");
+			poco_information(Logger(),"Stopping...");
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
 			Cache_.clear();
-			poco_information(Logger(), "Stopped...");
+			poco_information(Logger(),"Stopped...");
 		}
 
 		inline void RemovedCachedToken(const std::string &Token) {
 			Cache_.remove(Token);
-			ApiKeyCache_.remove(Token);
+            ApiKeyCache_.remove(Token);
 		}
 
 		inline static bool IsTokenExpired(const SecurityObjects::WebToken &T) {
-			return ((T.expires_in_ + T.created_) < Utils::Now());
+			return ((T.expires_in_+T.created_) < Utils::Now());
 		}
 
-		bool RetrieveTokenInformation(const std::string &SessionToken,
+		bool RetrieveTokenInformation(const std::string & SessionToken,
-									  SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+			SecurityObjects::UserInfoAndPolicy & UInfo,
-									  bool &Expired, bool &Contacted, bool Sub = false);
+			std::uint64_t TID,
+		bool & Expired, bool & Contacted, bool Sub=false);
 
-		bool RetrieveApiKeyInformation(const std::string &SessionToken,
+        bool RetrieveApiKeyInformation(const std::string & SessionToken,
-									   SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+                                      SecurityObjects::UserInfoAndPolicy & UInfo,
-									   bool &Expired, bool &Contacted, bool &Suspended);
+                                      std::uint64_t TID,
+                                      bool & Expired, bool & Contacted, bool & Suspended);
 
-		bool IsAuthorized(const std::string &SessionToken,
+		bool IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo,
-						  SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+								 std::uint64_t TID,
-						  bool &Expired, bool &Contacted, bool Sub = false);
+								 bool & Expired, bool & Contacted, bool Sub = false);
 
-		bool IsValidApiKey(const std::string &SessionToken,
+        bool IsValidApiKey(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo,
-						   SecurityObjects::UserInfoAndPolicy &UInfo, std::uint64_t TID,
+                          std::uint64_t TID,
-						   bool &Expired, bool &Contacted, bool &Suspended);
+                          bool & Expired, bool & Contacted, bool & Suspended) ;
 
 	  private:
-		Poco::ExpireLRUCache<std::string, OpenWifi::SecurityObjects::UserInfoAndPolicy> Cache_{
+
-			512, 1200000};
+		Poco::ExpireLRUCache<std::string,OpenWifi::SecurityObjects::UserInfoAndPolicy>      Cache_{512,1200000 };
-		Poco::ExpireLRUCache<std::string, ApiKeyCacheEntry> ApiKeyCache_{512, 1200000};
+        Poco::ExpireLRUCache<std::string,ApiKeyCacheEntry>                                  ApiKeyCache_{512,1200000 };
 	};
 
 	inline auto AuthClient() { return AuthClient::instance(); }
 
 } // namespace OpenWifi
+

src/framework/CIDR.h

@@ -21,13 +21,13 @@ namespace OpenWifi::CIDR {
 	}
 
 	static bool cidr6_match(const in6_addr &address, const in6_addr &network, uint8_t bits) {
-#ifdef __linux__
+	#ifdef __linux__
 		const uint32_t *a = address.s6_addr32;
 		const uint32_t *n = network.s6_addr32;
-#else
+	#else
 		const uint32_t *a = address.__u6_addr.__u6_addr32;
 		const uint32_t *n = network.__u6_addr.__u6_addr32;
-#endif
+	#endif
 		int bits_whole, bits_incomplete;
 		bits_whole = bits >> 5;		   // number of whole u32
 		bits_incomplete = bits & 0x1F; // number of bits in incomplete u32
@@ -152,4 +152,4 @@ namespace OpenWifi::CIDR {
 	[[nodiscard]] inline bool ValidateIpRanges(const Types::StringVec &Ranges) {
 		return std::all_of(cbegin(Ranges), cend(Ranges), ValidateRange);
 	}
-} // namespace OpenWifi::CIDR
+}

src/framework/ConfigurationValidator.cpp

@@ -2,8 +2,8 @@
 // Created by stephane bourque on 2021-09-14.
 //
 
-#include <fstream>
 #include <iostream>
+#include <fstream>
 #include <regex>
 
 #include "ConfigurationValidator.h"
@@ -17,15 +17,14 @@
 #include "fmt/format.h"
 
 #include <valijson/adapters/poco_json_adapter.hpp>
-#include <valijson/constraints/constraint.hpp>
+#include <valijson/utils/poco_json_utils.hpp>
 #include <valijson/schema.hpp>
 #include <valijson/schema_parser.hpp>
-#include <valijson/utils/poco_json_utils.hpp>
 #include <valijson/validator.hpp>
+#include <valijson/constraints/constraint.hpp>
 
 static const std::string GitUCentralJSONSchemaFile{
-	"https://raw.githubusercontent.com/Telecominfraproject/wlan-ucentral-schema/main/"
+	"https://raw.githubusercontent.com/Telecominfraproject/wlan-ucentral-schema/main/ucentral.schema.json"};
-	"ucentral.schema.json"};
 
 static std::string DefaultUCentralSchema = R"foo(
 
@@ -37,10 +36,6 @@ static std::string DefaultUCentralSchema = R"foo(
         "uuid": {
             "type": "integer"
         },
-        "public_ip_lookup": {
-            "type": "string",
-            "format": "uc-fqdn"
-        },
         "unit": {
             "$ref": "#/$defs/unit"
         },
@@ -638,6 +633,26 @@ static std::string DefaultUCentralSchema = R"foo(
                     "type": "string",
                     "format": "uc-timeout",
                     "default": "6h"
+                },
+                "relay-server": {
+                    "type": "string",
+                    "format": "ipv4",
+                    "example": "192.168.2.1"
+                },
+                "circuit-id-format": {
+                    "type": "string",
+                    "example": [
+                        "\\{Interface\\}:\\{VLAN-Id\\}:\\{SSID\\}:\\{Model\\}:\\{Name\\}:\\{AP-MAC\\}:\\{Location\\}",
+                        "\\{AP-MAC\\};\\{SSID\\};\\{Crypto\\}",
+                        "\\{Name\\} \\{ESSID\\}"
+                    ]
+                },
+                "remote-id-format": {
+                    "type": "string",
+                    "example": [
+                        "\\{Client-MAC-hex\\} \\{SSID\\}",
+                        "\\{AP-MAC-hex\\} \\{SSID\\}"
+                    ]
                 }
             }
         },
@@ -1216,32 +1231,6 @@ static std::string DefaultUCentralSchema = R"foo(
                         "secret"
                     ]
                 },
-                "secondary": {
-                    "type": "object",
-                    "properties": {
-                        "host": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1812
-                            ]
-                        },
-                        "secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        }
-                    }
-                },
                 "request-attribute": {
                     "type": "array",
                     "items": {
@@ -1319,25 +1308,6 @@ static std::string DefaultUCentralSchema = R"foo(
                                         "value": "Example Operator"
                                     }
                                 ]
-                            },
-                            {
-                                "type": "object",
-                                "properties": {
-                                    "id": {
-                                        "type": "integer",
-                                        "maximum": 255,
-                                        "minimum": 1
-                                    },
-                                    "hex-value": {
-                                        "type": "string"
-                                    }
-                                },
-                                "examples": [
-                                    {
-                                        "id": 32,
-                                        "value": "0a0b0c0d"
-                                    }
-                                ]
                             }
                         ]
                     }
@@ -1687,236 +1657,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "service.captive.click": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "click-to-continue"
-                }
-            }
-        },
-        "service.captive.radius": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "radius"
-                },
-                "auth-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "auth-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "auth-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "acct-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "acct-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-interval": {
-                    "type": "integer",
-                    "default": 600
-                }
-            }
-        },
-        "service.captive.credentials": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "credentials"
-                },
-                "credentials": {
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "username": {
-                                "type": "string"
-                            },
-                            "password": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "service.captive.uam": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "uam"
-                },
-                "uam-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 3990
-                },
-                "uam-secret": {
-                    "type": "string"
-                },
-                "uam-server": {
-                    "type": "string"
-                },
-                "nasid": {
-                    "type": "string"
-                },
-                "nasmac": {
-                    "type": "string"
-                },
-                "auth-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "auth-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "auth-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "acct-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "acct-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-interval": {
-                    "type": "integer",
-                    "default": 600
-                },
-                "ssid": {
-                    "type": "string"
-                },
-                "mac-format": {
-                    "type": "string",
-                    "enum": [
-                        "aabbccddeeff",
-                        "aa-bb-cc-dd-ee-ff",
-                        "aa:bb:cc:dd:ee:ff",
-                        "AABBCCDDEEFF",
-                        "AA:BB:CC:DD:EE:FF",
-                        "AA-BB-CC-DD-EE-FF"
-                    ]
-                },
-                "final-redirect-url": {
-                    "type": "string",
-                    "enum": [
-                        "default",
-                        "uam"
-                    ]
-                },
-                "mac-auth": {
-                    "type": "boolean",
-                    "default": "default"
-                },
-                "radius-gw-proxy": {
-                    "type": "boolean",
-                    "default": false
-                }
-            }
-        },
-        "service.captive": {
-            "allOf": [
-                {
-                    "oneOf": [
-                        {
-                            "$ref": "#/$defs/service.captive.click"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.radius"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.credentials"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.uam"
-                        }
-                    ]
-                },
-                {
-                    "type": "object",
-                    "properties": {
-                        "walled-garden-fqdn": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "walled-garden-ipaddr": {
-                            "type": "array",
-                            "items": {
-                                "type": "string",
-                                "format": "uc-ip"
-                            }
-                        },
-                        "web-root": {
-                            "type": "string",
-                            "format": "uc-base64"
-                        },
-                        "idle-timeout": {
-                            "type": "integer",
-                            "default": 600
-                        },
-                        "session-timeout": {
-                            "type": "integer"
-                        }
-                    }
-                }
-            ]
-        },
         "interface.ssid": {
             "type": "object",
             "properties": {
@@ -1969,10 +1709,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "isolate-clients": {
                     "type": "boolean"
                 },
-                "strict-forwarding": {
-                    "type": "boolean",
-                    "default": false
-                },
                 "power-save": {
                     "type": "boolean"
                 },
@@ -2041,14 +1777,7 @@ static std::string DefaultUCentralSchema = R"foo(
                     "$ref": "#/$defs/interface.ssid.rate-limit"
                 },
                 "roaming": {
-                    "anyOf": [
+                    "$ref": "#/$defs/interface.ssid.roaming"
-                        {
-                            "$ref": "#/$defs/interface.ssid.roaming"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ]
                 },
                 "radius": {
                     "$ref": "#/$defs/interface.ssid.radius"
@@ -2065,9 +1794,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "access-control-list": {
                     "$ref": "#/$defs/interface.ssid.acl"
                 },
-                "captive": {
-                    "$ref": "#/$defs/service.captive"
-                },
                 "hostapd-bss-raw": {
                     "type": "array",
                     "items": {
@@ -2235,17 +1961,6 @@ static std::string DefaultUCentralSchema = R"foo(
                         ]
                     }
                 },
-                "vlan-awareness": {
-                    "type": "object",
-                    "properties": {
-                        "first": {
-                            "type": "integer"
-                        },
-                        "last": {
-                            "type": "integer"
-                        }
-                    }
-                },
                 "vlan": {
                     "$ref": "#/$defs/interface.vlan"
                 },
@@ -2368,10 +2083,6 @@ static std::string DefaultUCentralSchema = R"foo(
                     "examples": [
                         "01234567890123456789012345678901"
                     ]
-                },
-                "mutual-tls": {
-                    "type": "boolean",
-                    "default": true
                 }
             }
         },
@@ -2981,6 +2692,236 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
+        "service.captive.click": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "click-to-continue"
+                }
+            }
+        },
+        "service.captive.radius": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "radius"
+                },
+                "auth-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "auth-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "auth-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "acct-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "acct-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-interval": {
+                    "type": "integer",
+                    "default": 600
+                }
+            }
+        },
+        "service.captive.credentials": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "credentials"
+                },
+                "credentials": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "username": {
+                                "type": "string"
+                            },
+                            "password": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "service.captive.uam": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "uam"
+                },
+                "uam-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 3990
+                },
+                "uam-secret": {
+                    "type": "string"
+                },
+                "uam-server": {
+                    "type": "string"
+                },
+                "nasid": {
+                    "type": "string"
+                },
+                "nasmac": {
+                    "type": "string"
+                },
+                "auth-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "auth-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "auth-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "acct-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "acct-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-interval": {
+                    "type": "integer",
+                    "default": 600
+                },
+                "ssid": {
+                    "type": "string"
+                },
+                "mac-format": {
+                    "type": "string",
+                    "enum": [
+                        "aabbccddeeff",
+                        "aa-bb-cc-dd-ee-ff",
+                        "aa:bb:cc:dd:ee:ff",
+                        "AABBCCDDEEFF",
+                        "AA:BB:CC:DD:EE:FF",
+                        "AA-BB-CC-DD-EE-FF"
+                    ]
+                },
+                "final-redirect-url": {
+                    "type": "string",
+                    "enum": [
+                        "default",
+                        "uam"
+                    ]
+                },
+                "mac-auth": {
+                    "type": "boolean",
+                    "default": "default"
+                },
+                "radius-gw-proxy": {
+                    "type": "boolean",
+                    "default": false
+                }
+            }
+        },
+        "service.captive": {
+            "allOf": [
+                {
+                    "oneOf": [
+                        {
+                            "$ref": "#/$defs/service.captive.click"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.radius"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.credentials"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.uam"
+                        }
+                    ]
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "walled-garden-fqdn": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "walled-garden-ipaddr": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "format": "uc-ip"
+                            }
+                        },
+                        "web-root": {
+                            "type": "string",
+                            "format": "uc-base64"
+                        },
+                        "idle-timeout": {
+                            "type": "integer",
+                            "default": 600
+                        },
+                        "session-timeout": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            ]
+        },
         "service.gps": {
             "type": "object",
             "properties": {
@@ -2999,32 +2940,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "service.dhcp-relay": {
-            "type": "object",
-            "properties": {
-                "select-ports": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "vlans": {
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "vlan": {
-                                "type": "number"
-                            },
-                            "relay-server": {
-                                "type": "string",
-                                "format": "uc-ip"
-                            }
-                        }
-                    }
-                }
-            }
-        },
         "service": {
             "type": "object",
             "properties": {
@@ -3084,9 +2999,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 },
                 "gps": {
                     "$ref": "#/$defs/service.gps"
-                },
-                "dhcp-relay": {
-                    "$ref": "#/$defs/service.dhcp-relay"
                 }
             }
         },
@@ -3179,20 +3091,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "metrics.wifi-scan": {
-            "type": "object",
-            "properties": {
-                "interval": {
-                    "type": "integer"
-                },
-                "verbose": {
-                    "type": "boolean"
-                },
-                "information-elements": {
-                    "type": "boolean"
-                }
-            }
-        },
         "metrics.telemetry": {
             "type": "object",
             "properties": {
@@ -3202,27 +3100,7 @@ static std::string DefaultUCentralSchema = R"foo(
                 "types": {
                     "type": "array",
                     "items": {
-                        "type": "string",
+                        "type": "string"
-                        "enum": [
-                            "ssh",
-                            "health",
-                            "health.dns",
-                            "health.dhcp",
-                            "health.radius",
-                            "health.memory",
-                            "client",
-                            "client.join",
-                            "client.leave",
-                            "client.key-mismatch",
-                            "wifi",
-                            "wifi.start",
-                            "wifi.stop",
-                            "wired",
-                            "wired.carrier-up",
-                            "wired.carrier-down",
-                            "unit",
-                            "unit.boot-up"
-                        ]
                     }
                 }
             }
@@ -3233,27 +3111,7 @@ static std::string DefaultUCentralSchema = R"foo(
                 "types": {
                     "type": "array",
                     "items": {
-                        "type": "string",
+                        "type": "string"
-                        "enum": [
-                            "ssh",
-                            "health",
-                            "health.dns",
-                            "health.dhcp",
-                            "health.radius",
-                            "health.memory",
-                            "client",
-                            "client.join",
-                            "client.leave",
-                            "client.key-mismatch",
-                            "wifi",
-                            "wifi.start",
-                            "wifi.stop",
-                            "wired",
-                            "wired.carrier-up",
-                            "wired.carrier-down",
-                            "unit",
-                            "unit.boot-up"
-                        ]
                     }
                 }
             }
@@ -3273,9 +3131,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "dhcp-snooping": {
                     "$ref": "#/$defs/metrics.dhcp-snooping"
                 },
-                "wifi-scan": {
-                    "$ref": "#/$defs/metrics.wifi-scan"
-                },
                 "telemetry": {
                     "$ref": "#/$defs/metrics.telemetry"
                 },
@@ -3329,6 +3184,7 @@ static std::string DefaultUCentralSchema = R"foo(
 
 )foo";
 
+
 static inline bool IsIPv4(const std::string &value) {
 	Poco::Net::IPAddress A;
 	return ((Poco::Net::IPAddress::tryParse(value, A) && A.family() == Poco::Net::IPAddress::IPv4));
@@ -3386,68 +3242,57 @@ bool ExternalValijsonFormatChecker(const std::string &format, const std::string
 	if (format == "uc-cidr4") {
 		if (IsCIDRv4(value))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid CIDR IPv4 block",value));
-			results->pushError(context, fmt::format("{} is not a valid CIDR IPv4 block", value));
 	} else if (format == "uc-cidr6") {
 		if (IsCIDRv6(value))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid CIDR IPv6 block",value));
-			results->pushError(context, fmt::format("{} is not a valid CIDR IPv6 block", value));
 	} else if (format == "uc-cidr") {
 		if (IsCIDR(value))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid CIDR block",value));
-			results->pushError(context, fmt::format("{} is not a valid CIDR block", value));
 	} else if (format == "uc-mac") {
 		if (std::regex_match(value, mac_regex))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid MAC address",value));
-			results->pushError(context, fmt::format("{} is not a valid MAC address", value));
 	} else if (format == "uc-timeout") {
 		if (std::regex_match(value, uc_timeout_regex))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid timeout value",value));
-			results->pushError(context, fmt::format("{} is not a valid timeout value", value));
 	} else if (format == "uc-host") {
 		if (IsIP(value))
 			return true;
 		if (std::regex_match(value, host_regex))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid hostname",value));
-			results->pushError(context, fmt::format("{} is not a valid hostname", value));
 	} else if (format == "fqdn" || format == "uc-fqdn") {
 		if (std::regex_match(value, host_regex))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid FQDN",value));
-			results->pushError(context, fmt::format("{} is not a valid FQDN", value));
 	} else if (format == "uc-base64") {
 		std::string s{value};
 		Poco::trimInPlace(s);
 		if ((s.size() % 4 == 0) && std::regex_match(s, b64_regex))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid base 64 value",value));
-			results->pushError(context, fmt::format("{} is not a valid base 64 value", value));
 	} else if (format == "uri") {
 		try {
 			Poco::URI uri(value);
 			return true;
 		} catch (...) {
 		}
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid URL",value));
-			results->pushError(context, fmt::format("{} is not a valid URL", value));
 	} else if (format == "uc-portrange") {
 		try {
 			if (IsPortRangeIsValid(value))
 				return true;
 		} catch (...) {
 		}
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid post range",value));
-			results->pushError(context, fmt::format("{} is not a valid post range", value));
 	} else if (format == "ip") {
 		if (IsIP(value))
 			return true;
-		if (results)
+		if(results) results->pushError(context,fmt::format("{} is not a valid IP address",value));
-			results->pushError(context, fmt::format("{} is not a valid IP address", value));
 	}
 	return true;
 }
@@ -3459,7 +3304,9 @@ namespace OpenWifi {
 		return 0;
 	}
 
-	void ConfigurationValidator::Stop() {}
+	void ConfigurationValidator::Stop() {
+
+	}
 
 	bool ConfigurationValidator::SetSchema(const std::string &SchemaStr) {
 		try {
@@ -3471,9 +3318,9 @@ namespace OpenWifi {
 			SchemaParser_->populateSchema(*PocoJsonAdapter_, *RootSchema_);
 			Initialized_ = Working_ = true;
 			return true;
-		} catch (const Poco::Exception &E) {
+		} catch(const Poco::Exception &E) {
 			Logger().log(E);
-		} catch (...) {
+		} catch(...) {
 			Logger().error("Validation schema is invalid, falling back.");
 		}
 		return false;
@@ -3484,7 +3331,7 @@ namespace OpenWifi {
 			return;
 
 		std::string GitSchema;
-		if (MicroServiceConfigGetBool("ucentral.datamodel.internal", true)) {
+		if(MicroServiceConfigGetBool("ucentral.datamodel.internal",true)) {
 			SetSchema(DefaultUCentralSchema);
 			poco_information(Logger(), "Using uCentral validation from built-in default.");
 			return;
@@ -3492,35 +3339,34 @@ namespace OpenWifi {
 
 		try {
 			auto GitURI =
-				MicroServiceConfigGetString("ucentral.datamodel.uri", GitUCentralJSONSchemaFile);
+			   MicroServiceConfigGetString("ucentral.datamodel.uri",GitUCentralJSONSchemaFile);
-			if (Utils::wgets(GitURI, GitSchema) && SetSchema(GitSchema)) {
+				if(Utils::wgets(GitURI, GitSchema) && SetSchema(GitSchema)) {
-				poco_information(Logger(), "Using uCentral data model validation schema from GIT.");
+					poco_information(Logger(),"Using uCentral data model validation schema from GIT.");
-				return;
-			} else {
-				std::string FileName{MicroServiceDataDirectory() + "/ucentral.schema.json"};
-				std::ifstream input(FileName);
-				std::stringstream schema_file;
-				schema_file << input.rdbuf();
-				input.close();
-				if (SetSchema(schema_file.str())) {
-					poco_information(
-						Logger(), "Using uCentral data model validation schema from local file.");
 					return;
+				} else {
+					std::string FileName{ MicroServiceDataDirectory() + "/ucentral.schema.json" };
+					std::ifstream       input(FileName);
+					std::stringstream   schema_file;
+					schema_file << input.rdbuf();
+					input.close();
+					if(SetSchema(schema_file.str())) {
+						poco_information(Logger(),
+										 "Using uCentral data model validation schema from local file.");
+						return;
+					}
 				}
-			}
 		} catch (const Poco::Exception &E) {
 
 		} catch (...) {
+
 		}
 		SetSchema(DefaultUCentralSchema);
-		poco_information(Logger(),
+		poco_information(Logger(),"Using uCentral data model validation schema from built-in default.");
-						 "Using uCentral data model validation schema from built-in default.");
 	}
 
-	bool ConfigurationValidator::Validate(const std::string &C, std::vector<std::string> &Errors,
+    bool ConfigurationValidator::Validate(const std::string &C, std::vector<std::string> &Errors, bool Strict) {
-										  bool Strict) {
+        if(Working_) {
-		if (Working_) {
+            try {
-			try {
 				Poco::JSON::Parser P;
 				auto Doc = P.parse(C).extract<Poco::JSON::Object::Ptr>();
 				valijson::adapters::PocoJsonAdapter Tester(Doc);
@@ -3529,28 +3375,27 @@ namespace OpenWifi {
 				if (Validator.validate(*RootSchema_, Tester, &Results)) {
 					return true;
 				}
-				for (const auto &error : Results) {
+				for(const auto &error:Results) {
 					Errors.push_back(error.description);
 				}
 				return false;
-			} catch (const Poco::Exception &E) {
+			} catch(const Poco::Exception &E) {
 				Logger().log(E);
-			} catch (const std::exception &E) {
+            } catch(const std::exception &E) {
-				Logger().warning(
+				Logger().warning(fmt::format("Error wile validating a configuration (1): {}", E.what()));
-					fmt::format("Error wile validating a configuration (1): {}", E.what()));
+            } catch(...) {
-			} catch (...) {
 				Logger().warning("Error wile validating a configuration (2)");
-			}
+            }
-		}
+        }
-		if (Strict)
+		if(Strict)
 			return false;
-		return true;
+        return true;
-	}
+    }
 
-	void ConfigurationValidator::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
+    void ConfigurationValidator::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
-		poco_information(Logger(), "Reinitializing.");
+		poco_information(Logger(),"Reinitializing.");
-		Working_ = Initialized_ = false;
+        Working_ = Initialized_ = false;
-		Init();
+        Init();
-	}
+    }
 
-} // namespace OpenWifi
+}

src/framework/ConfigurationValidator.h

@@ -7,43 +7,43 @@
 #include "framework/SubSystemServer.h"
 
 #include <valijson/adapters/poco_json_adapter.hpp>
-#include <valijson/constraints/constraint.hpp>
+#include <valijson/utils/poco_json_utils.hpp>
-#include <valijson/constraints/constraint_visitor.hpp>
 #include <valijson/schema.hpp>
 #include <valijson/schema_parser.hpp>
-#include <valijson/utils/poco_json_utils.hpp>
 #include <valijson/validator.hpp>
+#include <valijson/constraints/constraint.hpp>
+#include <valijson/constraints/constraint_visitor.hpp>
 
 namespace OpenWifi {
-	class ConfigurationValidator : public SubSystemServer {
+    class ConfigurationValidator : public  SubSystemServer {
-	  public:
+    public:
-		static auto instance() {
-			static auto instance_ = new ConfigurationValidator;
-			return instance_;
-		}
 
-		bool Validate(const std::string &C, std::vector<std::string> &Errors, bool Strict);
+        static auto instance() {
-		int Start() override;
+            static auto instance_ = new ConfigurationValidator;
-		void Stop() override;
+            return instance_;
-		void reinitialize(Poco::Util::Application &self) override;
+        }
 
-	  private:
+        bool Validate(const std::string &C, std::vector<std::string> &Errors, bool Strict);
-		bool Initialized_ = false;
+        int Start() override;
-		bool Working_ = false;
+        void Stop() override;
-		void Init();
+        void reinitialize(Poco::Util::Application &self) override;
-		std::unique_ptr<valijson::Schema> RootSchema_;
-		std::unique_ptr<valijson::SchemaParser> SchemaParser_;
-		std::unique_ptr<valijson::adapters::PocoJsonAdapter> PocoJsonAdapter_;
-		Poco::JSON::Object::Ptr SchemaDocPtr_;
-		bool SetSchema(const std::string &SchemaStr);
 
-		ConfigurationValidator()
+    private:
-			: SubSystemServer("ConfigValidator", "CFG-VALIDATOR", "config.validator") {}
+        bool            					Initialized_=false;
-	};
+        bool            					Working_=false;
+        void            					Init();
+		std::unique_ptr<valijson::Schema>						RootSchema_;
+		std::unique_ptr<valijson::SchemaParser>  				SchemaParser_;
+		std::unique_ptr<valijson::adapters::PocoJsonAdapter> 	PocoJsonAdapter_;
+		Poco::JSON::Object::Ptr 			SchemaDocPtr_;
+		bool 								SetSchema(const std::string &SchemaStr);
+
+        ConfigurationValidator():
+            SubSystemServer("ConfigValidator", "CFG-VALIDATOR", "config.validator") {
+        }
+    };
+
+    inline auto ConfigurationValidator() { return ConfigurationValidator::instance(); }
+    inline bool ValidateUCentralConfiguration(const std::string &C, std::vector<std::string> &Error, bool strict) { return ConfigurationValidator::instance()->Validate(C, Error, strict); }
+}
 
-	inline auto ConfigurationValidator() { return ConfigurationValidator::instance(); }
-	inline bool ValidateUCentralConfiguration(const std::string &C, std::vector<std::string> &Error,
-											  bool strict) {
-		return ConfigurationValidator::instance()->Validate(C, Error, strict);
-	}
-} // namespace OpenWifi

src/framework/CountryCodes.h

@@ -4,266 +4,268 @@
 
 #pragma once
 
+#include <vector>
 #include <string>
 #include <utility>
-#include <vector>
 
 namespace OpenWifi {
     
-	struct CountryInfo {
+    struct CountryInfo {
-		std::string code;
+        std::string     code;
-		std::string name;
+        std::string     name;
-	};
+    };
     
-	inline static const std::vector<CountryInfo> CountryCodes{
+    inline static const std::vector<CountryInfo> CountryCodes {
-		{.code = "US", .name = "United States"},
+        { .code= "US", .name= "United States" },
-		{.code = "GB", .name = "United Kingdom"},
+        { .code= "GB", .name= "United Kingdom" },
-		{.code = "CA", .name = "Canada"},
+        { .code= "CA", .name= "Canada" },
-		{.code = "AF", .name = "Afghanistan"},
+        { .code= "AF", .name= "Afghanistan" },
-		{.code = "AX", .name = "Aland Islands"},
+        { .code= "AX", .name= "Aland Islands" },
-		{.code = "AL", .name = "Albania"},
+        { .code= "AL", .name= "Albania" },
-		{.code = "DZ", .name = "Algeria"},
+        { .code= "DZ", .name= "Algeria" },
-		{.code = "AS", .name = "American Samoa"},
+        { .code= "AS", .name= "American Samoa" },
-		{.code = "AD", .name = "Andorra"},
+        { .code= "AD", .name= "Andorra" },
-		{.code = "AO", .name = "Angola"},
+        { .code= "AO", .name= "Angola" },
-		{.code = "AI", .name = "Anguilla"},
+        { .code= "AI", .name= "Anguilla" },
-		{.code = "AQ", .name = "Antarctica"},
+        { .code= "AQ", .name= "Antarctica" },
-		{.code = "AG", .name = "Antigua And Barbuda"},
+        { .code= "AG", .name= "Antigua And Barbuda" },
-		{.code = "AR", .name = "Argentina"},
+        { .code= "AR", .name= "Argentina" },
-		{.code = "AM", .name = "Armenia"},
+        { .code= "AM", .name= "Armenia" },
-		{.code = "AN", .name = "Netherlands Antilles"},
+        { .code= "AN", .name= "Netherlands Antilles" },
-		{.code = "AW", .name = "Aruba"},
+        { .code= "AW", .name= "Aruba" },
-		{.code = "AU", .name = "Australia"},
+        { .code= "AU", .name= "Australia" },
-		{.code = "AT", .name = "Austria"},
+        { .code= "AT", .name= "Austria" },
-		{.code = "AZ", .name = "Azerbaijan"},
+        { .code= "AZ", .name= "Azerbaijan" },
-		{.code = "BS", .name = "Bahamas"},
+        { .code= "BS", .name= "Bahamas" },
-		{.code = "BH", .name = "Bahrain"},
+        { .code= "BH", .name= "Bahrain" },
-		{.code = "BD", .name = "Bangladesh"},
+        { .code= "BD", .name= "Bangladesh" },
-		{.code = "BB", .name = "Barbados"},
+        { .code= "BB", .name= "Barbados" },
-		{.code = "BY", .name = "Belarus"},
+        { .code= "BY", .name= "Belarus" },
-		{.code = "BE", .name = "Belgium"},
+        { .code= "BE", .name= "Belgium" },
-		{.code = "BZ", .name = "Belize"},
+        { .code= "BZ", .name= "Belize" },
-		{.code = "BJ", .name = "Benin"},
+        { .code= "BJ", .name= "Benin" },
-		{.code = "BM", .name = "Bermuda"},
+        { .code= "BM", .name= "Bermuda" },
-		{.code = "BT", .name = "Bhutan"},
+        { .code= "BT", .name= "Bhutan" },
-		{.code = "BO", .name = "Bolivia"},
+        { .code= "BO", .name= "Bolivia" },
-		{.code = "BA", .name = "Bosnia And Herzegovina"},
+        { .code= "BA", .name= "Bosnia And Herzegovina" },
-		{.code = "BW", .name = "Botswana"},
+        { .code= "BW", .name= "Botswana" },
-		{.code = "BV", .name = "Bouvet Island"},
+        { .code= "BV", .name= "Bouvet Island" },
-		{.code = "BR", .name = "Brazil"},
+        { .code= "BR", .name= "Brazil" },
-		{.code = "IO", .name = "British Indian Ocean Territory"},
+        { .code= "IO", .name= "British Indian Ocean Territory" },
-		{.code = "BN", .name = "Brunei Darussalam"},
+        { .code= "BN", .name= "Brunei Darussalam" },
-		{.code = "BG", .name = "Bulgaria"},
+        { .code= "BG", .name= "Bulgaria" },
-		{.code = "BF", .name = "Burkina Faso"},
+        { .code= "BF", .name= "Burkina Faso" },
-		{.code = "BI", .name = "Burundi"},
+        { .code= "BI", .name= "Burundi" },
-		{.code = "KH", .name = "Cambodia"},
+        { .code= "KH", .name= "Cambodia" },
-		{.code = "CM", .name = "Cameroon"},
+        { .code= "CM", .name= "Cameroon" },
-		{.code = "CA", .name = "Canada"},
+        { .code= "CA", .name= "Canada" },
-		{.code = "CV", .name = "Cape Verde"},
+        { .code= "CV", .name= "Cape Verde" },
-		{.code = "KY", .name = "Cayman Islands"},
+        { .code= "KY", .name= "Cayman Islands" },
-		{.code = "CF", .name = "Central African Republic"},
+        { .code= "CF", .name= "Central African Republic" },
-		{.code = "TD", .name = "Chad"},
+        { .code= "TD", .name= "Chad" },
-		{.code = "CL", .name = "Chile"},
+        { .code= "CL", .name= "Chile" },
-		{.code = "CN", .name = "China"},
+        { .code= "CN", .name= "China" },
-		{.code = "CX", .name = "Christmas Island"},
+        { .code= "CX", .name= "Christmas Island" },
-		{.code = "CC", .name = "Cocos (Keeling) Islands"},
+        { .code= "CC", .name= "Cocos (Keeling) Islands" },
-		{.code = "CO", .name = "Colombia"},
+        { .code= "CO", .name= "Colombia" },
-		{.code = "KM", .name = "Comoros"},
+        { .code= "KM", .name= "Comoros" },
-		{.code = "CG", .name = "Congo"},
+        { .code= "CG", .name= "Congo" },
-		{.code = "CD", .name = "Congo, Democratic Republic"},
+        { .code= "CD", .name= "Congo, Democratic Republic" },
-		{.code = "CK", .name = "Cook Islands"},
+        { .code= "CK", .name= "Cook Islands" },
-		{.code = "CR", .name = "Costa Rica"},
+        { .code= "CR", .name= "Costa Rica" },
-		{.code = "CI", .name = "Cote D\"Ivoire"},
+        { .code= "CI", .name= "Cote D\"Ivoire" },
-		{.code = "HR", .name = "Croatia"},
+        { .code= "HR", .name= "Croatia" },
-		{.code = "CU", .name = "Cuba"},
+        { .code= "CU", .name= "Cuba" },
-		{.code = "CY", .name = "Cyprus"},
+        { .code= "CY", .name= "Cyprus" },
-		{.code = "CZ", .name = "Czech Republic"},
+        { .code= "CZ", .name= "Czech Republic" },
-		{.code = "DK", .name = "Denmark"},
+        { .code= "DK", .name= "Denmark" },
-		{.code = "DJ", .name = "Djibouti"},
+        { .code= "DJ", .name= "Djibouti" },
-		{.code = "DM", .name = "Dominica"},
+        { .code= "DM", .name= "Dominica" },
-		{.code = "DO", .name = "Dominican Republic"},
+        { .code= "DO", .name= "Dominican Republic" },
-		{.code = "EC", .name = "Ecuador"},
+        { .code= "EC", .name= "Ecuador" },
-		{.code = "EG", .name = "Egypt"},
+        { .code= "EG", .name= "Egypt" },
-		{.code = "SV", .name = "El Salvador"},
+        { .code= "SV", .name= "El Salvador" },
-		{.code = "GQ", .name = "Equatorial Guinea"},
+        { .code= "GQ", .name= "Equatorial Guinea" },
-		{.code = "ER", .name = "Eritrea"},
+        { .code= "ER", .name= "Eritrea" },
-		{.code = "EE", .name = "Estonia"},
+        { .code= "EE", .name= "Estonia" },
-		{.code = "ET", .name = "Ethiopia"},
+        { .code= "ET", .name= "Ethiopia" },
-		{.code = "FK", .name = "Falkland Islands (Malvinas)"},
+        { .code= "FK", .name= "Falkland Islands (Malvinas)" },
-		{.code = "FO", .name = "Faroe Islands"},
+        { .code= "FO", .name= "Faroe Islands" },
-		{.code = "FJ", .name = "Fiji"},
+        { .code= "FJ", .name= "Fiji" },
-		{.code = "FI", .name = "Finland"},
+        { .code= "FI", .name= "Finland" },
-		{.code = "FR", .name = "France"},
+        { .code= "FR", .name= "France" },
-		{.code = "GF", .name = "French Guiana"},
+        { .code= "GF", .name= "French Guiana" },
-		{.code = "PF", .name = "French Polynesia"},
+        { .code= "PF", .name= "French Polynesia" },
-		{.code = "TF", .name = "French Southern Territories"},
+        { .code= "TF", .name= "French Southern Territories" },
-		{.code = "GA", .name = "Gabon"},
+        { .code= "GA", .name= "Gabon" },
-		{.code = "GM", .name = "Gambia"},
+        { .code= "GM", .name= "Gambia" },
-		{.code = "GE", .name = "Georgia"},
+        { .code= "GE", .name= "Georgia" },
-		{.code = "DE", .name = "Germany"},
+        { .code= "DE", .name= "Germany" },
-		{.code = "GH", .name = "Ghana"},
+        { .code= "GH", .name= "Ghana" },
-		{.code = "GI", .name = "Gibraltar"},
+        { .code= "GI", .name= "Gibraltar" },
-		{.code = "GR", .name = "Greece"},
+        { .code= "GR", .name= "Greece" },
-		{.code = "GL", .name = "Greenland"},
+        { .code= "GL", .name= "Greenland" },
-		{.code = "GD", .name = "Grenada"},
+        { .code= "GD", .name= "Grenada" },
-		{.code = "GP", .name = "Guadeloupe"},
+        { .code= "GP", .name= "Guadeloupe" },
-		{.code = "GU", .name = "Guam"},
+        { .code= "GU", .name= "Guam" },
-		{.code = "GT", .name = "Guatemala"},
+        { .code= "GT", .name= "Guatemala" },
-		{.code = "GG", .name = "Guernsey"},
+        { .code= "GG", .name= "Guernsey" },
-		{.code = "GN", .name = "Guinea"},
+        { .code= "GN", .name= "Guinea" },
-		{.code = "GW", .name = "Guinea-Bissau"},
+        { .code= "GW", .name= "Guinea-Bissau" },
-		{.code = "GY", .name = "Guyana"},
+        { .code= "GY", .name= "Guyana" },
-		{.code = "HT", .name = "Haiti"},
+        { .code= "HT", .name= "Haiti" },
-		{.code = "HM", .name = "Heard Island & Mcdonald Islands"},
+        { .code= "HM", .name= "Heard Island & Mcdonald Islands" },
-		{.code = "VA", .name = "Holy See (Vatican City State)"},
+        { .code= "VA", .name= "Holy See (Vatican City State)" },
-		{.code = "HN", .name = "Honduras"},
+        { .code= "HN", .name= "Honduras" },
-		{.code = "HK", .name = "Hong Kong"},
+        { .code= "HK", .name= "Hong Kong" },
-		{.code = "HU", .name = "Hungary"},
+        { .code= "HU", .name= "Hungary" },
-		{.code = "IS", .name = "Iceland"},
+        { .code= "IS", .name= "Iceland" },
-		{.code = "IN", .name = "India"},
+        { .code= "IN", .name= "India" },
-		{.code = "ID", .name = "Indonesia"},
+        { .code= "ID", .name= "Indonesia" },
-		{.code = "IR", .name = "Iran, Islamic Republic Of"},
+        { .code= "IR", .name= "Iran, Islamic Republic Of" },
-		{.code = "IQ", .name = "Iraq"},
+        { .code= "IQ", .name= "Iraq" },
-		{.code = "IE", .name = "Ireland"},
+        { .code= "IE", .name= "Ireland" },
-		{.code = "IM", .name = "Isle Of Man"},
+        { .code= "IM", .name= "Isle Of Man" },
-		{.code = "IL", .name = "Israel"},
+        { .code= "IL", .name= "Israel" },
-		{.code = "IT", .name = "Italy"},
+        { .code= "IT", .name= "Italy" },
-		{.code = "JM", .name = "Jamaica"},
+        { .code= "JM", .name= "Jamaica" },
-		{.code = "JP", .name = "Japan"},
+        { .code= "JP", .name= "Japan" },
-		{.code = "JE", .name = "Jersey"},
+        { .code= "JE", .name= "Jersey" },
-		{.code = "JO", .name = "Jordan"},
+        { .code= "JO", .name= "Jordan" },
-		{.code = "KZ", .name = "Kazakhstan"},
+        { .code= "KZ", .name= "Kazakhstan" },
-		{.code = "KE", .name = "Kenya"},
+        { .code= "KE", .name= "Kenya" },
-		{.code = "KI", .name = "Kiribati"},
+        { .code= "KI", .name= "Kiribati" },
-		{.code = "KR", .name = "Korea"},
+        { .code= "KR", .name= "Korea" },
-		{.code = "KW", .name = "Kuwait"},
+        { .code= "KW", .name= "Kuwait" },
-		{.code = "KG", .name = "Kyrgyzstan"},
+        { .code= "KG", .name= "Kyrgyzstan" },
-		{.code = "LA", .name = "Lao People\"s Democratic Republic"},
+        { .code= "LA", .name= "Lao People\"s Democratic Republic" },
-		{.code = "LV", .name = "Latvia"},
+        { .code= "LV", .name= "Latvia" },
-		{.code = "LB", .name = "Lebanon"},
+        { .code= "LB", .name= "Lebanon" },
-		{.code = "LS", .name = "Lesotho"},
+        { .code= "LS", .name= "Lesotho" },
-		{.code = "LR", .name = "Liberia"},
+        { .code= "LR", .name= "Liberia" },
-		{.code = "LY", .name = "Libyan Arab Jamahiriya"},
+        { .code= "LY", .name= "Libyan Arab Jamahiriya" },
-		{.code = "LI", .name = "Liechtenstein"},
+        { .code= "LI", .name= "Liechtenstein" },
-		{.code = "LT", .name = "Lithuania"},
+        { .code= "LT", .name= "Lithuania" },
-		{.code = "LU", .name = "Luxembourg"},
+        { .code= "LU", .name= "Luxembourg" },
-		{.code = "MO", .name = "Macao"},
+        { .code= "MO", .name= "Macao" },
-		{.code = "MK", .name = "Macedonia"},
+        { .code= "MK", .name= "Macedonia" },
-		{.code = "MG", .name = "Madagascar"},
+        { .code= "MG", .name= "Madagascar" },
-		{.code = "MW", .name = "Malawi"},
+        { .code= "MW", .name= "Malawi" },
-		{.code = "MY", .name = "Malaysia"},
+        { .code= "MY", .name= "Malaysia" },
-		{.code = "MV", .name = "Maldives"},
+        { .code= "MV", .name= "Maldives" },
-		{.code = "ML", .name = "Mali"},
+        { .code= "ML", .name= "Mali" },
-		{.code = "MT", .name = "Malta"},
+        { .code= "MT", .name= "Malta" },
-		{.code = "MH", .name = "Marshall Islands"},
+        { .code= "MH", .name= "Marshall Islands" },
-		{.code = "MQ", .name = "Martinique"},
+        { .code= "MQ", .name= "Martinique" },
-		{.code = "MR", .name = "Mauritania"},
+        { .code= "MR", .name= "Mauritania" },
-		{.code = "MU", .name = "Mauritius"},
+        { .code= "MU", .name= "Mauritius" },
-		{.code = "YT", .name = "Mayotte"},
+        { .code= "YT", .name= "Mayotte" },
-		{.code = "MX", .name = "Mexico"},
+        { .code= "MX", .name= "Mexico" },
-		{.code = "FM", .name = "Micronesia, Federated States Of"},
+        { .code= "FM", .name= "Micronesia, Federated States Of" },
-		{.code = "MD", .name = "Moldova"},
+        { .code= "MD", .name= "Moldova" },
-		{.code = "MC", .name = "Monaco"},
+        { .code= "MC", .name= "Monaco" },
-		{.code = "MN", .name = "Mongolia"},
+        { .code= "MN", .name= "Mongolia" },
-		{.code = "ME", .name = "Montenegro"},
+        { .code= "ME", .name= "Montenegro" },
-		{.code = "MS", .name = "Montserrat"},
+        { .code= "MS", .name= "Montserrat" },
-		{.code = "MA", .name = "Morocco"},
+        { .code= "MA", .name= "Morocco" },
-		{.code = "MZ", .name = "Mozambique"},
+        { .code= "MZ", .name= "Mozambique" },
-		{.code = "MM", .name = "Myanmar"},
+        { .code= "MM", .name= "Myanmar" },
-		{.code = "NA", .name = "Namibia"},
+        { .code= "NA", .name= "Namibia" },
-		{.code = "NR", .name = "Nauru"},
+        { .code= "NR", .name= "Nauru" },
-		{.code = "NP", .name = "Nepal"},
+        { .code= "NP", .name= "Nepal" },
-		{.code = "NL", .name = "Netherlands"},
+        { .code= "NL", .name= "Netherlands" },
-		{.code = "AN", .name = "Netherlands Antilles"},
+        { .code= "AN", .name= "Netherlands Antilles" },
-		{.code = "NC", .name = "New Caledonia"},
+        { .code= "NC", .name= "New Caledonia" },
-		{.code = "NZ", .name = "New Zealand"},
+        { .code= "NZ", .name= "New Zealand" },
-		{.code = "NI", .name = "Nicaragua"},
+        { .code= "NI", .name= "Nicaragua" },
-		{.code = "NE", .name = "Niger"},
+        { .code= "NE", .name= "Niger" },
-		{.code = "NG", .name = "Nigeria"},
+        { .code= "NG", .name= "Nigeria" },
-		{.code = "NU", .name = "Niue"},
+        { .code= "NU", .name= "Niue" },
-		{.code = "NF", .name = "Norfolk Island"},
+        { .code= "NF", .name= "Norfolk Island" },
-		{.code = "MP", .name = "Northern Mariana Islands"},
+        { .code= "MP", .name= "Northern Mariana Islands" },
-		{.code = "NO", .name = "Norway"},
+        { .code= "NO", .name= "Norway" },
-		{.code = "OM", .name = "Oman"},
+        { .code= "OM", .name= "Oman" },
-		{.code = "PK", .name = "Pakistan"},
+        { .code= "PK", .name= "Pakistan" },
-		{.code = "PW", .name = "Palau"},
+        { .code= "PW", .name= "Palau" },
-		{.code = "PS", .name = "Palestinian Territory, Occupied"},
+        { .code= "PS", .name= "Palestinian Territory, Occupied" },
-		{.code = "PA", .name = "Panama"},
+        { .code= "PA", .name= "Panama" },
-		{.code = "PG", .name = "Papua New Guinea"},
+        { .code= "PG", .name= "Papua New Guinea" },
-		{.code = "PY", .name = "Paraguay"},
+        { .code= "PY", .name= "Paraguay" },
-		{.code = "PE", .name = "Peru"},
+        { .code= "PE", .name= "Peru" },
-		{.code = "PH", .name = "Philippines"},
+        { .code= "PH", .name= "Philippines" },
-		{.code = "PN", .name = "Pitcairn"},
+        { .code= "PN", .name= "Pitcairn" },
-		{.code = "PL", .name = "Poland"},
+        { .code= "PL", .name= "Poland" },
-		{.code = "PT", .name = "Portugal"},
+        { .code= "PT", .name= "Portugal" },
-		{.code = "PR", .name = "Puerto Rico"},
+        { .code= "PR", .name= "Puerto Rico" },
-		{.code = "QA", .name = "Qatar"},
+        { .code= "QA", .name= "Qatar" },
-		{.code = "RE", .name = "Reunion"},
+        { .code= "RE", .name= "Reunion" },
-		{.code = "RO", .name = "Romania"},
+        { .code= "RO", .name= "Romania" },
-		{.code = "RU", .name = "Russian Federation"},
+        { .code= "RU", .name= "Russian Federation" },
-		{.code = "RW", .name = "Rwanda"},
+        { .code= "RW", .name= "Rwanda" },
-		{.code = "BL", .name = "Saint Barthelemy"},
+        { .code= "BL", .name= "Saint Barthelemy" },
-		{.code = "SH", .name = "Saint Helena"},
+        { .code= "SH", .name= "Saint Helena" },
-		{.code = "KN", .name = "Saint Kitts And Nevis"},
+        { .code= "KN", .name= "Saint Kitts And Nevis" },
-		{.code = "LC", .name = "Saint Lucia"},
+        { .code= "LC", .name= "Saint Lucia" },
-		{.code = "MF", .name = "Saint Martin"},
+        { .code= "MF", .name= "Saint Martin" },
-		{.code = "PM", .name = "Saint Pierre And Miquelon"},
+        { .code= "PM", .name= "Saint Pierre And Miquelon" },
-		{.code = "VC", .name = "Saint Vincent And Grenadines"},
+        { .code= "VC", .name= "Saint Vincent And Grenadines" },
-		{.code = "WS", .name = "Samoa"},
+        { .code= "WS", .name= "Samoa" },
-		{.code = "SM", .name = "San Marino"},
+        { .code= "SM", .name= "San Marino" },
-		{.code = "ST", .name = "Sao Tome And Principe"},
+        { .code= "ST", .name= "Sao Tome And Principe" },
-		{.code = "SA", .name = "Saudi Arabia"},
+        { .code= "SA", .name= "Saudi Arabia" },
-		{.code = "SN", .name = "Senegal"},
+        { .code= "SN", .name= "Senegal" },
-		{.code = "RS", .name = "Serbia"},
+        { .code= "RS", .name= "Serbia" },
-		{.code = "SC", .name = "Seychelles"},
+        { .code= "SC", .name= "Seychelles" },
-		{.code = "SL", .name = "Sierra Leone"},
+        { .code= "SL", .name= "Sierra Leone" },
-		{.code = "SG", .name = "Singapore"},
+        { .code= "SG", .name= "Singapore" },
-		{.code = "SK", .name = "Slovakia"},
+        { .code= "SK", .name= "Slovakia" },
-		{.code = "SI", .name = "Slovenia"},
+        { .code= "SI", .name= "Slovenia" },
-		{.code = "SB", .name = "Solomon Islands"},
+        { .code= "SB", .name= "Solomon Islands" },
-		{.code = "SO", .name = "Somalia"},
+        { .code= "SO", .name= "Somalia" },
-		{.code = "ZA", .name = "South Africa"},
+        { .code= "ZA", .name= "South Africa" },
-		{.code = "GS", .name = "South Georgia And Sandwich Isl."},
+        { .code= "GS", .name= "South Georgia And Sandwich Isl." },
-		{.code = "ES", .name = "Spain"},
+        { .code= "ES", .name= "Spain" },
-		{.code = "LK", .name = "Sri Lanka"},
+        { .code= "LK", .name= "Sri Lanka" },
-		{.code = "SD", .name = "Sudan"},
+        { .code= "SD", .name= "Sudan" },
-		{.code = "SR", .name = "Suriname"},
+        { .code= "SR", .name= "Suriname" },
-		{.code = "SJ", .name = "Svalbard And Jan Mayen"},
+        { .code= "SJ", .name= "Svalbard And Jan Mayen" },
-		{.code = "SZ", .name = "Swaziland"},
+        { .code= "SZ", .name= "Swaziland" },
-		{.code = "SE", .name = "Sweden"},
+        { .code= "SE", .name= "Sweden" },
-		{.code = "CH", .name = "Switzerland"},
+        { .code= "CH", .name= "Switzerland" },
-		{.code = "SY", .name = "Syrian Arab Republic"},
+        { .code= "SY", .name= "Syrian Arab Republic" },
-		{.code = "TW", .name = "Taiwan"},
+        { .code= "TW", .name= "Taiwan" },
-		{.code = "TJ", .name = "Tajikistan"},
+        { .code= "TJ", .name= "Tajikistan" },
-		{.code = "TZ", .name = "Tanzania"},
+        { .code= "TZ", .name= "Tanzania" },
-		{.code = "TH", .name = "Thailand"},
+        { .code= "TH", .name= "Thailand" },
-		{.code = "TL", .name = "Timor-Leste"},
+        { .code= "TL", .name= "Timor-Leste" },
-		{.code = "TG", .name = "Togo"},
+        { .code= "TG", .name= "Togo" },
-		{.code = "TK", .name = "Tokelau"},
+        { .code= "TK", .name= "Tokelau" },
-		{.code = "TO", .name = "Tonga"},
+        { .code= "TO", .name= "Tonga" },
-		{.code = "TT", .name = "Trinidad And Tobago"},
+        { .code= "TT", .name= "Trinidad And Tobago" },
-		{.code = "TN", .name = "Tunisia"},
+        { .code= "TN", .name= "Tunisia" },
-		{.code = "TR", .name = "Turkey"},
+        { .code= "TR", .name= "Turkey" },
-		{.code = "TM", .name = "Turkmenistan"},
+        { .code= "TM", .name= "Turkmenistan" },
-		{.code = "TC", .name = "Turks And Caicos Islands"},
+        { .code= "TC", .name= "Turks And Caicos Islands" },
-		{.code = "TV", .name = "Tuvalu"},
+        { .code= "TV", .name= "Tuvalu" },
-		{.code = "UG", .name = "Uganda"},
+        { .code= "UG", .name= "Uganda" },
-		{.code = "UA", .name = "Ukraine"},
+        { .code= "UA", .name= "Ukraine" },
-		{.code = "AE", .name = "United Arab Emirates"},
+        { .code= "AE", .name= "United Arab Emirates" },
-		{.code = "GB", .name = "United Kingdom"},
+        { .code= "GB", .name= "United Kingdom" },
-		{.code = "US", .name = "United States"},
+        { .code= "US", .name= "United States" },
-		{.code = "UM", .name = "United States Outlying Islands"},
+        { .code= "UM", .name= "United States Outlying Islands" },
-		{.code = "UY", .name = "Uruguay"},
+        { .code= "UY", .name= "Uruguay" },
-		{.code = "UZ", .name = "Uzbekistan"},
+        { .code= "UZ", .name= "Uzbekistan" },
-		{.code = "VU", .name = "Vanuatu"},
+        { .code= "VU", .name= "Vanuatu" },
-		{.code = "VE", .name = "Venezuela"},
+        { .code= "VE", .name= "Venezuela" },
-		{.code = "VN", .name = "Viet Nam"},
+        { .code= "VN", .name= "Viet Nam" },
-		{.code = "VG", .name = "Virgin Islands, British"},
+        { .code= "VG", .name= "Virgin Islands, British" },
-		{.code = "VI", .name = "Virgin Islands, U.S."},
+        { .code= "VI", .name= "Virgin Islands, U.S." },
-		{.code = "WF", .name = "Wallis And Futuna"},
+        { .code= "WF", .name= "Wallis And Futuna" },
-		{.code = "EH", .name = "Western Sahara"},
+        { .code= "EH", .name= "Western Sahara" },
-		{.code = "YE", .name = "Yemen"},
+        { .code= "YE", .name= "Yemen" },
-		{.code = "ZM", .name = "Zambia"},
+        { .code= "ZM", .name= "Zambia" },
-		{.code = "ZW", .name = "Zimbabwe"}};
+        { .code= "ZW", .name= "Zimbabwe" }
+    };
+
+}
 
-} // namespace OpenWifi

src/framework/EventBusManager.cpp

@@ -4,46 +4,45 @@
 
 #include "framework/EventBusManager.h"
 #include "framework/KafkaManager.h"
-#include "framework/MicroServiceFuncs.h"
 #include "framework/utils.h"
+#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
-	EventBusManager::EventBusManager(Poco::Logger &L) : Logger_(L) {}
+	EventBusManager::EventBusManager(Poco::Logger &L) :
+		Logger_(L) {
+	}
 
 	void EventBusManager::run() {
 		Running_ = true;
 		Utils::SetThreadName("fmwk:EventMgr");
-		auto Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN));
+		auto Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
-		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,MicroServicePrivateEndPoint(),Msg, false);
-									false);
+		while(Running_) {
-		while (Running_) {
 			Poco::Thread::trySleep((unsigned long)MicroServiceDaemonBusTimer());
-			if (!Running_)
+			if(!Running_)
 				break;
-			Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE));
+			Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
-			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(),
+			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,MicroServicePrivateEndPoint(),Msg, false);
-										Msg, false);
 		}
-		Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE));
+		Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
-		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,MicroServicePrivateEndPoint(),Msg, false);
-									false);
 	};
 
 	void EventBusManager::Start() {
-		poco_information(Logger(), "Starting...");
+        poco_information(Logger(),"Starting...");
-		if (KafkaManager()->Enabled()) {
+		if(KafkaManager()->Enabled()) {
 			Thread_.start(*this);
 		}
 	}
 
 	void EventBusManager::Stop() {
-		if (KafkaManager()->Enabled()) {
+		if(KafkaManager()->Enabled()) {
-			poco_information(Logger(), "Stopping...");
+			poco_information(Logger(),"Stopping...");
 			Running_ = false;
 			Thread_.wakeUp();
 			Thread_.join();
-			poco_information(Logger(), "Stopped...");
+			poco_information(Logger(),"Stopped...");
 		}
 	}
 

src/framework/EventBusManager.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Poco/Logger.h"
 #include "Poco/Runnable.h"
+#include "Poco/Logger.h"
 #include "Poco/Thread.h"
 
 namespace OpenWifi {
@@ -16,12 +16,13 @@ namespace OpenWifi {
 		void run() final;
 		void Start();
 		void Stop();
-		inline Poco::Logger &Logger() { return Logger_; }
+		inline Poco::Logger & Logger() { return Logger_; }
 
 	  private:
-		mutable std::atomic_bool Running_ = false;
+		mutable std::atomic_bool 	Running_ = false;
-		Poco::Thread Thread_;
+		Poco::Thread		Thread_;
-		Poco::Logger &Logger_;
+		Poco::Logger		&Logger_;
 	};
 
 } // namespace OpenWifi
+

src/framework/KafkaManager.cpp

@@ -4,260 +4,251 @@
 
 #include "KafkaManager.h"
 
-#include "fmt/format.h"
 #include "framework/MicroServiceFuncs.h"
+#include "fmt/format.h"
 
 namespace OpenWifi {
 
-	void KafkaLoggerFun([[maybe_unused]] cppkafka::KafkaHandleBase &handle, int level,
+	void KafkaLoggerFun([[maybe_unused]] cppkafka::KafkaHandleBase & handle, int level, const std::string & facility, const std::string &message) {
-						const std::string &facility, const std::string &message) {
+		switch ((cppkafka::LogLevel) level) {
-		switch ((cppkafka::LogLevel)level) {
 		case cppkafka::LogLevel::LogNotice: {
-			poco_notice(KafkaManager()->Logger(),
+			poco_notice(KafkaManager()->Logger(),fmt::format("kafka-log: facility: {} message: {}",facility, message));
-						fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		case cppkafka::LogLevel::LogDebug: {
-			poco_debug(KafkaManager()->Logger(),
+			poco_debug(KafkaManager()->Logger(),fmt::format("kafka-log: facility: {} message: {}",facility, message));
-					   fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		case cppkafka::LogLevel::LogInfo: {
-			poco_information(KafkaManager()->Logger(),
+			poco_information(KafkaManager()->Logger(),fmt::format("kafka-log: facility: {} message: {}",facility, message));
-							 fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		case cppkafka::LogLevel::LogWarning: {
-			poco_warning(KafkaManager()->Logger(),
+			poco_warning(KafkaManager()->Logger(), fmt::format("kafka-log: facility: {} message: {}",facility, message));
-						 fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		case cppkafka::LogLevel::LogAlert:
 		case cppkafka::LogLevel::LogCrit: {
-			poco_critical(KafkaManager()->Logger(),
+			poco_critical(KafkaManager()->Logger(),fmt::format("kafka-log: facility: {} message: {}",facility, message));
-						  fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		case cppkafka::LogLevel::LogErr:
 		case cppkafka::LogLevel::LogEmerg:
 		default: {
-			poco_error(KafkaManager()->Logger(),
+			poco_error(KafkaManager()->Logger(),fmt::format("kafka-log: facility: {} message: {}",facility, message));
-					   fmt::format("kafka-log: facility: {} message: {}", facility, message));
+		}
-		} break;
+		break;
 		}
 	}
 
-	inline void KafkaErrorFun([[maybe_unused]] cppkafka::KafkaHandleBase &handle, int error,
+	inline void KafkaErrorFun([[maybe_unused]] cppkafka::KafkaHandleBase & handle, int error, const std::string &reason) {
-							  const std::string &reason) {
+		poco_error(KafkaManager()->Logger(),fmt::format("kafka-error: {}, reason: {}", error, reason));
-		poco_error(KafkaManager()->Logger(),
-				   fmt::format("kafka-error: {}, reason: {}", error, reason));
 	}
 
-	inline void AddKafkaSecurity(cppkafka::Configuration &Config) {
+	inline void AddKafkaSecurity(cppkafka::Configuration & Config) {
-		auto CA = MicroServiceConfigGetString("openwifi.kafka.ssl.ca.location", "");
+		auto CA = MicroServiceConfigGetString("openwifi.kafka.ssl.ca.location","");
-		auto Certificate =
+		auto Certificate = MicroServiceConfigGetString("openwifi.kafka.ssl.certificate.location","");
-			MicroServiceConfigGetString("openwifi.kafka.ssl.certificate.location", "");
+		auto Key = MicroServiceConfigGetString("openwifi.kafka.ssl.key.location","");
-		auto Key = MicroServiceConfigGetString("openwifi.kafka.ssl.key.location", "");
+		auto Password = MicroServiceConfigGetString("openwifi.kafka.ssl.key.password","");
-		auto Password = MicroServiceConfigGetString("openwifi.kafka.ssl.key.password", "");
 
-		if (CA.empty() || Certificate.empty() || Key.empty())
+		if(CA.empty() || Certificate.empty() || Key.empty())
 			return;
 
 		Config.set("ssl.ca.location", CA);
 		Config.set("ssl.certificate.location", Certificate);
 		Config.set("ssl.key.location", Key);
-		if (!Password.empty())
+		if(!Password.empty())
 			Config.set("ssl.key.password", Password);
 	}
 
-	void KafkaManager::initialize(Poco::Util::Application &self) {
+
+	void KafkaManager::initialize(Poco::Util::Application & self) {
 		SubSystemServer::initialize(self);
-		KafkaEnabled_ = MicroServiceConfigGetBool("openwifi.kafka.enable", false);
+		KafkaEnabled_ = MicroServiceConfigGetBool("openwifi.kafka.enable",false);
 	}
 
 	inline void KafkaProducer::run() {
-		Poco::Logger &Logger_ =
+        Poco::Logger &Logger_ = Poco::Logger::create("KAFKA-PRODUCER", KafkaManager()->Logger().getChannel());
-			Poco::Logger::create("KAFKA-PRODUCER", KafkaManager()->Logger().getChannel());
+        poco_information(Logger_,"Starting...");
-		poco_information(Logger_, "Starting...");
 
 		Utils::SetThreadName("Kafka:Prod");
-		cppkafka::Configuration Config(
+		cppkafka::Configuration Config({
-			{{"client.id", MicroServiceConfigGetString("openwifi.kafka.client.id", "")},
+			{ "client.id", MicroServiceConfigGetString("openwifi.kafka.client.id", "") },
-			 {"metadata.broker.list",
+			{ "metadata.broker.list", MicroServiceConfigGetString("openwifi.kafka.brokerlist", "") }
-			  MicroServiceConfigGetString("openwifi.kafka.brokerlist", "")}});
+		});
 
 		AddKafkaSecurity(Config);
 
 		Config.set_log_callback(KafkaLoggerFun);
 		Config.set_error_callback(KafkaErrorFun);
 
-		KafkaManager()->SystemInfoWrapper_ =
+		KafkaManager()->SystemInfoWrapper_ = 	R"lit({ "system" : { "id" : )lit" +
-			R"lit({ "system" : { "id" : )lit" + std::to_string(MicroServiceID()) +
+											 std::to_string(MicroServiceID()) +
-			R"lit( , "host" : ")lit" + MicroServicePrivateEndPoint() +
+											 R"lit( , "host" : ")lit" + MicroServicePrivateEndPoint() +
-			R"lit(" } , "payload" : )lit";
+											 R"lit(" } , "payload" : )lit" ;
 
-		cppkafka::Producer Producer(Config);
+		cppkafka::Producer	Producer(Config);
 		Running_ = true;
 
-		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
+		Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-		while (Note && Running_) {
+		while(Note && Running_) {
 			try {
 				auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
 				if (Msg != nullptr) {
-					Producer.produce(cppkafka::MessageBuilder(Msg->Topic())
+					Producer.produce(
-										 .key(Msg->Key())
+						cppkafka::MessageBuilder(Msg->Topic()).key(Msg->Key()).payload(Msg->Payload()));
-										 .payload(Msg->Payload()));
 				}
 			} catch (const cppkafka::HandleException &E) {
-				poco_warning(Logger_,
+				poco_warning(Logger_,fmt::format("Caught a Kafka exception (producer): {}", E.what()));
-							 fmt::format("Caught a Kafka exception (producer): {}", E.what()));
+			} catch( const Poco::Exception &E) {
-			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
 			} catch (...) {
-				poco_error(Logger_, "std::exception");
+				poco_error(Logger_,"std::exception");
 			}
 			Note = Queue_.waitDequeueNotification();
 		}
-		poco_information(Logger_, "Stopped...");
+        poco_information(Logger_,"Stopped...");
 	}
 
 	inline void KafkaConsumer::run() {
 		Utils::SetThreadName("Kafka:Cons");
 
-		Poco::Logger &Logger_ =
+        Poco::Logger &Logger_ = Poco::Logger::create("KAFKA-CONSUMER", KafkaManager()->Logger().getChannel());
-			Poco::Logger::create("KAFKA-CONSUMER", KafkaManager()->Logger().getChannel());
 
-		poco_information(Logger_, "Starting...");
+        poco_information(Logger_,"Starting...");
 
-		cppkafka::Configuration Config(
+		cppkafka::Configuration Config({
-			{{"client.id", MicroServiceConfigGetString("openwifi.kafka.client.id", "")},
+			{ "client.id", MicroServiceConfigGetString("openwifi.kafka.client.id","") },
-			 {"metadata.broker.list", MicroServiceConfigGetString("openwifi.kafka.brokerlist", "")},
+			{ "metadata.broker.list", MicroServiceConfigGetString("openwifi.kafka.brokerlist","") },
-			 {"group.id", MicroServiceConfigGetString("openwifi.kafka.group.id", "")},
+			{ "group.id", MicroServiceConfigGetString("openwifi.kafka.group.id","") },
-			 {"enable.auto.commit", MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false)},
+			{ "enable.auto.commit", MicroServiceConfigGetBool("openwifi.kafka.auto.commit",false) },
-			 {"auto.offset.reset", "latest"},
+			{ "auto.offset.reset", "latest" } ,
-			 {"enable.partition.eof", false}});
+			{ "enable.partition.eof", false }
+		});
 
 		AddKafkaSecurity(Config);
 
 		Config.set_log_callback(KafkaLoggerFun);
 		Config.set_error_callback(KafkaErrorFun);
 
-		cppkafka::TopicConfiguration topic_config = {{"auto.offset.reset", "smallest"}};
+		cppkafka::TopicConfiguration topic_config = {
+			{ "auto.offset.reset", "smallest" }
+		};
 
 		// Now configure it to be the default topic config
 		Config.set_default_topic_configuration(topic_config);
 
 		cppkafka::Consumer Consumer(Config);
-		Consumer.set_assignment_callback([&](cppkafka::TopicPartitionList &partitions) {
+		Consumer.set_assignment_callback([&](cppkafka::TopicPartitionList& partitions) {
-			if (!partitions.empty()) {
+			if(!partitions.empty()) {
-				poco_information(Logger_, fmt::format("Partition assigned: {}...",
+				poco_information(Logger_,fmt::format("Partition assigned: {}...",
-													  partitions.front().get_partition()));
+																 partitions.front().get_partition()));
 			}
 		});
-		Consumer.set_revocation_callback([&](const cppkafka::TopicPartitionList &partitions) {
+		Consumer.set_revocation_callback([&](const cppkafka::TopicPartitionList& partitions) {
-			if (!partitions.empty()) {
+			if(!partitions.empty()) {
-				poco_information(Logger_, fmt::format("Partition revocation: {}...",
+                poco_information(Logger_,fmt::format("Partition revocation: {}...",
-													  partitions.front().get_partition()));
+																 partitions.front().get_partition()));
 			}
 		});
 
-		bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false);
+		bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit",false);
-		auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize", 20);
+		auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize",20);
 
-		Types::StringVec Topics;
+		Types::StringVec    Topics;
 		KafkaManager()->Topics(Topics);
 		Consumer.subscribe(Topics);
 
 		Running_ = true;
-		while (Running_) {
+		while(Running_) {
 			try {
-				std::vector<cppkafka::Message> MsgVec =
+				std::vector<cppkafka::Message> MsgVec = Consumer.poll_batch(BatchSize, std::chrono::milliseconds(100));
-					Consumer.poll_batch(BatchSize, std::chrono::milliseconds(100));
+				for(auto const &Msg:MsgVec) {
-				for (auto const &Msg : MsgVec) {
 					if (!Msg)
 						continue;
 					if (Msg.get_error()) {
 						if (!Msg.is_eof()) {
-							poco_error(Logger_,
+							poco_error(Logger_,fmt::format("Error: {}", Msg.get_error().to_string()));
-									   fmt::format("Error: {}", Msg.get_error().to_string()));
 						}
-						if (!AutoCommit)
+						if(!AutoCommit)
 							Consumer.async_commit(Msg);
 						continue;
 					}
-					KafkaManager()->Dispatch(Msg.get_topic().c_str(), Msg.get_key(), std::make_shared<std::string>(Msg.get_payload()));
+					KafkaManager()->Dispatch(Msg.get_topic(), Msg.get_key(),Msg.get_payload() );
 					if (!AutoCommit)
 						Consumer.async_commit(Msg);
 				}
 			} catch (const cppkafka::HandleException &E) {
-				poco_warning(Logger_,
+				poco_warning(Logger_,fmt::format("Caught a Kafka exception (consumer): {}", E.what()));
-							 fmt::format("Caught a Kafka exception (consumer): {}", E.what()));
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
 			} catch (...) {
-				poco_error(Logger_, "std::exception");
+				poco_error(Logger_,"std::exception");
 			}
 		}
 		Consumer.unsubscribe();
-		poco_information(Logger_, "Stopped...");
+        poco_information(Logger_,"Stopped...");
 	}
 
 	void KafkaProducer::Start() {
-		if (!Running_) {
+		if(!Running_) {
-			Running_ = true;
+			Running_=true;
 			Worker_.start(*this);
 		}
 	}
 
 	void KafkaProducer::Stop() {
-		if (Running_) {
+		if(Running_) {
-			Running_ = false;
+			Running_=false;
 			Queue_.wakeUpAll();
 			Worker_.join();
 		}
 	}
 
-	void KafkaProducer::Produce(const char *Topic, const std::string &Key,
+	void KafkaProducer::Produce(const std::string &Topic, const std::string &Key, const std::string &Payload) {
-								std::shared_ptr<std::string> Payload) {
+		std::lock_guard	G(Mutex_);
-		std::lock_guard G(Mutex_);
+		Queue_.enqueueNotification( new KafkaMessage(Topic,Key,Payload));
-		Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
 	}
 
 	void KafkaConsumer::Start() {
-		if (!Running_) {
+		if(!Running_) {
-			Running_ = true;
+			Running_=true;
 			Worker_.start(*this);
 		}
 	}
 
 	void KafkaConsumer::Stop() {
-		if (Running_) {
+		if(Running_) {
-			Running_ = false;
+			Running_=false;
 			Worker_.wakeUp();
 			Worker_.join();
 		}
 	}
 
 	void KafkaDispatcher::Start() {
-		if (!Running_) {
+		if(!Running_) {
-			Running_ = true;
+			Running_=true;
 			Worker_.start(*this);
 		}
 	}
 
 	void KafkaDispatcher::Stop() {
-		if (Running_) {
+		if(Running_) {
-			Running_ = false;
+			Running_=false;
 			Queue_.wakeUpAll();
 			Worker_.join();
 		}
 	}
 
-	auto KafkaDispatcher::RegisterTopicWatcher(const std::string &Topic,
+	auto KafkaDispatcher::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
-											   Types::TopicNotifyFunction &F) {
 		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
-		if (It == Notifiers_.end()) {
+		if(It == Notifiers_.end()) {
 			Types::TopicNotifyFunctionList L;
-			L.emplace(L.end(), std::make_pair(F, FunctionId_));
+			L.emplace(L.end(),std::make_pair(F,FunctionId_));
 			Notifiers_[Topic] = std::move(L);
 		} else {
-			It->second.emplace(It->second.end(), std::make_pair(F, FunctionId_));
+			It->second.emplace(It->second.end(),std::make_pair(F,FunctionId_));
 		}
 		return FunctionId_++;
 	}
@@ -265,115 +256,110 @@ namespace OpenWifi {
 	void KafkaDispatcher::UnregisterTopicWatcher(const std::string &Topic, int Id) {
 		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
-		if (It != Notifiers_.end()) {
+		if(It != Notifiers_.end()) {
-			Types::TopicNotifyFunctionList &L = It->second;
+			Types::TopicNotifyFunctionList & L = It->second;
-			for (auto it = L.begin(); it != L.end(); it++)
+			for(auto it=L.begin(); it!=L.end(); it++)
-				if (it->second == Id) {
+				if(it->second == Id) {
 					L.erase(it);
 					break;
 				}
 		}
 	}
 
-	void KafkaDispatcher::Dispatch(const char *Topic, const std::string &Key,
+	void KafkaDispatcher::Dispatch(const std::string &Topic, const std::string &Key, const std::string &Payload) {
-								   const std::shared_ptr<std::string> Payload) {
+		std::lock_guard	G(Mutex_);
-		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
-		if (It != Notifiers_.end()) {
+		if(It!=Notifiers_.end()) {
 			Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
 		}
 	}
 
 	void KafkaDispatcher::run() {
-		Poco::Logger &Logger_ =
+        Poco::Logger &Logger_ = Poco::Logger::create("KAFKA-DISPATCHER", KafkaManager()->Logger().getChannel());
-			Poco::Logger::create("KAFKA-DISPATCHER", KafkaManager()->Logger().getChannel());
+        poco_information(Logger_,"Starting...");
-		poco_information(Logger_, "Starting...");
+		Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
 		Utils::SetThreadName("kafka:dispatch");
-		while (Note && Running_) {
+		while(Note && Running_) {
-			auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
+			auto Msg = dynamic_cast<KafkaMessage*>(Note.get());
-			if (Msg != nullptr) {
+			if(Msg!= nullptr) {
 				auto It = Notifiers_.find(Msg->Topic());
 				if (It != Notifiers_.end()) {
-					const auto &FL = It->second;
+					const auto & FL = It->second;
-					for (const auto &[CallbackFunc, _] : FL) {
+					for(const auto &[CallbackFunc,_]:FL) {
 						CallbackFunc(Msg->Key(), Msg->Payload());
 					}
 				}
 			}
 			Note = Queue_.waitDequeueNotification();
 		}
-		poco_information(Logger_, "Stopped...");
+        poco_information(Logger_,"Stopped...");
 	}
 
 	void KafkaDispatcher::Topics(std::vector<std::string> &T) {
 		T.clear();
-		for (const auto &[TopicName, _] : Notifiers_)
+		for(const auto &[TopicName,_]:Notifiers_)
 			T.push_back(TopicName);
 	}
 
+
 	int KafkaManager::Start() {
-		if (!KafkaEnabled_)
+		if(!KafkaEnabled_)
 			return 0;
-		ConsumerThr_.Start();
+        ConsumerThr_.Start();
 		ProducerThr_.Start();
 		Dispatcher_.Start();
 		return 0;
 	}
 
-	void KafkaManager::Stop() {
+	void KafkaManager::Stop()  {
-		if (KafkaEnabled_) {
+		if(KafkaEnabled_) {
-			poco_information(Logger(), "Stopping...");
+			poco_information(Logger(),"Stopping...");
 			Dispatcher_.Stop();
 			ProducerThr_.Stop();
 			ConsumerThr_.Stop();
-			poco_information(Logger(), "Stopped...");
+			poco_information(Logger(),"Stopped...");
 			return;
 		}
 	}
 
-	void KafkaManager::PostMessage(const char *topic, const std::string &key,
+	void KafkaManager::PostMessage(const std::string &topic, const std::string & key, const std::string &PayLoad, bool WrapMessage ) {
-								   const std::shared_ptr<std::string> PayLoad, bool WrapMessage) {
+		if(KafkaEnabled_) {
-		if (KafkaEnabled_) {
+			ProducerThr_.Produce(topic,key,WrapMessage ? WrapSystemId(PayLoad) : PayLoad);
-			ProducerThr_.Produce(topic, key, WrapMessage ? WrapSystemId(PayLoad) : PayLoad);
 		}
 	}
 
-	void KafkaManager::Dispatch(const char *Topic, const std::string &Key,
+	void KafkaManager::Dispatch(const std::string &Topic, const std::string & Key, const std::string &Payload) {
-								const std::shared_ptr<std::string> Payload) {
 		Dispatcher_.Dispatch(Topic, Key, Payload);
 	}
 
-	[[nodiscard]] const std::shared_ptr<std::string> KafkaManager::WrapSystemId(const std::shared_ptr<std::string> PayLoad) {
+	[[nodiscard]] std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
-		*PayLoad = SystemInfoWrapper_ + *PayLoad + "}";
+		return SystemInfoWrapper_ + PayLoad + "}";
-		return PayLoad;
 	}
 
-	uint64_t KafkaManager::RegisterTopicWatcher(const std::string &Topic,
+	uint64_t KafkaManager::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
-												Types::TopicNotifyFunction &F) {
+		if(KafkaEnabled_) {
-		if (KafkaEnabled_) {
+			return Dispatcher_.RegisterTopicWatcher(Topic,F);
-			return Dispatcher_.RegisterTopicWatcher(Topic, F);
 		} else {
 			return 0;
 		}
 	}
 
 	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, uint64_t Id) {
-		if (KafkaEnabled_) {
+		if(KafkaEnabled_) {
 			Dispatcher_.UnregisterTopicWatcher(Topic, Id);
 		}
 	}
 
-	void KafkaManager::Topics(std::vector<std::string> &T) { Dispatcher_.Topics(T); }
+	void KafkaManager::Topics(std::vector<std::string> &T) {
-
+		Dispatcher_.Topics(T);
-	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList &partitions) {
-		poco_information(
-			Logger(), fmt::format("Partition assigned: {}...", partitions.front().get_partition()));
 	}
 
-	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList &partitions) {
+	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList& partitions) {
-		poco_information(Logger(), fmt::format("Partition revocation: {}...",
+		poco_information(Logger(),fmt::format("Partition assigned: {}...", partitions.front().get_partition()));
-											   partitions.front().get_partition()));
+	}
+
+	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList& partitions) {
+		poco_information(Logger(),fmt::format("Partition revocation: {}...",partitions.front().get_partition()));
 	}
 
 } // namespace OpenWifi

src/framework/KafkaManager.h

@@ -7,43 +7,44 @@
 #include "Poco/Notification.h"
 #include "Poco/NotificationQueue.h"
 
-#include "framework/KafkaTopics.h"
-#include "framework/OpenWifiTypes.h"
 #include "framework/SubSystemServer.h"
+#include "framework/OpenWifiTypes.h"
 #include "framework/utils.h"
+#include "framework/KafkaTopics.h"
 
 #include "cppkafka/cppkafka.h"
 
 namespace OpenWifi {
 
-	class KafkaMessage : public Poco::Notification {
+	class KafkaMessage: public Poco::Notification {
 	  public:
-		KafkaMessage(const char * Topic, const std::string &Key, std::shared_ptr<std::string> Payload)
+		KafkaMessage( const std::string &Topic, const std::string &Key, const std::string & Payload) :
-			: Topic_(Topic), Key_(Key), Payload_(Payload) {}
+			Topic_(Topic), Key_(Key), Payload_(Payload) {
+		}
 
-		inline const char * Topic() { return Topic_; }
+		inline const std::string & Topic() { return Topic_; }
-		inline const std::string &Key() { return Key_; }
+		inline const std::string & Key() { return Key_; }
-		inline const std::string &Payload() { return *Payload_; }
+		inline const std::string & Payload() { return Payload_; }
 
 	  private:
-		const char *Topic_;
+		std::string	Topic_;
-		std::string Key_;
+		std::string	Key_;
-		std::shared_ptr<std::string> Payload_;
+		std::string	Payload_;
 	};
 
 	class KafkaProducer : public Poco::Runnable {
-	  public:
+        public:
-		void run() override;
+            void run () override;
-		void Start();
+            void Start();
-		void Stop();
+            void Stop();
-		void Produce(const char *Topic, const std::string &Key, std::shared_ptr<std::string> Payload);
+            void Produce(const std::string &Topic, const std::string &Key, const std::string &Payload);
 
 	  private:
-		std::recursive_mutex Mutex_;
+            std::recursive_mutex  		Mutex_;
-		Poco::Thread Worker_;
+            Poco::Thread        		Worker_;
-		mutable std::atomic_bool Running_ = false;
+            mutable std::atomic_bool    Running_=false;
-		Poco::NotificationQueue Queue_;
+            Poco::NotificationQueue		Queue_;
-	};
+    };
 
 	class KafkaConsumer : public Poco::Runnable {
 	  public:
@@ -52,9 +53,9 @@ namespace OpenWifi {
 		void Stop();
 
 	  private:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex  	    Mutex_;
-		Poco::Thread Worker_;
+		Poco::Thread        	    Worker_;
-		mutable std::atomic_bool Running_ = false;
+		mutable std::atomic_bool    Running_=false;
 	};
 
 	class KafkaDispatcher : public Poco::Runnable {
@@ -63,25 +64,26 @@ namespace OpenWifi {
 		void Stop();
 		auto RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
 		void UnregisterTopicWatcher(const std::string &Topic, int Id);
-		void Dispatch(const char *Topic, const std::string &Key, const std::shared_ptr<std::string> Payload);
+		void Dispatch(const std::string &Topic, const std::string &Key, const std::string &Payload);
 		void run() override;
 		void Topics(std::vector<std::string> &T);
 
 	  private:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex  		Mutex_;
-		Types::NotifyTable Notifiers_;
+		Types::NotifyTable      	Notifiers_;
-		Poco::Thread Worker_;
+		Poco::Thread        		Worker_;
-		mutable std::atomic_bool Running_ = false;
+		mutable std::atomic_bool    Running_=false;
-		uint64_t FunctionId_ = 1;
+		uint64_t          			FunctionId_=1;
-		Poco::NotificationQueue Queue_;
+		Poco::NotificationQueue		Queue_;
 	};
 
 	class KafkaManager : public SubSystemServer {
 	  public:
+
 		friend class KafkaConsumer;
 		friend class KafkaProducer;
 
-		inline void initialize(Poco::Util::Application &self) override;
+		inline void initialize(Poco::Util::Application & self) override;
 
 		static auto instance() {
 			static auto instance_ = new KafkaManager;
@@ -91,28 +93,30 @@ namespace OpenWifi {
 		int Start() override;
 		void Stop() override;
 
-		void PostMessage(const char *topic, const std::string &key,
+		void PostMessage(const std::string &topic, const std::string & key, const std::string &PayLoad, bool WrapMessage = true  );
-						 std::shared_ptr<std::string> PayLoad, bool WrapMessage = true);
+		void Dispatch(const std::string &Topic, const std::string & Key, const std::string &Payload);
-		void Dispatch(const char *Topic, const std::string &Key, std::shared_ptr<std::string> Payload);
+		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
-		[[nodiscard]] const std::shared_ptr<std::string> WrapSystemId(std::shared_ptr<std::string> PayLoad);
 		[[nodiscard]] inline bool Enabled() const { return KafkaEnabled_; }
 		uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
 		void UnregisterTopicWatcher(const std::string &Topic, uint64_t Id);
 		void Topics(std::vector<std::string> &T);
 
 	  private:
-		bool KafkaEnabled_ = false;
+		bool 				KafkaEnabled_ = false;
-		std::string SystemInfoWrapper_;
+		std::string 		SystemInfoWrapper_;
-		KafkaProducer ProducerThr_;
+		KafkaProducer       ProducerThr_;
-		KafkaConsumer ConsumerThr_;
+        KafkaConsumer       ConsumerThr_;
-		KafkaDispatcher Dispatcher_;
+		KafkaDispatcher     Dispatcher_;
 
-		void PartitionAssignment(const cppkafka::TopicPartitionList &partitions);
+		void PartitionAssignment(const cppkafka::TopicPartitionList& partitions);
-		void PartitionRevocation(const cppkafka::TopicPartitionList &partitions);
+		void PartitionRevocation(const cppkafka::TopicPartitionList& partitions);
 
-		KafkaManager() noexcept : SubSystemServer("KafkaManager", "KAFKA-SVR", "openwifi.kafka") {}
+		KafkaManager() noexcept:
+			SubSystemServer("KafkaManager", "KAFKA-SVR", "openwifi.kafka") {
+		}
 	};
 
 	inline auto KafkaManager() { return KafkaManager::instance(); }
 
 } // namespace OpenWifi
+

src/framework/KafkaTopics.h

@@ -10,32 +10,33 @@
 
 #include <string>
 namespace OpenWifi::KafkaTopics {
-	inline const char * HEALTHCHECK = "healthcheck";
+	static const std::string HEALTHCHECK{"healthcheck"};
-	inline const char * STATE = "state";
+	static const std::string STATE{"state"};
-	inline const char * CONNECTION = "connection";
+	static const std::string CONNECTION{"connection"};
-	inline const char * WIFISCAN = "wifiscan";
+	static const std::string WIFISCAN{"wifiscan"};
-	inline const char * ALERTS = "alerts";
+	static const std::string ALERTS{"alerts"};
-	inline const char * COMMAND = "command";
+	static const std::string COMMAND{"command"};
-	inline const char * SERVICE_EVENTS = "service_events";
+	static const std::string SERVICE_EVENTS{"service_events"};
-	inline const char * DEVICE_EVENT_QUEUE = "device_event_queue";
+	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
-	inline const char * DEVICE_TELEMETRY = "device_telemetry";
+	static const std::string DEVICE_TELEMETRY{"device_telemetry"};
-	inline const char * PROVISIONING_CHANGE = "provisioning_change";
+    static const std::string PROVISIONING_CHANGE{"provisioning_change"};
 
 	namespace ServiceEvents {
-		inline const char * EVENT_JOIN = "join";
+		static const std::string EVENT_JOIN{"join"};
-		inline const char * EVENT_LEAVE = "leave";
+		static const std::string EVENT_LEAVE{"leave"};
-		inline const char * EVENT_KEEP_ALIVE = "keep-alive";
+		static const std::string EVENT_KEEP_ALIVE{"keep-alive"};
-		inline const char * EVENT_REMOVE_TOKEN = "remove-token";
+		static const std::string EVENT_REMOVE_TOKEN{"remove-token"};
 
 		namespace Fields {
-			inline const char * EVENT = "event";
+			static const std::string EVENT{"event"};
-			inline const char * ID = "id";
+			static const std::string ID{"id"};
-			inline const char * TYPE = "type";
+			static const std::string TYPE{"type"};
-			inline const char * PUBLIC = "publicEndPoint";
+			static const std::string PUBLIC{"publicEndPoint"};
-			inline const char * PRIVATE = "privateEndPoint";
+			static const std::string PRIVATE{"privateEndPoint"};
-			inline const char * KEY = "key";
+			static const std::string KEY{"key"};
-			inline const char * VRSN = "version";
+			static const std::string VRSN{"version"};
-			inline const char * TOKEN = "token";
+			static const std::string TOKEN{"token"};
-		} // namespace Fields
+		}
-	}	  // namespace ServiceEvents
+	}
-} // namespace OpenWifi::KafkaTopics
+}
+

src/framework/MicroService.cpp

@@ -2,39 +2,40 @@
 // Created by stephane bourque on 2022-10-26.
 //
 
-#include "Poco/AsyncChannel.h"
-#include "Poco/ConsoleChannel.h"
 #include "Poco/FileChannel.h"
+#include "Poco/ConsoleChannel.h"
+#include "Poco/PatternFormatter.h"
 #include "Poco/FormattingChannel.h"
-#include "Poco/JSON/JSONException.h"
+#include "Poco/AsyncChannel.h"
+#include "Poco/NullChannel.h"
+#include "Poco/SplitterChannel.h"
+#include "Poco/Net/HTTPStreamFactory.h"
+#include "Poco/Net/HTTPSStreamFactory.h"
 #include "Poco/Net/FTPSStreamFactory.h"
 #include "Poco/Net/FTPStreamFactory.h"
-#include "Poco/Net/HTTPSStreamFactory.h"
-#include "Poco/Net/HTTPStreamFactory.h"
 #include "Poco/Net/SSLManager.h"
-#include "Poco/NullChannel.h"
+#include "Poco/JSON/JSONException.h"
-#include "Poco/PatternFormatter.h"
-#include "Poco/SplitterChannel.h"
 
-#include "framework/ALBserver.h"
-#include "framework/AuthClient.h"
-#include "framework/KafkaManager.h"
 #include "framework/MicroService.h"
 #include "framework/MicroServiceErrorHandler.h"
-#include "framework/MicroServiceNames.h"
-#include "framework/RESTAPI_ExtServer.h"
-#include "framework/RESTAPI_GenericServerAccounting.h"
-#include "framework/RESTAPI_IntServer.h"
 #include "framework/UI_WebSocketClientServer.h"
-#include "framework/WebSocketLogger.h"
+#include "framework/MicroServiceNames.h"
+#include "framework/AuthClient.h"
+#include "framework/ALBserver.h"
+#include "framework/KafkaManager.h"
+#include "framework/RESTAPI_GenericServerAccounting.h"
+#include "framework/RESTAPI_ExtServer.h"
+#include "framework/RESTAPI_IntServer.h"
 #include "framework/utils.h"
+#include "framework/WebSocketLogger.h"
 
 namespace OpenWifi {
 
-	void MicroService::Exit(int Reason) { std::exit(Reason); }
+	void MicroService::Exit(int Reason) {
+		std::exit(Reason);
+	}
 
-	void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key,
+	void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key, const std::string & Payload) {
-										  const std::string &Payload) {
 		std::lock_guard G(InfraMutex_);
 		try {
 			Poco::JSON::Parser P;
@@ -42,101 +43,66 @@ namespace OpenWifi {
 
 			if (Object->has(KafkaTopics::ServiceEvents::Fields::ID) &&
 				Object->has(KafkaTopics::ServiceEvents::Fields::EVENT)) {
-				uint64_t ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
+				uint64_t 	ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
-				auto Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
+				auto 		Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
 				if (ID != ID_) {
-					if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN ||
+					if(	Event==KafkaTopics::ServiceEvents::EVENT_JOIN ||
-						Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
+						Event==KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
-						Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+						Event==KafkaTopics::ServiceEvents::EVENT_LEAVE ) {
-						if (Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
+						if(	Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
 							Object->has(KafkaTopics::ServiceEvents::Fields::PUBLIC) &&
 							Object->has(KafkaTopics::ServiceEvents::Fields::PRIVATE) &&
 							Object->has(KafkaTopics::ServiceEvents::Fields::VRSN) &&
 							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
-							auto PrivateEndPoint =
+							auto PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString();
-								Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString();
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE && Services_.find(PrivateEndPoint) != Services_.end()) {
-							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE &&
-								Services_.find(PrivateEndPoint) != Services_.end()) {
 								Services_[PrivateEndPoint].LastUpdate = Utils::Now();
 							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
 								Services_.erase(PrivateEndPoint);
-								poco_debug(
+								poco_debug(logger(),fmt::format("Service {} ID={} leaving system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
-									logger(),
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN || Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
-									fmt::format(
+								poco_debug(logger(),fmt::format("Service {} ID={} joining system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
-										"Service {} ID={} leaving system.",
-										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
-											.toString(),
-										ID));
-							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN ||
-									   Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
-								poco_debug(
-									logger(),
-									fmt::format(
-										"Service {} ID={} joining system.",
-										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
-											.toString(),
-										ID));
 								Services_[PrivateEndPoint] = Types::MicroServiceMeta{
 									.Id = ID,
-									.Type = Poco::toLower(
+									.Type = Poco::toLower(Object->get(KafkaTopics::ServiceEvents::Fields::TYPE).toString()),
-										Object->get(KafkaTopics::ServiceEvents::Fields::TYPE)
+									.PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),
-											.toString()),
+									.PublicEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC).toString(),
-									.PrivateEndPoint =
+									.AccessKey = Object->get(KafkaTopics::ServiceEvents::Fields::KEY).toString(),
-										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
+									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN).toString(),
-											.toString(),
+									.LastUpdate = Utils::Now() };
-									.PublicEndPoint =
-										Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC)
-											.toString(),
-									.AccessKey =
-										Object->get(KafkaTopics::ServiceEvents::Fields::KEY)
-											.toString(),
-									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN)
-												   .toString(),
-									.LastUpdate = Utils::Now()};
 
 								std::string SvcList;
-								for (const auto &Svc : Services_) {
+								for (const auto &Svc: Services_) {
-									if (SvcList.empty())
+									if(SvcList.empty())
 										SvcList = Svc.second.Type;
 									else
 										SvcList += ", " + Svc.second.Type;
 								}
-								poco_information(
+								poco_information(logger(),fmt::format("Current list of microservices: {}", SvcList));
-									logger(),
-									fmt::format("Current list of microservices: {}", SvcList));
 							}
 						} else {
-							poco_error(
+							poco_error(logger(),fmt::format("KAFKA-MSG: invalid event '{}', missing a field.",Event));
-								logger(),
-								fmt::format("KAFKA-MSG: invalid event '{}', missing a field.",
-											Event));
 						}
-					} else if (Event == KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
+					} else if (Event==KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
-						if (Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
+						if(Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
-#ifndef TIP_SECURITY_SERVICE
+	#ifndef TIP_SECURITY_SERVICE
-							AuthClient()->RemovedCachedToken(
+							AuthClient()->RemovedCachedToken(Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
-								Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
+	#endif
-#endif
 						} else {
-							poco_error(
+							poco_error(logger(),fmt::format("KAFKA-MSG: invalid event '{}', missing token",Event));
-								logger(),
-								fmt::format("KAFKA-MSG: invalid event '{}', missing token", Event));
 						}
 					} else {
-						poco_error(logger(),
+						poco_error(logger(),fmt::format("Unknown Event: {} Source: {}", Event, ID));
-								   fmt::format("Unknown Event: {} Source: {}", Event, ID));
 					}
 				}
 			} else {
-				poco_error(logger(), "Bad bus message.");
+				poco_error(logger(),"Bad bus message.");
-                std::ostringstream os;
-                Object->stringify(std::cout);
 			}
 
-			auto i = Services_.begin();
+			auto i=Services_.begin();
 			auto now = Utils::Now();
-			for (; i != Services_.end();) {
+			for(;i!=Services_.end();) {
-				if ((now - i->second.LastUpdate) > 60) {
+				if((now - i->second.LastUpdate)>60) {
 					i = Services_.erase(i);
 				} else
 					++i;
@@ -147,13 +113,13 @@ namespace OpenWifi {
 		}
 	}
 
-	Types::MicroServiceMetaVec MicroService::GetServices(const std::string &Type) {
+	Types::MicroServiceMetaVec MicroService::GetServices(const std::string & Type) {
 		std::lock_guard G(InfraMutex_);
 
 		auto T = Poco::toLower(Type);
-		Types::MicroServiceMetaVec Res;
+		Types::MicroServiceMetaVec	Res;
-		for (const auto &[_, ServiceRec] : Services_) {
+		for(const auto &[_,ServiceRec]:Services_) {
-			if (ServiceRec.Type == T)
+			if(ServiceRec.Type==T)
 				Res.push_back(ServiceRec);
 		}
 		return Res;
@@ -162,25 +128,23 @@ namespace OpenWifi {
 	Types::MicroServiceMetaVec MicroService::GetServices() {
 		std::lock_guard G(InfraMutex_);
 
-		Types::MicroServiceMetaVec Res;
+		Types::MicroServiceMetaVec	Res;
-		for (const auto &[_, ServiceRec] : Services_) {
+		for(const auto &[_,ServiceRec]:Services_) {
 			Res.push_back(ServiceRec);
 		}
 		return Res;
 	}
 
 	void MicroService::LoadConfigurationFile() {
-		std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR, ".");
+		std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR,".");
-		ConfigFileName_ =
+		ConfigFileName_ = ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
-			ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
 		Poco::Path ConfigFile(ConfigFileName_);
 
-		if (!ConfigFile.isFile()) {
+		if(!ConfigFile.isFile())
-			std::cerr << DAEMON_APP_NAME << ": Configuration " << ConfigFile.toString()
+		{
-					  << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR +
+			std::cerr << DAEMON_APP_NAME << ": Configuration "
-							 " env variable the path of the " + DAEMON_PROPERTIES_FILENAME +
+					  << ConfigFile.toString() << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR
-							 " file."
+													  + " env variable the path of the " + DAEMON_PROPERTIES_FILENAME + " file." << std::endl;
-					  << std::endl;
 			std::exit(Poco::Util::Application::EXIT_CONFIG);
 		}
 
@@ -195,12 +159,11 @@ namespace OpenWifi {
 	}
 
 	void MicroService::LoadMyConfig() {
-		NoAPISecurity_ = ConfigGetBool("openwifi.security.restapi.disable", false);
+		NoAPISecurity_ = ConfigGetBool("openwifi.security.restapi.disable",false);
-		std::string KeyFile = ConfigPath("openwifi.service.key", "");
+		std::string KeyFile = ConfigPath("openwifi.service.key","");
-		if (!KeyFile.empty()) {
+		if(!KeyFile.empty()) {
 			std::string KeyFilePassword = ConfigPath("openwifi.service.key.password", "");
-			AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(
+			AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
-				new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
 			Cipher_ = CipherFactory_.createCipher(*AppKey_);
 			Signer_.setRSAKey(AppKey_);
 			Signer_.addAllAlgorithms();
@@ -210,8 +173,8 @@ namespace OpenWifi {
 		}
 
 		ID_ = Utils::GetSystemId();
-		if (!DebugMode_)
+		if(!DebugMode_)
-			DebugMode_ = ConfigGetBool("openwifi.system.debug", false);
+			DebugMode_ = ConfigGetBool("openwifi.system.debug",false);
 		MyPrivateEndPoint_ = ConfigGetString("openwifi.system.uri.private");
 		MyPublicEndPoint_ = ConfigGetString("openwifi.system.uri.public");
 		UIURI_ = ConfigGetString("openwifi.system.uri.ui");
@@ -221,170 +184,151 @@ namespace OpenWifi {
 	void MicroService::InitializeLoggingSystem() {
 		static auto initialized = false;
 
-		if (!initialized) {
+		if(!initialized) {
 			initialized = true;
 			LoadConfigurationFile();
 
-			auto LoggingDestination =
+			auto LoggingDestination = MicroService::instance().ConfigGetString("logging.type", "file");
-				MicroService::instance().ConfigGetString("logging.type", "file");
+			auto LoggingFormat = MicroService::instance().ConfigGetString("logging.format",
-			auto LoggingFormat = MicroService::instance().ConfigGetString(
+																		  "%Y-%m-%d %H:%M:%S.%i %s: [%p][thr:%I] %t");
-				"logging.format", "%Y-%m-%d %H:%M:%S.%i %s: [%p][thr:%I] %t");
 			auto UseAsyncLogs_ = MicroService::instance().ConfigGetBool("logging.asynch", true);
-			auto DisableWebSocketLogging =
+			auto DisableWebSocketLogging = MicroService::instance().ConfigGetBool("logging.websocket",false);
-				MicroService::instance().ConfigGetBool("logging.websocket", false);
 
 			if (LoggingDestination == "null") {
 				Poco::AutoPtr<Poco::NullChannel> DevNull(new Poco::NullChannel);
 				Poco::Logger::root().setChannel(DevNull);
 			} else if (LoggingDestination == "console") {
-				SetConsoleLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
+                SetConsoleLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
 			} else if (LoggingDestination == "colorconsole") {
-				SetColorConsoleLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
+                SetColorConsoleLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
 			} else if (LoggingDestination == "sql") {
-				SetSQLLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
+                SetSQLLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
 			} else if (LoggingDestination == "syslog") {
-				SetSyslogLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
+                SetSyslogLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat);
 			} else {
-				SetFileLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat,
+                SetFileLogs(UseAsyncLogs_, DisableWebSocketLogging, LoggingFormat, DAEMON_ROOT_ENV_VAR);
-							DAEMON_ROOT_ENV_VAR);
+            }
-			}
 
-			auto Level = Poco::Logger::parseLevel(
+			auto Level = Poco::Logger::parseLevel(MicroService::instance().ConfigGetString("logging.level", "debug"));
-				MicroService::instance().ConfigGetString("logging.level", "debug"));
 			Poco::Logger::root().setLevel(Level);
-			if (!DisableWebSocketLogging) {
+			if(!DisableWebSocketLogging) {
 				static const UI_WebSocketClientServer::NotificationTypeIdVec Notifications = {
 					{1, "log"}};
 				UI_WebSocketClientServer()->RegisterNotifications(Notifications);
 			}
 		}
-	}
+    }
 
-	void MicroService::SetConsoleLogs(bool UseAsync, bool DisableWebSocketLogging,
+    void MicroService::SetConsoleLogs(bool UseAsync, bool DisableWebSocketLogging, const std::string & FormatterPattern) {
-									  const std::string &FormatterPattern) {
 
-		Poco::AutoPtr<Poco::ConsoleChannel> Console(new Poco::ConsoleChannel);
+        Poco::AutoPtr<Poco::ConsoleChannel> Console(new Poco::ConsoleChannel);
-		Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
+        Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
-		Formatter->setProperty("pattern", FormatterPattern);
+        Formatter->setProperty("pattern", FormatterPattern);
-		Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(
+        Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(new Poco::FormattingChannel(Formatter, Console));
-			new Poco::FormattingChannel(Formatter, Console));
 
-		if (DisableWebSocketLogging) {
+        if(DisableWebSocketLogging) {
-			if (UseAsync) {
+            if(UseAsync) {
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
-				Poco::Logger::root().setChannel(Async);
+                Poco::Logger::root().setChannel(Async);
-			} else {
+            } else {
-				Poco::Logger::root().setChannel(FormattingChannel);
+                Poco::Logger::root().setChannel(FormattingChannel);
-			}
+            }
-		} else {
+        } else {
-			Poco::AutoPtr<WebSocketLogger> WSLogger(new WebSocketLogger);
+            Poco::AutoPtr<WebSocketLogger>			WSLogger(new WebSocketLogger);
-			Poco::AutoPtr<Poco::SplitterChannel> Splitter(new Poco::SplitterChannel);
+            Poco::AutoPtr<Poco::SplitterChannel>	Splitter(new Poco::SplitterChannel);
-			Splitter->addChannel(WSLogger);
+            Splitter->addChannel(WSLogger);
-			Splitter->addChannel(FormattingChannel);
+            Splitter->addChannel(FormattingChannel);
-			if (UseAsync) {
+            if(UseAsync) {
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
-				Poco::Logger::root().setChannel(Async);
+                Poco::Logger::root().setChannel(Async);
-			} else {
+            } else {
-				Poco::Logger::root().setChannel(Splitter);
+                Poco::Logger::root().setChannel(Splitter);
-			}
+            }
-		}
+        }
-		Poco::Logger::root().information(fmt::format("Enabled console logs: asynch={} websocket={}",
+		Poco::Logger::root().information(fmt::format("Enabled console logs: asynch={} websocket={}",UseAsync,DisableWebSocketLogging));
-													 UseAsync, DisableWebSocketLogging));
+    }
-	}
 
-	void MicroService::SetColorConsoleLogs(bool UseAsync, bool DisableWebSocketLogging,
+    void MicroService::SetColorConsoleLogs(bool UseAsync, bool DisableWebSocketLogging, const std::string & FormatterPattern) {
-										   const std::string &FormatterPattern) {
 
-		Poco::AutoPtr<Poco::ColorConsoleChannel> Console(new Poco::ColorConsoleChannel);
+        Poco::AutoPtr<Poco::ColorConsoleChannel> Console(new Poco::ColorConsoleChannel);
-		Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
+        Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
-		Formatter->setProperty("pattern", FormatterPattern);
+        Formatter->setProperty("pattern", FormatterPattern);
-		Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(
+        Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(new Poco::FormattingChannel(Formatter, Console));
-			new Poco::FormattingChannel(Formatter, Console));
 
-		if (DisableWebSocketLogging) {
+        if(DisableWebSocketLogging) {
-			if (UseAsync) {
+            if(UseAsync) {
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
-				Poco::Logger::root().setChannel(Async);
+                Poco::Logger::root().setChannel(Async);
-			} else {
+            } else {
-				Poco::Logger::root().setChannel(FormattingChannel);
+                Poco::Logger::root().setChannel(FormattingChannel);
-			}
+            }
-		} else {
+        } else {
-			Poco::AutoPtr<WebSocketLogger> WSLogger(new WebSocketLogger);
+            Poco::AutoPtr<WebSocketLogger>			WSLogger(new WebSocketLogger);
-			Poco::AutoPtr<Poco::SplitterChannel> Splitter(new Poco::SplitterChannel);
+            Poco::AutoPtr<Poco::SplitterChannel>	Splitter(new Poco::SplitterChannel);
-			Splitter->addChannel(WSLogger);
+            Splitter->addChannel(WSLogger);
-			Splitter->addChannel(FormattingChannel);
+            Splitter->addChannel(FormattingChannel);
-			if (UseAsync) {
+            if(UseAsync) {
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
-				Poco::Logger::root().setChannel(Async);
+                Poco::Logger::root().setChannel(Async);
-			} else {
+            } else {
-				Poco::Logger::root().setChannel(Splitter);
+                Poco::Logger::root().setChannel(Splitter);
-			}
+            }
-		}
+        }
-		Poco::Logger::root().information(
+		Poco::Logger::root().information(fmt::format("Enabled color console logs: asynch={} websocket={}",UseAsync,DisableWebSocketLogging));
-			fmt::format("Enabled color console logs: asynch={} websocket={}", UseAsync,
+    }
-						DisableWebSocketLogging));
-	}
 
-	void MicroService::SetSQLLogs([[maybe_unused]] bool UseAsync,
+    void MicroService::SetSQLLogs([[maybe_unused]] bool UseAsync,[[maybe_unused]]  bool DisableWebSocketLogging,[[maybe_unused]]  const std::string & FormatterPattern) {
-								  [[maybe_unused]] bool DisableWebSocketLogging,
+        //"CREATE TABLE T_POCO_LOG (Source VARCHAR, Name VARCHAR, ProcessId INTEGER, Thread VARCHAR, ThreadId INTEGER, Priority INTEGER, Text VARCHAR, DateTime DATE)"
-								  [[maybe_unused]] const std::string &FormatterPattern) {
+    }
-		//"CREATE TABLE T_POCO_LOG (Source VARCHAR, Name VARCHAR, ProcessId INTEGER, Thread VARCHAR,
-		//ThreadId INTEGER, Priority INTEGER, Text VARCHAR, DateTime DATE)"
-	}
 
-	void MicroService::SetSyslogLogs([[maybe_unused]] bool UseAsync,
+    void MicroService::SetSyslogLogs([[maybe_unused]] bool UseAsync,[[maybe_unused]]  bool DisableWebSocketLogging,[[maybe_unused]]  const std::string & FormatterPattern) {
-									 [[maybe_unused]] bool DisableWebSocketLogging,
-									 [[maybe_unused]] const std::string &FormatterPattern) {}
 
-	void MicroService::SetFileLogs(bool UseAsync, bool DisableWebSocketLogging,
+    }
-								   const std::string &FormatterPattern,
-								   const std::string &root_env_var) {
-		std::string DefaultLogPath = fmt::format("${}/logs", root_env_var);
-		auto LoggingLocationDir =
-			MicroService::instance().ConfigPath("logging.path", DefaultLogPath);
-		Poco::File LD(LoggingLocationDir);
-		try {
-			if (!LD.exists()) {
-				LD.createDirectory();
-			}
-		} catch (const Poco::Exception &E) {
-			std::cout << "Cannot create " << LD.path() << "  Error: " << E.message() << std::endl;
-		}
-		auto LoggingLocationDirFilePattern = LoggingLocationDir + "/log";
 
-		Poco::AutoPtr<Poco::FileChannel> FileChannel(new Poco::FileChannel);
+    void MicroService::SetFileLogs(bool UseAsync, bool DisableWebSocketLogging, const std::string & FormatterPattern, const std::string & root_env_var) {
-		FileChannel->setProperty("rotation", "10 M");
+        std::string DefaultLogPath = fmt::format("${}/logs",root_env_var);
-		FileChannel->setProperty("archive", "timestamp");
+        auto LoggingLocationDir = MicroService::instance().ConfigPath("logging.path", DefaultLogPath);
-		FileChannel->setProperty("purgeCount", "10");
+        Poco::File      LD(LoggingLocationDir);
-		FileChannel->setProperty("path", LoggingLocationDirFilePattern);
+        try {
+            if(!LD.exists()) {
+                LD.createDirectory();
+            }
+        } catch(const Poco::Exception &E) {
+            std::cout << "Cannot create " << LD.path() << "  Error: " << E.message() << std::endl;
+        }
+        auto LoggingLocationDirFilePattern = LoggingLocationDir + "/log";
 
-		Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
+        Poco::AutoPtr<Poco::FileChannel> FileChannel(new Poco::FileChannel);
-		Formatter->setProperty("pattern", FormatterPattern);
+        FileChannel->setProperty("rotation", "10 M");
-		Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(
+        FileChannel->setProperty("archive", "timestamp");
-			new Poco::FormattingChannel(Formatter, FileChannel));
+        FileChannel->setProperty("purgeCount", "10");
+        FileChannel->setProperty("path", LoggingLocationDirFilePattern);
 
-		if (DisableWebSocketLogging) {
+        Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
-			if (UseAsync) {
+        Formatter->setProperty("pattern", FormatterPattern);
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
+        Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(new Poco::FormattingChannel(Formatter, FileChannel));
-				Poco::Logger::root().setChannel(Async);
+
-			} else {
+        if(DisableWebSocketLogging) {
-				Poco::Logger::root().setChannel(FormattingChannel);
+            if(UseAsync) {
-			}
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(FormattingChannel));
-		} else {
+                Poco::Logger::root().setChannel(Async);
-			Poco::AutoPtr<WebSocketLogger> WSLogger(new WebSocketLogger);
+            } else {
-			Poco::AutoPtr<Poco::SplitterChannel> Splitter(new Poco::SplitterChannel);
+                Poco::Logger::root().setChannel(FormattingChannel);
-			Splitter->addChannel(WSLogger);
+            }
-			Splitter->addChannel(FormattingChannel);
+        } else {
-			if (UseAsync) {
+            Poco::AutoPtr<WebSocketLogger>			WSLogger(new WebSocketLogger);
-				Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
+            Poco::AutoPtr<Poco::SplitterChannel>	Splitter(new Poco::SplitterChannel);
-				Poco::Logger::root().setChannel(Async);
+            Splitter->addChannel(WSLogger);
-			} else {
+            Splitter->addChannel(FormattingChannel);
-				Poco::Logger::root().setChannel(Splitter);
+            if(UseAsync) {
-			}
+                Poco::AutoPtr<Poco::AsyncChannel> Async(new Poco::AsyncChannel(Splitter));
-		}
+                Poco::Logger::root().setChannel(Async);
-		Poco::Logger::root().information(fmt::format("Enabled file logs: asynch={} websocket={}",
+            } else {
-													 UseAsync, DisableWebSocketLogging));
+                Poco::Logger::root().setChannel(Splitter);
-	}
+            }
+        }
+		Poco::Logger::root().information(fmt::format("Enabled file logs: asynch={} websocket={}",UseAsync,DisableWebSocketLogging));
+    }
 
 	void DaemonPostInitialization(Poco::Util::Application &self);
 
@@ -397,39 +341,37 @@ namespace OpenWifi {
 		SubSystems_.push_back(ALBHealthCheckServer());
 		SubSystems_.push_back(RESTAPI_ExtServer());
 		SubSystems_.push_back(RESTAPI_IntServer());
-#ifndef TIP_SECURITY_SERVICE
+	#ifndef TIP_SECURITY_SERVICE
 		SubSystems_.push_back(AuthClient());
-#endif
+	#endif
 		Poco::Net::initializeSSL();
 		Poco::Net::HTTPStreamFactory::registerFactory();
 		Poco::Net::HTTPSStreamFactory::registerFactory();
 		Poco::Net::FTPStreamFactory::registerFactory();
 		Poco::Net::FTPSStreamFactory::registerFactory();
 
-		Poco::File DataDir(ConfigPath("openwifi.system.data"));
+		Poco::File	DataDir(ConfigPath("openwifi.system.data"));
 		DataDir_ = DataDir.path();
-		if (!DataDir.exists()) {
+		if(!DataDir.exists()) {
 			try {
 				DataDir.createDirectory();
 			} catch (const Poco::Exception &E) {
 				logger().log(E);
 			}
 		}
-		WWWAssetsDir_ = ConfigPath("openwifi.restapi.wwwassets", "");
+		WWWAssetsDir_ = ConfigPath("openwifi.restapi.wwwassets","");
-		if (WWWAssetsDir_.empty())
+		if(WWWAssetsDir_.empty())
 			WWWAssetsDir_ = DataDir_;
 
 		LoadMyConfig();
 
-		AllowExternalMicroServices_ = ConfigGetBool("allowexternalmicroservices", true);
+        AllowExternalMicroServices_ = ConfigGetBool("allowexternalmicroservices",true);
 
 		InitializeSubSystemServers();
 		ServerApplication::initialize(self);
 		DaemonPostInitialization(self);
 
-		Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) {
+		Types::TopicNotifyFunction F = [this](const std::string &Key,const std::string &Payload) { this->BusMessageReceived(Key, Payload); };
-			this->BusMessageReceived(Key, Payload);
-		};
 		KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);
 	}
 
@@ -450,64 +392,58 @@ namespace OpenWifi {
 			Poco::Util::Option("help", "", "display help information on command line arguments")
 				.required(false)
 				.repeatable(false)
-				.callback(
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
-					Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
 
-		options.addOption(Poco::Util::Option("file", "", "specify the configuration file")
+		options.addOption(
-							  .required(false)
+			Poco::Util::Option("file", "", "specify the configuration file")
-							  .repeatable(false)
+				.required(false)
-							  .argument("file")
+				.repeatable(false)
-							  .callback(Poco::Util::OptionCallback<MicroService>(
+				.argument("file")
-								  this, &MicroService::handleConfig)));
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleConfig)));
 
-		options.addOption(Poco::Util::Option("debug", "", "to run in debug, set to true")
+		options.addOption(
-							  .required(false)
+			Poco::Util::Option("debug", "", "to run in debug, set to true")
-							  .repeatable(false)
+				.required(false)
-							  .callback(Poco::Util::OptionCallback<MicroService>(
+				.repeatable(false)
-								  this, &MicroService::handleDebug)));
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleDebug)));
 
 		options.addOption(
 			Poco::Util::Option("logs", "", "specify the log directory and file (i.e. dir/file.log)")
 				.required(false)
 				.repeatable(false)
 				.argument("dir")
-				.callback(
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
-					Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
+
+		options.addOption(
+			Poco::Util::Option("version", "", "get the version and quit.")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleVersion)));
 
-		options.addOption(Poco::Util::Option("version", "", "get the version and quit.")
-							  .required(false)
-							  .repeatable(false)
-							  .callback(Poco::Util::OptionCallback<MicroService>(
-								  this, &MicroService::handleVersion)));
 	}
 
-	void MicroService::handleHelp([[maybe_unused]] const std::string &name,
+	void MicroService::handleHelp([[maybe_unused]] const std::string &name, [[maybe_unused]] const std::string &value) {
-								  [[maybe_unused]] const std::string &value) {
 		HelpRequested_ = true;
 		displayHelp();
 		stopOptionsProcessing();
 	}
 
-	void MicroService::handleVersion([[maybe_unused]] const std::string &name,
+	void MicroService::handleVersion([[maybe_unused]] const std::string &name, [[maybe_unused]] const std::string &value) {
-									 [[maybe_unused]] const std::string &value) {
 		HelpRequested_ = true;
 		std::cout << Version() << std::endl;
 		stopOptionsProcessing();
 	}
 
-	void MicroService::handleDebug([[maybe_unused]] const std::string &name,
+	void MicroService::handleDebug([[maybe_unused]] const std::string &name, const std::string &value) {
-								   const std::string &value) {
+		if(value == "true")
-		if (value == "true")
+			DebugMode_ = true ;
-			DebugMode_ = true;
 	}
 
-	void MicroService::handleLogs([[maybe_unused]] const std::string &name,
+	void MicroService::handleLogs([[maybe_unused]] const std::string &name, const std::string &value) {
-								  const std::string &value) {
 		LogDir_ = value;
 	}
 
-	void MicroService::handleConfig([[maybe_unused]] const std::string &name,
+	void MicroService::handleConfig([[maybe_unused]] const std::string &name, const std::string &value) {
-									const std::string &value) {
 		ConfigFileName_ = value;
 	}
 
@@ -520,32 +456,31 @@ namespace OpenWifi {
 	}
 
 	void MicroService::InitializeSubSystemServers() {
-		for (auto i : SubSystems_) {
+		for(auto i:SubSystems_) {
 			addSubsystem(i);
 		}
 	}
 
 	void MicroService::StartSubSystemServers() {
 		AddActivity("Starting");
-		for (auto i : SubSystems_) {
+		for(auto i:SubSystems_) {
 			i->Start();
 		}
-		EventBusManager_ = std::make_unique<EventBusManager>(Poco::Logger::create(
+		EventBusManager_ = std::make_unique<EventBusManager>(Poco::Logger::create("EventBusManager",Poco::Logger::root().getChannel(),Poco::Logger::root().getLevel()));
-			"EventBusManager", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel()));
 		EventBusManager_->Start();
 	}
 
 	void MicroService::StopSubSystemServers() {
 		AddActivity("Stopping");
 		EventBusManager_->Stop();
-		for (auto i = SubSystems_.rbegin(); i != SubSystems_.rend(); ++i) {
+		for(auto i=SubSystems_.rbegin(); i!=SubSystems_.rend(); ++i) {
 			(*i)->Stop();
 		}
 	}
 
 	[[nodiscard]] std::string MicroService::CreateUUID() {
-		static std::random_device rd;
+		static std::random_device              rd;
-		static std::mt19937_64 gen(rd());
+		static std::mt19937_64                 gen(rd());
 		static std::uniform_int_distribution<> dis(0, 15);
 		static std::uniform_int_distribution<> dis2(8, 11);
 
@@ -575,8 +510,7 @@ namespace OpenWifi {
 		return ss.str();
 	}
 
-	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem,
+	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
-											const std::string &Level) {
 		try {
 			auto P = Poco::Logger::parseLevel(Level);
 			auto Sub = Poco::toLower(SubSystem);
@@ -594,7 +528,7 @@ namespace OpenWifi {
 					}
 				}
 			}
-		} catch (const Poco::Exception &E) {
+		} catch (const Poco::Exception & E) {
 			std::cerr << "Exception" << std::endl;
 		}
 		return false;
@@ -611,7 +545,7 @@ namespace OpenWifi {
 
 	Types::StringVec MicroService::GetSubSystems() const {
 		Types::StringVec Result;
-		for (auto i : SubSystems_)
+		for(auto i:SubSystems_)
 			Result.push_back(Poco::toLower(i->Name()));
 		return Result;
 	}
@@ -619,32 +553,35 @@ namespace OpenWifi {
 	Types::StringPairVec MicroService::GetLogLevels() {
 		Types::StringPairVec Result;
 
-		for (auto &i : SubSystems_) {
+		for(auto &i:SubSystems_) {
-			auto P = std::make_pair(i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
+			auto P = std::make_pair( i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
 			Result.push_back(P);
 		}
 		return Result;
 	}
 
-	const Types::StringVec &MicroService::GetLogLevelNames() {
+	const Types::StringVec & MicroService::GetLogLevelNames() {
-		static Types::StringVec LevelNames{"none",	 "fatal",		"critical", "error", "warning",
+		static Types::StringVec LevelNames{"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace" };
-										   "notice", "information", "debug",	"trace"};
 		return LevelNames;
 	}
 
-	uint64_t MicroService::ConfigGetInt(const std::string &Key, uint64_t Default) {
+	uint64_t MicroService::ConfigGetInt(const std::string &Key,uint64_t Default) {
-		return (uint64_t)config().getInt64(Key, Default);
+		return (uint64_t) config().getInt64(Key,Default);
 	}
 
-	uint64_t MicroService::ConfigGetInt(const std::string &Key) { return config().getInt(Key); }
+	uint64_t MicroService::ConfigGetInt(const std::string &Key) {
-
+		return config().getInt(Key);
-	uint64_t MicroService::ConfigGetBool(const std::string &Key, bool Default) {
-		return config().getBool(Key, Default);
 	}
 
-	uint64_t MicroService::ConfigGetBool(const std::string &Key) { return config().getBool(Key); }
+	uint64_t MicroService::ConfigGetBool(const std::string &Key,bool Default) {
+		return config().getBool(Key,Default);
+	}
 
-	std::string MicroService::ConfigGetString(const std::string &Key, const std::string &Default) {
+	uint64_t MicroService::ConfigGetBool(const std::string &Key) {
+		return config().getBool(Key);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key,const std::string & Default) {
 		return config().getString(Key, Default);
 	}
 
@@ -652,7 +589,7 @@ namespace OpenWifi {
 		return config().getString(Key);
 	}
 
-	std::string MicroService::ConfigPath(const std::string &Key, const std::string &Default) {
+	std::string MicroService::ConfigPath(const std::string &Key,const std::string & Default) {
 		std::string R = config().getString(Key, Default);
 		return Poco::Path::expand(R);
 	}
@@ -663,30 +600,28 @@ namespace OpenWifi {
 	}
 
 	std::string MicroService::Encrypt(const std::string &S) {
-		if (NoBuiltInCrypto_) {
+		if(NoBuiltInCrypto_) {
 			return S;
 		}
-		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);
+		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
-		;
 	}
 
 	std::string MicroService::Decrypt(const std::string &S) {
-		if (NoBuiltInCrypto_) {
+		if(NoBuiltInCrypto_) {
 			return S;
 		}
-		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);
+		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
-		;
 	}
 
-	std::string MicroService::MakeSystemEventMessage(const std::string &Type) const {
+	std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
-		Poco::JSON::Object Obj;
+		Poco::JSON::Object	Obj;
-		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT, Type);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
-		Obj.set(KafkaTopics::ServiceEvents::Fields::ID, ID_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::ID,ID_);
-		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE, Poco::toLower(DAEMON_APP_NAME));
+		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE,Poco::toLower(DAEMON_APP_NAME));
-		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC, MyPublicEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC,MyPublicEndPoint_);
-		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE, MyPrivateEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE,MyPrivateEndPoint_);
-		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY, MyHash_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY,MyHash_);
-		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN, Version_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN,Version_);
 		std::stringstream ResultText;
 		Poco::JSON::Stringifier::stringify(Obj, ResultText);
 		return ResultText.str();
@@ -705,73 +640,75 @@ namespace OpenWifi {
 	void MicroService::SavePID() {
 		try {
 			std::ofstream O;
-			O.open(MicroService::instance().DataDir() + "/pidfile",
+			O.open(MicroService::instance().DataDir() + "/pidfile",std::ios::binary | std::ios::trunc);
-				   std::ios::binary | std::ios::trunc);
 			O << Poco::Process::id();
 			O.close();
-		} catch (...) {
+		} catch (...)
+		{
 			std::cout << "Could not save system ID" << std::endl;
 		}
 	}
 
 	int MicroService::main([[maybe_unused]] const ArgVec &args) {
-		MicroServiceErrorHandler ErrorHandler(*this);
+		MicroServiceErrorHandler	ErrorHandler(*this);
 		Poco::ErrorHandler::set(&ErrorHandler);
 
 		if (!HelpRequested_) {
 			SavePID();
 
 			Poco::Logger &logger = Poco::Logger::get(DAEMON_APP_NAME);
-			logger.notice(fmt::format("Starting {} version {}.", DAEMON_APP_NAME, Version()));
+			logger.notice(fmt::format("Starting {} version {}.",DAEMON_APP_NAME, Version()));
 
-			if (Poco::Net::Socket::supportsIPv6())
+			if(Poco::Net::Socket::supportsIPv6())
-				poco_information(logger, "System supports IPv6.");
+				poco_information(logger,"System supports IPv6.");
 			else
-				poco_information(logger, "System does NOT support IPv6.");
+				poco_information(logger,"System does NOT support IPv6.");
 
 			if (config().getBool("application.runAsDaemon", false)) {
-				poco_information(logger, "Starting as a daemon.");
+				poco_information(logger,"Starting as a daemon.");
 			}
 
-			poco_information(logger, fmt::format("System ID set to {}", ID_));
+			poco_information(logger,fmt::format("System ID set to {}",ID_));
 			StartSubSystemServers();
 			waitForTerminationRequest();
 			StopSubSystemServers();
-			logger.notice(fmt::format("Stopped {}...", DAEMON_APP_NAME));
+			logger.notice(fmt::format("Stopped {}...",DAEMON_APP_NAME));
 		}
 
 		return Application::EXIT_OK;
 	}
 
 	void MicroService::AddActivity(const std::string &Activity) {
-		if (!DataDir_.empty()) {
+		if(!DataDir_.empty()) {
-			std::string ActivityFile{DataDir_ + "/activity.log"};
+			std::string ActivityFile{ DataDir_ + "/activity.log"};
 			try {
-				std::ofstream of(ActivityFile, std::ios_base::app | std::ios_base::out);
+				std::ofstream of(ActivityFile,std::ios_base::app | std::ios_base::out );
 				auto t = std::chrono::system_clock::now();
 				std::time_t now = std::chrono::system_clock::to_time_t(t);
-				of << Activity << " at " << std::ctime(&now);
+				of << Activity << " at " << std::ctime(&now) ;
 			} catch (...) {
+
 			}
 		}
 	}
 
 	[[nodiscard]] std::string MicroService::Sign(Poco::JWT::Token &T, const std::string &Algo) {
-		if (NoBuiltInCrypto_) {
+		if(NoBuiltInCrypto_) {
 			return T.toString();
 		} else {
-			return Signer_.sign(T, Algo);
+			return Signer_.sign(T,Algo);
 		}
 	}
 
 	void MicroService::DeleteOverrideConfiguration() {
-		Poco::File F(DataDir_ + ExtraConfigurationFilename);
+		Poco::File	F(DataDir_ + ExtraConfigurationFilename);
 
 		try {
-			if (F.exists())
+			if(F.exists())
 				F.remove();
 		} catch (...) {
+
 		}
 	}
 
-} // namespace OpenWifi
+}

src/framework/MicroService.h

@@ -9,11 +9,12 @@
 #pragma once
 
 #include <array>
-#include <ctime>
-#include <fstream>
 #include <iostream>
-#include <random>
 #include <vector>
+#include <fstream>
+#include <random>
+#include <ctime>
+
 
 // This must be defined for poco_debug and poco_trace macros to function.
 
@@ -22,94 +23,97 @@
 #endif
 
 namespace OpenWifi {
-	inline uint64_t Now() { return std::time(nullptr); };
+    inline uint64_t Now() { return std::time(nullptr); };
-} // namespace OpenWifi
+}
 
-#include "Poco/AutoPtr.h"
-#include "Poco/Crypto/Cipher.h"
-#include "Poco/Crypto/CipherFactory.h"
-#include "Poco/Crypto/RSAKey.h"
-#include "Poco/Environment.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/JWT/Signer.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "Poco/Process.h"
 #include "Poco/Util/Application.h"
-#include "Poco/Util/HelpFormatter.h"
+#include "Poco/Util/ServerApplication.h"
 #include "Poco/Util/Option.h"
 #include "Poco/Util/OptionSet.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Process.h"
+#include "Poco/Util/HelpFormatter.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/AutoPtr.h"
 #include "Poco/Util/PropertyFileConfiguration.h"
-#include "Poco/Util/ServerApplication.h"
+#include "Poco/JWT/Signer.h"
+#include "Poco/Environment.h"
 
 #include "framework/OpenWifiTypes.h"
 
-#include "framework/EventBusManager.h"
-#include "framework/SubSystemServer.h"
 #include "framework/ow_constants.h"
 #include "framework/utils.h"
+#include "framework/SubSystemServer.h"
+#include "framework/EventBusManager.h"
 
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
 #include "cppkafka/cppkafka.h"
 
-#include "fmt/core.h"
 #include "nlohmann/json.hpp"
 #include "ow_version.h"
+#include "fmt/core.h"
 
-#define _OWDEBUG_ std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+#define _OWDEBUG_ std::cout<< __FILE__ <<":" << __LINE__ << std::endl;
 // #define _OWDEBUG_ Logger().debug(Poco::format("%s: %lu",__FILE__,__LINE__));
 
 namespace OpenWifi {
 
 	class MicroService : public Poco::Util::ServerApplication {
 	  public:
-		explicit MicroService(std::string PropFile, std::string RootEnv, std::string ConfigVar,
+		explicit MicroService( 	std::string PropFile,
-							  std::string AppName, uint64_t BusTimer, SubSystemVec Subsystems)
+					 	std::string RootEnv,
-			: DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
+					 	std::string ConfigVar,
-			  DAEMON_ROOT_ENV_VAR(std::move(RootEnv)), DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+					 	std::string AppName,
-			  DAEMON_APP_NAME(std::move(AppName)), DAEMON_BUS_TIMER(BusTimer),
+					  	uint64_t BusTimer,
-			  SubSystems_(std::move(Subsystems)), Logger_(Poco::Logger::get("FRAMEWORK")) {
+					  	SubSystemVec Subsystems) :
-			instance_ = this;
+				DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
-			RandomEngine_.seed(std::chrono::steady_clock::now().time_since_epoch().count());
+				DAEMON_ROOT_ENV_VAR(std::move(RootEnv)),
+				DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+				DAEMON_APP_NAME(std::move(AppName)),
+				DAEMON_BUS_TIMER(BusTimer),
+				SubSystems_(std::move(Subsystems)),
+				Logger_(Poco::Logger::get("FRAMEWORK")) {
+		    instance_ = this;
+		    RandomEngine_.seed(std::chrono::steady_clock::now().time_since_epoch().count());
 			// Logger_ = Poco::Logger::root().get("BASE-SVC");
 		}
 
-		inline static const char *ExtraConfigurationFilename = "/configuration_override.json";
+		inline static const char * ExtraConfigurationFilename = "/configuration_override.json";
 
 		inline void SaveConfig() { PropConfigurationFile_->save(ConfigFileName_); }
 		inline auto UpdateConfig() { return PropConfigurationFile_; }
 		inline bool NoAPISecurity() const { return NoAPISecurity_; }
-		inline Poco::ThreadPool &TimerPool() { return TimerPool_; }
+		inline Poco::ThreadPool & TimerPool() { return TimerPool_; }
 		[[nodiscard]] std::string Version() { return Version_; }
-		[[nodiscard]] inline const std::string &DataDir() { return DataDir_; }
+		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
-		[[nodiscard]] inline const std::string &WWWAssetsDir() { return WWWAssetsDir_; }
+		[[nodiscard]] inline const std::string & WWWAssetsDir() { return WWWAssetsDir_; }
 		[[nodiscard]] bool Debug() const { return DebugMode_; }
 		[[nodiscard]] uint64_t ID() const { return ID_; }
 		[[nodiscard]] std::string Hash() const { return MyHash_; };
 		[[nodiscard]] std::string ServiceType() const { return DAEMON_APP_NAME; };
 		[[nodiscard]] std::string PrivateEndPoint() const { return MyPrivateEndPoint_; };
 		[[nodiscard]] std::string PublicEndPoint() const { return MyPublicEndPoint_; };
-		[[nodiscard]] const SubSystemVec &GetFullSubSystems() { return SubSystems_; }
+		[[nodiscard]] const SubSystemVec & GetFullSubSystems() { return SubSystems_; }
 		inline uint64_t DaemonBusTimer() const { return DAEMON_BUS_TIMER; };
-		[[nodiscard]] const std::string &AppName() { return DAEMON_APP_NAME; }
+        [[nodiscard]] const std::string & AppName() { return DAEMON_APP_NAME; }
 		static inline uint64_t GetPID() { return Poco::Process::id(); };
-		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() {
+		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() { return MyPublicEndPoint_ + "/api/v1"; };
-			return MyPublicEndPoint_ + "/api/v1";
+		[[nodiscard]] inline const std::string & GetUIURI() const { return UIURI_;};
-		};
+		[[nodiscard]] inline uint64_t Random(uint64_t ceiling) { return (RandomEngine_() % ceiling); }
-		[[nodiscard]] inline const std::string &GetUIURI() const { return UIURI_; };
-		[[nodiscard]] inline uint64_t Random(uint64_t ceiling) {
-			return (RandomEngine_() % ceiling);
-		}
 		[[nodiscard]] inline uint64_t Random(uint64_t min, uint64_t max) {
-			return ((RandomEngine_() % (max - min)) + min);
+		    return ((RandomEngine_() % (max-min)) + min);
 		}
-		virtual void GetExtraConfiguration(Poco::JSON::Object &Cfg) {
+        virtual void GetExtraConfiguration(Poco::JSON::Object & Cfg) {
-			Cfg.set("additionalConfiguration", false);
+            Cfg.set("additionalConfiguration",false);
-		}
+        }
-		static MicroService &instance() { return *instance_; }
+		static MicroService & instance() { return *instance_; }
 
-		inline void Exit(int Reason);
+        inline void Exit(int Reason);
-		void BusMessageReceived(const std::string &Key, const std::string &Payload);
+		void BusMessageReceived(const std::string &Key, const std::string & Payload);
-		Types::MicroServiceMetaVec GetServices(const std::string &Type);
+		Types::MicroServiceMetaVec GetServices(const std::string & Type);
 		Types::MicroServiceMetaVec GetServices();
 		void LoadConfigurationFile();
 		void Reload();
@@ -132,78 +136,71 @@ namespace OpenWifi {
 		void Reload(const std::string &Sub);
 		Types::StringVec GetSubSystems() const;
 		Types::StringPairVec GetLogLevels();
-		const Types::StringVec &GetLogLevelNames();
+		const Types::StringVec & GetLogLevelNames();
-		uint64_t ConfigGetInt(const std::string &Key, uint64_t Default);
+		uint64_t ConfigGetInt(const std::string &Key,uint64_t Default);
 		uint64_t ConfigGetInt(const std::string &Key);
-		uint64_t ConfigGetBool(const std::string &Key, bool Default);
+		uint64_t ConfigGetBool(const std::string &Key,bool Default);
 		uint64_t ConfigGetBool(const std::string &Key);
-		std::string ConfigGetString(const std::string &Key, const std::string &Default);
+		std::string ConfigGetString(const std::string &Key,const std::string & Default);
 		std::string ConfigGetString(const std::string &Key);
-		std::string ConfigPath(const std::string &Key, const std::string &Default);
+		std::string ConfigPath(const std::string &Key,const std::string & Default);
 		std::string ConfigPath(const std::string &Key);
 		std::string Encrypt(const std::string &S);
 		std::string Decrypt(const std::string &S);
-		std::string MakeSystemEventMessage(const std::string &Type) const;
+		std::string MakeSystemEventMessage( const std::string & Type ) const;
 		[[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
 		static void SavePID();
 		int main(const ArgVec &args) override;
-		void InitializeLoggingSystem();
+        void InitializeLoggingSystem();
 
 		void DeleteOverrideConfiguration();
 
 		[[nodiscard]] std::string Sign(Poco::JWT::Token &T, const std::string &Algo);
 		void AddActivity(const std::string &Activity);
 
-		static void SetConsoleLogs(bool UseAsync, bool AllowWebSocket,
+        static void SetConsoleLogs(bool UseAsync, bool AllowWebSocket, const std::string & FormatterPattern);
-								   const std::string &FormatterPattern);
+        static void SetColorConsoleLogs(bool UseAsync, bool AllowWebSocket, const std::string & FormatterPattern);
-		static void SetColorConsoleLogs(bool UseAsync, bool AllowWebSocket,
+        static void SetSQLLogs(bool UseAsync, bool AllowWebSocket, const std::string & FormatterPattern);
-										const std::string &FormatterPattern);
+        static void SetSyslogLogs(bool UseAsync, bool AllowWebSocket, const std::string & FormatterPattern);
-		static void SetSQLLogs(bool UseAsync, bool AllowWebSocket,
+        static void SetFileLogs(bool UseAsync, bool AllowWebSocket, const std::string & FormatterPattern, const std::string & root_env_var);
-							   const std::string &FormatterPattern);
+        inline bool AllowExternalMicroServices() const { return AllowExternalMicroServices_; }
-		static void SetSyslogLogs(bool UseAsync, bool AllowWebSocket,
-								  const std::string &FormatterPattern);
-		static void SetFileLogs(bool UseAsync, bool AllowWebSocket,
-								const std::string &FormatterPattern,
-								const std::string &root_env_var);
-		inline bool AllowExternalMicroServices() const { return AllowExternalMicroServices_; }
 
 	  private:
-		static MicroService *instance_;
+	    static MicroService         * instance_;
-		bool HelpRequested_ = false;
+		bool                        HelpRequested_ = false;
-		std::string LogDir_;
+		std::string                 LogDir_;
-		std::string ConfigFileName_;
+		std::string                 ConfigFileName_;
-		uint64_t ID_ = 1;
+		uint64_t                    ID_ = 1;
-		Poco::SharedPtr<Poco::Crypto::RSAKey> AppKey_;
+		Poco::SharedPtr<Poco::Crypto::RSAKey>	AppKey_;
-		bool DebugMode_ = false;
+		bool                        DebugMode_ = false;
-		std::string DataDir_;
+		std::string 				DataDir_;
-		std::string WWWAssetsDir_;
+		std::string                 WWWAssetsDir_;
-		Poco::Crypto::CipherFactory &CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
+		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
-		Poco::Crypto::Cipher *Cipher_ = nullptr;
+		Poco::Crypto::Cipher        * Cipher_ = nullptr;
-		Types::MicroServiceMetaMap Services_;
+		Types::MicroServiceMetaMap	Services_;
-		std::string MyHash_;
+		std::string 				MyHash_;
-		std::string MyPrivateEndPoint_;
+		std::string 				MyPrivateEndPoint_;
-		std::string MyPublicEndPoint_;
+		std::string 				MyPublicEndPoint_;
-		std::string UIURI_;
+		std::string                 UIURI_;
-		std::string Version_{OW_VERSION::VERSION + "(" + OW_VERSION::BUILD + ")" + " - " +
+		std::string 				Version_{ OW_VERSION::VERSION + "("+ OW_VERSION::BUILD + ")" + " - " + OW_VERSION::HASH };
-							 OW_VERSION::HASH};
+		std::recursive_mutex		InfraMutex_;
-		std::recursive_mutex InfraMutex_;
+		std::default_random_engine  RandomEngine_;
-		std::default_random_engine RandomEngine_;
+        Poco::Util::PropertyFileConfiguration   * PropConfigurationFile_ = nullptr;
-		Poco::Util::PropertyFileConfiguration *PropConfigurationFile_ = nullptr;
+		std::string                 DAEMON_PROPERTIES_FILENAME;
-		std::string DAEMON_PROPERTIES_FILENAME;
+		std::string                 DAEMON_ROOT_ENV_VAR;
-		std::string DAEMON_ROOT_ENV_VAR;
+		std::string                 DAEMON_CONFIG_ENV_VAR;
-		std::string DAEMON_CONFIG_ENV_VAR;
+		std::string                 DAEMON_APP_NAME;
-		std::string DAEMON_APP_NAME;
+		uint64_t 	                DAEMON_BUS_TIMER;
-		uint64_t DAEMON_BUS_TIMER;
+        SubSystemVec			    SubSystems_;
-		SubSystemVec SubSystems_;
+        bool                        NoAPISecurity_=false;
-		bool NoAPISecurity_ = false;
+        bool                        NoBuiltInCrypto_=false;
-		bool NoBuiltInCrypto_ = false;
+        bool                        AllowExternalMicroServices_=false;
-		bool AllowExternalMicroServices_ = false;
+        Poco::JWT::Signer	        Signer_;
-		Poco::JWT::Signer Signer_;
+		Poco::Logger				&Logger_;
-		Poco::Logger &Logger_;
+		Poco::ThreadPool				TimerPool_{"timer:pool",2,32};
-		Poco::ThreadPool TimerPool_{"timer:pool", 2, 32};
+		std::unique_ptr<EventBusManager>	EventBusManager_;
-		std::unique_ptr<EventBusManager> EventBusManager_;
+    };
-	};
 
-	inline MicroService *MicroService::instance_ = nullptr;
+	inline MicroService * MicroService::instance_ = nullptr;
 
-} // namespace OpenWifi
+}

src/framework/MicroServiceErrorHandler.h

@@ -4,24 +4,25 @@
 
 #pragma once
 
+#include "fmt/format.h"
+#include "Poco/Util/Application.h"
 #include "Poco/ErrorHandler.h"
-#include "Poco/JSON/JSONException.h"
-#include "Poco/JSON/Template.h"
 #include "Poco/Net/NetException.h"
 #include "Poco/Net/SSLException.h"
+#include "Poco/JSON/Template.h"
+#include "Poco/JSON/JSONException.h"
 #include "Poco/Thread.h"
-#include "Poco/Util/Application.h"
-#include "fmt/format.h"
 
 namespace OpenWifi {
 
 	class MicroServiceErrorHandler : public Poco::ErrorHandler {
 	  public:
-		explicit MicroServiceErrorHandler(Poco::Util::Application &App) : App_(App) {}
+		explicit MicroServiceErrorHandler(Poco::Util::Application &App) : App_(App) {
+		}
 
-		inline void exception(const Poco::Exception &Base) override {
+		inline void exception(const Poco::Exception & Base) override {
 			try {
-				if (Poco::Thread::current() != nullptr) {
+				if(Poco::Thread::current()!= nullptr) {
 					t_name = Poco::Thread::current()->getName();
 					t_id = Poco::Thread::current()->id();
 				} else {
@@ -33,167 +34,179 @@ namespace OpenWifi {
 				Base.rethrow();
 
 			} catch (const Poco::Net::InvalidCertificateException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::InvalidCertificateException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::InvalidCertificateException thr_name={} "
+													  t_name, t_id, E.code(),
-									   "thr_id={} code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::Net::InvalidSocketException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::InvalidSocketException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::InvalidSocketException thr_name={} thr_id={} "
+													  t_name, t_id, E.code(),
-									   "code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::Net::WebSocketException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::Net::WebSocketException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::Net::WebSocketException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::Net::ConnectionResetException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::ConnectionResetException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::ConnectionResetException thr_name={} thr_id={} "
+													  t_name, t_id, E.code(),
-									   "code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::Net::CertificateValidationException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::CertificateValidationException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::CertificateValidationException thr_name={} "
+													  t_name, t_id, E.code(),
-									   "thr_id={} code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::Net::SSLConnectionUnexpectedlyClosedException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::SSLConnectionUnexpectedlyClosedException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::SSLConnectionUnexpectedlyClosedException "
+													  t_name, t_id, E.code(),
-									   "thr_name={} thr_id={} code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::Net::SSLContextException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::Net::SSLContextException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::Net::SSLContextException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::Net::SSLException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::Net::SSLException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::Net::SSLException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 
 			} catch (const Poco::Net::InvalidAddressException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::Net::InvalidAddressException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::Net::InvalidAddressException thr_name={} thr_id={} "
+													  t_name, t_id, E.code(),
-									   "code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 
 			} catch (const Poco::Net::NetException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::Net::NetException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::Net::NetException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 
 			} catch (const Poco::IOException &E) {
-				poco_error(
+				poco_error(App_.logger(), fmt::format("Poco::IOException thr_name={} thr_id={} code={} text={} msg={} what={}",
-					App_.logger(),
+													  t_name, t_id, E.code(),
-					fmt::format(
+													  E.displayText(),
-						"Poco::IOException thr_name={} thr_id={} code={} text={} msg={} what={}",
+													  E.message(),
-						t_name, t_id, E.code(), E.displayText(), E.message(), E.what()));
+													  E.what()));
 			} catch (const Poco::TimeoutException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::TimeoutException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::TimeoutException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::NoThreadAvailableException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::NoThreadAvailableException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::NoThreadAvailableException thr_name={} thr_id={} "
+													  t_name, t_id, E.code(),
-									   "code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::OutOfMemoryException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::OutOfMemoryException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::OutOfMemoryException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::BadCastException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::BadCastException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::BadCastException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::DataException &E) {
-				poco_error(
+				poco_error(App_.logger(), fmt::format("Poco::DataException thr_name={} thr_id={} code={} text={} msg={} what={}",
-					App_.logger(),
+													  t_name, t_id, E.code(),
-					fmt::format(
+													  E.displayText(),
-						"Poco::DataException thr_name={} thr_id={} code={} text={} msg={} what={}",
+													  E.message(),
-						t_name, t_id, E.code(), E.displayText(), E.message(), E.what()));
+													  E.what()));
 			} catch (const Poco::PoolOverflowException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::PoolOverflowException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::PoolOverflowException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::SystemException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::SystemException thr_name={} thr_id={} "
+				poco_error(App_.logger(), fmt::format("Poco::SystemException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::RuntimeException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::RuntimeException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::RuntimeException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::JSON::JSONTemplateException &E) {
-				poco_error(App_.logger(),
+				poco_error(App_.logger(), fmt::format("Poco::JSON::JSONTemplateException thr_name={} thr_id={} code={} text={} msg={} what={}",
-						   fmt::format("Poco::JSON::JSONTemplateException thr_name={} thr_id={} "
+													  t_name, t_id, E.code(),
-									   "code={} text={} msg={} what={}",
+													  E.displayText(),
-									   t_name, t_id, E.code(), E.displayText(), E.message(),
+													  E.message(),
-									   E.what()));
+													  E.what()));
 			} catch (const Poco::JSON::JSONException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::JSON::JSONException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::JSON::JSONException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::ApplicationException &E) {
-				poco_error(App_.logger(), fmt::format("Poco::ApplicationException thr_name={} "
+				poco_error(App_.logger(), fmt::format("Poco::ApplicationException thr_name={} thr_id={} code={} text={} msg={} what={}",
-													  "thr_id={} code={} text={} msg={} what={}",
+													  t_name, t_id, E.code(),
-													  t_name, t_id, E.code(), E.displayText(),
+													  E.displayText(),
-													  E.message(), E.what()));
+													  E.message(),
+													  E.what()));
 			} catch (const Poco::Exception &E) {
-				poco_error(
+				poco_error(App_.logger(), fmt::format("Poco::Exception thr_name={} thr_id={} code={} text={} msg={} what={}",
-					App_.logger(),
+													  t_name, t_id, E.code(),
-					fmt::format(
+													  E.displayText(),
-						"Poco::Exception thr_name={} thr_id={} code={} text={} msg={} what={}",
+													  E.message(),
-						t_name, t_id, E.code(), E.displayText(), E.message(), E.what()));
+													  E.what()));
 			} catch (...) {
-				poco_error(App_.logger(), fmt::format("Poco:Generic thr_name={}", t_name, t_id));
+				poco_error(App_.logger(), fmt::format("Poco:Generic thr_name={}",t_name, t_id));
 			}
 		}
 
-		inline void exception(const std::exception &E) override {
+		inline void exception(const std::exception & E) override {
-			if (Poco::Thread::current() != nullptr) {
+			if(Poco::Thread::current()!= nullptr) {
 				t_name = Poco::Thread::current()->getName();
 				t_id = Poco::Thread::current()->id();
 			} else {
 				t_name = "startup_code";
 				t_id = 0;
 			}
-			poco_warning(App_.logger(),
+			poco_warning(App_.logger(), fmt::format("std::exception in {}: {} thr_id={}",
-						 fmt::format("std::exception in {}: {} thr_id={}", t_name, E.what(), t_id));
+													t_name,E.what(),
+													t_id));
 		}
 
 		inline void exception() override {
-			if (Poco::Thread::current() != nullptr) {
+			if(Poco::Thread::current()!= nullptr) {
 				t_name = Poco::Thread::current()->getName();
 				t_id = Poco::Thread::current()->id();
 			} else {
 				t_name = "startup_code";
 				t_id = 0;
 			}
-			poco_warning(App_.logger(),
+			poco_warning(App_.logger(), fmt::format("generic exception in {} thr_id={}",
-						 fmt::format("generic exception in {} thr_id={}", t_name, t_id));
+													t_name, t_id));
 		}
-
 	  private:
-		Poco::Util::Application &App_;
+		Poco::Util::Application	&App_;
-		std::string t_name;
+		std::string		t_name;
-		int t_id = 0;
+		int 			t_id=0;
 	};
 
-} // namespace OpenWifi
+}

src/framework/MicroServiceExtra.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <map>
 #include <string>
+#include <map>
 
 #include "Poco/BasicEvent.h"
 #include "Poco/ExpireLRUCache.h"
@@ -13,40 +13,46 @@
 namespace OpenWifi {
 	class ConfigurationEntry {
 	  public:
-		template <typename T> explicit ConfigurationEntry(T def) : Default_(def), Current_(def) {}
+		template <typename T> explicit ConfigurationEntry(T def) :
-
+											 Default_(def),
-		template <typename T>
+											 Current_(def){
-		explicit ConfigurationEntry(T def, T cur, const std::string &Hint = "")
-			: Default_(def), Current_(cur), Hint_(Hint) {}
-
-		inline ConfigurationEntry() = default;
-		inline ~ConfigurationEntry() = default;
-
-		template <typename T> explicit operator T() const { return std::get<T>(Current_); }
-		inline ConfigurationEntry &operator=(const char *v) {
-			Current_ = std::string(v);
-			return *this;
-		}
-		template <typename T> ConfigurationEntry &operator=(T v) {
-			Current_ = (T)v;
-			return *this;
 		}
 
-		void reset() { Current_ = Default_; }
+		template <typename T> explicit ConfigurationEntry(T def, T cur, const std::string  &Hint="") :
+																				  Default_(def),
+																				  Current_(cur),
+																				  Hint_(Hint){
+		}
+
+		inline ConfigurationEntry()=default;
+		inline ~ConfigurationEntry()=default;
+
+		template <typename T> explicit operator T () const { return std::get<T>(Current_); }
+		inline ConfigurationEntry & operator=(const char *v) { Current_ = std::string(v); return *this;}
+		template <typename T> ConfigurationEntry &  operator=(T v) { Current_ = (T) v; return *this;}
+
+		void reset() {
+			Current_ = Default_;
+		}
 
 	  private:
-		std::variant<bool, uint64_t, std::string> Default_, Current_;
+		std::variant<bool,uint64_t,std::string> Default_, Current_;
 		std::string Hint_;
 	};
-	inline std::string to_string(const ConfigurationEntry &v) { return (std::string)v; }
+	inline std::string to_string(const ConfigurationEntry &v) { return (std::string) v; }
 
-	typedef std::map<std::string, ConfigurationEntry> ConfigurationMap_t;
+	typedef std::map<std::string,ConfigurationEntry>    ConfigurationMap_t;
 
 	template <typename T> class FIFO {
 	  public:
-		explicit FIFO(uint32_t Size) : Size_(Size) { Buffer_ = new T[Size_]; }
+		explicit FIFO(uint32_t Size) :
+									   Size_(Size) {
+			Buffer_ = new T [Size_];
+		}
 
-		~FIFO() { delete[] Buffer_; }
+		~FIFO() {
+			delete [] Buffer_;
+		}
 
 		mutable Poco::BasicEvent<bool> Writable_;
 		mutable Poco::BasicEvent<bool> Readable_;
@@ -78,7 +84,7 @@ namespace OpenWifi {
 					Write_ = 0;
 				}
 				Used_++;
-				MaxEverUsed_ = std::max(Used_, MaxEverUsed_);
+				MaxEverUsed_ = std::max(Used_,MaxEverUsed_);
 			}
 			bool flag = true;
 			Readable_.notify(this, flag);
@@ -87,32 +93,40 @@ namespace OpenWifi {
 
 		inline bool isFull() {
 			std::lock_guard M(Mutex_);
-			return Used_ == Buffer_->capacity();
+			return Used_==Buffer_->capacity();
 		}
 
 		inline auto MaxEverUser() const { return MaxEverUsed_; }
 
 	  private:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex    Mutex_;
-		uint32_t Size_ = 0;
+		uint32_t 				Size_=0;
-		uint32_t Read_ = 0;
+		uint32_t        		Read_=0;
-		uint32_t Write_ = 0;
+		uint32_t        		Write_=0;
-		uint32_t Used_ = 0;
+		uint32_t 				Used_=0;
-		uint32_t MaxEverUsed_ = 0;
+		uint32_t 				MaxEverUsed_=0;
-		T *Buffer_ = nullptr;
+		T	  					* Buffer_ = nullptr;
 	};
 
-	template <class Record, typename KeyType = std::string, int Size = 256, int Expiry = 60000>
+	template <class Record, typename KeyType = std::string, int Size=256, int Expiry=60000> class RecordCache {
-	class RecordCache {
 	  public:
-		explicit RecordCache(KeyType Record::*Q) : MemberOffset(Q){};
+		explicit RecordCache( KeyType Record::* Q) :
-		inline auto update(const Record &R) { return Cache_.update(R.*MemberOffset, R); }
+												   MemberOffset(Q){
-		inline auto get(const KeyType &K) { return Cache_.get(K); }
+												   };
-		inline auto remove(const KeyType &K) { return Cache_.remove(K); }
+		inline auto update(const Record &R) {
-		inline auto remove(const Record &R) { return Cache_.remove(R.*MemberOffset); }
+			return Cache_.update(R.*MemberOffset, R);
-
+		}
+		inline auto get(const KeyType &K) {
+			return Cache_.get(K);
+		}
+		inline auto remove(const KeyType &K) {
+			return Cache_.remove(K);
+		}
+		inline auto remove(const Record &R) {
+			return Cache_.remove(R.*MemberOffset);
+		}
 	  private:
-		KeyType Record::*MemberOffset;
+		KeyType Record::* MemberOffset;
-		Poco::ExpireLRUCache<KeyType, Record> Cache_{Size, Expiry};
+		Poco::ExpireLRUCache<KeyType,Record>  Cache_{Size,Expiry};
 	};
-} // namespace OpenWifi
+}

src/framework/MicroServiceFuncs.cpp

@@ -2,131 +2,125 @@
 // Created by stephane bourque on 2022-10-25.
 //
 
-#include "framework/MicroServiceFuncs.h"
 #include "framework/MicroService.h"
-
+#include "framework/MicroServiceFuncs.h"
-#include "framework/ALBserver.h"
 
 namespace OpenWifi {
-	const std::string &MicroServiceDataDirectory() { return MicroService::instance().DataDir(); }
+    const std::string &MicroServiceDataDirectory() { return MicroService::instance().DataDir(); }
 
-	Types::MicroServiceMetaVec MicroServiceGetServices(const std::string &Type) {
+    Types::MicroServiceMetaVec MicroServiceGetServices(const std::string &Type) {
-		return MicroService::instance().GetServices(Type);
+        return MicroService::instance().GetServices(Type);
-	}
+    }
 
-	Types::MicroServiceMetaVec MicroServiceGetServices() {
+    Types::MicroServiceMetaVec MicroServiceGetServices() {
-		return MicroService::instance().GetServices();
+        return MicroService::instance().GetServices();
-	}
+    }
 
-	std::string MicroServicePublicEndPoint() { return MicroService::instance().PublicEndPoint(); }
+    std::string MicroServicePublicEndPoint() { return MicroService::instance().PublicEndPoint(); }
 
-	std::string MicroServiceConfigGetString(const std::string &Key,
+    std::string MicroServiceConfigGetString(const std::string &Key, const std::string &DefaultValue) {
-											const std::string &DefaultValue) {
+        return MicroService::instance().ConfigGetString(Key, DefaultValue);
-		return MicroService::instance().ConfigGetString(Key, DefaultValue);
+    }
-	}
 
-	bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue) {
+    bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue) {
-		return MicroService::instance().ConfigGetBool(Key, DefaultValue);
+        return MicroService::instance().ConfigGetBool(Key, DefaultValue);
-	}
+    }
 
-	std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue) {
+    std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue) {
-		return MicroService::instance().ConfigGetInt(Key, DefaultValue);
+        return MicroService::instance().ConfigGetInt(Key, DefaultValue);
-	}
+    }
 
-	std::string MicroServicePrivateEndPoint() { return MicroService::instance().PrivateEndPoint(); }
+    std::string MicroServicePrivateEndPoint() { return MicroService::instance().PrivateEndPoint(); }
 
-	std::uint64_t MicroServiceID() { return MicroService::instance().ID(); }
+    std::uint64_t MicroServiceID() { return MicroService::instance().ID(); }
 
-	bool MicroServiceIsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
+    bool MicroServiceIsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
-		return MicroService::instance().IsValidAPIKEY(Request);
+        return MicroService::instance().IsValidAPIKEY(Request);
-	}
+    }
 
-	bool MicroServiceNoAPISecurity() { return MicroService::instance().NoAPISecurity(); }
+    bool MicroServiceNoAPISecurity() { return MicroService::instance().NoAPISecurity(); }
 
-	void MicroServiceLoadConfigurationFile() { MicroService::instance().LoadConfigurationFile(); }
+    void MicroServiceLoadConfigurationFile() { MicroService::instance().LoadConfigurationFile(); }
 
-	void MicroServiceReload() { MicroService::instance().Reload(); }
+    void MicroServiceReload() { MicroService::instance().Reload(); }
 
-	void MicroServiceReload(const std::string &Type) { MicroService::instance().Reload(Type); }
+    void MicroServiceReload(const std::string &Type) { MicroService::instance().Reload(Type); }
 
-	Types::StringVec MicroServiceGetLogLevelNames() {
+    const Types::StringVec MicroServiceGetLogLevelNames() {
-		return MicroService::instance().GetLogLevelNames();
+        return MicroService::instance().GetLogLevelNames();
-	}
+    }
 
-	Types::StringVec MicroServiceGetSubSystems() {
+    const Types::StringVec MicroServiceGetSubSystems() {
-		return MicroService::instance().GetSubSystems();
+        return MicroService::instance().GetSubSystems();
-	}
+    }
 
-	Types::StringPairVec MicroServiceGetLogLevels() {
+    Types::StringPairVec MicroServiceGetLogLevels() { return MicroService::instance().GetLogLevels(); }
-		return MicroService::instance().GetLogLevels();
-	}
 
-	bool MicroServiceSetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
+    bool MicroServiceSetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
-		return MicroService::instance().SetSubsystemLogLevel(SubSystem, Level);
+        return MicroService::instance().SetSubsystemLogLevel(SubSystem, Level);
-	}
+    }
 
-	void MicroServiceGetExtraConfiguration(Poco::JSON::Object &Answer) {
+    void MicroServiceGetExtraConfiguration(Poco::JSON::Object &Answer) {
-		MicroService::instance().GetExtraConfiguration(Answer);
+        MicroService::instance().GetExtraConfiguration(Answer);
-	}
+    }
 
-	std::string MicroServiceVersion() { return MicroService::instance().Version(); }
+    std::string MicroServiceVersion() { return MicroService::instance().Version(); }
 
-	std::uint64_t MicroServiceUptimeTotalSeconds() {
+    std::uint64_t MicroServiceUptimeTotalSeconds() {
-		return MicroService::instance().uptime().totalSeconds();
+        return MicroService::instance().uptime().totalSeconds();
-	}
+    }
 
-	std::uint64_t MicroServiceStartTimeEpochTime() {
+    std::uint64_t MicroServiceStartTimeEpochTime() {
-		return MicroService::instance().startTime().epochTime();
+        return MicroService::instance().startTime().epochTime();
-	}
+    }
 
-	std::string MicroServiceGetUIURI() { return MicroService::instance().GetUIURI(); }
+    std::string MicroServiceGetUIURI() { return MicroService::instance().GetUIURI(); }
 
-	SubSystemVec MicroServiceGetFullSubSystems() {
+    const SubSystemVec MicroServiceGetFullSubSystems() {
-		return MicroService::instance().GetFullSubSystems();
+        return MicroService::instance().GetFullSubSystems();
-	}
+    }
 
-	std::string MicroServiceCreateUUID() { return MicroService::CreateUUID(); }
+    std::string MicroServiceCreateUUID() { return MicroService::CreateUUID(); }
 
-	std::uint64_t MicroServiceDaemonBusTimer() { return MicroService::instance().DaemonBusTimer(); }
+    std::uint64_t MicroServiceDaemonBusTimer() { return MicroService::instance().DaemonBusTimer(); }
 
-	std::string MicroServiceMakeSystemEventMessage(const char *Type) {
+    std::string MicroServiceMakeSystemEventMessage(const std::string &Type) {
-		return MicroService::instance().MakeSystemEventMessage(Type);
+        return MicroService::instance().MakeSystemEventMessage(Type);
-	}
+    }
 
-	Poco::ThreadPool &MicroServiceTimerPool() { return MicroService::instance().TimerPool(); }
+    Poco::ThreadPool &MicroServiceTimerPool() { return MicroService::instance().TimerPool(); }
 
-	std::string MicroServiceConfigPath(const std::string &Key, const std::string &DefaultValue) {
+    std::string MicroServiceConfigPath(const std::string &Key,
-		return MicroService::instance().ConfigPath(Key, DefaultValue);
+                                       const std::string &DefaultValue) {
-	}
+        return MicroService::instance().ConfigPath(Key, DefaultValue);
+    }
 
-	std::string MicroServiceWWWAssetsDir() { return MicroService::instance().WWWAssetsDir(); }
+    std::string MicroServiceWWWAssetsDir() {
+        return MicroService::instance().WWWAssetsDir();
+    }
 
-	std::uint64_t MicroServiceRandom(std::uint64_t Start, std::uint64_t End) {
+    std::uint64_t MicroServiceRandom(std::uint64_t Start,std::uint64_t End) {
-		return MicroService::instance().Random(Start, End);
+        return MicroService::instance().Random(Start, End);
-	}
+    }
 
-	std::uint64_t MicroServiceRandom(std::uint64_t Range) {
+    std::uint64_t MicroServiceRandom(std::uint64_t Range) {
-		return MicroService::instance().Random(Range);
+        return MicroService::instance().Random(Range);
-	}
+    }
 
-	std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo) {
+    std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo) {
-		return MicroService::instance().Sign(T, Algo);
+        return MicroService::instance().Sign(T, Algo);
-	}
+    }
 
-	std::string MicroServiceGetPublicAPIEndPoint() {
+    std::string MicroServiceGetPublicAPIEndPoint() {
-		return MicroService::instance().GetPublicAPIEndPoint();
+        return MicroService::instance().GetPublicAPIEndPoint();
-	}
+    }
 
 	void MicroServiceDeleteOverrideConfiguration() {
 		return MicroService::instance().DeleteOverrideConfiguration();
 	}
 
-	bool AllowExternalMicroServices() {
+    bool AllowExternalMicroServices() {
-		return MicroService::instance().AllowExternalMicroServices();
+        return MicroService::instance().AllowExternalMicroServices();
-	}
+    }
 
-	void MicroServiceALBCallback( std::string Callback()) {
+}
-		return ALBHealthCheckServer()->RegisterExtendedHealthMessage(Callback);
-	}
-
-} // namespace OpenWifi

src/framework/MicroServiceFuncs.h

@@ -8,20 +8,20 @@
 
 #include "framework/OpenWifiTypes.h"
 
-#include "Poco/JSON/Object.h"
-#include "Poco/JWT/Token.h"
 #include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/JSON/Object.h"
 #include "Poco/ThreadPool.h"
+#include "Poco/JWT/Token.h"
+
 
 namespace OpenWifi {
 	class SubSystemServer;
-	using SubSystemVec = std::vector<SubSystemServer *>;
+	using SubSystemVec=std::vector<SubSystemServer *>;
-	const std::string &MicroServiceDataDirectory();
+	const std::string & MicroServiceDataDirectory();
-	Types::MicroServiceMetaVec MicroServiceGetServices(const std::string &Type);
+	Types::MicroServiceMetaVec MicroServiceGetServices(const std::string & Type);
-	Types::MicroServiceMetaVec MicroServiceGetServices();
+    Types::MicroServiceMetaVec MicroServiceGetServices();
 	std::string MicroServicePublicEndPoint();
-	std::string MicroServiceConfigGetString(const std::string &Key,
+	std::string MicroServiceConfigGetString(const std::string &Key, const std::string &DefaultValue);
-											const std::string &DefaultValue);
 	bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue);
 	std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue);
 	std::string MicroServicePrivateEndPoint();
@@ -31,8 +31,8 @@ namespace OpenWifi {
 	void MicroServiceLoadConfigurationFile();
 	void MicroServiceReload();
 	void MicroServiceReload(const std::string &Type);
-	Types::StringVec MicroServiceGetLogLevelNames();
+	const Types::StringVec MicroServiceGetLogLevelNames();
-	Types::StringVec MicroServiceGetSubSystems();
+	const Types::StringVec MicroServiceGetSubSystems();
 	Types::StringPairVec MicroServiceGetLogLevels();
 	bool MicroServiceSetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level);
 	void MicroServiceGetExtraConfiguration(Poco::JSON::Object &Answer);
@@ -40,18 +40,18 @@ namespace OpenWifi {
 	std::uint64_t MicroServiceUptimeTotalSeconds();
 	std::uint64_t MicroServiceStartTimeEpochTime();
 	std::string MicroServiceGetUIURI();
-	SubSystemVec MicroServiceGetFullSubSystems();
+	const SubSystemVec MicroServiceGetFullSubSystems();
 	std::string MicroServiceCreateUUID();
 	std::uint64_t MicroServiceDaemonBusTimer();
-	std::string MicroServiceMakeSystemEventMessage(const char *Type);
+	std::string MicroServiceMakeSystemEventMessage( const std::string & Type );
-	Poco::ThreadPool &MicroServiceTimerPool();
+	Poco::ThreadPool & MicroServiceTimerPool();
-	std::string MicroServiceConfigPath(const std::string &Key, const std::string &DefaultValue);
+	std::string MicroServiceConfigPath(const std::string &Key,
-	std::string MicroServiceWWWAssetsDir();
+									   const std::string &DefaultValue);
-	std::uint64_t MicroServiceRandom(std::uint64_t Start, std::uint64_t End);
+    std::string MicroServiceWWWAssetsDir();
-	std::uint64_t MicroServiceRandom(std::uint64_t Range);
+    std::uint64_t MicroServiceRandom(std::uint64_t Start,std::uint64_t End);
-	std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo);
+    std::uint64_t MicroServiceRandom(std::uint64_t Range);
-	std::string MicroServiceGetPublicAPIEndPoint();
+    std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo);
+    std::string MicroServiceGetPublicAPIEndPoint();
 	void MicroServiceDeleteOverrideConfiguration();
-	bool AllowExternalMicroServices();
+    bool AllowExternalMicroServices();
-	void MicroServiceALBCallback( std::string Callback());
+}
-} // namespace OpenWifi

src/framework/MicroServiceNames.h

@@ -10,13 +10,13 @@ namespace OpenWifi {
 
 	static const std::string uSERVICE_SECURITY{"owsec"};
 	static const std::string uSERVICE_GATEWAY{"owgw"};
-	static const std::string uSERVICE_FIRMWARE{"owfms"};
+	static const std::string uSERVICE_FIRMWARE{ "owfms"};
-	static const std::string uSERVICE_TOPOLOGY{"owtopo"};
+	static const std::string uSERVICE_TOPOLOGY{ "owtopo"};
-	static const std::string uSERVICE_PROVISIONING{"owprov"};
+	static const std::string uSERVICE_PROVISIONING{ "owprov"};
-	static const std::string uSERVICE_OWLS{"owls"};
+	static const std::string uSERVICE_OWLS{ "owls"};
-	static const std::string uSERVICE_SUBCRIBER{"owsub"};
+	static const std::string uSERVICE_SUBCRIBER{ "owsub"};
-	static const std::string uSERVICE_INSTALLER{"owinst"};
+	static const std::string uSERVICE_INSTALLER{ "owinst"};
-	static const std::string uSERVICE_ANALYTICS{"owanalytics"};
+	static const std::string uSERVICE_ANALYTICS{ "owanalytics"};
-	static const std::string uSERVICE_OWRRM{"owrrm"};
+	static const std::string uSERVICE_OWRRM{ "owrrm"};
 
-} // namespace OpenWifi
+}

src/framework/OpenAPIRequests.cpp

@@ -4,281 +4,286 @@
 
 #include "OpenAPIRequests.h"
 
-#include "Poco/JSON/Parser.h"
 #include "Poco/Logger.h"
+#include "Poco/URI.h"
 #include "Poco/Net/HTTPRequest.h"
 #include "Poco/Net/HTTPSClientSession.h"
-#include "Poco/URI.h"
+#include "Poco/JSON/Parser.h"
 
 #include "fmt/format.h"
 #include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
-	Poco::Net::HTTPServerResponse::HTTPStatus
+	Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken) {
-	OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string &BearerToken) {
+	try {
-		try {
 
-			auto Services = MicroServiceGetServices(Type_);
+		auto Services = MicroServiceGetServices(Type_);
-			for (auto const &Svc : Services) {
+		for(auto const &Svc:Services) {
-				Poco::URI URI(Svc.PrivateEndPoint);
+			Poco::URI	URI(Svc.PrivateEndPoint);
 
-				auto Secure = (URI.getScheme() == "https");
+			auto Secure = (URI.getScheme() == "https");
 
-				URI.setPath(EndPoint_);
+			URI.setPath(EndPoint_);
-				for (const auto &qp : QueryData_)
+			for (const auto &qp : QueryData_)
-					URI.addQueryParameter(qp.first, qp.second);
+				URI.addQueryParameter(qp.first, qp.second);
 
-				std::string Path(URI.getPathAndQuery());
+			std::string Path(URI.getPathAndQuery());
-				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET, Path,
+			Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET,
-											   Poco::Net::HTTPMessage::HTTP_1_1);
+										   Path,
+										   Poco::Net::HTTPMessage::HTTP_1_1);
 
-				poco_debug(Poco::Logger::get("REST-CALLER-GET"),
+			poco_debug(Poco::Logger::get("REST-CALLER-GET"), fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_ ) );
-						   fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_));
 
-				if (BearerToken.empty()) {
+			if(BearerToken.empty()) {
-					Request.add("X-API-KEY", Svc.AccessKey);
+				Request.add("X-API-KEY", Svc.AccessKey);
-					Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
+				Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
-				} else {
+			} else {
-					// Authorization: Bearer ${token}
+				// Authorization: Bearer ${token}
-					Request.add("Authorization", "Bearer " + BearerToken);
+				Request.add("Authorization", "Bearer " + BearerToken);
-				}
-
-				if (Secure) {
-					Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-
-					Session.sendRequest(Request);
-
-					Poco::Net::HTTPResponse Response;
-					std::istream &is = Session.receiveResponse(Response);
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
-				} else {
-					Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-
-					Session.sendRequest(Request);
-
-					Poco::Net::HTTPResponse Response;
-					std::istream &is = Session.receiveResponse(Response);
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
-				}
 			}
-		} catch (const Poco::Exception &E) {
-			Poco::Logger::get("REST-CALLER-GET").log(E);
-		}
-		return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
-	}
 
-	Poco::Net::HTTPServerResponse::HTTPStatus
+			if(Secure) {
-	OpenAPIRequestPut::Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string &BearerToken) {
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
-		try {
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-			auto Services = MicroServiceGetServices(Type_);
-			for (auto const &Svc : Services) {
-				Poco::URI URI(Svc.PrivateEndPoint);
 
-				auto Secure = (URI.getScheme() == "https");
+				Session.sendRequest(Request);
 
-				URI.setPath(EndPoint_);
+				Poco::Net::HTTPResponse Response;
-				for (const auto &qp : QueryData_)
+				std::istream &is = Session.receiveResponse(Response);
-					URI.addQueryParameter(qp.first, qp.second);
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-
+					Poco::JSON::Parser P;
-				poco_debug(Poco::Logger::get("REST-CALLER-PUT"),
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-						   fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_));
-
-				std::string Path(URI.getPathAndQuery());
-
-				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_PUT, Path,
-											   Poco::Net::HTTPMessage::HTTP_1_1);
-				std::ostringstream obody;
-				Poco::JSON::Stringifier::stringify(Body_, obody);
-
-				Request.setContentType("application/json");
-				Request.setContentLength(obody.str().size());
-
-				if (BearerToken.empty()) {
-					Request.add("X-API-KEY", Svc.AccessKey);
-					Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
-				} else {
-					// Authorization: Bearer ${token}
-					Request.add("Authorization", "Bearer " + BearerToken);
 				}
+				return Response.getStatus();
+			} else {
+				Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
 
-				if (Secure) {
+				Session.sendRequest(Request);
-					Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
 
-					std::ostream &os = Session.sendRequest(Request);
+				Poco::Net::HTTPResponse Response;
-					os << obody.str();
+				std::istream &is = Session.receiveResponse(Response);
-
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-					Poco::Net::HTTPResponse Response;
+					Poco::JSON::Parser P;
-					std::istream &is = Session.receiveResponse(Response);
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					} else {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
-				} else {
-					Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-
-					std::ostream &os = Session.sendRequest(Request);
-					os << obody.str();
-
-					Poco::Net::HTTPResponse Response;
-					std::istream &is = Session.receiveResponse(Response);
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					} else {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
 				}
+				return Response.getStatus();
 			}
-		} catch (const Poco::Exception &E) {
-			Poco::Logger::get("REST-CALLER-PUT").log(E);
 		}
-		return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
 	}
+	catch (const Poco::Exception &E)
+	{
+		Poco::Logger::get("REST-CALLER-GET").log(E);
+	}
+	return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
+}
 
-	Poco::Net::HTTPServerResponse::HTTPStatus
+	Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestPut::Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken) {
-	OpenAPIRequestPost::Do(Poco::JSON::Object::Ptr &ResponseObject,
+	try {
-						   const std::string &BearerToken) {
+		auto Services = MicroServiceGetServices(Type_);
-		try {
+		for(auto const &Svc:Services) {
-			auto Services = MicroServiceGetServices(Type_);
+			Poco::URI	URI(Svc.PrivateEndPoint);
 
-			for (auto const &Svc : Services) {
+			auto Secure = (URI.getScheme() == "https");
-				Poco::URI URI(Svc.PrivateEndPoint);
 
-				auto Secure = (URI.getScheme() == "https");
+			URI.setPath(EndPoint_);
+			for (const auto &qp : QueryData_)
+				URI.addQueryParameter(qp.first, qp.second);
 
-				URI.setPath(EndPoint_);
+			poco_debug(Poco::Logger::get("REST-CALLER-PUT"), fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_ ) );
-				for (const auto &qp : QueryData_)
-					URI.addQueryParameter(qp.first, qp.second);
 
-				poco_debug(Poco::Logger::get("REST-CALLER-POST"),
+			std::string Path(URI.getPathAndQuery());
-						   fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_));
 
-				std::string Path(URI.getPathAndQuery());
+			Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_PUT,
+										   Path,
+										   Poco::Net::HTTPMessage::HTTP_1_1);
+			std::ostringstream obody;
+			Poco::JSON::Stringifier::stringify(Body_,obody);
 
-				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_POST, Path,
+			Request.setContentType("application/json");
-											   Poco::Net::HTTPMessage::HTTP_1_1);
+			Request.setContentLength(obody.str().size());
-				std::ostringstream obody;
-				Poco::JSON::Stringifier::stringify(Body_, obody);
 
-				Request.setContentType("application/json");
+			if(BearerToken.empty()) {
-				Request.setContentLength(obody.str().size());
+				Request.add("X-API-KEY", Svc.AccessKey);
-
+				Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
-				if (BearerToken.empty()) {
+			} else {
-					Request.add("X-API-KEY", Svc.AccessKey);
+				// Authorization: Bearer ${token}
-					Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
+				Request.add("Authorization", "Bearer " + BearerToken);
-				} else {
-					// Authorization: Bearer ${token}
-					Request.add("Authorization", "Bearer " + BearerToken);
-				}
-
-				if (Secure) {
-					Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-					std::ostream &os = Session.sendRequest(Request);
-					os << obody.str();
-
-					Poco::Net::HTTPResponse Response;
-					std::istream &is = Session.receiveResponse(Response);
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					} else {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
-				} else {
-					Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-					std::ostream &os = Session.sendRequest(Request);
-					os << obody.str();
-
-					Poco::Net::HTTPResponse Response;
-					std::istream &is = Session.receiveResponse(Response);
-					if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					} else {
-						Poco::JSON::Parser P;
-						ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					}
-					return Response.getStatus();
-				}
 			}
-		} catch (const Poco::Exception &E) {
-			Poco::Logger::get("REST-CALLER-POST").log(E);
-		}
-		return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
-	}
 
-	Poco::Net::HTTPServerResponse::HTTPStatus
+			if(Secure) {
-	OpenAPIRequestDelete::Do(const std::string &BearerToken) {
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
-		try {
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
-			auto Services = MicroServiceGetServices(Type_);
 
-			for (auto const &Svc : Services) {
+				std::ostream &os = Session.sendRequest(Request);
-				Poco::URI URI(Svc.PrivateEndPoint);
+				os << obody.str();
 
-				auto Secure = (URI.getScheme() == "https");
+				Poco::Net::HTTPResponse Response;
-
+				std::istream &is = Session.receiveResponse(Response);
-				URI.setPath(EndPoint_);
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-				for (const auto &qp : QueryData_)
+					Poco::JSON::Parser P;
-					URI.addQueryParameter(qp.first, qp.second);
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-
-				poco_debug(Poco::Logger::get("REST-CALLER-DELETE"),
-						   fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_));
-
-				std::string Path(URI.getPathAndQuery());
-
-				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_DELETE, Path,
-											   Poco::Net::HTTPMessage::HTTP_1_1);
-				if (BearerToken.empty()) {
-					Request.add("X-API-KEY", Svc.AccessKey);
-					Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
 				} else {
-					// Authorization: Bearer ${token}
+					Poco::JSON::Parser P;
-					Request.add("Authorization", "Bearer " + BearerToken);
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
 				}
+				return Response.getStatus();
+			} else {
+				Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
 
-				if (Secure) {
+				std::ostream &os = Session.sendRequest(Request);
-					Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+				os << obody.str();
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+
-					Session.sendRequest(Request);
+				Poco::Net::HTTPResponse Response;
-					Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
-					Session.receiveResponse(Response);
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
-					return Response.getStatus();
+					Poco::JSON::Parser P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
 				} else {
-					Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
+					Poco::JSON::Parser P;
-					Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-					Session.sendRequest(Request);
-					Poco::Net::HTTPResponse Response;
-					Session.receiveResponse(Response);
-					return Response.getStatus();
 				}
+				return Response.getStatus();
 			}
-		} catch (const Poco::Exception &E) {
-			Poco::Logger::get("REST-CALLER-DELETE").log(E);
 		}
-		return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
 	}
+	catch (const Poco::Exception &E)
+	{
+		Poco::Logger::get("REST-CALLER-PUT").log(E);
+	}
+	return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
+}
+
+	Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestPost::Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken) {
+	try {
+		auto Services = MicroServiceGetServices(Type_);
+
+		for(auto const &Svc:Services) {
+			Poco::URI	URI(Svc.PrivateEndPoint);
+
+
+			auto Secure = (URI.getScheme() == "https");
+
+			URI.setPath(EndPoint_);
+			for (const auto &qp : QueryData_)
+				URI.addQueryParameter(qp.first, qp.second);
+
+			poco_debug(Poco::Logger::get("REST-CALLER-POST"),fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_ ) );
+
+			std::string Path(URI.getPathAndQuery());
+
+			Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_POST,
+										   Path,
+										   Poco::Net::HTTPMessage::HTTP_1_1);
+			std::ostringstream obody;
+			Poco::JSON::Stringifier::stringify(Body_,obody);
+
+			Request.setContentType("application/json");
+			Request.setContentLength(obody.str().size());
+
+			if(BearerToken.empty()) {
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
+			} else {
+				// Authorization: Bearer ${token}
+				Request.add("Authorization", "Bearer " + BearerToken);
+			}
+
+			if(Secure) {
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+				std::ostream &os = Session.sendRequest(Request);
+				os << obody.str();
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				} else {
+					Poco::JSON::Parser P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			} else {
+				Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+				std::ostream &os = Session.sendRequest(Request);
+				os << obody.str();
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				} else {
+					Poco::JSON::Parser P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			}
+		}
+	}
+	catch (const Poco::Exception &E)
+	{
+		Poco::Logger::get("REST-CALLER-POST").log(E);
+	}
+	return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
+}
+
+	Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestDelete::Do(const std::string & BearerToken) {
+	try {
+		auto Services = MicroServiceGetServices(Type_);
+
+		for(auto const &Svc:Services) {
+			Poco::URI	URI(Svc.PrivateEndPoint);
+
+			auto Secure = (URI.getScheme() == "https");
+
+			URI.setPath(EndPoint_);
+			for (const auto &qp : QueryData_)
+				URI.addQueryParameter(qp.first, qp.second);
+
+			poco_debug(Poco::Logger::get("REST-CALLER-DELETE"),fmt::format(" {}", LoggingStr_.empty() ? URI.toString() : LoggingStr_ ) );
+
+			std::string Path(URI.getPathAndQuery());
+
+			Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_DELETE,
+										   Path,
+										   Poco::Net::HTTPMessage::HTTP_1_1);
+			if(BearerToken.empty()) {
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Request.add("X-INTERNAL-NAME", MicroServicePublicEndPoint());
+			} else {
+				// Authorization: Bearer ${token}
+				Request.add("Authorization", "Bearer " + BearerToken);
+			}
+
+			if(Secure) {
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+				Session.sendRequest(Request);
+				Poco::Net::HTTPResponse Response;
+				Session.receiveResponse(Response);
+				return Response.getStatus();
+			} else {
+				Poco::Net::HTTPClientSession Session(URI.getHost(), URI.getPort());
+				Session.setTimeout(Poco::Timespan(msTimeout_ / 1000, msTimeout_ % 1000));
+				Session.sendRequest(Request);
+				Poco::Net::HTTPResponse Response;
+				Session.receiveResponse(Response);
+				return Response.getStatus();
+			}
+		}
+	}
+	catch (const Poco::Exception &E)
+	{
+		Poco::Logger::get("REST-CALLER-DELETE").log(E);
+	}
+	return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
+}
+
 
 } // namespace OpenWifi

src/framework/OpenAPIRequests.h

@@ -15,79 +15,96 @@ namespace OpenWifi {
 
 	class OpenAPIRequestGet {
 	  public:
-		explicit OpenAPIRequestGet(const std::string &Type, const std::string &EndPoint,
+		explicit OpenAPIRequestGet( const std::string & Type,
-								   const Types::StringPairVec &QueryData, uint64_t msTimeout,
+								   const std::string & EndPoint,
-								   const std::string &LoggingStr = "")
+								   const Types::StringPairVec & QueryData,
-			: Type_(Type), EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout),
+								   uint64_t msTimeout,
-			  LoggingStr_(LoggingStr){};
+                                   const std::string &LoggingStr=""):
-		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject,
+														 Type_(Type),
-													 const std::string &BearerToken = "");
+														 EndPoint_(EndPoint),
-
+														 QueryData_(QueryData),
+														 msTimeout_(msTimeout),
+                                                         LoggingStr_(LoggingStr){};
+		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken = "");
 	  private:
-		std::string Type_;
+		std::string 			Type_;
-		std::string EndPoint_;
+		std::string 			EndPoint_;
-		Types::StringPairVec QueryData_;
+		Types::StringPairVec 	QueryData_;
-		uint64_t msTimeout_;
+		uint64_t 				msTimeout_;
-		std::string LoggingStr_;
+        std::string             LoggingStr_;
 	};
 
 	class OpenAPIRequestPut {
 	  public:
-		explicit OpenAPIRequestPut(const std::string &Type, const std::string &EndPoint,
+		explicit OpenAPIRequestPut( const std::string & Type,
-								   const Types::StringPairVec &QueryData,
+								   const std::string & EndPoint,
-								   const Poco::JSON::Object &Body, uint64_t msTimeout,
+								   const Types::StringPairVec & QueryData,
-								   const std::string &LoggingStr = "")
+								   const Poco::JSON::Object & Body,
-			: Type_(Type), EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout),
+								   uint64_t msTimeout,
-			  Body_(Body), LoggingStr_(LoggingStr){};
+                                   const std::string &LoggingStr=""):
+														 Type_(Type),
+														 EndPoint_(EndPoint),
+														 QueryData_(QueryData),
+														 msTimeout_(msTimeout),
+														 Body_(Body),
+                                                         LoggingStr_(LoggingStr){};
 
-		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject,
+		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken = "");
-													 const std::string &BearerToken = "");
 
 	  private:
-		std::string Type_;
+		std::string 			Type_;
-		std::string EndPoint_;
+		std::string 			EndPoint_;
-		Types::StringPairVec QueryData_;
+		Types::StringPairVec 	QueryData_;
-		uint64_t msTimeout_;
+		uint64_t 				msTimeout_;
-		Poco::JSON::Object Body_;
+		Poco::JSON::Object      Body_;
-		std::string LoggingStr_;
+        std::string             LoggingStr_;
 	};
 
 	class OpenAPIRequestPost {
 	  public:
-		explicit OpenAPIRequestPost(const std::string &Type, const std::string &EndPoint,
+		explicit OpenAPIRequestPost( const std::string & Type,
-									const Types::StringPairVec &QueryData,
+									const std::string & EndPoint,
-									const Poco::JSON::Object &Body, uint64_t msTimeout,
+									const Types::StringPairVec & QueryData,
-									const std::string &LoggingStr = "")
+									const Poco::JSON::Object & Body,
-			: Type_(Type), EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout),
+									uint64_t msTimeout,
-			  Body_(Body), LoggingStr_(LoggingStr){};
+                                   const std::string &LoggingStr=""):
-		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject,
+														  Type_(Type),
-													 const std::string &BearerToken = "");
+														  EndPoint_(EndPoint),
-
+														  QueryData_(QueryData),
+														  msTimeout_(msTimeout),
+														  Body_(Body),
+                                                         LoggingStr_(LoggingStr){};
+		Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject, const std::string & BearerToken = "");
 	  private:
-		std::string Type_;
+		std::string 			Type_;
-		std::string EndPoint_;
+		std::string 			EndPoint_;
-		Types::StringPairVec QueryData_;
+		Types::StringPairVec 	QueryData_;
-		uint64_t msTimeout_;
+		uint64_t 				msTimeout_;
-		Poco::JSON::Object Body_;
+		Poco::JSON::Object      Body_;
-		std::string LoggingStr_;
+        std::string             LoggingStr_;
 	};
 
 	class OpenAPIRequestDelete {
 	  public:
-		explicit OpenAPIRequestDelete(const std::string &Type, const std::string &EndPoint,
+		explicit OpenAPIRequestDelete(  const std::string & Type,
-									  const Types::StringPairVec &QueryData, uint64_t msTimeout,
+									    const std::string & EndPoint,
-									  const std::string &LoggingStr = "")
+									    const Types::StringPairVec & QueryData,
-			: Type_(Type), EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout),
+									    uint64_t msTimeout,
-			  LoggingStr_(LoggingStr){};
+                                        const std::string &LoggingStr=""):
-		Poco::Net::HTTPServerResponse::HTTPStatus Do(const std::string &BearerToken = "");
+                                            Type_(Type),
+                                            EndPoint_(EndPoint),
+                                            QueryData_(QueryData),
+                                            msTimeout_(msTimeout),
+                                            LoggingStr_(LoggingStr){};
+		Poco::Net::HTTPServerResponse::HTTPStatus Do(const std::string & BearerToken = "");
 
 	  private:
-		std::string Type_;
+		std::string 			Type_;
-		std::string EndPoint_;
+		std::string 			EndPoint_;
-		Types::StringPairVec QueryData_;
+		Types::StringPairVec 	QueryData_;
-		uint64_t msTimeout_;
+		uint64_t 				msTimeout_;
-		Poco::JSON::Object Body_;
+		Poco::JSON::Object      Body_;
-		std::string LoggingStr_;
+        std::string             LoggingStr_;
 	};
 
 } // namespace OpenWifi

src/framework/OpenWifiTypes.h

@@ -4,74 +4,70 @@
 
 #pragma once
 
-#include <functional>
-#include <list>
 #include <map>
-#include <queue>
-#include <set>
-#include <string>
 #include <utility>
 #include <vector>
+#include <functional>
+#include <string>
+#include <queue>
+#include <list>
+#include <set>
 
 namespace OpenWifi::Types {
-	typedef std::pair<std::string, std::string> StringPair;
+    typedef std::pair<std::string,std::string>                  StringPair;
-	typedef std::vector<StringPair> StringPairVec;
+    typedef std::vector<StringPair>	                            StringPairVec;
-	typedef std::queue<StringPair> StringPairQueue;
+    typedef std::queue<StringPair>	                            StringPairQueue;
-	typedef std::vector<std::string> StringVec;
+    typedef std::vector<std::string>						    StringVec;
-	typedef std::set<std::string> StringSet;
+    typedef std::set<std::string>                               StringSet;
-	typedef std::map<std::string, std::set<std::string>> StringMapStringSet;
+    typedef std::map<std::string,std::set<std::string>>		    StringMapStringSet;
-	typedef std::function<void(const std::string &, const std::string &)> TopicNotifyFunction;
+    typedef std::function<void(const std::string &, const std::string &)>       TopicNotifyFunction;
-	typedef std::list<std::pair<TopicNotifyFunction, int>> TopicNotifyFunctionList;
+    typedef std::list<std::pair<TopicNotifyFunction,int>>       TopicNotifyFunctionList;
-	typedef std::map<std::string, TopicNotifyFunctionList> NotifyTable;
+    typedef std::map<std::string, TopicNotifyFunctionList>      NotifyTable;
-	typedef std::map<std::string, uint64_t> CountedMap;
+    typedef std::map<std::string,uint64_t>                      CountedMap;
-	typedef std::vector<uint64_t> TagList;
+    typedef std::vector<uint64_t>                               TagList;
-	typedef std::string UUID_t;
+    typedef std::string                                         UUID_t;
-	typedef std::vector<UUID_t> UUIDvec_t;
+    typedef std::vector<UUID_t>                                 UUIDvec_t;
-	typedef std::map<std::string, std::map<uint32_t, uint64_t>> Counted3DMapSII;
+    typedef std::map<std::string,std::map<uint32_t,uint64_t>>   Counted3DMapSII;
-	typedef std::vector<int64_t> IntList;
-	typedef std::vector<uint64_t> UIntList;
-	typedef std::vector<double> DoubleList;
 
 	struct MicroServiceMeta {
-		uint64_t Id = 0;
+		uint64_t 		Id=0;
-		std::string Type;
+		std::string 	Type;
-		std::string PrivateEndPoint;
+		std::string 	PrivateEndPoint;
-		std::string PublicEndPoint;
+		std::string 	PublicEndPoint;
-		std::string AccessKey;
+		std::string 	AccessKey;
-		std::string Version;
+		std::string		Version;
-		uint64_t LastUpdate = 0;
+		uint64_t 		LastUpdate=0;
 	};
 
-	typedef std::map<std::string, MicroServiceMeta> MicroServiceMetaMap;
+	typedef std::map<std::string, MicroServiceMeta>				MicroServiceMetaMap;
-	typedef std::vector<MicroServiceMeta> MicroServiceMetaVec;
+	typedef std::vector<MicroServiceMeta>						MicroServiceMetaVec;
-} // namespace OpenWifi::Types
+}
 
 namespace OpenWifi {
 
-	inline void UpdateCountedMap(OpenWifi::Types::CountedMap &M, const std::string &S,
+    inline void UpdateCountedMap(OpenWifi::Types::CountedMap &M, const std::string &S, uint64_t Increment=1) {
-								 uint64_t Increment = 1) {
+        auto it = M.find(S);
-		auto it = M.find(S);
+        if(it==M.end())
-		if (it == M.end())
+            M[S] = Increment;
-			M[S] = Increment;
+        else
-		else
+            it->second += Increment;
-			it->second += Increment;
+    }
-	}
 
-	inline void UpdateCountedMap(OpenWifi::Types::Counted3DMapSII &M, const std::string &S,
+    inline void UpdateCountedMap(OpenWifi::Types::Counted3DMapSII &M, const std::string &S, uint32_t Index, uint64_t Increment=1) {
-								 uint32_t Index, uint64_t Increment = 1) {
+        auto it = M.find(S);
-		auto it = M.find(S);
+        if(it==M.end()) {
-		if (it == M.end()) {
+            std::map<uint32_t,uint64_t> E;
-			std::map<uint32_t, uint64_t> E;
+            E[Index] = Increment;
-			E[Index] = Increment;
+            M[S] = E;
-			M[S] = E;
+        }
-		} else {
+        else {
-			std::map<uint32_t, uint64_t> &IndexMap = it->second;
+            std::map<uint32_t,uint64_t> & IndexMap = it->second;
-			auto it_index = IndexMap.find(Index);
+            auto it_index = IndexMap.find(Index);
-			if (it_index == IndexMap.end()) {
+            if(it_index == IndexMap.end()) {
-				IndexMap[Index] = Increment;
+                IndexMap[Index] = Increment;
-			} else {
+            } else {
-				it_index->second += Increment;
+                it_index->second += Increment;
-			}
+            }
-		}
+        }
-	}
+    }
-} // namespace OpenWifi
+}

src/framework/RESTAPI_ExtServer.cpp

@@ -6,23 +6,22 @@
 
 namespace OpenWifi {
 
-	Poco::Net::HTTPRequestHandler *
+	Poco::Net::HTTPRequestHandler *ExtRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest &Request) {
-	ExtRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest &Request) {
 		try {
 			Poco::URI uri(Request.getURI());
 			auto TID = NextTransactionId_++;
-			Utils::SetThreadName(fmt::format("x-rest:{}", TID).c_str());
+			Utils::SetThreadName(fmt::format("x-rest:{}",TID).c_str());
 			return RESTAPI_ExtServer()->CallServer(uri.getPath(), TID);
 		} catch (...) {
+
 		}
 		return nullptr;
 	}
 
-	Poco::Net::HTTPRequestHandler *RESTAPI_ExtServer::CallServer(const std::string &Path,
+	Poco::Net::HTTPRequestHandler *RESTAPI_ExtServer::CallServer(const std::string &Path, uint64_t Id) {
-																 uint64_t Id) {
 		RESTAPIHandler::BindingMap Bindings;
-		Utils::SetThreadName(fmt::format("x-rest:{}", Id).c_str());
+		Utils::SetThreadName(fmt::format("x-rest:{}",Id).c_str());
 		return RESTAPI_ExtRouter(Path, Bindings, Logger(), Server_, Id);
 	}
 
-} // namespace OpenWifi
+}

src/framework/RESTAPI_ExtServer.h

@@ -6,23 +6,20 @@
 
 #include "Poco/Net/HTTPServer.h"
 
-#include "framework/RESTAPI_Handler.h"
 #include "framework/SubSystemServer.h"
+#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
-	Poco::Net::HTTPRequestHandler *
+	Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-	RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+													 Poco::Logger & L, RESTAPI_GenericServerAccounting & S, uint64_t Id);
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t Id);
 
 	class ExtRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
 	  public:
 		ExtRequestHandlerFactory() = default;
-		Poco::Net::HTTPRequestHandler *
+		Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override;
-		createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override;
-
 	  private:
-		static inline std::atomic_uint64_t NextTransactionId_ = 1;
+		static inline std::atomic_uint64_t  NextTransactionId_ = 1;
 	};
 
 	class RESTAPI_ExtServer : public SubSystemServer {
@@ -33,21 +30,16 @@ namespace OpenWifi {
 		}
 
 		inline int Start() override {
-			poco_information(Logger(), "Starting.");
+			poco_information(Logger(),"Starting.");
 			Server_.InitLogging();
 
-			for (const auto &Svr : ConfigServersList_) {
+			for(const auto & Svr: ConfigServersList_) {
 
-				if (MicroServiceNoAPISecurity()) {
+				if(MicroServiceNoAPISecurity()) {
-					poco_information(
+					poco_information(Logger(),fmt::format("Starting: {}:{}. Security has been disabled for APIs.", Svr.Address(), Svr.Port()));
-						Logger(),
-						fmt::format("Starting: {}:{}. Security has been disabled for APIs.",
-									Svr.Address(), Svr.Port()));
 				} else {
-					poco_information(Logger(),
+					poco_information(Logger(),fmt::format("Starting: {}:{} Keyfile:{} CertFile: {}", Svr.Address(), Svr.Port(),
-									 fmt::format("Starting: {}:{} Keyfile:{} CertFile: {}",
+													 Svr.KeyFile(),Svr.CertFile()));
-												 Svr.Address(), Svr.Port(), Svr.KeyFile(),
-												 Svr.CertFile()));
 					Svr.LogCert(Logger());
 					if (!Svr.RootCA().empty())
 						Svr.LogCas(Logger());
@@ -57,15 +49,13 @@ namespace OpenWifi {
 				Params->setKeepAlive(true);
 				Params->setName("ws:xrest");
 
-				std::unique_ptr<Poco::Net::HTTPServer> NewServer;
+				std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
-				if (MicroServiceNoAPISecurity()) {
+				if(MicroServiceNoAPISecurity()) {
 					auto Sock{Svr.CreateSocket(Logger())};
-					NewServer = std::make_unique<Poco::Net::HTTPServer>(
+					NewServer = std::make_unique<Poco::Net::HTTPServer>(new ExtRequestHandlerFactory, Pool_, Sock, Params);
-						new ExtRequestHandlerFactory, Pool_, Sock, Params);
 				} else {
 					auto Sock{Svr.CreateSecureSocket(Logger())};
-					NewServer = std::make_unique<Poco::Net::HTTPServer>(
+					NewServer = std::make_unique<Poco::Net::HTTPServer>(new ExtRequestHandlerFactory, Pool_, Sock, Params);
-						new ExtRequestHandlerFactory, Pool_, Sock, Params);
 				};
 				NewServer->start();
 				RESTServers_.push_back(std::move(NewServer));
@@ -74,34 +64,36 @@ namespace OpenWifi {
 		}
 
 		inline void Stop() override {
-			poco_information(Logger(), "Stopping...");
+			poco_information(Logger(),"Stopping...");
-			for (const auto &svr : RESTServers_)
+			for( const auto & svr : RESTServers_ )
 				svr->stopAll(true);
 			Pool_.stopAll();
 			Pool_.joinAll();
 			RESTServers_.clear();
-			poco_information(Logger(), "Stopped...");
+			poco_information(Logger(),"Stopped...");
 		}
 
 		inline void reinitialize([[maybe_unused]] Poco::Util::Application &self) override {
 			MicroServiceLoadConfigurationFile();
-			poco_information(Logger(), "Reinitializing.");
+			poco_information(Logger(),"Reinitializing.");
 			Stop();
 			Start();
 		}
 
 		Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id);
-		const Poco::ThreadPool &Pool() { return Pool_; }
+		const Poco::ThreadPool & Pool() { return Pool_; }
 
 	  private:
-		std::vector<std::unique_ptr<Poco::Net::HTTPServer>> RESTServers_;
+		std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-		Poco::ThreadPool Pool_{"x-rest", 8, 128};
+		Poco::ThreadPool	    Pool_{"x-rest",8,128};
-		RESTAPI_GenericServerAccounting Server_;
+		RESTAPI_GenericServerAccounting   Server_;
 
-		RESTAPI_ExtServer() noexcept
+		RESTAPI_ExtServer() noexcept:
-			: SubSystemServer("RESTAPI_ExtServer", "REST-XSRV", "openwifi.restapi") {}
+									   SubSystemServer("RESTAPI_ExtServer", "REST-XSRV", "openwifi.restapi")
+		{
+		}
 	};
 
 	inline auto RESTAPI_ExtServer() { return RESTAPI_ExtServer::instance(); };
 
-} // namespace OpenWifi
+}

src/framework/RESTAPI_GenericServerAccounting.h

@@ -4,70 +4,72 @@
 
 #pragma once
 
-#include <array>
 #include <string>
+#include <array>
 
-#include "Poco/Net/HTTPRequest.h"
-#include "Poco/String.h"
 #include "Poco/StringTokenizer.h"
+#include "Poco/String.h"
+#include "Poco/Net/HTTPRequest.h"
 
 #include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 	class RESTAPI_GenericServerAccounting {
 	  public:
-		enum { LOG_GET = 0, LOG_DELETE, LOG_PUT, LOG_POST };
+
+		enum {
+			LOG_GET=0,
+			LOG_DELETE,
+			LOG_PUT,
+			LOG_POST
+		};
 
 		void inline SetFlags(bool External, const std::string &Methods) {
-			Poco::StringTokenizer Tokens(Methods, ",");
+			Poco::StringTokenizer   Tokens(Methods,",");
 			auto Offset = (External ? 0 : 4);
-			for (const auto &i : Tokens) {
+			for(const auto &i:Tokens) {
-				if (Poco::icompare(i, Poco::Net::HTTPRequest::HTTP_DELETE) == 0)
+				if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_DELETE)==0)
-					LogFlags_[Offset + LOG_DELETE] = true;
+					LogFlags_[Offset+LOG_DELETE]=true;
-				else if (Poco::icompare(i, Poco::Net::HTTPRequest::HTTP_PUT) == 0)
+				else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_PUT)==0)
-					LogFlags_[Offset + LOG_PUT] = true;
+					LogFlags_[Offset+LOG_PUT]=true;
-				else if (Poco::icompare(i, Poco::Net::HTTPRequest::HTTP_POST) == 0)
+				else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_POST)==0)
-					LogFlags_[Offset + LOG_POST] = true;
+					LogFlags_[Offset+LOG_POST]=true;
-				else if (Poco::icompare(i, Poco::Net::HTTPRequest::HTTP_GET) == 0)
+				else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_GET)==0)
-					LogFlags_[Offset + LOG_GET] = true;
+					LogFlags_[Offset+LOG_GET]=true;
 			}
 		}
 
 		inline void InitLogging() {
-			std::string Public =
+			std::string Public = MicroServiceConfigGetString("apilogging.public.methods","PUT,POST,DELETE");
-				MicroServiceConfigGetString("apilogging.public.methods", "PUT,POST,DELETE");
 			SetFlags(true, Public);
-			std::string Private =
+			std::string Private = MicroServiceConfigGetString("apilogging.private.methods","PUT,POST,DELETE");
-				MicroServiceConfigGetString("apilogging.private.methods", "PUT,POST,DELETE");
 			SetFlags(false, Private);
 
-			std::string PublicBadTokens =
+			std::string PublicBadTokens = MicroServiceConfigGetString("apilogging.public.badtokens.methods","");
-				MicroServiceConfigGetString("apilogging.public.badtokens.methods", "");
+			LogBadTokens_[0] = (Poco::icompare(PublicBadTokens,"true")==0);
-			LogBadTokens_[0] = (Poco::icompare(PublicBadTokens, "true") == 0);
+			std::string PrivateBadTokens = MicroServiceConfigGetString("apilogging.private.badtokens.methods","");
-			std::string PrivateBadTokens =
+			LogBadTokens_[1] = (Poco::icompare(PrivateBadTokens,"true")==0);
-				MicroServiceConfigGetString("apilogging.private.badtokens.methods", "");
-			LogBadTokens_[1] = (Poco::icompare(PrivateBadTokens, "true") == 0);
 		}
 
 		[[nodiscard]] inline bool LogIt(const std::string &Method, bool External) const {
 			auto Offset = (External ? 0 : 4);
-			if (Method == Poco::Net::HTTPRequest::HTTP_GET)
+			if(Method == Poco::Net::HTTPRequest::HTTP_GET)
-				return LogFlags_[Offset + LOG_GET];
+				return LogFlags_[Offset+LOG_GET];
-			if (Method == Poco::Net::HTTPRequest::HTTP_POST)
+			if(Method == Poco::Net::HTTPRequest::HTTP_POST)
-				return LogFlags_[Offset + LOG_POST];
+				return LogFlags_[Offset+LOG_POST];
-			if (Method == Poco::Net::HTTPRequest::HTTP_PUT)
+			if(Method == Poco::Net::HTTPRequest::HTTP_PUT)
-				return LogFlags_[Offset + LOG_PUT];
+				return LogFlags_[Offset+LOG_PUT];
-			if (Method == Poco::Net::HTTPRequest::HTTP_DELETE)
+			if(Method == Poco::Net::HTTPRequest::HTTP_DELETE)
-				return LogFlags_[Offset + LOG_DELETE];
+				return LogFlags_[Offset+LOG_DELETE];
 			return false;
 		};
 
 		[[nodiscard]] inline bool LogBadTokens(bool External) const {
-			return LogBadTokens_[(External ? 0 : 1)];
+			return LogBadTokens_[ (External ? 0 : 1) ];
 		};
 
 	  private:
-		std::array<bool, 8> LogFlags_{false};
+		std::array<bool,8>       LogFlags_{false};
-		std::array<bool, 2> LogBadTokens_{false};
+		std::array<bool,2>       LogBadTokens_{false};
 	};
-} // namespace OpenWifi
+}

src/framework/RESTAPI_Handler.cpp

@@ -4,4 +4,5 @@
 
 #include "RESTAPI_Handler.h"
 
-namespace OpenWifi {} // namespace OpenWifi
+namespace OpenWifi {
+} // namespace OpenWifi

src/framework/RESTAPI_IntServer.h

@@ -6,23 +6,20 @@
 
 #include "Poco/Net/HTTPServer.h"
 
-#include "framework/RESTAPI_Handler.h"
 #include "framework/SubSystemServer.h"
+#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
-	Poco::Net::HTTPRequestHandler *
+	Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-	RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+													 Poco::Logger & L, RESTAPI_GenericServerAccounting & S, uint64_t Id);
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t Id);
 
 	class IntRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
 	  public:
 		inline IntRequestHandlerFactory() = default;
-		Poco::Net::HTTPRequestHandler *
+		Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override;
-		createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override;
-
 	  private:
-		static inline std::atomic_uint64_t NextTransactionId_ = 1;
+		static inline std::atomic_uint64_t  NextTransactionId_ = 1;
 	};
 
 	class RESTAPI_IntServer : public SubSystemServer {
@@ -33,21 +30,16 @@ namespace OpenWifi {
 		}
 
 		inline int Start() override {
-			poco_information(Logger(), "Starting.");
+			poco_information(Logger(),"Starting.");
 			Server_.InitLogging();
 
-			for (const auto &Svr : ConfigServersList_) {
+			for(const auto & Svr: ConfigServersList_) {
 
-				if (MicroServiceNoAPISecurity()) {
+				if(MicroServiceNoAPISecurity()) {
-					poco_information(
+					poco_information(Logger(),fmt::format("Starting: {}:{}. Security has been disabled for APIs.", Svr.Address(), Svr.Port()));
-						Logger(),
-						fmt::format("Starting: {}:{}. Security has been disabled for APIs.",
-									Svr.Address(), Svr.Port()));
 				} else {
-					poco_information(Logger(),
+					poco_information(Logger(),fmt::format("Starting: {}:{}. Keyfile:{} CertFile: {}", Svr.Address(), Svr.Port(),
-									 fmt::format("Starting: {}:{}. Keyfile:{} CertFile: {}",
+													 Svr.KeyFile(),Svr.CertFile()));
-												 Svr.Address(), Svr.Port(), Svr.KeyFile(),
-												 Svr.CertFile()));
 					Svr.LogCert(Logger());
 					if (!Svr.RootCA().empty())
 						Svr.LogCas(Logger());
@@ -57,15 +49,13 @@ namespace OpenWifi {
 				Params->setKeepAlive(true);
 				Params->setName("ws:irest");
 
-				std::unique_ptr<Poco::Net::HTTPServer> NewServer;
+				std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
-				if (MicroServiceNoAPISecurity()) {
+				if(MicroServiceNoAPISecurity()) {
 					auto Sock{Svr.CreateSocket(Logger())};
-					NewServer = std::make_unique<Poco::Net::HTTPServer>(
+					NewServer = std::make_unique<Poco::Net::HTTPServer>(new IntRequestHandlerFactory, Pool_, Sock, Params);
-						new IntRequestHandlerFactory, Pool_, Sock, Params);
 				} else {
 					auto Sock{Svr.CreateSecureSocket(Logger())};
-					NewServer = std::make_unique<Poco::Net::HTTPServer>(
+					NewServer = std::make_unique<Poco::Net::HTTPServer>(new IntRequestHandlerFactory, Pool_, Sock, Params);
-						new IntRequestHandlerFactory, Pool_, Sock, Params);
 				};
 				NewServer->start();
 				RESTServers_.push_back(std::move(NewServer));
@@ -75,37 +65,40 @@ namespace OpenWifi {
 		}
 
 		inline void Stop() override {
-			poco_information(Logger(), "Stopping...");
+			poco_information(Logger(),"Stopping...");
-			for (const auto &svr : RESTServers_)
+			for( const auto & svr : RESTServers_ )
 				svr->stopAll(true);
 			Pool_.stopAll();
 			Pool_.joinAll();
-			poco_information(Logger(), "Stopped...");
+			poco_information(Logger(),"Stopped...");
 		}
 
 		inline void reinitialize([[maybe_unused]] Poco::Util::Application &self) override {
 			MicroServiceLoadConfigurationFile();
-			poco_information(Logger(), "Reinitializing.");
+			poco_information(Logger(),"Reinitializing.");
 			Stop();
 			Start();
 		}
 
 		inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) {
 			RESTAPIHandler::BindingMap Bindings;
-			Utils::SetThreadName(fmt::format("i-rest:{}", Id).c_str());
+			Utils::SetThreadName(fmt::format("i-rest:{}",Id).c_str());
 			return RESTAPI_IntRouter(Path, Bindings, Logger(), Server_, Id);
 		}
-		const Poco::ThreadPool &Pool() { return Pool_; }
+		const Poco::ThreadPool & Pool() { return Pool_; }
-
 	  private:
-		std::vector<std::unique_ptr<Poco::Net::HTTPServer>> RESTServers_;
+		std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-		Poco::ThreadPool Pool_{"i-rest", 4, 64};
+		Poco::ThreadPool	    Pool_{"i-rest",4,64};
-		RESTAPI_GenericServerAccounting Server_;
+		RESTAPI_GenericServerAccounting   Server_;
 
-		RESTAPI_IntServer() noexcept
+		RESTAPI_IntServer() noexcept:
-			: SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi") {}
+									   SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi")
+		{
+		}
 	};
 
 	inline auto RESTAPI_IntServer() { return RESTAPI_IntServer::instance(); };
 
+
 } // namespace OpenWifi
+

src/framework/RESTAPI_PartHandler.h

@@ -4,26 +4,29 @@
 
 #pragma once
 
-#include "Poco/CountingStream.h"
+#include <string>
-#include "Poco/Net/MessageHeader.h"
 #include "Poco/Net/PartHandler.h"
+#include "Poco/Net/MessageHeader.h"
+#include "Poco/CountingStream.h"
 #include "Poco/NullStream.h"
 #include "Poco/StreamCopier.h"
-#include <string>
 
 namespace OpenWifi {
-	class RESTAPI_PartHandler : public Poco::Net::PartHandler {
+	class RESTAPI_PartHandler: public Poco::Net::PartHandler {
 	  public:
-		RESTAPI_PartHandler() : _length(0) {}
+		RESTAPI_PartHandler():
+								_length(0)
+		{
+		}
 
-		inline void handlePart(const Poco::Net::MessageHeader &header,
+		inline void handlePart(const Poco::Net::MessageHeader& header, std::istream& stream) override
-							   std::istream &stream) override {
+		{
 			_type = header.get("Content-Type", "(unspecified)");
-			if (header.has("Content-Disposition")) {
+			if (header.has("Content-Disposition"))
+			{
 				std::string disp;
 				Poco::Net::NameValueCollection params;
-				Poco::Net::MessageHeader::splitParameters(header["Content-Disposition"], disp,
+				Poco::Net::MessageHeader::splitParameters(header["Content-Disposition"], disp, params);
-														  params);
 				_name = params.get("name", "(unnamed)");
 				_fileName = params.get("filename", "(unnamed)");
 			}
@@ -34,13 +37,25 @@ namespace OpenWifi {
 			_length = (int)istr.chars();
 		}
 
-		[[nodiscard]] inline int length() const { return _length; }
+		[[nodiscard]] inline int length() const
+		{
+			return _length;
+		}
 
-		[[nodiscard]] inline const std::string &name() const { return _name; }
+		[[nodiscard]] inline const std::string& name() const
+		{
+			return _name;
+		}
 
-		[[nodiscard]] inline const std::string &fileName() const { return _fileName; }
+		[[nodiscard]] inline const std::string& fileName() const
+		{
+			return _fileName;
+		}
 
-		[[nodiscard]] inline const std::string &contentType() const { return _type; }
+		[[nodiscard]] inline const std::string& contentType() const
+		{
+			return _type;
+		}
 
 	  private:
 		int _length;
@@ -48,4 +63,4 @@ namespace OpenWifi {
 		std::string _name;
 		std::string _fileName;
 	};
-} // namespace OpenWifi
+}

src/framework/RESTAPI_RateLimiter.h

@@ -6,9 +6,9 @@
 
 #include "framework/SubSystemServer.h"
 
-#include "Poco/ExpireLRUCache.h"
-#include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/URI.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/ExpireLRUCache.h"
 
 #include "fmt/format.h"
 
@@ -16,9 +16,10 @@ namespace OpenWifi {
 
 	class RESTAPI_RateLimiter : public SubSystemServer {
 	  public:
+
 		struct ClientCacheEntry {
-			int64_t Start = 0;
+			int64_t  Start=0;
-			int Count = 0;
+			int      Count=0;
 		};
 
 		static auto instance() {
@@ -26,47 +27,49 @@ namespace OpenWifi {
 			return instance_;
 		}
 
-		inline int Start() final { return 0; };
+		inline int Start() final { return 0;};
-		inline void Stop() final{};
+		inline void Stop() final { };
 
-		inline bool IsRateLimited(const Poco::Net::HTTPServerRequest &R, int64_t Period,
+		inline bool IsRateLimited(const Poco::Net::HTTPServerRequest &R, int64_t Period, int64_t MaxCalls) {
-								  int64_t MaxCalls) {
+			Poco::URI   uri(R.getURI());
-			Poco::URI uri(R.getURI());
 			auto H = str_hash(uri.getPath() + R.clientAddress().host().toString());
 			auto E = Cache_.get(H);
-			auto Now = std::chrono::duration_cast<std::chrono::milliseconds>(
+			auto Now = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-						   std::chrono::system_clock::now().time_since_epoch())
+			if(E.isNull()) {
-						   .count();
+				Cache_.add(H,ClientCacheEntry{.Start=Now, .Count=1});
-			if (E.isNull()) {
-				Cache_.add(H, ClientCacheEntry{.Start = Now, .Count = 1});
 				return false;
 			}
-			if ((Now - E->Start) < Period) {
+			if((Now-E->Start)<Period) {
 				E->Count++;
-				Cache_.update(H, E);
+				Cache_.update(H,E);
-				if (E->Count > MaxCalls) {
+				if(E->Count > MaxCalls) {
-					poco_warning(Logger(), fmt::format("RATE-LIMIT-EXCEEDED: from '{}'",
+					poco_warning(Logger(),fmt::format("RATE-LIMIT-EXCEEDED: from '{}'", R.clientAddress().toString()));
-													   R.clientAddress().toString()));
 					return true;
 				}
 				return false;
 			}
 			E->Start = Now;
 			E->Count = 1;
-			Cache_.update(H, E);
+			Cache_.update(H,E);
 			return false;
 		}
 
-		inline void Clear() { Cache_.clear(); }
+		inline void Clear() {
+			Cache_.clear();
+		}
 
 	  private:
-		Poco::ExpireLRUCache<uint64_t, ClientCacheEntry> Cache_{2048};
+		Poco::ExpireLRUCache<uint64_t,ClientCacheEntry>      Cache_{2048};
-		std::hash<std::string> str_hash;
+		std::hash<std::string>          str_hash;
+
+		RESTAPI_RateLimiter() noexcept:
+										 SubSystemServer("RateLimiter", "RATE-LIMITER", "rate.limiter")
+		{
+		}
 
-		RESTAPI_RateLimiter() noexcept
-			: SubSystemServer("RateLimiter", "RATE-LIMITER", "rate.limiter") {}
 	};
 
 	inline auto RESTAPI_RateLimiter() { return RESTAPI_RateLimiter::instance(); }
 
-} // namespace OpenWifi
+
+}

src/framework/RESTAPI_SystemCommand.h

@@ -14,79 +14,66 @@ namespace OpenWifi {
 
 	class RESTAPI_system_command : public RESTAPIHandler {
 	  public:
-		RESTAPI_system_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+		RESTAPI_system_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
-							   RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-							   bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
 													  Poco::Net::HTTPRequest::HTTP_GET,
 													  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+							 Server,
-		static auto PathName() { return std::list<std::string>{"/api/v1/system"}; }
+							 TransactionId,
+							 Internal) {}
+		static auto PathName() { return std::list<std::string>{"/api/v1/system"};}
 
-		inline void DoGet() final {
+		inline void DoGet() {
 			std::string Arg;
-			if (HasParameter("command", Arg)) {
+			if(HasParameter("command",Arg) && Arg=="info") {
-				if (Arg == "info") {
+				Poco::JSON::Object Answer;
-					Poco::JSON::Object Answer;
+				Answer.set(RESTAPI::Protocol::VERSION, MicroServiceVersion());
-					Answer.set(RESTAPI::Protocol::VERSION, MicroServiceVersion());
+				Answer.set(RESTAPI::Protocol::UPTIME, MicroServiceUptimeTotalSeconds());
-					Answer.set(RESTAPI::Protocol::UPTIME, MicroServiceUptimeTotalSeconds());
+				Answer.set(RESTAPI::Protocol::START, MicroServiceStartTimeEpochTime());
-					Answer.set(RESTAPI::Protocol::START, MicroServiceStartTimeEpochTime());
+				Answer.set(RESTAPI::Protocol::OS, Poco::Environment::osName());
-					Answer.set(RESTAPI::Protocol::OS, Poco::Environment::osName());
+				Answer.set(RESTAPI::Protocol::PROCESSORS, Poco::Environment::processorCount());
-					Answer.set(RESTAPI::Protocol::PROCESSORS, Poco::Environment::processorCount());
+				Answer.set(RESTAPI::Protocol::HOSTNAME, Poco::Environment::nodeName());
-					Answer.set(RESTAPI::Protocol::HOSTNAME, Poco::Environment::nodeName());
+				Answer.set(RESTAPI::Protocol::UI, MicroServiceGetUIURI());
-					Answer.set(RESTAPI::Protocol::UI, MicroServiceGetUIURI());
 
-					Poco::JSON::Array Certificates;
+				Poco::JSON::Array   Certificates;
-					auto SubSystems = MicroServiceGetFullSubSystems();
+				auto SubSystems = MicroServiceGetFullSubSystems();
-					std::set<std::string> CertNames;
+				std::set<std::string>   CertNames;
 
-					for (const auto &i : SubSystems) {
+				for(const auto &i:SubSystems) {
-						auto Hosts = i->HostSize();
+					auto Hosts=i->HostSize();
-						for (uint64_t j = 0; j < Hosts; ++j) {
+					for(uint64_t j=0;j<Hosts;++j) {
-							auto CertFileName = i->Host(j).CertFile();
+						auto CertFileName = i->Host(j).CertFile();
-							if (!CertFileName.empty()) {
+						if(!CertFileName.empty()) {
-								Poco::File F1(CertFileName);
+							Poco::File  F1(CertFileName);
-								if (F1.exists()) {
+							if(F1.exists()) {
-									auto InsertResult = CertNames.insert(CertFileName);
+								auto InsertResult = CertNames.insert(CertFileName);
-									if (InsertResult.second) {
+								if(InsertResult.second) {
-										Poco::JSON::Object Inner;
+									Poco::JSON::Object Inner;
-										Poco::Path F(CertFileName);
+									Poco::Path F(CertFileName);
-										Inner.set("filename", F.getFileName());
+									Inner.set("filename", F.getFileName());
-										Poco::Crypto::X509Certificate C(CertFileName);
+									Poco::Crypto::X509Certificate C(CertFileName);
-										auto ExpiresOn = C.expiresOn();
+									auto ExpiresOn = C.expiresOn();
-										Inner.set("expiresOn", ExpiresOn.timestamp().epochTime());
+									Inner.set("expiresOn", ExpiresOn.timestamp().epochTime());
-										Certificates.add(Inner);
+									Certificates.add(Inner);
-									}
 								}
 							}
 						}
 					}
-					Answer.set("certificates", Certificates);
-					return ReturnObject(Answer);
-				}
-				if (Arg == "extraConfiguration") {
-					Poco::JSON::Object Answer;
-					MicroServiceGetExtraConfiguration(Answer);
-					return ReturnObject(Answer);
-				}
-				if (Arg == "resources") {
-					Poco::JSON::Object Answer;
-					Answer.set("numberOfFileDescriptors", Utils::get_open_fds());
-					std::uint64_t currRealMem, peakRealMem, currVirtMem, peakVirtMem;
-					Utils::getMemory(currRealMem, peakRealMem, currVirtMem, peakVirtMem);
-					Answer.set("currRealMem", currRealMem);
-					Answer.set("peakRealMem", peakRealMem);
-					Answer.set("currVirtMem", currVirtMem);
-					Answer.set("peakVirtMem", peakVirtMem);
-					return ReturnObject(Answer);
 				}
+				Answer.set("certificates", Certificates);
+				return ReturnObject(Answer);
+			}
+			if(GetBoolParameter("extraConfiguration")) {
+				Poco::JSON::Object  Answer;
+				MicroServiceGetExtraConfiguration(Answer);
+				return ReturnObject(Answer);
 			}
 			BadRequest(RESTAPI::Errors::InvalidCommand);
 		}
 
 		inline void DoPost() final {
-			const auto &Obj = ParsedBody_;
+			const auto & Obj = ParsedBody_;
 			if (Obj->has(RESTAPI::Protocol::COMMAND)) {
 				auto Command = Poco::toLower(Obj->get(RESTAPI::Protocol::COMMAND).toString());
 				if (Command == RESTAPI::Protocol::SETLOGLEVEL) {
@@ -101,8 +88,7 @@ namespace OpenWifi {
 								auto Name = GetS(RESTAPI::Protocol::TAG, InnerObj);
 								auto Value = GetS(RESTAPI::Protocol::VALUE, InnerObj);
 								MicroServiceSetSubsystemLogLevel(Name, Value);
-								poco_information(
+								poco_information(Logger_,
-									Logger_,
 									fmt::format("Setting log level for {} at {}", Name, Value));
 							}
 						}
@@ -123,7 +109,7 @@ namespace OpenWifi {
 				} else if (Command == RESTAPI::Protocol::GETLOGLEVELNAMES) {
 					Poco::JSON::Object Result;
 					Poco::JSON::Array LevelNamesArray;
-					const Types::StringVec &LevelNames = MicroServiceGetLogLevelNames();
+					const Types::StringVec &LevelNames =  MicroServiceGetLogLevelNames();
 					for (const auto &i : LevelNames)
 						LevelNamesArray.add(i);
 					Result.set(RESTAPI::Protocol::LIST, LevelNamesArray);
@@ -131,7 +117,7 @@ namespace OpenWifi {
 				} else if (Command == RESTAPI::Protocol::GETSUBSYSTEMNAMES) {
 					Poco::JSON::Object Result;
 					Poco::JSON::Array LevelNamesArray;
-					const Types::StringVec &SubSystemNames = MicroServiceGetSubSystems();
+					const Types::StringVec &SubSystemNames =  MicroServiceGetSubSystems();
 					for (const auto &i : SubSystemNames)
 						LevelNamesArray.add(i);
 					Result.set(RESTAPI::Protocol::LIST, LevelNamesArray);
@@ -145,10 +131,10 @@ namespace OpenWifi {
 						std::vector<std::string> Names;
 						for (const auto &i : *SubSystems)
 							Names.push_back(i.toString());
-						std::thread ReloadThread([Names]() {
+						std::thread	ReloadThread([Names](){
 							std::this_thread::sleep_for(10000ms);
-							for (const auto &i : Names) {
+							for(const auto &i:Names) {
-								if (i == "daemon")
+								if(i=="daemon")
 									MicroServiceReload();
 								else
 									MicroServiceReload(i);
@@ -164,8 +150,8 @@ namespace OpenWifi {
 			BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 		}
 
-		void DoPut() final{};
+		void DoPut() final {};
-		void DoDelete() final{};
+		void DoDelete() final {};
 	};
 
-} // namespace OpenWifi
+}

src/framework/RESTAPI_WebSocketServer.h

@@ -4,44 +4,42 @@
 
 #pragma once
 
-#include "Poco/Net/WebSocket.h"
 #include "framework/RESTAPI_Handler.h"
+#include "Poco/Net/WebSocket.h"
 
-#include "framework/MicroServiceFuncs.h"
 #include "framework/UI_WebSocketClientServer.h"
+#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 	class RESTAPI_webSocketServer : public RESTAPIHandler {
 	  public:
-		inline RESTAPI_webSocketServer(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+		inline RESTAPI_webSocketServer(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-									   RESTAPI_GenericServerAccounting &Server,
-									   uint64_t TransactionId, bool Internal)
 			: RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+							 std::vector<std::string>{	Poco::Net::HTTPRequest::HTTP_GET,
-													  Poco::Net::HTTPRequest::HTTP_OPTIONS},
+													  	Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal, false) {}
+							 Server, TransactionId, Internal,false) {}
-		static auto PathName() { return std::list<std::string>{"/api/v1/ws"}; }
+		static auto PathName() { return std::list<std::string>{"/api/v1/ws"};}
 		void DoGet() final {
-			try {
+				try
-				if (Request->find("Upgrade") != Request->end() &&
+				{
-					Poco::icompare((*Request)["Upgrade"], "websocket") == 0) {
+					if(Request->find("Upgrade") != Request->end() && Poco::icompare((*Request)["Upgrade"], "websocket") == 0) {
-					try {
+						try
-						Poco::Net::WebSocket WS(*Request, *Response);
+						{
-						auto Id = MicroServiceCreateUUID();
+							Poco::Net::WebSocket WS(*Request, *Response);
-						UI_WebSocketClientServer()->NewClient(WS, Id, UserInfo_.userinfo.email,
+							auto Id = MicroServiceCreateUUID();
-															  TransactionId_);
+							UI_WebSocketClientServer()->NewClient(WS,Id,UserInfo_.userinfo.email, TransactionId_);
-					} catch (...) {
+						}
-						std::cout << "Cannot create websocket client..." << std::endl;
+						catch (...) {
+							std::cout << "Cannot create websocket client..." << std::endl;
+						}
 					}
+				} catch(...) {
+					std::cout << "Cannot upgrade connection..." << std::endl;
 				}
-			} catch (...) {
+			};
-				std::cout << "Cannot upgrade connection..." << std::endl;
+		void DoDelete() final {};
-			}
+		void DoPost() final {};
-		};
+		void DoPut() final {};
-		void DoDelete() final{};
-		void DoPost() final{};
-		void DoPut() final{};
-
 	  private:
 	};
-} // namespace OpenWifi
+}

src/framework/RESTAPI_utils.h

@@ -6,25 +6,17 @@
 
 #include <string>
 
-#include "Poco/Data/LOB.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
+#include "Poco/Data/LOB.h"
 #include "Poco/Net/HTTPServerRequest.h"
 
 #include "framework/OpenWifiTypes.h"
 #include "framework/utils.h"
 
-#include <RESTObjects/RESTAPI_SecurityObjects.h>
-
 namespace OpenWifi::RESTAPI_utils {
 
-	inline bool IsRootOrAdmin(const SecurityObjects::UserInfo &UI) {
+	inline void EmbedDocument(const std::string & ObjName, Poco::JSON::Object & Obj, const std::string &ObjStr) {
-		return 	UI.userRole==SecurityObjects::ROOT ||
-				UI.userRole==SecurityObjects::ADMIN;
-	}
-
-	inline void EmbedDocument(const std::string &ObjName, Poco::JSON::Object &Obj,
-							  const std::string &ObjStr) {
 		std::string D = ObjStr.empty() ? "{}" : ObjStr;
 		Poco::JSON::Parser P;
 		Poco::Dynamic::Var result = P.parse(D);
@@ -33,23 +25,23 @@ namespace OpenWifi::RESTAPI_utils {
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, bool V) {
-		Obj.set(Field, V);
+		Obj.set(Field,V);
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, double V) {
-		Obj.set(Field, V);
+		Obj.set(Field,V);
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, float V) {
-		Obj.set(Field, V);
+		Obj.set(Field,V);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::string &S) {
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::string & S) {
-		Obj.set(Field, S);
+		Obj.set(Field,S);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const char *S) {
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const char * S) {
-		Obj.set(Field, S);
+		Obj.set(Field,S);
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, int16_t Value) {
@@ -73,107 +65,87 @@ namespace OpenWifi::RESTAPI_utils {
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, uint64_t Value) {
-		Obj.set(Field, Value);
+		Obj.set(Field,Value);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field,
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Poco::Data::BLOB &Value) {
-							  const Poco::Data::BLOB &Value) {
+		auto Result = Utils::base64encode((const unsigned char *)Value.rawContent(),Value.size());
-		auto Result = Utils::base64encode((const unsigned char *)Value.rawContent(), Value.size());
+		Obj.set(Field,Result);
-		Obj.set(Field, Result);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field,
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringPairVec & S) {
-							  const Types::StringPairVec &S) {
+		Poco::JSON::Array   Array;
-		Poco::JSON::Array Array;
+		for(const auto &i:S) {
-		for (const auto &i : S) {
+			Poco::JSON::Object  O;
-			Poco::JSON::Object O;
+			O.set("tag",i.first);
-			O.set("tag", i.first);
 			O.set("value", i.second);
 			Array.add(O);
 		}
-		Obj.set(Field, Array);
+		Obj.set(Field,Array);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field,
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringVec &V) {
-							  const Types::StringVec &V) {
+		Poco::JSON::Array	A;
-		Poco::JSON::Array A;
+		for(const auto &i:V)
-		for (const auto &i : V)
 			A.add(i);
-		Obj.set(Field, A);
+		Obj.set(Field,A);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::DoubleList &V) {
-		Poco::JSON::Array A;
-		for (const auto &i : V)
-			A.add(i);
-		Obj.set(Field, A);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::IntList &V) {
-		Poco::JSON::Array A;
-		for (const auto &i : V)
-			A.add(i);
-		Obj.set(Field, A);
 	}
 
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::TagList &V) {
-		Poco::JSON::Array A;
+		Poco::JSON::Array	A;
-		for (const auto &i : V)
+		for(const auto &i:V)
 			A.add(i);
-		Obj.set(Field, A);
+		Obj.set(Field,A);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field,
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::CountedMap &M) {
-							  const Types::CountedMap &M) {
+		Poco::JSON::Array	A;
-		Poco::JSON::Array A;
+		for(const auto &[Key,Value]:M) {
-		for (const auto &[Key, Value] : M) {
+			Poco::JSON::Object  O;
-			Poco::JSON::Object O;
+			O.set("tag",Key);
-			O.set("tag", Key);
 			O.set("value", Value);
 			A.add(O);
 		}
-		Obj.set(Field, A);
+		Obj.set(Field,A);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field,
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::Counted3DMapSII &M) {
-							  const Types::Counted3DMapSII &M) {
+		Poco::JSON::Array	A;
-		Poco::JSON::Array A;
+		for(const auto &[OrgName,MonthlyNumberMap]:M) {
-		for (const auto &[OrgName, MonthlyNumberMap] : M) {
+			Poco::JSON::Object  OrgObject;
-			Poco::JSON::Object OrgObject;
+			OrgObject.set("tag",OrgName);
-			OrgObject.set("tag", OrgName);
+			Poco::JSON::Array   MonthlyArray;
-			Poco::JSON::Array MonthlyArray;
+			for(const auto &[Month,Counter]:MonthlyNumberMap) {
-			for (const auto &[Month, Counter] : MonthlyNumberMap) {
+				Poco::JSON::Object  Inner;
-				Poco::JSON::Object Inner;
 				Inner.set("value", Month);
 				Inner.set("counter", Counter);
 				MonthlyArray.add(Inner);
 			}
-			OrgObject.set("index", MonthlyArray);
+			OrgObject.set("index",MonthlyArray);
 			A.add(OrgObject);
 		}
 		Obj.set(Field, A);
 	}
 
-	template <typename T>
+	template<typename T> void field_to_json(Poco::JSON::Object &Obj,
-	void field_to_json(Poco::JSON::Object &Obj, const char *Field, const T &V,
+					   const char *Field,
+					   const T &V,
 					   std::function<std::string(const T &)> F) {
 		Obj.set(Field, F(V));
 	}
 
-	template <class T>
+	template<class T> void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::vector<T> &Value) {
-	void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::vector<T> &Value) {
 		Poco::JSON::Array Arr;
-		for (const auto &i : Value) {
+		for(const auto &i:Value) {
-			Poco::JSON::Object AO;
+			Poco::JSON::Object	AO;
 			i.to_json(AO);
 			Arr.add(AO);
 		}
 		Obj.set(Field, Arr);
 	}
 
-	template <class T>
+	template<class T> void field_to_json(Poco::JSON::Object &Obj, const char *Field, const T &Value) {
-	void field_to_json(Poco::JSON::Object &Obj, const char *Field, const T &Value) {
+		Poco::JSON::Object  Answer;
-		Poco::JSON::Object Answer;
 		Value.to_json(Answer);
 		Obj.set(Field, Answer);
 	}
@@ -183,229 +155,188 @@ namespace OpenWifi::RESTAPI_utils {
 	///////////////////////////
 	///////////////////////////
 
-	template <typename T>
+	template<typename T> bool field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T & V,
-	bool field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T &V,
 						 std::function<T(const std::string &)> F) {
-		if (Obj->has(Field) && !Obj->isNull(Field))
+		if(Obj->has(Field) && !Obj->isNull(Field))
 			V = F(Obj->get(Field).toString());
 		return true;
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, std::string &S) {
-								std::string &S) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			S = Obj->get(Field).toString();
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, double & Value) {
-								double &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (double)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, float & Value) {
-								float &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (float)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, bool &Value) {
-								bool &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (Obj->get(Field).toString() == "true");
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, int16_t &Value) {
-								int16_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (int16_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, int32_t &Value) {
-								int32_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
+			Value = (int32_t) Obj->get(Field);
-			Value = (int32_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, int64_t &Value) {
-								int64_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (int64_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, uint16_t &Value) {
-								uint16_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (uint16_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, uint32_t &Value) {
-								uint32_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (uint32_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, uint64_t &Value) {
-								uint64_t &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field))
-		if (Obj->has(Field) && !Obj->isNull(Field))
 			Value = (uint64_t)Obj->get(Field);
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Poco::Data::BLOB &Value) {
-								Poco::Data::BLOB &Value) {
+		if(Obj->has(Field) && !Obj->isNull(Field)) {
-		if (Obj->has(Field) && !Obj->isNull(Field)) {
 			auto Result = Utils::base64decode(Obj->get(Field).toString());
-			Value.assignRaw((const unsigned char *)&Result[0], Result.size());
+			Value.assignRaw((const unsigned char *)&Result[0],Result.size());
 		}
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringPairVec &Vec) {
-								Types::StringPairVec &Vec) {
+		if(Obj->isArray(Field) && !Obj->isNull(Field)) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
 			auto O = Obj->getArray(Field);
-			for (const auto &i : *O) {
+			for(const auto &i:*O) {
-				std::string S1, S2;
+				std::string S1,S2;
 				auto Inner = i.extract<Poco::JSON::Object::Ptr>();
-				if (Inner->has("tag"))
+				if(Inner->has("tag"))
 					S1 = Inner->get("tag").toString();
-				if (Inner->has("value"))
+				if(Inner->has("value"))
 					S2 = Inner->get("value").toString();
-				auto P = std::make_pair(S1, S2);
+				auto P = std::make_pair(S1,S2);
 				Vec.push_back(P);
 			}
 		}
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringVec &Value) {
-								Types::StringVec &Value) {
+		if(Obj->isArray(Field) && !Obj->isNull(Field)) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
 			Value.clear();
 			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
+			for(const auto &i:*A) {
 				Value.push_back(i.toString());
 			}
 		}
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::TagList &Value) {
-								Types::TagList &Value) {
+		if(Obj->isArray(Field) && !Obj->isNull(Field)) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
 			Value.clear();
 			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
+			for(const auto &i:*A) {
 				Value.push_back(i);
 			}
 		}
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
+	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, std::vector<T> &Value) {
-								Types::DoubleList &Value) {
+		if(Obj->isArray(Field) && !Obj->isNull(Field)) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
+			Poco::JSON::Array::Ptr	Arr = Obj->getArray(Field);
-			Value.clear();
+			for(auto &i:*Arr) {
-			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
-				Value.push_back(i);
-			}
-		}
-	}
-
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
-								Types::IntList &Value) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
-			Value.clear();
-			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
-				Value.push_back(i);
-			}
-		}
-	}
-
-	template <class T>
-	void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
-						 std::vector<T> &Value) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
-			Poco::JSON::Array::Ptr Arr = Obj->getArray(Field);
-			for (auto &i : *Arr) {
 				auto InnerObj = i.extract<Poco::JSON::Object::Ptr>();
-				T NewItem;
+				T	NewItem;
 				NewItem.from_json(InnerObj);
 				Value.push_back(NewItem);
 			}
 		}
 	}
 
-	template <class T>
+	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T &Value) {
-	void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T &Value) {
+		if(Obj->isObject(Field) && !Obj->isNull(Field)) {
-		if (Obj->isObject(Field) && !Obj->isNull(Field)) {
+			Poco::JSON::Object::Ptr	A = Obj->getObject(Field);
-			Poco::JSON::Object::Ptr A = Obj->getObject(Field);
 			Value.from_json(A);
 		}
 	}
 
-	inline std::string to_string(const Types::TagList &ObjectArray) {
+	inline std::string to_string(const Types::TagList & ObjectArray) {
 		Poco::JSON::Array OutputArr;
-		if (ObjectArray.empty())
+		if(ObjectArray.empty())
 			return "[]";
-		for (auto const &i : ObjectArray) {
+		for(auto const &i:ObjectArray) {
 			OutputArr.add(i);
 		}
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::stringify(OutputArr, OS, 0, 0, Poco::JSON_PRESERVE_KEY_ORDER);
+		Poco::JSON::Stringifier::stringify(OutputArr,OS, 0,0, Poco::JSON_PRESERVE_KEY_ORDER );
 		return OS.str();
 	}
 
-	inline std::string to_string(const Types::StringVec &ObjectArray) {
+	inline std::string to_string(const Types::StringVec & ObjectArray) {
 		Poco::JSON::Array OutputArr;
-		if (ObjectArray.empty())
+		if(ObjectArray.empty())
 			return "[]";
-		for (auto const &i : ObjectArray) {
+		for(auto const &i:ObjectArray) {
 			OutputArr.add(i);
 		}
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr, OS);
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
 		return OS.str();
 	}
 
-	inline std::string to_string(const Types::StringPairVec &ObjectArray) {
+	inline std::string to_string(const Types::StringPairVec & ObjectArray) {
 		Poco::JSON::Array OutputArr;
-		if (ObjectArray.empty())
+		if(ObjectArray.empty())
 			return "[]";
-		for (auto const &i : ObjectArray) {
+		for(auto const &i:ObjectArray) {
 			Poco::JSON::Array InnerArray;
 			InnerArray.add(i.first);
 			InnerArray.add(i.second);
 			OutputArr.add(InnerArray);
 		}
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr, OS);
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
 		return OS.str();
 	}
 
-	template <class T> std::string to_string(const std::vector<T> &ObjectArray) {
+	template<class T> std::string to_string(const std::vector<T> & ObjectArray) {
 		Poco::JSON::Array OutputArr;
-		if (ObjectArray.empty())
+		if(ObjectArray.empty())
 			return "[]";
-		for (auto const &i : ObjectArray) {
+		for(auto const &i:ObjectArray) {
 			Poco::JSON::Object O;
 			i.to_json(O);
 			OutputArr.add(O);
 		}
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr, OS);
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
 		return OS.str();
 	}
 
-	template <class T> std::string to_string(const std::vector<std::vector<T>> &ObjectArray) {
+	template<class T> std::string to_string(const std::vector<std::vector<T>> & ObjectArray) {
 		Poco::JSON::Array OutputArr;
-		if (ObjectArray.empty())
+		if(ObjectArray.empty())
 			return "[]";
-		for (auto const &i : ObjectArray) {
+		for(auto const &i:ObjectArray) {
 			Poco::JSON::Array InnerArr;
-			for (auto const &j : i) {
+			for(auto const &j:i) {
-				if constexpr (std::is_integral<T>::value) {
+				if constexpr(std::is_integral<T>::value) {
 					InnerArr.add(j);
-				}
+				} if constexpr(std::is_same_v<T,std::string>) {
-				if constexpr (std::is_same_v<T, std::string>) {
 					InnerArr.add(j);
 				} else {
 					InnerArr.add(j);
@@ -417,22 +348,22 @@ namespace OpenWifi::RESTAPI_utils {
 			OutputArr.add(InnerArr);
 		}
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr, OS);
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
 		return OS.str();
 	}
 
-	template <class T> std::string to_string(const T &Object) {
+	template<class T> std::string to_string(const T & Object) {
 		Poco::JSON::Object OutputObj;
 		Object.to_json(OutputObj);
 		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputObj, OS);
+		Poco::JSON::Stringifier::condense(OutputObj,OS);
 		return OS.str();
 	}
 
-	inline Types::StringVec to_object_array(const std::string &ObjectString) {
+	inline Types::StringVec to_object_array(const std::string & ObjectString) {
 
-		Types::StringVec Result;
+		Types::StringVec 	Result;
-		if (ObjectString.empty())
+		if(ObjectString.empty())
 			return Result;
 
 		try {
@@ -442,13 +373,14 @@ namespace OpenWifi::RESTAPI_utils {
 				Result.push_back(i.toString());
 			}
 		} catch (...) {
+
 		}
 		return Result;
 	}
 
-	inline OpenWifi::Types::TagList to_taglist(const std::string &ObjectString) {
+	inline OpenWifi::Types::TagList to_taglist(const std::string & ObjectString) {
-		Types::TagList Result;
+		Types::TagList 	Result;
-		if (ObjectString.empty())
+		if(ObjectString.empty())
 			return Result;
 
 		try {
@@ -458,34 +390,36 @@ namespace OpenWifi::RESTAPI_utils {
 				Result.push_back(i);
 			}
 		} catch (...) {
+
 		}
 		return Result;
 	}
 
 	inline Types::StringPairVec to_stringpair_array(const std::string &S) {
-		Types::StringPairVec R;
+		Types::StringPairVec   R;
-		if (S.empty())
+		if(S.empty())
 			return R;
 		try {
 			Poco::JSON::Parser P;
 			auto Object = P.parse(S).template extract<Poco::JSON::Array::Ptr>();
 			for (const auto &i : *Object) {
 				auto InnerObject = i.template extract<Poco::JSON::Array::Ptr>();
-				if (InnerObject->size() == 2) {
+				if(InnerObject->size()==2) {
 					auto S1 = InnerObject->getElement<std::string>(0);
 					auto S2 = InnerObject->getElement<std::string>(1);
-					R.push_back(std::make_pair(S1, S2));
+					R.push_back(std::make_pair(S1,S2));
 				}
 			}
 		} catch (...) {
+
 		}
 
 		return R;
 	}
 
-	template <class T> std::vector<T> to_object_array(const std::string &ObjectString) {
+	template<class T> std::vector<T> to_object_array(const std::string & ObjectString) {
-		std::vector<T> Result;
+		std::vector<T>	Result;
-		if (ObjectString.empty())
+		if(ObjectString.empty())
 			return Result;
 
 		try {
@@ -498,14 +432,14 @@ namespace OpenWifi::RESTAPI_utils {
 				Result.push_back(Obj);
 			}
 		} catch (...) {
+
 		}
 		return Result;
 	}
 
-	template <class T>
+	template<class T> std::vector<std::vector<T>> to_array_of_array_of_object(const std::string & ObjectString) {
-	std::vector<std::vector<T>> to_array_of_array_of_object(const std::string &ObjectString) {
+		std::vector<std::vector<T>>	Result;
-		std::vector<std::vector<T>> Result;
+		if(ObjectString.empty())
-		if (ObjectString.empty())
 			return Result;
 		try {
 			Poco::JSON::Parser P1;
@@ -513,8 +447,8 @@ namespace OpenWifi::RESTAPI_utils {
 			for (auto const &i : *OutterArray) {
 				Poco::JSON::Parser P2;
 				auto InnerArray = P2.parse(i).template extract<Poco::JSON::Array::Ptr>();
-				std::vector<T> InnerVector;
+				std::vector<T>  InnerVector;
-				for (auto const &j : *InnerArray) {
+				for(auto const &j: *InnerArray) {
 					auto Object = j.template extract<Poco::JSON::Object::Ptr>();
 					T Obj;
 					Obj.from_json(Object);
@@ -523,27 +457,28 @@ namespace OpenWifi::RESTAPI_utils {
 				Result.push_back(InnerVector);
 			}
 		} catch (...) {
+
 		}
 		return Result;
 	}
 
-	template <class T> T to_object(const std::string &ObjectString) {
+	template<class T> T to_object(const std::string & ObjectString) {
-		T Result;
+		T	Result;
 
-		if (ObjectString.empty())
+		if(ObjectString.empty())
 			return Result;
 
-		Poco::JSON::Parser P;
+		Poco::JSON::Parser	P;
 		auto Object = P.parse(ObjectString).template extract<Poco::JSON::Object::Ptr>();
 		Result.from_json(Object);
 
 		return Result;
 	}
 
-	template <class T> bool from_request(T &Obj, Poco::Net::HTTPServerRequest &Request) {
+	template<class T> bool from_request(T & Obj, Poco::Net::HTTPServerRequest &Request) {
 		Poco::JSON::Parser IncomingParser;
 		auto RawObject = IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
 		Obj.from_json(RawObject);
 		return true;
 	}
-} // namespace OpenWifi::RESTAPI_utils
+}

src/framework/StorageClass.h

@@ -4,137 +4,137 @@
 
 #pragma once
 
-#include "Poco/Data/SQLite/Connector.h"
 #include "Poco/Data/Session.h"
 #include "Poco/Data/SessionPool.h"
+#include "Poco/Data/SQLite/Connector.h"
 #include "Poco/JSON/Object.h"
 
 #ifndef SMALL_BUILD
-#include "Poco/Data/MySQL/Connector.h"
 #include "Poco/Data/PostgreSQL/Connector.h"
+#include "Poco/Data/MySQL/Connector.h"
 #endif
 
-#include "framework/MicroServiceFuncs.h"
 #include "framework/SubSystemServer.h"
+#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
-	enum DBType { sqlite, pgsql, mysql };
+    enum DBType {
-
+        sqlite,
-	class StorageClass : public SubSystemServer {
+        pgsql,
-	  public:
+        mysql
-
+    };
-        inline int Start() override {
-			std::lock_guard Guard(Mutex_);
-
-			Logger().notice("Starting.");
-			std::string DBType = MicroServiceConfigGetString("storage.type", "");
-
-			if (DBType == "sqlite") {
-				Setup_SQLite();
-			} else if (DBType == "postgresql") {
-				Setup_PostgreSQL();
-			} else if (DBType == "mysql") {
-				Setup_MySQL();
-			}
-			return 0;
-		}
-
-		inline void Stop() override { Pool_->shutdown(); }
-
-		DBType Type() const { return dbType_; };
-
-        StorageClass() noexcept : SubSystemServer("StorageClass", "STORAGE-SVR", "storage") {
 
+    class StorageClass : public SubSystemServer {
+    public:
+        StorageClass() noexcept:
+            SubSystemServer("StorageClass", "STORAGE-SVR", "storage")
+        {
         }
 
-	  private:
+        int Start() override {
-		inline int Setup_SQLite();
+            std::lock_guard		Guard(Mutex_);
-		inline int Setup_MySQL();
-		inline int Setup_PostgreSQL();
 
+            Logger().notice("Starting.");
+            std::string DBType = MicroServiceConfigGetString("storage.type","");
+
+            if (DBType == "sqlite") {
+                Setup_SQLite();
+            } else if (DBType == "postgresql") {
+                Setup_PostgreSQL();
+            } else if (DBType == "mysql") {
+                Setup_MySQL();
+            }
+            return 0;
+        }
+
+        void Stop() override {
+            Pool_->shutdown();
+        }
+
+        DBType Type() const { return dbType_; };
+    private:
+        inline int Setup_SQLite();
+        inline int Setup_MySQL();
+        inline int Setup_PostgreSQL();
 
     protected:
-		std::shared_ptr<Poco::Data::SessionPool> Pool_;
+    	std::unique_ptr<Poco::Data::SessionPool>    Pool_;
-		Poco::Data::SQLite::Connector SQLiteConn_;
+        Poco::Data::SQLite::Connector  	            SQLiteConn_;
-		Poco::Data::PostgreSQL::Connector PostgresConn_;
+        Poco::Data::PostgreSQL::Connector           PostgresConn_;
-		Poco::Data::MySQL::Connector MySQLConn_;
+        Poco::Data::MySQL::Connector                MySQLConn_;
-		DBType dbType_ = sqlite;
+        DBType                                      dbType_ = sqlite;
-	};
+    };
 
-#ifdef SMALL_BUILD
+#ifdef	SMALL_BUILD
-	int Service::Setup_MySQL() {
+    int Service::Setup_MySQL() { Daemon()->exit(Poco::Util::Application::EXIT_CONFIG); return 0; }
-		Daemon()->exit(Poco::Util::Application::EXIT_CONFIG);
+    int Service::Setup_PostgreSQL() { Daemon()->exit(Poco::Util::Application::EXIT_CONFIG); return 0; }
-		return 0;
-	}
-	int Service::Setup_PostgreSQL() {
-		Daemon()->exit(Poco::Util::Application::EXIT_CONFIG);
-		return 0;
-	}
 #else
 
-	inline int StorageClass::Setup_SQLite() {
+    inline int StorageClass::Setup_SQLite() {
-		Logger().notice("SQLite StorageClass enabled.");
+        Logger().notice("SQLite StorageClass enabled.");
-		dbType_ = sqlite;
+        dbType_ = sqlite;
-		auto DBName = MicroServiceDataDirectory() + "/" +
+        auto DBName = MicroServiceDataDirectory() + "/" + MicroServiceConfigGetString("storage.type.sqlite.db","");
-					  MicroServiceConfigGetString("storage.type.sqlite.db", "");
+        int NumSessions = (int) MicroServiceConfigGetInt("storage.type.sqlite.maxsessions", 64);
-		int NumSessions = (int)MicroServiceConfigGetInt("storage.type.sqlite.maxsessions", 64);
+        int IdleTime = (int) MicroServiceConfigGetInt("storage.type.sqlite.idletime", 60);
-		int IdleTime = (int)MicroServiceConfigGetInt("storage.type.sqlite.idletime", 60);
 
-		Poco::Data::SQLite::Connector::registerConnector();
+        Poco::Data::SQLite::Connector::registerConnector();
-		//        Pool_ = std::make_unique<Poco::Data::SessionPool>(new
+//        Pool_ = std::make_unique<Poco::Data::SessionPool>(new Poco::Data::SessionPool(SQLiteConn_.name(), DBName, 8,
-		//        Poco::Data::SessionPool(SQLiteConn_.name(), DBName, 8,
+//                                                                                     (int)NumSessions, (int)IdleTime));
-		//                                                                                     (int)NumSessions,
+        Pool_ = std::make_unique<Poco::Data::SessionPool>(SQLiteConn_.name(), DBName, 8,
-		//                                                                                     (int)IdleTime));
+                                                                                     (int)NumSessions, (int)IdleTime);
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(SQLiteConn_.name(), DBName, 8,
+        return 0;
-														  (int)NumSessions, (int)IdleTime);
+    }
-		return 0;
-	}
 
-	inline int StorageClass::Setup_MySQL() {
+    inline int StorageClass::Setup_MySQL() {
-		Logger().notice("MySQL StorageClass enabled.");
+        Logger().notice("MySQL StorageClass enabled.");
-		dbType_ = mysql;
+        dbType_ = mysql;
-		int NumSessions = (int)MicroServiceConfigGetInt("storage.type.mysql.maxsessions", 64);
+        int NumSessions = (int) MicroServiceConfigGetInt("storage.type.mysql.maxsessions", 64);
-		int IdleTime = (int)MicroServiceConfigGetInt("storage.type.mysql.idletime", 60);
+        int IdleTime = (int) MicroServiceConfigGetInt("storage.type.mysql.idletime", 60);
-		auto Host = MicroServiceConfigGetString("storage.type.mysql.host", "");
+        auto Host = MicroServiceConfigGetString("storage.type.mysql.host","");
-		auto Username = MicroServiceConfigGetString("storage.type.mysql.username", "");
+        auto Username = MicroServiceConfigGetString("storage.type.mysql.username","");
-		auto Password = MicroServiceConfigGetString("storage.type.mysql.password", "");
+        auto Password = MicroServiceConfigGetString("storage.type.mysql.password","");
-		auto Database = MicroServiceConfigGetString("storage.type.mysql.database", "");
+        auto Database = MicroServiceConfigGetString("storage.type.mysql.database","");
-		auto Port = MicroServiceConfigGetString("storage.type.mysql.port", "");
+        auto Port = MicroServiceConfigGetString("storage.type.mysql.port","");
 
-		std::string ConnectionStr = "host=" + Host + ";user=" + Username + ";password=" + Password +
+        std::string ConnectionStr =
-									";db=" + Database + ";port=" + Port +
+                "host=" + Host +
-									";compress=true;auto-reconnect=true";
+                ";user=" + Username +
+                ";password=" + Password +
+                ";db=" + Database +
+                ";port=" + Port +
+                ";compress=true;auto-reconnect=true";
 
-		Poco::Data::MySQL::Connector::registerConnector();
+        Poco::Data::MySQL::Connector::registerConnector();
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(MySQLConn_.name(), ConnectionStr, 8,
+        Pool_ = std::make_unique<Poco::Data::SessionPool>(MySQLConn_.name(), ConnectionStr, 8, NumSessions, IdleTime);
-														  NumSessions, IdleTime);
 
-		return 0;
+        return 0;
-	}
+    }
 
-	inline int StorageClass::Setup_PostgreSQL() {
+    inline int StorageClass::Setup_PostgreSQL() {
-		Logger().notice("PostgreSQL StorageClass enabled.");
+        Logger().notice("PostgreSQL StorageClass enabled.");
-		dbType_ = pgsql;
+        dbType_ = pgsql;
-		int NumSessions = (int)MicroServiceConfigGetInt("storage.type.postgresql.maxsessions", 64);
+        int NumSessions = (int) MicroServiceConfigGetInt("storage.type.postgresql.maxsessions", 64);
-		int IdleTime = (int)MicroServiceConfigGetInt("storage.type.postgresql.idletime", 60);
+        int IdleTime = (int) MicroServiceConfigGetInt("storage.type.postgresql.idletime", 60);
-		auto Host = MicroServiceConfigGetString("storage.type.postgresql.host", "");
+        auto Host = MicroServiceConfigGetString("storage.type.postgresql.host", "");
-		auto Username = MicroServiceConfigGetString("storage.type.postgresql.username", "");
+        auto Username = MicroServiceConfigGetString("storage.type.postgresql.username", "");
-		auto Password = MicroServiceConfigGetString("storage.type.postgresql.password", "");
+        auto Password = MicroServiceConfigGetString("storage.type.postgresql.password", "");
-		auto Database = MicroServiceConfigGetString("storage.type.postgresql.database", "");
+        auto Database = MicroServiceConfigGetString("storage.type.postgresql.database", "");
-		auto Port = MicroServiceConfigGetString("storage.type.postgresql.port", "");
+        auto Port = MicroServiceConfigGetString("storage.type.postgresql.port", "");
-		auto ConnectionTimeout =
+        auto ConnectionTimeout = MicroServiceConfigGetString("storage.type.postgresql.connectiontimeout", "");
-			MicroServiceConfigGetString("storage.type.postgresql.connectiontimeout", "");
 
-		std::string ConnectionStr = "host=" + Host + " user=" + Username + " password=" + Password +
+        std::string ConnectionStr =
-									" dbname=" + Database + " port=" + Port +
+                "host=" + Host +
-									" connect_timeout=" + ConnectionTimeout;
+                " user=" + Username +
+                " password=" + Password +
+                " dbname=" + Database +
+                " port=" + Port +
+                " connect_timeout=" + ConnectionTimeout;
 
-		Poco::Data::PostgreSQL::Connector::registerConnector();
+        Poco::Data::PostgreSQL::Connector::registerConnector();
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(PostgresConn_.name(), ConnectionStr, 8,
+        Pool_ = std::make_unique<Poco::Data::SessionPool>(PostgresConn_.name(), ConnectionStr, 8, NumSessions, IdleTime);
-														  NumSessions, IdleTime);
 
-		return 0;
+        return 0;
-	}
+    }
 #endif
 
-} // namespace OpenWifi
+}

src/framework/SubSystemServer.cpp

@@ -6,29 +6,36 @@
 
 #include "framework/SubSystemServer.h"
 
-#include "Poco/DateTimeFormat.h"
-#include "Poco/DateTimeFormatter.h"
 #include "Poco/Net/SSLManager.h"
+#include "Poco/DateTimeFormatter.h"
+#include "Poco/DateTimeFormat.h"
 
 #include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
-	PropertiesFileServerEntry::PropertiesFileServerEntry(
+	PropertiesFileServerEntry::PropertiesFileServerEntry(std::string Address, uint32_t port, std::string Key_file,
-		std::string Address, uint32_t port, std::string Key_file, std::string Cert_file,
+							  std::string Cert_file, std::string RootCa, std::string Issuer,
-		std::string RootCa, std::string Issuer, std::string ClientCas, std::string Cas,
+							  std::string ClientCas, std::string Cas,
-		std::string Key_file_password, std::string Name, Poco::Net::Context::VerificationMode M,
+							  std::string Key_file_password, std::string Name,
-		int backlog)
+							  Poco::Net::Context::VerificationMode M,
-		: address_(std::move(Address)), port_(port), cert_file_(std::move(Cert_file)),
+							  int backlog)
-		  key_file_(std::move(Key_file)), root_ca_(std::move(RootCa)),
+		: address_(std::move(Address)),
-		  key_file_password_(std::move(Key_file_password)), issuer_cert_file_(std::move(Issuer)),
+		  port_(port),
-		  client_cas_(std::move(ClientCas)), cas_(std::move(Cas)), name_(std::move(Name)),
+		  cert_file_(std::move(Cert_file)),
-		  backlog_(backlog), level_(M){
+		  key_file_(std::move(Key_file)),
+		  root_ca_(std::move(RootCa)),
+		  key_file_password_(std::move(Key_file_password)),
+		  issuer_cert_file_(std::move(Issuer)),
+		  client_cas_(std::move(ClientCas)),
+		  cas_(std::move(Cas)),
+		  name_(std::move(Name)),
+		  backlog_(backlog),
+		  level_(M) {
 
-							 };
+	  };
 
-	[[nodiscard]] Poco::Net::SecureServerSocket
+	[[nodiscard]] Poco::Net::SecureServerSocket PropertiesFileServerEntry::CreateSecureSocket(Poco::Logger &L) const {
-	PropertiesFileServerEntry::CreateSecureSocket(Poco::Logger &L) const {
 		Poco::Net::Context::Params P;
 
 		P.verificationMode = level_;
@@ -38,13 +45,11 @@ namespace OpenWifi {
 		P.dhUse2048Bits = true;
 		P.caLocation = cas_;
 
-		auto Context = Poco::AutoPtr<Poco::Net::Context>(
+		auto Context = Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
-			new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
 
-		if (!key_file_password_.empty()) {
+		if(!key_file_password_.empty()) {
-			auto PassphraseHandler = Poco::SharedPtr<MyPrivateKeyPassphraseHandler>(
+			auto PassphraseHandler = Poco::SharedPtr<MyPrivateKeyPassphraseHandler>( new MyPrivateKeyPassphraseHandler(key_file_password_,L));
-				new MyPrivateKeyPassphraseHandler(key_file_password_, L));
+			Poco::Net::SSLManager::instance().initializeServer(PassphraseHandler, nullptr,Context);
-			Poco::Net::SSLManager::instance().initializeServer(PassphraseHandler, nullptr, Context);
 		}
 
 		if (!cert_file_.empty() && !key_file_.empty()) {
@@ -106,8 +111,7 @@ namespace OpenWifi {
 		}
 	}
 
-	[[nodiscard]] Poco::Net::ServerSocket
+	[[nodiscard]] Poco::Net::ServerSocket PropertiesFileServerEntry::CreateSocket([[maybe_unused]] Poco::Logger &L) const {
-	PropertiesFileServerEntry::CreateSocket([[maybe_unused]] Poco::Logger &L) const {
 		Poco::Net::Context::Params P;
 
 		if (address_ == "*") {
@@ -123,25 +127,20 @@ namespace OpenWifi {
 		}
 	}
 
-	void PropertiesFileServerEntry::LogCertInfo(Poco::Logger &L,
+	void PropertiesFileServerEntry::LogCertInfo(Poco::Logger &L, const Poco::Crypto::X509Certificate &C) const {
-												const Poco::Crypto::X509Certificate &C) const {
+		L.information("=============================================================================================");
-		L.information("============================================================================"
-					  "=================");
 		L.information(fmt::format(">          Issuer: {}", C.issuerName()));
-		L.information("----------------------------------------------------------------------------"
+		L.information("---------------------------------------------------------------------------------------------");
-					  "-----------------");
 		L.information(fmt::format(">     Common Name: {}",
 								  C.issuerName(Poco::Crypto::X509Certificate::NID_COMMON_NAME)));
 		L.information(fmt::format(">         Country: {}",
 								  C.issuerName(Poco::Crypto::X509Certificate::NID_COUNTRY)));
 		L.information(fmt::format(">        Locality: {}",
 								  C.issuerName(Poco::Crypto::X509Certificate::NID_LOCALITY_NAME)));
-		L.information(
+		L.information(fmt::format(">      State/Prov: {}",
-			fmt::format(">      State/Prov: {}",
+								  C.issuerName(Poco::Crypto::X509Certificate::NID_STATE_OR_PROVINCE)));
-						C.issuerName(Poco::Crypto::X509Certificate::NID_STATE_OR_PROVINCE)));
+		L.information(fmt::format(">        Org name: {}",
-		L.information(
+								  C.issuerName(Poco::Crypto::X509Certificate::NID_ORGANIZATION_NAME)));
-			fmt::format(">        Org name: {}",
-						C.issuerName(Poco::Crypto::X509Certificate::NID_ORGANIZATION_NAME)));
 		L.information(
 			fmt::format(">        Org unit: {}",
 						C.issuerName(Poco::Crypto::X509Certificate::NID_ORGANIZATION_UNIT_NAME)));
@@ -150,11 +149,9 @@ namespace OpenWifi {
 						C.issuerName(Poco::Crypto::X509Certificate::NID_PKCS9_EMAIL_ADDRESS)));
 		L.information(fmt::format(">         Serial#: {}",
 								  C.issuerName(Poco::Crypto::X509Certificate::NID_SERIAL_NUMBER)));
-		L.information("----------------------------------------------------------------------------"
+		L.information("---------------------------------------------------------------------------------------------");
-					  "-----------------");
 		L.information(fmt::format(">         Subject: {}", C.subjectName()));
-		L.information("----------------------------------------------------------------------------"
+		L.information("---------------------------------------------------------------------------------------------");
-					  "-----------------");
 		L.information(fmt::format(">     Common Name: {}",
 								  C.subjectName(Poco::Crypto::X509Certificate::NID_COMMON_NAME)));
 		L.information(fmt::format(">         Country: {}",
@@ -175,66 +172,52 @@ namespace OpenWifi {
 						C.subjectName(Poco::Crypto::X509Certificate::NID_PKCS9_EMAIL_ADDRESS)));
 		L.information(fmt::format(">         Serial#: {}",
 								  C.subjectName(Poco::Crypto::X509Certificate::NID_SERIAL_NUMBER)));
-		L.information("----------------------------------------------------------------------------"
+		L.information("---------------------------------------------------------------------------------------------");
-					  "-----------------");
 		L.information(fmt::format(">  Signature Algo: {}", C.signatureAlgorithm()));
-		auto From =
+		auto From = Poco::DateTimeFormatter::format(C.validFrom(), Poco::DateTimeFormat::HTTP_FORMAT);
-			Poco::DateTimeFormatter::format(C.validFrom(), Poco::DateTimeFormat::HTTP_FORMAT);
 		L.information(fmt::format(">      Valid from: {}", From));
 		auto Expires =
 			Poco::DateTimeFormatter::format(C.expiresOn(), Poco::DateTimeFormat::HTTP_FORMAT);
 		L.information(fmt::format(">      Expires on: {}", Expires));
 		L.information(fmt::format(">         Version: {}", (int)C.version()));
 		L.information(fmt::format(">        Serial #: {}", C.serialNumber()));
-		L.information("============================================================================"
+		L.information("=============================================================================================");
-					  "=================");
 	}
 
 	void PropertiesFileServerEntry::LogCert(Poco::Logger &L) const {
 		try {
 			Poco::Crypto::X509Certificate C(cert_file_);
-			L.information("========================================================================"
+			L.information("=============================================================================================");
-						  "=====================");
+			L.information("=============================================================================================");
-			L.information("========================================================================"
-						  "=====================");
 			L.information(fmt::format("Certificate Filename: {}", cert_file_));
 			LogCertInfo(L, C);
-			L.information("========================================================================"
+			L.information("=============================================================================================");
-						  "=====================");
 
 			if (!issuer_cert_file_.empty()) {
 				Poco::Crypto::X509Certificate C1(issuer_cert_file_);
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
+				L.information("=============================================================================================");
-				L.information("===================================================================="
-							  "=========================");
 				L.information(fmt::format("Issues Certificate Filename: {}", issuer_cert_file_));
 				LogCertInfo(L, C1);
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
 			}
 
 			if (!client_cas_.empty()) {
 				std::vector<Poco::Crypto::X509Certificate> Certs =
 					Poco::Net::X509Certificate::readPEM(client_cas_);
 
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
+				L.information("=============================================================================================");
-				L.information("===================================================================="
-							  "=========================");
 				L.information(fmt::format("Client CAs Filename: {}", client_cas_));
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
 				auto i = 1;
 				for (const auto &C3 : Certs) {
 					L.information(fmt::format(" Index: {}", i));
-					L.information("================================================================"
+					L.information("=============================================================================================");
-								  "=============================");
 					LogCertInfo(L, C3);
 					i++;
 				}
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
 			}
 
 		} catch (const Poco::Exception &E) {
@@ -247,31 +230,28 @@ namespace OpenWifi {
 			std::vector<Poco::Crypto::X509Certificate> Certs =
 				Poco::Net::X509Certificate::readPEM(root_ca_);
 
-			L.information("========================================================================"
+			L.information("=============================================================================================");
-						  "=====================");
+			L.information("=============================================================================================");
-			L.information("========================================================================"
-						  "=====================");
 			L.information(fmt::format("CA Filename: {}", root_ca_));
-			L.information("========================================================================"
+			L.information("=============================================================================================");
-						  "=====================");
 			auto i = 1;
 			for (const auto &C : Certs) {
 				L.information(fmt::format(" Index: {}", i));
-				L.information("===================================================================="
+				L.information("=============================================================================================");
-							  "=========================");
 				LogCertInfo(L, C);
 				i++;
 			}
-			L.information("========================================================================"
+			L.information("=============================================================================================");
-						  "=====================");
 		} catch (const Poco::Exception &E) {
 			L.log(E);
 		}
 	}
 
 	SubSystemServer::SubSystemServer(const std::string &Name, const std::string &LoggingPrefix,
-									 const std::string &SubSystemConfigPrefix)
+											const std::string &SubSystemConfigPrefix):
-		: Name_(Name), LoggerPrefix_(LoggingPrefix), SubSystemConfigPrefix_(SubSystemConfigPrefix) {
+		Name_(Name),
+		LoggerPrefix_(LoggingPrefix),
+		SubSystemConfigPrefix_(SubSystemConfigPrefix) {
 	}
 
 	void SubSystemServer::initialize([[maybe_unused]] Poco::Util::Application &self) {
@@ -279,13 +259,10 @@ namespace OpenWifi {
 		bool good = true;
 
 		auto NewLevel = MicroServiceConfigGetString("logging.level." + Name_, "");
-		if (NewLevel.empty())
+		if(NewLevel.empty())
-			Logger_ = std::make_unique<LoggerWrapper>(Poco::Logger::create(
+			Logger_ = std::make_unique<LoggerWrapper>(Poco::Logger::create(LoggerPrefix_, Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel()));
-				LoggerPrefix_, Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel()));
 		else
-			Logger_ = std::make_unique<LoggerWrapper>(
+			Logger_ = std::make_unique<LoggerWrapper>(Poco::Logger::create(LoggerPrefix_, Poco::Logger::root().getChannel(), Poco::Logger::parseLevel(NewLevel)));
-				Poco::Logger::create(LoggerPrefix_, Poco::Logger::root().getChannel(),
-									 Poco::Logger::parseLevel(NewLevel)));
 
 		ConfigServersList_.clear();
 		while (good) {
@@ -320,18 +297,24 @@ namespace OpenWifi {
 				} else if (L == "once")
 					M = Poco::Net::Context::VERIFY_ONCE;
 
-				PropertiesFileServerEntry entry(
+				PropertiesFileServerEntry entry(MicroServiceConfigGetString(address, ""),
-					MicroServiceConfigGetString(address, ""), MicroServiceConfigGetInt(port, 0),
+												MicroServiceConfigGetInt(port, 0),
-					MicroServiceConfigPath(key, ""), MicroServiceConfigPath(cert, ""),
+												MicroServiceConfigPath(key, ""),
-					MicroServiceConfigPath(rootca, ""), MicroServiceConfigPath(issuer, ""),
+												MicroServiceConfigPath(cert, ""),
-					MicroServiceConfigPath(clientcas, ""), MicroServiceConfigPath(cas, ""),
+												MicroServiceConfigPath(rootca, ""),
-					MicroServiceConfigGetString(key_password, ""),
+												MicroServiceConfigPath(issuer, ""),
-					MicroServiceConfigGetString(name, ""), M,
+												MicroServiceConfigPath(clientcas, ""),
-					(int)MicroServiceConfigGetInt(backlog, 64));
+												MicroServiceConfigPath(cas, ""),
+												MicroServiceConfigGetString(key_password, ""),
+												MicroServiceConfigGetString(name, ""), M,
+												(int)MicroServiceConfigGetInt(backlog, 64));
 				ConfigServersList_.push_back(entry);
 				i++;
 			}
 		}
 	}
 
+
+
+
 } // namespace OpenWifi

src/framework/SubSystemServer.h

@@ -4,30 +4,32 @@
 
 #pragma once
 
-#include <mutex>
 #include <string>
+#include <mutex>
 
-#include "Poco/Net/Context.h"
-#include "Poco/Net/PrivateKeyPassphraseHandler.h"
-#include "Poco/Net/SecureServerSocket.h"
 #include "Poco/Util/Application.h"
+#include "Poco/Net/Context.h"
+#include "Poco/Net/SecureServerSocket.h"
+#include "Poco/Net/PrivateKeyPassphraseHandler.h"
 
 namespace OpenWifi {
 
 	class MyPrivateKeyPassphraseHandler : public Poco::Net::PrivateKeyPassphraseHandler {
 	  public:
-		explicit MyPrivateKeyPassphraseHandler(const std::string &Password, Poco::Logger &Logger)
+		explicit MyPrivateKeyPassphraseHandler(const std::string &Password, Poco::Logger & Logger):
-			: PrivateKeyPassphraseHandler(true), Password_(Password), Logger_(Logger) {}
+			PrivateKeyPassphraseHandler(true),
+			Password_(Password),
+			Logger_(Logger) {
+		}
 
-		void onPrivateKeyRequested([[maybe_unused]] const void *pSender, std::string &privateKey) {
+		void onPrivateKeyRequested([[maybe_unused]] const void * pSender,std::string & privateKey) {
-			poco_information(Logger_, "Returning key passphrase.");
+			poco_information(Logger_,"Returning key passphrase.");
 			privateKey = Password_;
 		};
-		inline Poco::Logger &Logger() { return Logger_; }
+		inline Poco::Logger & Logger() { return Logger_; }
-
 	  private:
 		std::string Password_;
-		Poco::Logger &Logger_;
+		Poco::Logger & Logger_;
 	};
 
 	class PropertiesFileServerEntry {
@@ -74,24 +76,24 @@ namespace OpenWifi {
 
 	class SubSystemServer : public Poco::Util::Application::Subsystem {
 	  public:
-		SubSystemServer(const std::string &Name, const std::string &LoggingPrefix,
+		SubSystemServer(const std::string & Name, const std::string &LoggingPrefix,
-						const std::string &SubSystemConfigPrefix);
+						const std::string & SubSystemConfigPrefix);
 
 		void initialize(Poco::Util::Application &self) override;
-		inline void uninitialize() override {}
+		inline void uninitialize() override {
-		inline void reinitialize([[maybe_unused]] Poco::Util::Application &self) override {
-			poco_information(Logger_->L_, "Reloading of this subsystem is not supported.");
 		}
-		inline void defineOptions([[maybe_unused]] Poco::Util::OptionSet &options) override {}
+		inline void reinitialize([[maybe_unused]] Poco::Util::Application &self) override {
-		inline const std::string &Name() const { return Name_; };
+			poco_information(Logger_->L_,"Reloading of this subsystem is not supported.");
-		inline const char *name() const override { return Name_.c_str(); }
+		}
+		inline void defineOptions([[maybe_unused]] Poco::Util::OptionSet &options) override {
+		}
+		inline const std::string & Name() const { return Name_; };
+		inline const char * name() const override { return Name_.c_str(); }
 
-		inline const PropertiesFileServerEntry &Host(uint64_t index) {
+		inline const PropertiesFileServerEntry & Host(uint64_t index) { return ConfigServersList_[index]; };
-			return ConfigServersList_[index];
-		};
 		inline uint64_t HostSize() const { return ConfigServersList_.size(); }
-		inline Poco::Logger &Logger() const { return Logger_->L_; }
+		inline Poco::Logger & Logger() const { return Logger_->L_; }
-		inline void SetLoggingLevel(const std::string &levelName) {
+		inline void SetLoggingLevel(const std::string & levelName) {
 			Logger_->L_.setLevel(Poco::Logger::parseLevel(levelName));
 		}
 		inline int GetLoggingLevel() { return Logger_->L_.getLevel(); }
@@ -100,21 +102,23 @@ namespace OpenWifi {
 		virtual void Stop() = 0;
 
 		struct LoggerWrapper {
-			Poco::Logger &L_;
+			Poco::Logger & L_;
-			LoggerWrapper(Poco::Logger &L) : L_(L) {}
+			LoggerWrapper(Poco::Logger &L) :
+ 				L_(L) {
+			}
 		};
 
 	  protected:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex 			Mutex_;
 		std::vector<PropertiesFileServerEntry> ConfigServersList_;
 
 	  private:
-		std::unique_ptr<LoggerWrapper> Logger_;
+		std::unique_ptr<LoggerWrapper>  Logger_;
-		std::string Name_;
+		std::string 					Name_;
-		std::string LoggerPrefix_;
+		std::string         			LoggerPrefix_;
-		std::string SubSystemConfigPrefix_;
+		std::string 					SubSystemConfigPrefix_;
 	};
 
-	typedef std::vector<SubSystemServer *> SubSystemVec;
+	typedef std::vector<SubSystemServer *>          SubSystemVec;
 
 } // namespace OpenWifi

src/framework/UI_WebSocketClientNotifications.cpp

@@ -5,4 +5,7 @@
 #include "framework/UI_WebSocketClientNotifications.h"
 #include "framework/UI_WebSocketClientServer.h"
 
-namespace OpenWifi {}
+namespace OpenWifi {
+
+}
+

src/framework/UI_WebSocketClientNotifications.h

@@ -9,35 +9,37 @@
 
 namespace OpenWifi {
 
-	template <typename ContentStruct>
+    template<typename ContentStruct>
 
-	struct WebSocketNotification {
+    struct WebSocketNotification {
-		inline static uint64_t xid = 1;
+        inline static uint64_t xid = 1;
-		uint64_t notification_id = ++xid;
+        uint64_t 		notification_id = ++xid;
-		std::uint64_t type_id = 0;
+		std::uint64_t 	type_id=0;
-		ContentStruct content;
+        ContentStruct 	content;
 
-		void to_json(Poco::JSON::Object &Obj) const;
+        void to_json(Poco::JSON::Object &Obj) const;
 
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+    };
 
-	template <typename ContentStruct>
+    template<typename ContentStruct>
-	void WebSocketNotification<ContentStruct>::to_json(Poco::JSON::Object &Obj) const {
+    void WebSocketNotification<ContentStruct>::to_json(Poco::JSON::Object &Obj) const {
-		RESTAPI_utils::field_to_json(Obj, "notification_id", notification_id);
+        RESTAPI_utils::field_to_json(Obj, "notification_id", notification_id);
 		RESTAPI_utils::field_to_json(Obj, "type_id", type_id);
-		RESTAPI_utils::field_to_json(Obj, "content", content);
+        RESTAPI_utils::field_to_json(Obj, "content", content);
-	}
+    }
 
-	template <typename ContentStruct>
+    template<typename ContentStruct>
-	bool WebSocketNotification<ContentStruct>::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool WebSocketNotification<ContentStruct>::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
+        try {
-			RESTAPI_utils::field_from_json(Obj, "notification_id", notification_id);
+            RESTAPI_utils::field_from_json(Obj, "notification_id", notification_id);
 			RESTAPI_utils::field_from_json(Obj, "type_id", type_id);
 			RESTAPI_utils::field_from_json(Obj, "content", content);
-			return true;
+            return true;
-		} catch (...) {
+        } catch (...) {
-		}
+
-		return false;
+        }
-	}
+        return false;
-} // namespace OpenWifi
+    }
+}
+

src/framework/UI_WebSocketClientServer.cpp

@@ -4,14 +4,14 @@
 
 #include <mutex>
 
+#include "Poco/NObserver.h"
 #include "Poco/JSON/JSONException.h"
 #include "Poco/JSON/Parser.h"
 #include "Poco/Logger.h"
-#include "Poco/NObserver.h"
 
+#include "framework/UI_WebSocketClientServer.h"
 #include "framework/AuthClient.h"
 #include "framework/MicroServiceFuncs.h"
-#include "framework/UI_WebSocketClientServer.h"
 
 #include "fmt/format.h"
 
@@ -19,82 +19,80 @@
 #include "AuthService.h"
 #endif
 
-#define DBG                                                                                        \
+#define DBG { std::cout << __LINE__ << std::endl; }
-	{ std::cout << __LINE__ << std::endl; }
 
 namespace OpenWifi {
 
-	void UI_WebSocketClientServer::NewClient(Poco::Net::WebSocket &WS, const std::string &Id,
+	void UI_WebSocketClientServer::NewClient(Poco::Net::WebSocket & WS, const std::string &Id, const std::string &UserName, std::uint64_t TID ) {
-											 const std::string &UserName, std::uint64_t TID) {
 
-		std::lock_guard G(LocalMutex_);
+        std::lock_guard G(LocalMutex_);
-		auto Client = std::make_unique<UI_WebSocketClientInfo>(WS, Id, UserName);
+        auto Client = std::make_unique<UI_WebSocketClientInfo>(WS,Id, UserName);
-		auto ClientSocket = Client->WS_->impl()->sockfd();
+        auto ClientSocket = Client->WS_->impl()->sockfd();
-		TID_ = TID;
+        TID_ = TID;
-		Client->WS_->setNoDelay(true);
+        Client->WS_->setNoDelay(true);
-		Client->WS_->setKeepAlive(true);
+        Client->WS_->setKeepAlive(true);
-		Client->WS_->setBlocking(false);
+        Client->WS_->setBlocking(false);
-		Reactor_.addEventHandler(
+        Reactor_.addEventHandler(*Client->WS_,
-			*Client->WS_,
+                                 Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ReadableNotification>(
-			Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ReadableNotification>(
+                                         *this, &UI_WebSocketClientServer::OnSocketReadable));
-				*this, &UI_WebSocketClientServer::OnSocketReadable));
+        Reactor_.addEventHandler(*Client->WS_,
-		Reactor_.addEventHandler(
+                                 Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ShutdownNotification>(
-			*Client->WS_,
+                                         *this, &UI_WebSocketClientServer::OnSocketShutdown));
-			Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ShutdownNotification>(
+        Reactor_.addEventHandler(*Client->WS_,
-				*this, &UI_WebSocketClientServer::OnSocketShutdown));
+                                 Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ErrorNotification>(
-		Reactor_.addEventHandler(
+                                         *this, &UI_WebSocketClientServer::OnSocketError));
-			*Client->WS_, Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ErrorNotification>(
+        Client->SocketRegistered_ = true;
-							  *this, &UI_WebSocketClientServer::OnSocketError));
+        Clients_[ClientSocket] = std::move(Client);
-		Client->SocketRegistered_ = true;
-		Clients_[ClientSocket] = std::move(Client);
 		UsersConnected_ = Clients_.size();
+    }
+
+	void UI_WebSocketClientServer::SetProcessor( UI_WebSocketClientProcessor * F) {
+		Processor_ = F;
 	}
 
-	void UI_WebSocketClientServer::SetProcessor(UI_WebSocketClientProcessor *F) { Processor_ = F; }
+	UI_WebSocketClientServer::UI_WebSocketClientServer() noexcept:
-
+		 SubSystemServer("WebSocketClientServer", "UI-WSCLNT-SVR", "websocketclients")
-	UI_WebSocketClientServer::UI_WebSocketClientServer() noexcept
+	{
-		: SubSystemServer("WebSocketClientServer", "UI-WSCLNT-SVR", "websocketclients") {}
+	}
 
 	void UI_WebSocketClientServer::run() {
 		Running_ = true;
-		while (Running_) {
+		while(Running_) {
 			Poco::Thread::trySleep(2000);
 
-			if (!Running_)
+			if(!Running_)
 				break;
 
-			std::lock_guard G(LocalMutex_);
+			std::lock_guard		G(LocalMutex_);
-			for (const auto i : ToBeRemoved_) {
+			for(const auto i:ToBeRemoved_) {
 				// std::cout << "Erasing old WS UI connection..." << std::endl;
 				Clients_.erase(i);
 			}
-			ToBeRemoved_.clear();
+            ToBeRemoved_.clear();
 			UsersConnected_ = Clients_.size();
 		}
+
 	}
 
-	void UI_WebSocketClientServer::EndConnection(ClientList::iterator Client) {
+    void UI_WebSocketClientServer::EndConnection(ClientList::iterator Client) {
-		if (Client->second->SocketRegistered_) {
+        if(Client->second->SocketRegistered_) {
-			Client->second->SocketRegistered_ = false;
+            Client->second->SocketRegistered_ = false;
-			Reactor_.removeEventHandler(
+            Reactor_.removeEventHandler(*Client->second->WS_,
-				*Client->second->WS_,
+                                        Poco::NObserver<UI_WebSocketClientServer,
-				Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ReadableNotification>(
+                                                Poco::Net::ReadableNotification>(*this,&UI_WebSocketClientServer::OnSocketReadable));
-					*this, &UI_WebSocketClientServer::OnSocketReadable));
+            Reactor_.removeEventHandler(*Client->second->WS_,
-			Reactor_.removeEventHandler(
+                                        Poco::NObserver<UI_WebSocketClientServer,
-				*Client->second->WS_,
+                                                Poco::Net::ShutdownNotification>(*this,&UI_WebSocketClientServer::OnSocketShutdown));
-				Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ShutdownNotification>(
+            Reactor_.removeEventHandler(*Client->second->WS_,
-					*this, &UI_WebSocketClientServer::OnSocketShutdown));
+                                        Poco::NObserver<UI_WebSocketClientServer,
-			Reactor_.removeEventHandler(
+                                                Poco::Net::ErrorNotification>(*this,&UI_WebSocketClientServer::OnSocketError));
-				*Client->second->WS_,
+        }
-				Poco::NObserver<UI_WebSocketClientServer, Poco::Net::ErrorNotification>(
-					*this, &UI_WebSocketClientServer::OnSocketError));
-		}
 		ToBeRemoved_.push_back(Client);
-	}
+    }
 
 	int UI_WebSocketClientServer::Start() {
-		poco_information(Logger(), "Starting...");
+        poco_information(Logger(),"Starting...");
-		GoogleApiKey_ = MicroServiceConfigGetString("google.apikey", "");
+		GoogleApiKey_ = MicroServiceConfigGetString("google.apikey","");
 		GeoCodeEnabled_ = !GoogleApiKey_.empty();
 		ReactorThread_.start(Reactor_);
 		ReactorThread_.setName("ws:ui-reactor");
@@ -104,31 +102,29 @@ namespace OpenWifi {
 	};
 
 	void UI_WebSocketClientServer::Stop() {
-		if (Running_) {
+		if(Running_) {
-			poco_information(Logger(), "Stopping...");
+            poco_information(Logger(),"Stopping...");
-			Clients_.clear();
+            Clients_.clear();
 			Reactor_.stop();
 			ReactorThread_.join();
 			Running_ = false;
 			CleanerThread_.wakeUp();
 			CleanerThread_.join();
-			poco_information(Logger(), "Stopped...");
+            poco_information(Logger(),"Stopped...");
 		}
 	};
 
-	bool UI_WebSocketClientServer::IsFiltered(std::uint64_t id,
+	bool UI_WebSocketClientServer::IsFiltered(std::uint64_t id, const OpenWifi::UI_WebSocketClientInfo &Client) {
-											  const OpenWifi::UI_WebSocketClientInfo &Client) {
+		return std::find(Client.Filter_.begin(), Client.Filter_.end(),id)!=end(Client.Filter_);
-		return std::find(Client.Filter_.begin(), Client.Filter_.end(), id) != end(Client.Filter_);
 	}
 
-	bool UI_WebSocketClientServer::SendToUser(const std::string &UserName, std::uint64_t id,
+	bool UI_WebSocketClientServer::SendToUser(const std::string &UserName, std::uint64_t id, const std::string &Payload) {
-											  const std::string &Payload) {
 		std::lock_guard G(LocalMutex_);
 
-		for (const auto &Client : Clients_) {
+		for(const auto &Client:Clients_) {
-			if (Client.second->UserName_ == UserName) {
+			if(Client.second->UserName_ == UserName) {
 				try {
-					if (!IsFiltered(id, *Client.second) && Client.second->Authenticated_) {
+					if(!IsFiltered(id,*Client.second) && Client.second->Authenticated_) {
 						return Client.second->WS_->sendFrame(
 								   Payload.c_str(), (int)Payload.size()) == (int)Payload.size();
 					} else {
@@ -145,32 +141,31 @@ namespace OpenWifi {
 	void UI_WebSocketClientServer::SendToAll(std::uint64_t id, const std::string &Payload) {
 		std::lock_guard G(LocalMutex_);
 
-		for (const auto &Client : Clients_) {
+		for(const auto &Client:Clients_) {
 			try {
-				if (!IsFiltered(id, *Client.second) && Client.second->Authenticated_)
+				if(!IsFiltered(id,*Client.second) && Client.second->Authenticated_)
-					Client.second->WS_->sendFrame(Payload.c_str(), (int)Payload.size());
+					Client.second->WS_->sendFrame(Payload.c_str(),(int)Payload.size());
 			} catch (...) {
+
 			}
 		}
 	}
 
-	UI_WebSocketClientServer::ClientList::iterator UI_WebSocketClientServer::FindWSClient(
+    UI_WebSocketClientServer::ClientList::iterator UI_WebSocketClientServer::FindWSClient( [[maybe_unused]]  std::lock_guard<std::recursive_mutex> &G, int ClientSocket) {
-		[[maybe_unused]] std::lock_guard<std::recursive_mutex> &G, int ClientSocket) {
+        return Clients_.find(ClientSocket);
-		return Clients_.find(ClientSocket);
+    }
-	}
 
 	void UI_WebSocketClientServer::SortNotifications() {
 		struct {
-			bool operator()(const NotificationEntry &A, const NotificationEntry &B) const {
+			bool operator()(const NotificationEntry &A, const NotificationEntry & B) const {
-				return A.id < B.id;
+				return A.id < B.id; };
-			};
 		} CompareNotifications;
 		std::sort(NotificationTypes_.begin(), NotificationTypes_.end(), CompareNotifications);
 
 		NotificationTypesJSON_.clear();
-		Poco::JSON::Array AllNotifications;
+		Poco::JSON::Array		AllNotifications;
-		for (const auto &notification : NotificationTypes_) {
+		for(const auto &notification:NotificationTypes_) {
-			Poco::JSON::Object Notification;
+			Poco::JSON::Object	Notification;
 			Notification.set("id", notification.id);
 			Notification.set("helper", notification.helper);
 			AllNotifications.add(Notification);
@@ -178,60 +173,52 @@ namespace OpenWifi {
 		NotificationTypesJSON_.set("notificationTypes", AllNotifications);
 	}
 
-	void UI_WebSocketClientServer::RegisterNotifications(
+	void UI_WebSocketClientServer::RegisterNotifications(const OpenWifi::UI_WebSocketClientServer::NotificationTypeIdVec &Notifications) {
-		const OpenWifi::UI_WebSocketClientServer::NotificationTypeIdVec &Notifications) {
+		std::copy(Notifications.begin(), Notifications.end(), std::back_inserter(NotificationTypes_));
-		std::copy(Notifications.begin(), Notifications.end(),
-				  std::back_inserter(NotificationTypes_));
 		SortNotifications();
 	}
 
-	void UI_WebSocketClientServer::OnSocketError(
+    void UI_WebSocketClientServer::OnSocketError([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
-		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
+        std::lock_guard     G(LocalMutex_);
-		std::lock_guard G(LocalMutex_);
+        auto Client = Clients_.find(pNf->socket().impl()->sockfd());
-		auto Client = Clients_.find(pNf->socket().impl()->sockfd());
+        if(Client==end(Clients_))
-		if (Client == end(Clients_))
+            return;
-			return;
+        EndConnection(Client);
-		EndConnection(Client);
 	}
 
-	void UI_WebSocketClientServer::OnSocketReadable(
+	void UI_WebSocketClientServer::OnSocketReadable([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
 
-		UI_WebSocketClientServer::ClientList::iterator Client;
+        UI_WebSocketClientServer::ClientList::iterator Client;
-		std::lock_guard G(LocalMutex_);
+        std::lock_guard     G(LocalMutex_);
 
 		try {
 
-			Client = Clients_.find(pNf->socket().impl()->sockfd());
+            Client = Clients_.find(pNf->socket().impl()->sockfd());
-			if (Client == end(Clients_))
+            if( Client == end(Clients_))
-				return;
+                return;
 
 			Poco::Buffer<char> IncomingFrame(0);
-			int flags;
+            int flags;
-			int n;
+            int n;
 			n = Client->second->WS_->receiveFrame(IncomingFrame, flags);
 			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
 
 			if (n == 0) {
-				poco_debug(Logger(),
+				poco_debug(Logger(),fmt::format("CLOSE({}): {} UI Client is closing WS connection.", Client->second->Id_, Client->second->UserName_));
-						   fmt::format("CLOSE({}): {} UI Client is closing WS connection.",
-									   Client->second->Id_, Client->second->UserName_));
 				return EndConnection(Client);
 			}
 
 			switch (Op) {
 			case Poco::Net::WebSocket::FRAME_OP_PING: {
-				Client->second->WS_->sendFrame("", 0,
+                Client->second->WS_->sendFrame("", 0,
-											   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
+							   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-												   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
 			} break;
 			case Poco::Net::WebSocket::FRAME_OP_PONG: {
 			} break;
 			case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-				poco_debug(Logger(),
+				poco_debug(Logger(),fmt::format("CLOSE({}): {} UI Client is closing WS connection.", Client->second->Id_, Client->second->UserName_));
-						   fmt::format("CLOSE({}): {} UI Client is closing WS connection.",
+                return EndConnection(Client);
-									   Client->second->Id_, Client->second->UserName_));
-				return EndConnection(Client);
 			} break;
 			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 				constexpr const char *DropMessagesCommand = "drop-notifications";
@@ -241,84 +228,80 @@ namespace OpenWifi {
 					auto Tokens = Utils::Split(Frame, ':');
 					bool Expired = false;
 #if not defined(TIP_SECURITY_SERVICE)
-					bool Contacted = false;
+                    bool    Contacted = false;
 #endif
 					if (Tokens.size() == 2 &&
 #if defined(TIP_SECURITY_SERVICE)
-						AuthService()->IsAuthorized(Tokens[1], Client->second->UserInfo_, TID_,
+        			    AuthService()->IsAuthorized(Tokens[1], Client->second->UserInfo_, TID_, Expired)) {
-													Expired)) {
 #else
-						AuthClient()->IsAuthorized(Tokens[1], Client->second->UserInfo_, TID_,
+                        AuthClient()->IsAuthorized(Tokens[1], Client->second->UserInfo_, TID_, Expired, Contacted)) {
-												   Expired, Contacted)) {
 #endif
-						Client->second->Authenticated_ = true;
+                        Client->second->Authenticated_ = true;
-						Client->second->UserName_ = Client->second->UserInfo_.userinfo.email;
+                        Client->second->UserName_ = Client->second->UserInfo_.userinfo.email;
-						poco_debug(Logger(),
+						poco_debug(Logger(),fmt::format("START({}): {} UI Client is starting WS connection.", Client->second->Id_, Client->second->UserName_));
-								   fmt::format("START({}): {} UI Client is starting WS connection.",
-											   Client->second->Id_, Client->second->UserName_));
 						auto WelcomeMessage = NotificationTypesJSON_;
 						WelcomeMessage.set("success", "Welcome! Bienvenue! Bienvenidos!");
 						std::ostringstream OS;
 						WelcomeMessage.stringify(OS);
-						Client->second->WS_->sendFrame(OS.str().c_str(), (int)OS.str().size());
+						Client->second->WS_->sendFrame(OS.str().c_str(), (int) OS.str().size());
-						Client->second->UserName_ = Client->second->UserInfo_.userinfo.email;
+                        Client->second->UserName_ = Client->second->UserInfo_.userinfo.email;
 					} else {
-						Poco::JSON::Object WelcomeMessage;
+						Poco::JSON::Object	WelcomeMessage;
 						WelcomeMessage.set("error", "Invalid token. Closing connection.");
 						std::ostringstream OS;
 						WelcomeMessage.stringify(OS);
-						Client->second->WS_->sendFrame(OS.str().c_str(), (int)OS.str().size());
+						Client->second->WS_->sendFrame(OS.str().c_str(), (int) OS.str().size());
-						return EndConnection(Client);
+                        return EndConnection(Client);
 					}
 				} else {
-					Poco::JSON::Parser P;
+                    Poco::JSON::Parser P;
-					auto Obj = P.parse(IncomingFrame.begin()).extract<Poco::JSON::Object::Ptr>();
+                    auto Obj =
+                        P.parse(IncomingFrame.begin()).extract<Poco::JSON::Object::Ptr>();
 
-					if (Obj->has(DropMessagesCommand) && Obj->isArray(DropMessagesCommand)) {
+					if(Obj->has(DropMessagesCommand) && Obj->isArray(DropMessagesCommand)) {
 						auto Filters = Obj->getArray(DropMessagesCommand);
 						Client->second->Filter_.clear();
-						for (const auto &Filter : *Filters) {
+						for(const auto &Filter:*Filters) {
-							Client->second->Filter_.emplace_back((std::uint64_t)Filter);
+							Client->second->Filter_.emplace_back( (std::uint64_t) Filter);
 						}
-						std::sort(begin(Client->second->Filter_), end(Client->second->Filter_));
+						std::sort(begin(Client->second->Filter_),end(Client->second->Filter_));
 						return;
 					}
 
-					std::string Answer;
+                    std::string Answer;
-					bool CloseConnection = false;
+                    bool CloseConnection=false;
-					if (Processor_ != nullptr) {
+                    if (Processor_ != nullptr) {
-						Processor_->Processor(Obj, Answer, CloseConnection,
+                        Processor_->Processor(Obj, Answer, CloseConnection,Client->second->UserInfo_.userinfo);
-											  Client->second->UserInfo_.userinfo);
+                    }
-					}
+                    if (!Answer.empty())
-					if (!Answer.empty())
+                        Client->second->WS_->sendFrame(Answer.c_str(), (int)Answer.size());
-						Client->second->WS_->sendFrame(Answer.c_str(), (int)Answer.size());
+                    else {
-					else {
+                        Client->second->WS_->sendFrame("{}", 2);
-						Client->second->WS_->sendFrame("{}", 2);
+                    }
-					}
 
-					if (CloseConnection) {
+                    if(CloseConnection) {
-						return EndConnection(Client);
+                        return EndConnection(Client);
-					}
+                    }
 				}
 			} break;
 			default: {
 			}
 			}
 		} catch (...) {
-			return EndConnection(Client);
+            return EndConnection(Client);
 		}
 	}
 
-	void UI_WebSocketClientServer::OnSocketShutdown(
+	void UI_WebSocketClientServer::OnSocketShutdown([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
-		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
+        try {
-		try {
+			std::lock_guard     G(LocalMutex_);
-			std::lock_guard G(LocalMutex_);
 			auto Client = Clients_.find(pNf->socket().impl()->sockfd());
-			if (Client == end(Clients_))
+            if (Client == end(Clients_))
-				return;
+                return;
-			EndConnection(Client);
+            EndConnection(Client);
-		} catch (...) {
+        } catch (...) {
-		}
+
+        }
 	}
 
 } // namespace OpenWifi

src/framework/UI_WebSocketClientServer.h

@@ -7,11 +7,11 @@
 #include <map>
 #include <string>
 
-#include "Poco/JSON/Object.h"
+#include "Poco/Runnable.h"
-#include "Poco/Net/SocketNotification.h"
 #include "Poco/Net/SocketReactor.h"
 #include "Poco/Net/WebSocket.h"
-#include "Poco/Runnable.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/Net/SocketNotification.h"
 
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
 #include "framework/SubSystemServer.h"
@@ -21,28 +21,25 @@ namespace OpenWifi {
 
 	class UI_WebSocketClientProcessor {
 	  public:
-		virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done,
+		virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done , const SecurityObjects::UserInfo & UserInfo) = 0;
-							   const SecurityObjects::UserInfo &UserInfo) = 0;
-
 	  private:
 	};
 
-	struct UI_WebSocketClientInfo {
+    struct UI_WebSocketClientInfo {
-		std::unique_ptr<Poco::Net::WebSocket> WS_ = nullptr;
+        std::unique_ptr<Poco::Net::WebSocket>   WS_ = nullptr;
-		std::string Id_;
+        std::string 				            Id_;
-		std::string UserName_;
+        std::string					            UserName_;
-		bool Authenticated_ = false;
+        bool 			                        Authenticated_ = false;
-		bool SocketRegistered_ = false;
+        bool				                    SocketRegistered_=false;
-		std::vector<std::uint64_t> Filter_;
+		std::vector<std::uint64_t>				Filter_;
-		SecurityObjects::UserInfoAndPolicy UserInfo_;
+        SecurityObjects::UserInfoAndPolicy      UserInfo_;
 
-		UI_WebSocketClientInfo(Poco::Net::WebSocket &WS, const std::string &Id,
+        UI_WebSocketClientInfo(Poco::Net::WebSocket &WS, const std::string &Id, const std::string &username) {
-							   const std::string &username) {
+            WS_ =  std::make_unique<Poco::Net::WebSocket>(WS);
-			WS_ = std::make_unique<Poco::Net::WebSocket>(WS);
+            Id_ = Id;
-			Id_ = Id;
+            UserName_ = username;
-			UserName_ = username;
+        }
-		}
+    };
-	};
 
 	class UI_WebSocketClientServer : public SubSystemServer, Poco::Runnable {
 
@@ -52,26 +49,26 @@ namespace OpenWifi {
 			return instance_;
 		}
 
-		bool IsAnyoneConnected() { return UsersConnected_; }
+		bool IsAnyoneConnected() {
+			return UsersConnected_;
+		}
 
 		int Start() override;
 		void Stop() override;
 		void run() override;
-		Poco::Net::SocketReactor &Reactor() { return Reactor_; }
+		Poco::Net::SocketReactor & Reactor() { return Reactor_; }
-		void NewClient(Poco::Net::WebSocket &WS, const std::string &Id, const std::string &UserName,
+		void NewClient(Poco::Net::WebSocket &WS, const std::string &Id, const std::string &UserName, std::uint64_t TID);
-					   std::uint64_t TID);
 		void SetProcessor(UI_WebSocketClientProcessor *F);
 		[[nodiscard]] inline bool GeoCodeEnabled() const { return GeoCodeEnabled_; }
 		[[nodiscard]] inline std::string GoogleApiKey() const { return GoogleApiKey_; }
 
-		template <typename T>
+		template <typename T> bool
-		bool SendUserNotification(const std::string &userName,
+		SendUserNotification(const std::string &userName, const WebSocketNotification<T> &Notification) {
-								  const WebSocketNotification<T> &Notification) {
 
-			Poco::JSON::Object Payload;
+			Poco::JSON::Object  Payload;
 			Notification.to_json(Payload);
-			Poco::JSON::Object Msg;
+			Poco::JSON::Object  Msg;
-			Msg.set("notification", Payload);
+			Msg.set("notification",Payload);
 			std::ostringstream OO;
 			Msg.stringify(OO);
 
@@ -79,59 +76,58 @@ namespace OpenWifi {
 		}
 
 		template <typename T> void SendNotification(const WebSocketNotification<T> &Notification) {
-			Poco::JSON::Object Payload;
+			Poco::JSON::Object  Payload;
 			Notification.to_json(Payload);
-			Poco::JSON::Object Msg;
+			Poco::JSON::Object  Msg;
-			Msg.set("notification", Payload);
+			Msg.set("notification",Payload);
 			std::ostringstream OO;
 			Msg.stringify(OO);
 			SendToAll(Notification.type_id, OO.str());
 		}
 
-		[[nodiscard]] bool SendToUser(const std::string &userName, std::uint64_t id,
+		[[nodiscard]] bool SendToUser(const std::string &userName, std::uint64_t id, const std::string &Payload);
-									  const std::string &Payload);
 		void SendToAll(std::uint64_t id, const std::string &Payload);
 
 		struct NotificationEntry {
-			std::uint64_t id = 0;
+			std::uint64_t 	id=0;
-			std::string helper;
+			std::string 	helper;
 		};
 
-		using ClientList = std::map<int, std::unique_ptr<UI_WebSocketClientInfo>>;
+        using ClientList = std::map<int,std::unique_ptr<UI_WebSocketClientInfo>>;
 		using NotificationTypeIdVec = std::vector<NotificationEntry>;
 
-		void RegisterNotifications(const NotificationTypeIdVec &Notifications);
+		void RegisterNotifications(const NotificationTypeIdVec & Notifications);
 		bool IsFiltered(std::uint64_t id, const UI_WebSocketClientInfo &Client);
 
-	  private:
+    private:
-		volatile bool Running_ = false;
+		volatile bool 								Running_ = false;
-		std::atomic_uint64_t UsersConnected_ = 0;
+		std::atomic_uint64_t 						UsersConnected_=0;
-		Poco::Net::SocketReactor Reactor_;
+		Poco::Net::SocketReactor					Reactor_;
-		Poco::Thread ReactorThread_;
+		Poco::Thread								ReactorThread_;
-		Poco::Thread CleanerThread_;
+		Poco::Thread								CleanerThread_;
-		std::recursive_mutex LocalMutex_;
+        std::recursive_mutex                        LocalMutex_;
-		bool GeoCodeEnabled_ = false;
+		bool 										GeoCodeEnabled_ = false;
-		std::string GoogleApiKey_;
+		std::string 								GoogleApiKey_;
-		ClientList Clients_;
+        ClientList    								Clients_;
-		UI_WebSocketClientProcessor *Processor_ = nullptr;
+		UI_WebSocketClientProcessor                 *Processor_ = nullptr;
-		NotificationTypeIdVec NotificationTypes_;
+		NotificationTypeIdVec						NotificationTypes_;
-		Poco::JSON::Object NotificationTypesJSON_;
+		Poco::JSON::Object							NotificationTypesJSON_;
-		std::vector<ClientList::iterator> ToBeRemoved_;
+		std::vector<ClientList::iterator>			ToBeRemoved_;
-		std::uint64_t TID_ = 0;
+        std::uint64_t                               TID_=0;
 
 		UI_WebSocketClientServer() noexcept;
-		void EndConnection(ClientList::iterator Client);
+        void EndConnection(ClientList::iterator Client);
 
-		void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
+        void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
-		void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf);
+        void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf);
-		void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf);
+        void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf);
 
-		ClientList::iterator FindWSClient(std::lock_guard<std::recursive_mutex> &G,
+        ClientList::iterator FindWSClient( std::lock_guard<std::recursive_mutex> &G, int ClientSocket);
-										  int ClientSocket);
 
 		void SortNotifications();
 	};
 
 	inline auto UI_WebSocketClientServer() { return UI_WebSocketClientServer::instance(); }
 
-}; // namespace OpenWifi
+};
+

src/framework/WebSocketLogger.h

@@ -5,64 +5,61 @@
 #pragma once
 
 #include "framework/SubSystemServer.h"
-#include "framework/UI_WebSocketClientNotifications.h"
 #include "framework/UI_WebSocketClientServer.h"
+#include "framework/UI_WebSocketClientNotifications.h"
+
 
 namespace OpenWifi {
 
 	class WebSocketLogger : public Poco::Channel {
 	  public:
-		WebSocketLogger() {}
 
-		~WebSocketLogger() {}
+		WebSocketLogger() {
+		}
 
-		std::string getProperty([[maybe_unused]] const std::string &p) const {
+		~WebSocketLogger() {
+		}
+
+		std::string getProperty( [[maybe_unused]] const std::string &p ) const {
 			std::cout << "WS getProperty" << std::endl;
 			return "";
 		}
 
-		void close() final {}
+		void close() final {
+		}
 
-		void open() final {}
+		void open() final {
+		}
 
 		static std::string to_string(Poco::Message::Priority p) {
-			switch (p) {
+			switch(p) {
-			case Poco::Message::PRIO_INFORMATION:
+			case Poco::Message::PRIO_INFORMATION: return "information";
-				return "information";
+			case Poco::Message::PRIO_CRITICAL: return "critical";
-			case Poco::Message::PRIO_CRITICAL:
+			case Poco::Message::PRIO_DEBUG: return "debug";
-				return "critical";
+			case Poco::Message::PRIO_ERROR: return "error";
-			case Poco::Message::PRIO_DEBUG:
+			case Poco::Message::PRIO_FATAL: return "fatal";
-				return "debug";
+			case Poco::Message::PRIO_NOTICE: return "notice";
-			case Poco::Message::PRIO_ERROR:
+			case Poco::Message::PRIO_TRACE: return "trace";
-				return "error";
+			case Poco::Message::PRIO_WARNING: return "warning";
-			case Poco::Message::PRIO_FATAL:
+			default: return "none";
-				return "fatal";
-			case Poco::Message::PRIO_NOTICE:
-				return "notice";
-			case Poco::Message::PRIO_TRACE:
-				return "trace";
-			case Poco::Message::PRIO_WARNING:
-				return "warning";
-			default:
-				return "none";
 			}
 		}
 
 		struct NotificationLogMessage {
-			std::string msg;
+			std::string 		msg;
-			std::string level;
+			std::string 		level;
-			std::uint64_t timestamp;
+			std::uint64_t 		timestamp;
-			std::string source;
+			std::string 		source;
-			std::string thread_name;
+			std::string 		thread_name;
-			std::uint64_t thread_id = 0;
+			std::uint64_t 		thread_id=0;
 
 			inline void to_json(Poco::JSON::Object &Obj) const {
-				RESTAPI_utils::field_to_json(Obj, "msg", msg);
+				RESTAPI_utils::field_to_json(Obj,"msg", msg);
-				RESTAPI_utils::field_to_json(Obj, "level", level);
+				RESTAPI_utils::field_to_json(Obj,"level", level);
-				RESTAPI_utils::field_to_json(Obj, "timestamp", timestamp);
+				RESTAPI_utils::field_to_json(Obj,"timestamp", timestamp);
-				RESTAPI_utils::field_to_json(Obj, "source", source);
+				RESTAPI_utils::field_to_json(Obj,"source", source);
-				RESTAPI_utils::field_to_json(Obj, "thread_name", thread_name);
+				RESTAPI_utils::field_to_json(Obj,"thread_name", thread_name);
-				RESTAPI_utils::field_to_json(Obj, "thread_id", thread_id);
+				RESTAPI_utils::field_to_json(Obj,"thread_id", thread_id);
 			}
 
 			inline bool from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -74,18 +71,18 @@ namespace OpenWifi {
 					RESTAPI_utils::field_from_json(Obj, "thread_name", thread_name);
 					RESTAPI_utils::field_from_json(Obj, "thread_id", thread_id);
 					return true;
-				} catch (...) {
+				} catch(...) {
+
 				}
 				return false;
 			}
 		};
 
-		typedef WebSocketNotification<NotificationLogMessage>
+		typedef WebSocketNotification<NotificationLogMessage> WebSocketClientNotificationLogMessage_t;
-			WebSocketClientNotificationLogMessage_t;
 
 		void log(const Poco::Message &m) final {
-			if (UI_WebSocketClientServer()->IsAnyoneConnected()) {
+			if(UI_WebSocketClientServer()->IsAnyoneConnected()) {
-				WebSocketClientNotificationLogMessage_t Msg;
+				WebSocketClientNotificationLogMessage_t		Msg;
 				Msg.content.msg = m.getText();
 				Msg.content.level = WebSocketLogger::to_string(m.getPriority());
 				Msg.content.timestamp = m.getTime().epochTime();
@@ -97,15 +94,14 @@ namespace OpenWifi {
 			}
 		}
 
-		void setProperty([[maybe_unused]] const std::string &name,
+		void setProperty([[maybe_unused]] const std::string &name, [[maybe_unused]] const std::string &value) {
-						 [[maybe_unused]] const std::string &value) {
 			std::cout << "WS setProperty" << std::endl;
 		}
 
 	  private:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex	Mutex_;
 	};
 
-	//	inline auto WebSocketLogger() { return WebSocketLogger::instance(); }
+//	inline auto WebSocketLogger() { return WebSocketLogger::instance(); }
 
-} // namespace OpenWifi
+}

src/framework/default_device_types.h

@@ -1,63 +0,0 @@
-//
-// Created by stephane bourque on 2023-04-19.
-//
-
-#pragma once
-
-#include <vector>
-#include <string>
-
-namespace OpenWifi {
-	inline  const std::vector<std::pair<std::string, std::string>> DefaultDeviceTypeList{
-		{"actiontec_web7200", "AP"},
-		{"cig_wf186w", "AP"},
-		{"cig_wf188n", "AP"},
-		{"cig_wf194c4", "AP"},
-		{"cig_wf196", "AP"},
-		{"cig_wf196-ca", "AP"},
-		{"cig_wf196-ca-ath12", "AP"},
-		{"cig_wf196-us", "AP"},
-		{"cig_wf610d", "AP"},
-		{"cig_wf660a", "AP"},
-		{"cig_wf808", "AP"},
-		{"cybertan_eww622-a1", "AP"},
-		{"edgecore_eap101", "AP"},
-		{"edgecore_eap101-ath12", "AP"},
-		{"edgecore_eap102", "AP"},
-		{"edgecore_eap104", "AP"},
-		{"edgecore_eap104-ath12", "AP"},
-		{"edgecore_ecs4100-12ph", "AP"},
-		{"edgecore_ecw5211", "AP"},
-		{"edgecore_ecw5410", "AP"},
-		{"edgecore_oap100", "AP"},
-		{"edgecore_spw2ac1200", "SWITCH"},
-		{"edgecore_spw2ac1200-lan-poe", "SWITCH"},
-		{"edgecore_ssw2ac2600", "SWITCH"},
-		{"hfcl_ion4", "AP"},
-		{"hfcl_ion4x", "AP"},
-		{"hfcl_ion4x_2", "AP"},
-		{"hfcl_ion4xe", "AP"},
-		{"hfcl_ion4xi", "AP"},
-		{"indio_um-305ac", "AP"},
-		{"indio_um-305ax", "AP"},
-		{"indio_um-310ax-v1", "AP"},
-		{"indio_um-325ac", "AP"},
-		{"indio_um-510ac-v3", "AP"},
-		{"indio_um-510axm-v1", "AP"},
-		{"indio_um-510axp-v1", "AP"},
-		{"indio_um-550ac", "AP"},
-		{"linksys_e8450-ubi", "AP"},
-		{"linksys_ea6350-v4", "AP"},
-		{"linksys_ea8300", "AP"},
-		{"liteon_wpx8324", "AP"},
-		{"meshpp_s618_cp01", "AP"},
-		{"meshpp_s618_cp03", "AP"},
-		{"udaya_a5-id2", "AP"},
-		{"wallys_dr40x9", "AP"},
-		{"wallys_dr6018", "AP"},
-		{"wallys_dr6018_v4", "AP"},
-		{"x64_vm", "AP"},
-		{"yuncore_ax840", "AP"},
-		{"yuncore_fap640", "AP"},
-		{"yuncore_fap650", "AP"}};
-}

src/framework/utils.h

@@ -4,144 +4,145 @@
 
 #pragma once
 
+#include <string>
 #include <fstream>
-#include <iomanip>
 #include <iostream>
+#include <iomanip>
 #include <random>
 #include <regex>
-#include <shared_mutex>
-#include <string>
 #include <thread>
+#include <shared_mutex>
 
-#include <dirent.h>
+#include "Poco/Thread.h"
-
+#include "Poco/StringTokenizer.h"
+#include "Poco/String.h"
+#include "Poco/SHA2Engine.h"
+#include "Poco/Message.h"
+#include "Poco/StreamCopier.h"
+#include "Poco/File.h"
+#include "Poco/Net/NetworkInterface.h"
+#include "Poco/URI.h"
+#include "Poco/Net/HTTPRequest.h"
+#include "Poco/Net/HTTPClientSession.h"
+#include "Poco/Net/HTTPSClientSession.h"
+#include "Poco/Net/HTTPResponse.h"
 #include "Poco/Base64Decoder.h"
 #include "Poco/Base64Encoder.h"
-#include "Poco/File.h"
-#include "Poco/Message.h"
-#include "Poco/Net/HTTPClientSession.h"
-#include "Poco/Net/HTTPRequest.h"
-#include "Poco/Net/HTTPResponse.h"
-#include "Poco/Net/HTTPSClientSession.h"
-#include "Poco/Net/NetworkInterface.h"
-#include "Poco/SHA2Engine.h"
-#include "Poco/StreamCopier.h"
-#include "Poco/String.h"
-#include "Poco/StringTokenizer.h"
-#include "Poco/Thread.h"
-#include "Poco/URI.h"
 #include "Poco/zlib.h"
 
-#include "framework/OpenWifiTypes.h"
 #include "framework/ow_constants.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi::Utils {
 
 	inline uint64_t Now() { return std::time(nullptr); };
 
-	bool NormalizeMac(std::string &Mac);
+	bool NormalizeMac(std::string & Mac);
 
 	inline void SetThreadName(const char *name) {
-#ifdef __linux__
+	#ifdef __linux__
 		Poco::Thread::current()->setName(name);
 		pthread_setname_np(pthread_self(), name);
-#endif
+	#endif
-#ifdef __APPLE__
+	#ifdef __APPLE__
 		Poco::Thread::current()->setName(name);
 		pthread_setname_np(name);
-#endif
+	#endif
 	}
 
 	inline void SetThreadName(Poco::Thread &thr, const char *name) {
-#ifdef __linux__
+	#ifdef __linux__
 		thr.setName(name);
 		pthread_setname_np(thr.tid(), name);
-#endif
+	#endif
-#ifdef __APPLE__
+	#ifdef __APPLE__
 		thr.setName(name);
-#endif
+	#endif
 	}
 
-	enum MediaTypeEncodings { PLAIN, BINARY, BASE64 };
+	enum MediaTypeEncodings {
+		PLAIN,
+		BINARY,
+		BASE64
+	};
 
 	struct MediaTypeEncoding {
-		MediaTypeEncodings Encoding = PLAIN;
+		MediaTypeEncodings  Encoding=PLAIN;
-		std::string ContentType;
+		std::string         ContentType;
 	};
 
 	[[nodiscard]] bool ValidSerialNumber(const std::string &Serial);
-	[[nodiscard]] bool ValidSerialNumbers(const std::vector<std::string> &Serial);
 	[[nodiscard]] bool ValidUUID(const std::string &UUID);
-	[[nodiscard]] bool ValidHostname(const std::string &hostname);
+    [[nodiscard]] bool ValidHostname(const std::string &hostname);
-	[[nodiscard]] bool ValidNumber(const std::string &number, bool isSigned);
 
-	template <typename... Args> std::string ComputeHash(Args &&...args) {
+	template <typename ...Args> std::string ComputeHash(Args&&... args) {
-		Poco::SHA2Engine E;
+		Poco::SHA2Engine    E;
 		auto as_string = [](auto p) {
-			if constexpr (std::is_arithmetic_v<decltype(p)>) {
+			if constexpr(std::is_arithmetic_v<decltype(p)>) {
 				return std::to_string(p);
 			} else {
 				return p;
 			}
 		};
-		(E.update(as_string(args)), ...);
+		(E.update(as_string(args)),...);
 		return Poco::SHA2Engine::digestToHex(E.digest());
 	}
 
-	[[nodiscard]] std::vector<std::string> Split(const std::string &List, char Delimiter = ',');
+	[[nodiscard]] std::vector<std::string> Split(const std::string &List, char Delimiter=',' );
-	[[nodiscard]] std::string FormatIPv6(const std::string &I);
+	[[nodiscard]] std::string FormatIPv6(const std::string & I );
-	void padTo(std::string &str, size_t num, char paddingChar = '\0');
+	void padTo(std::string& str, size_t num, char paddingChar = '\0');
 	[[nodiscard]] std::string SerialToMAC(const std::string &Serial);
 	uint64_t MACToInt(const std::string &MAC);
-	[[nodiscard]] std::string ToHex(const std::vector<unsigned char> &B);
+	[[nodiscard]] std::string ToHex(const std::vector<unsigned char> & B);
 
 	using byte = std::uint8_t;
 
 	[[nodiscard]] std::string base64encode(const byte *input, uint32_t size);
-	[[nodiscard]] std::vector<byte> base64decode(const std::string &input);
+	[[nodiscard]] std::vector<byte> base64decode(const std::string& input);;
-	;
+	bool ParseTime(const std::string &Time, int & Hours, int & Minutes, int & Seconds);
-	bool ParseTime(const std::string &Time, int &Hours, int &Minutes, int &Seconds);
+	bool ParseDate(const std::string &Time, int & Year, int & Month, int & Day);
-	bool ParseDate(const std::string &Time, int &Year, int &Month, int &Day);
+	bool CompareTime( int H1, int H2, int M1, int M2, int S1, int S2);
-	bool CompareTime(int H1, int H2, int M1, int M2, int S1, int S2);
 	[[nodiscard]] std::string LogLevelToString(int Level);
-	[[nodiscard]] uint64_t SerialNumberToInt(const std::string &S);
+	[[nodiscard]] uint64_t SerialNumberToInt(const std::string & S);
 	[[nodiscard]] std::string IntToSerialNumber(uint64_t S);
-	[[nodiscard]] bool SerialNumberMatch(const std::string &S1, const std::string &S2,
+	[[nodiscard]] bool SerialNumberMatch(const std::string &S1, const std::string &S2, int Bits=2);
-										 int Bits = 2);
+	[[nodiscard]] uint64_t SerialNumberToOUI(const std::string & S);
-	[[nodiscard]] uint64_t SerialNumberToOUI(const std::string &S);
 	[[nodiscard]] uint64_t GetDefaultMacAsInt64();
 	[[nodiscard]] uint64_t InitializeSystemId();
 	[[nodiscard]] uint64_t GetSystemId();
 	[[nodiscard]] bool ValidEMailAddress(const std::string &email);
-	[[nodiscard]] std::string LoadFile(const Poco::File &F);
+	[[nodiscard]] std::string LoadFile( const Poco::File & F);
-	void ReplaceVariables(std::string &Content, const Types::StringPairVec &P);
+	void ReplaceVariables( std::string & Content , const Types::StringPairVec & P);
 	[[nodiscard]] MediaTypeEncoding FindMediaType(const Poco::File &F);
 	[[nodiscard]] std::string BinaryFileToHexString(const Poco::File &F);
 	[[nodiscard]] std::string SecondsToNiceText(uint64_t Seconds);
 	[[nodiscard]] bool wgets(const std::string &URL, std::string &Response);
 	[[nodiscard]] bool wgetfile(const Poco::URI &uri, const std::string &FileName);
 	[[nodiscard]] bool IsAlphaNumeric(const std::string &s);
-	[[nodiscard]] std::string SanitizeToken(const std::string &Token);
+    [[nodiscard]] std::string SanitizeToken(const std::string &Token);
 	[[nodiscard]] bool ValidateURI(const std::string &uri);
 
-	[[nodiscard]] std::uint64_t ConvertDate(const std::string &d);
+    [[nodiscard]] std::uint64_t ConvertDate(const std::string &d);
 
-	template <typename T> std::string int_to_hex(T i) {
+	template< typename T >
+	std::string int_to_hex( T i )
+	{
 		std::stringstream stream;
-		stream << std::setfill('0') << std::setw(12) << std::hex << i;
+		stream << std::setfill ('0') << std::setw(12)
+			   << std::hex << i;
 		return stream.str();
 	}
 
-	inline bool SpinLock_Read(std::shared_mutex &M, volatile bool &Flag, uint64_t wait_ms = 100) {
+	inline bool SpinLock_Read(std::shared_mutex &M, volatile bool &Flag, uint64_t wait_ms=100) {
-		while (!M.try_lock_shared() && Flag) {
+		while(!M.try_lock_shared() && Flag) {
 			Poco::Thread::yield();
 			Poco::Thread::trySleep((long)wait_ms);
 		}
 		return Flag;
 	}
 
-	inline bool SpinLock_Write(std::shared_mutex &M, volatile bool &Flag, uint64_t wait_ms = 100) {
+	inline bool SpinLock_Write(std::shared_mutex &M, volatile bool &Flag, uint64_t wait_ms=100) {
-		while (!M.try_lock() && Flag) {
+		while(!M.try_lock() && Flag) {
 			Poco::Thread::yield();
 			Poco::Thread::trySleep(wait_ms);
 		}
@@ -149,102 +150,5 @@ namespace OpenWifi::Utils {
 	}
 
 	bool ExtractBase64CompressedData(const std::string &CompressedData,
-									 std::string &UnCompressedData, uint64_t compress_sz);
+											std::string &UnCompressedData, uint64_t compress_sz );
-
+}
-	inline bool match(const char* first, const char* second)
-	{
-		// If we reach at the end of both strings, we are done
-		if (*first == '\0' && *second == '\0')
-			return true;
-
-		// Make sure to eliminate consecutive '*'
-		if (*first == '*') {
-			while (*(first + 1) == '*')
-				first++;
-		}
-
-		// Make sure that the characters after '*' are present
-		// in second string. This function assumes that the
-		// first string will not contain two consecutive '*'
-		if (*first == '*' && *(first + 1) != '\0'
-			&& *second == '\0')
-			return false;
-
-		// If the first string contains '?', or current
-		// characters of both strings match
-		if (*first == '?' || *first == *second)
-			return match(first + 1, second + 1);
-
-		// If there is *, then there are two possibilities
-		// a) We consider current character of second string
-		// b) We ignore current character of second string.
-		if (*first == '*')
-			return match(first + 1, second)
-				   || match(first, second + 1);
-		return false;
-	}
-
-	static inline std::uint64_t GetValue(FILE *file) {
-		unsigned long v=0;
-		char factor[32];
-		if(fscanf(file, " %lu %31s", &v, factor)==2) {
-			switch (factor[0]) {
-			case 'k':
-				return v * 1000;
-			case 'M':
-				return v * 1000000;
-			case 'G':
-				return v * 1000000000;
-			}
-		}
-		return v;
-	}
-
-	inline bool getMemory(
-		std::uint64_t &currRealMem, std::uint64_t &peakRealMem,
-		std::uint64_t &currVirtMem, std::uint64_t &peakVirtMem) {
-
-		// stores each word in status file
-		char buffer[1024] = "";
-
-		currRealMem = peakRealMem = currVirtMem = peakVirtMem = 0;
-
-		// linux file contains this-process info
-		FILE * file = std::fopen("/proc/self/status", "r");
-		if (file == nullptr) {
-			return false;
-		}
-
-		// read the entire file, recording mems in kB
-		while (fscanf(file, " %1023s", buffer) == 1) {
-
-			if (strcmp(buffer, "VmRSS:") == 0) {
-				currRealMem= GetValue(file);
-			} else if (strcmp(buffer, "VmHWM:") == 0) {
-				peakRealMem= GetValue(file);
-			} else if (strcmp(buffer, "VmSize:") == 0) {
-				currVirtMem= GetValue(file);
-			} else if (strcmp(buffer, "VmPeak:") == 0) {
-				peakVirtMem= GetValue(file);
-			}
-		}
-		fclose(file);
-
-		return true;
-	}
-
-	inline int get_open_fds() {
-		DIR *dp = opendir("/proc/self/fd");
-		struct dirent *de;
-		int count = -3; // '.', '..', dp
-
-		if (dp == nullptr)
-			return -1;
-		while ((de = readdir(dp)) != nullptr)
-			count++;
-		(void)closedir(dp);
-
-		return count;
-	}
-
-} // namespace OpenWifi::Utils

src/storage/storage_venue.cpp

@@ -112,31 +112,6 @@ namespace OpenWifi {
 		return true;
 	}
 
-    bool VenueDB::DoesVenueNameAlreadyExist(const std::string &name, const std::string &entity_uuid, const std::string &parent_uuid) {
-
-        std::string Statement;
-        if(!entity_uuid.empty()) {
-            Statement = fmt::format("select count(*) from venues where entity='{}' and upper(name)='{}'",
-                                    entity_uuid, Poco::toUpper(name));
-        } else {
-            Statement = fmt::format("select count(*) from venues where parent='{}' and upper(name)='{}'",
-                                    parent_uuid, Poco::toUpper(name));
-        }
-
-        std::uint64_t RecordCount = 0;
-        try {
-            Poco::Data::Session Session = Pool_.get();
-            Poco::Data::Statement Command(Session);
-
-            Command << Statement,
-                    Poco::Data::Keywords::into(RecordCount);
-            Command.execute();
-        } catch (...) {
-
-        }
-        return RecordCount!=0;
-    }
-
 } // namespace OpenWifi
 
 template <>

src/storage/storage_venue.h

@@ -26,7 +26,6 @@ namespace OpenWifi {
 		bool GetByIP(const std::string &IP, std::string &uuid);
 		bool Upgrade(uint32_t from, uint32_t &to) override;
 		bool EvaluateDeviceRules(const std::string &id, ProvObjects::DeviceRules &Rules);
-        bool DoesVenueNameAlreadyExist(const std::string &name, const std::string &entity_uuid, const std::string &parent_uuid);
 
 	  private:
 	};