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

[WIFI-10842] Add: docker-compose support for iptocountry

.clang-format

@@ -4,4 +4,4 @@ TabWidth:     4
 IndentWidth:  4
 UseTab:       Always
 ColumnLimit:  100
-Language:     Cpp
+Language:     Cpp

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -58,10 +58,10 @@ jobs:
     - name: Get base branch name and set as output
       id: get_base_branch
       run: |
-        echo "branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/master/main/g')" >> $GITHUB_OUTPUT
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/master/main/g')
 
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -85,7 +85,7 @@ jobs:
       - docker
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github

.github/workflows/enforce-jira-issue-key.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout actions repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: Telecominfraproject/.github
           path: github

.github/workflows/openapi-pages.yml

@@ -1,41 +0,0 @@
-name: Update OpenAPI docs on GitHub Pages
-
-on:
-  push:
-    paths:
-      - 'openapi/**'
-    branches:
-      - master
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  docsgen:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Generate static HTML page with docs from OpenAPI definition
-        run: |
-          docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli:v6.2.1 generate -i https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentralgw/master/openapi/owgw.yaml -g html2 --skip-validate-spec -o /local/
-
-      - name: Update OpenAPI docs
-        run: |
-          mkdir tmp-docs
-          mv index.html tmp-docs/index.html
-          mkdir -p ~/.ssh
-          ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-          echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials
-          git config --global credential.helper store
-          git config --global user.email "tip-automation@telecominfraproject.com"
-          git config --global user.name "TIP Automation User"
-          git pull
-          git checkout gh-pages || git checkout -b gh-pages
-          rm -rf docs
-          mv tmp-docs docs
-          git add docs
-          git commit -m'Update OpenAPI docs for GitHub pages'
-          git push --set-upstream origin gh-pages

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       HELM_REPO_USERNAME: ucentral
     steps:
       - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           path: wlan-cloud-ucentralgw
 

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owgw VERSION 2.8.0)
+project(owgw VERSION 2.6.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -30,26 +30,19 @@ else()
     file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
 endif()
 
-if(ASAN)
-    add_compile_options(-fsanitize=address)
-    add_link_options(-fsanitize=address)
-    add_compile_options(-fsanitize=undefined)
-    add_link_options(-fsanitize=undefined)
-endif()
-
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             RESULT_VARIABLE GIT_RESULT
             OUTPUT_VARIABLE GIT_HASH)
     if(NOT GIT_RESULT EQUAL "0")
-        message(FATAL_ERROR "git rev-parse --short HEAD failed with ${GIT_RESULT}")
+        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
     endif()
     string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
 endif()
 
-add_definitions(-DTIP_GATEWAY_SERVICE="1" -DPOCO_LOG_DEBUG="1")
+add_definitions(-DTIP_GATEWAY_SERVICE="1")
 
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
@@ -71,6 +64,12 @@ include_directories(/usr/local/include  /usr/local/opt/openssl/include src inclu
 configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
 
 add_compile_options(-Wall -Wextra)
+if(ASAN)
+    add_compile_options(-fsanitize=address)
+    add_link_options(-fsanitize=address)
+    add_compile_options(-fsanitize=undefined)
+    add_link_options(-fsanitize=undefined)
+endif()
 
 add_executable( owgw
         build
@@ -81,54 +80,10 @@ add_executable( owgw
         src/framework/OpenWifiTypes.h
         src/framework/orm.h
         src/framework/StorageClass.h
-        src/framework/MicroServiceErrorHandler.h
-        src/framework/UI_WebSocketClientServer.cpp
-        src/framework/UI_WebSocketClientServer.h
-        src/framework/UI_WebSocketClientNotifications.cpp
-        src/framework/UI_WebSocketClientNotifications.h
-        src/framework/utils.h
-        src/framework/utils.cpp
-        src/framework/AppServiceRegistry.h
-        src/framework/SubSystemServer.cpp
-        src/framework/SubSystemServer.h
-        src/framework/RESTAPI_utils.h
-        src/framework/AuthClient.cpp
-        src/framework/AuthClient.h
-        src/framework/MicroServiceNames.h
-        src/framework/MicroServiceFuncs.h
-        src/framework/OpenAPIRequests.cpp
-        src/framework/OpenAPIRequests.h
-        src/framework/MicroServiceFuncs.cpp
-        src/framework/ALBserver.cpp
-        src/framework/ALBserver.h
-        src/framework/KafkaManager.cpp
-        src/framework/KafkaManager.h
-        src/framework/RESTAPI_RateLimiter.h
-        src/framework/WebSocketLogger.h
-        src/framework/RESTAPI_GenericServerAccounting.h
-        src/framework/CIDR.h
-        src/framework/RESTAPI_Handler.cpp
-        src/framework/RESTAPI_Handler.h
-        src/framework/RESTAPI_ExtServer.h
-        src/framework/RESTAPI_ExtServer.cpp
-        src/framework/RESTAPI_IntServer.cpp
-        src/framework/RESTAPI_IntServer.h
-        src/framework/RESTAPI_SystemCommand.h
-        src/framework/RESTAPI_WebSocketServer.h
-        src/framework/RESTAPI_SystemConfiguration.h
-        src/framework/EventBusManager.cpp
-        src/framework/EventBusManager.h
-        src/framework/RESTAPI_PartHandler.h
-        src/framework/MicroService.cpp
-        src/framework/MicroServiceExtra.h
         src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
+        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
         src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
         src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTObjects/RESTAPI_CertObjects.cpp src/RESTObjects/RESTAPI_CertObjects.h
-        src/RESTObjects/RESTAPI_OWLSobjects.cpp src/RESTObjects/RESTAPI_OWLSobjects.h
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_AnalyticsObjects.cpp src/RESTObjects/RESTAPI_AnalyticsObjects.h
-        src/RESTObjects/RESTAPI_SubObjects.cpp src/RESTObjects/RESTAPI_SubObjects.h
         src/RESTAPI/RESTAPI_devices_handler.cpp src/RESTAPI/RESTAPI_devices_handler.h
         src/RESTAPI/RESTAPI_device_handler.cpp src/RESTAPI/RESTAPI_device_handler.h
         src/RESTAPI/RESTAPI_device_commandHandler.cpp src/RESTAPI/RESTAPI_device_commandHandler.h
@@ -150,8 +105,9 @@ add_executable( owgw
         src/storage/storage_tables.cpp
         src/RESTAPI/RESTAPI_routers.cpp
         src/Daemon.cpp src/Daemon.h
-        src/AP_WS_Server.cpp src/AP_WS_Server.h
+        src/WS_Server.cpp src/WS_Server.h
         src/StorageService.cpp src/StorageService.h
+        src/DeviceRegistry.cpp src/DeviceRegistry.h
         src/CommandManager.cpp src/CommandManager.h
         src/CentralConfig.cpp src/CentralConfig.h
         src/FileUploader.cpp src/FileUploader.h
@@ -162,40 +118,7 @@ add_executable( owgw
         src/TelemetryStream.cpp src/TelemetryStream.h
         src/framework/ConfigurationValidator.cpp src/framework/ConfigurationValidator.h
         src/ConfigurationCache.h
-        src/CapabilitiesCache.h src/FindCountry.h
-        src/rttys/RTTYS_server.cpp
-        src/rttys/RTTYS_server.h
-        src/rttys/RTTYS_WebServer.cpp
-        src/rttys/RTTYS_WebServer.h src/RESTAPI/RESTAPI_device_helper.h
-        src/SDKcalls.cpp
-        src/SDKcalls.h
-        src/StateUtils.cpp src/StateUtils.h
-        src/AP_WS_ReactorPool.h
-        src/AP_WS_Connection.h
-        src/AP_WS_Connection.cpp
-        src/TelemetryClient.h src/TelemetryClient.cpp
-        src/RESTAPI/RESTAPI_iptocountry_handler.cpp src/RESTAPI/RESTAPI_iptocountry_handler.h
-        src/framework/ow_constants.h
-        src/GwWebSocketClient.cpp src/GwWebSocketClient.h
-        src/RADIUS_proxy_server.cpp src/RADIUS_proxy_server.h
-        src/RESTAPI/RESTAPI_radiusProxyConfig_handler.cpp src/RESTAPI/RESTAPI_radiusProxyConfig_handler.h
-        src/ParseWifiScan.h
-        src/RADIUS_helpers.h
-        src/VenueBroadcaster.h
-        src/sdks/sdk_prov.h
-        src/AP_WS_Process_connect.cpp
-        src/AP_WS_Process_state.cpp
-        src/AP_WS_Process_healthcheck.cpp
-        src/AP_WS_Process_log.cpp
-        src/AP_WS_Process_crashlog.cpp
-        src/AP_WS_Process_ping.cpp
-        src/AP_WS_Process_cfgpending.cpp
-        src/AP_WS_Process_recovery.cpp
-        src/AP_WS_Process_deviceupdate.cpp
-        src/AP_WS_Process_telemetry.cpp
-        src/AP_WS_Process_venuebroadcast.cpp
-        src/RADSEC_server.h
-        src/UI_GW_WebSocketNotifications.cpp src/UI_GW_WebSocketNotifications.h src/framework/RESTAPI_SystemConfiguration.h src/ScriptManager.cpp src/ScriptManager.h src/RESTAPI/RESTAPI_scripts_handler.cpp src/RESTAPI/RESTAPI_scripts_handler.h src/RESTAPI/RESTAPI_script_handler.cpp src/RESTAPI/RESTAPI_script_handler.h src/storage/storage_scripts.cpp src/storage/storage_scripts.h src/SignatureMgr.cpp src/SignatureMgr.h)
+        src/CapabilitiesCache.h src/FindCountry.h src/rttys/RTTYS_server.cpp src/rttys/RTTYS_server.h src/rttys/RTTYS_device.cpp src/rttys/RTTYS_device.h src/rttys/RTTYS_ClientConnection.cpp src/rttys/RTTYS_ClientConnection.h src/rttys/RTTYS_WebServer.cpp src/rttys/RTTYS_WebServer.h src/RESTAPI/RESTAPI_device_helper.h src/SDKcalls.cpp src/SDKcalls.h src/StateUtils.cpp src/StateUtils.h src/WS_ReactorPool.h src/WS_Connection.h src/WS_Connection.cpp src/TelemetryClient.h src/TelemetryClient.cpp src/RESTAPI/RESTAPI_iptocountry_handler.cpp src/RESTAPI/RESTAPI_iptocountry_handler.h src/framework/ow_constants.h src/GwWebSocketClient.cpp src/GwWebSocketClient.h src/framework/WebSocketClientNotifications.h src/RADIUS_proxy_server.cpp src/RADIUS_proxy_server.h src/RESTAPI/RESTAPI_radiusProxyConfig_handler.cpp src/RESTAPI/RESTAPI_radiusProxyConfig_handler.h src/ParseWifiScan.h src/RADIUS_helpers.h src/VenueBroadcaster.h src/sdks/sdk_prov.h)
 
 if(NOT SMALL_BUILD)
 
@@ -219,4 +142,4 @@ if(NOT SMALL_BUILD)
     if(UNIX AND NOT APPLE)
         target_link_libraries(owgw PUBLIC PocoJSON)
     endif()
-endif()
+endif()

Dockerfile

@@ -1,22 +1,15 @@
-ARG DEBIAN_VERSION=11.5-slim
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
-ARG JSON_VALIDATOR_VERSION=2.1.0
+FROM alpine:3.15 AS build-base
 
-FROM debian:$DEBIAN_VERSION AS build-base
-
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apk add --update --no-cache \
     make cmake g++ git \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
-    librdkafka-dev libboost-all-dev libssl-dev \
-    zlib1g-dev nlohmann-json3-dev ca-certificates libfmt-dev
+    unixodbc-dev postgresql-dev mariadb-dev \
+    librdkafka-dev boost-dev openssl-dev \
+    zlib-dev nlohmann-json
 
 FROM build-base AS poco-build
 
-ARG POCO_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
+ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
+RUN git clone https://github.com/stephb9959/poco /poco
 
 WORKDIR /poco
 RUN mkdir cmake-build
@@ -25,12 +18,22 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
+FROM build-base AS fmtlib-build
+
+ADD https://api.github.com/repos/fmtlib/fmt/git/refs/heads/master version.json
+RUN git clone https://github.com/fmtlib/fmt /fmtlib
+
+WORKDIR /fmtlib
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN make
+RUN make install
+
 FROM build-base AS cppkafka-build
 
-ARG CPPKAFKA_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
+ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -41,10 +44,8 @@ RUN cmake --build . --target install
 
 FROM build-base AS json-schema-validator-build
 
-ARG JSON_VALIDATOR_VERSION
-
-ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/tags/${JSON_VALIDATOR_VERSION} version.json
-RUN git clone https://github.com/pboettch/json-schema-validator --branch ${JSON_VALIDATOR_VERSION} /json-schema-validator
+ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/heads/master version.json
+RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
 
 WORKDIR /json-schema-validator
 RUN mkdir cmake-build
@@ -66,6 +67,8 @@ COPY --from=cppkafka-build /usr/local/include /usr/local/include
 COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
 COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
 COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
+COPY --from=fmtlib-build /usr/local/include /usr/local/include
+COPY --from=fmtlib-build /usr/local/lib /usr/local/lib
 
 WORKDIR /owgw
 RUN mkdir cmake-build
@@ -73,21 +76,21 @@ WORKDIR /owgw/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine:3.15
 
 ENV OWGW_USER=owgw \
     OWGW_ROOT=/owgw-data \
     OWGW_CONFIG=/owgw-data
 
-RUN useradd "$OWGW_USER"
+RUN addgroup -S "$OWGW_USER" && \
+    adduser -S -G "$OWGW_USER" "$OWGW_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWGW_ROOT" "$OWGW_CONFIG" && \
     chown "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
-    libmariadb-dev-compat libpq5 unixodbc postgresql-client libfmt7 sqlite3
+RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
+    mariadb-connector-c libpq unixodbc postgresql-client
 
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli
@@ -97,13 +100,11 @@ COPY docker-entrypoint.sh /
 COPY wait-for-postgres.sh /
 COPY rtty_ui /dist/rtty_ui
 RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
-    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.crt
+    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
 
 COPY --from=owgw-build /owgw/cmake-build/owgw /openwifi/owgw
 COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib /usr/local/lib/
-COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib/
-
-RUN ldconfig
+COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib
 
 EXPOSE 15002 16002 16003 17002 16102
 

MICRO_SERVICE_PROTOCOL.md

@@ -18,29 +18,17 @@ System messages are what maintains the collection of micro-services working on t
 }
 ```
 
-### Responsibilities
-Each micro service is responsible to generate its own messages and keep track of messages coming from other 
-micro services. This is necessary so that any micro service may reach our any other micro service. This provides 
-discovery for any micro service. All current micro services provided in OpenWiFi perform these functions. If you leverage 
-the C++ framework, this functionality if performed automatically.
-
 ### `event-type`
-Each micro service is responsible to generate and consume these events
-
-#### `join` event
-When a service start and joins the bus, it should generate an event-type of `join`. 
-
-### `leave` event
-When a service shuts down, it should generate a `leave` event-type. 
-
-### `keep-alive` event
-Every 30 seconds, a service should generate a `keep-alive` message.
-
+When a service joins the bus, it should generate an event-type of `join`. When a service shutdown, it should generate a `leave` event-type. Every 30 seconds, a service 
+should generate a `keep-alive` message.
 
 ### `id`
 You should generate a random number from some unique factor for the system. This ID is used to identify different services. You should reuse that ID 
 when you restart.
 
+## Micro-service maintaining bus state
+A micro-service should maintain its own lists of available micro-services by looking at the messages it receives and keep a list.
+
 ## The `type`
 The `type` in the system message is oen of the following:
 ```c++
@@ -59,11 +47,11 @@ The `type` in the system message is oen of the following:
 The `type` is what you should use to find the `privateEndPoint` you are looking to communicate with.
 
 ### Example
-Assume you want to communicate with the gateway to configure a device. 
+Assume you want to communicate with the gateway t pconfigure a device. 
 
 ```text
 1. Look into my list of current Micro-services for the type=owgw.
-2. Use the privateEndPoint associated with that entry
+2. Use the priovateEndPoint associated with that entry
 ```
 
 ## REST API calls on the private interface
@@ -84,9 +72,9 @@ This is the `publicEndPoint` you included in your `system-messages`.
 This method can _only_ be used to any another `privateEndPoint` in the system. You can use the exact same EndPoints provided in the OpenAPI files for any of the services.
 
 ## OpenAPI Integration
-To appear in the UI consoles, a microservice should be able to handle a get to the `/api/v1/system` endpoint on its `publicEndPoint` interface.
+To appear in the UI consoles, a micro-service should ne able to handle a get to the `/api/v1/system` endpoint on its `publicEndPoint` interface.
 
-Here is a brief description of what the microservice should answer:
+Here is a brief description of what the micro-service should answer:
 ```yaml
   /system:
     get:

OPENAPI.md

@@ -5,11 +5,6 @@ This document will describe how the API is built and how to use it.
 This uses OpenAPI definition 3.0 and can be found [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/owgw.yaml).
 All endpoints begin with `/api/v1`.
 
-## OpenAPI docs
-You may get static page with OpenAPI docs generated from the definition on [GitHub Page](https://telecominfraproject.github.io/wlan-cloud-ucentralgw).
-
-Also you may use [Swagger UI](https://petstore.swagger.io/#/) with OpenAPI definition file raw link (i.e. [latest version file](https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentralgw/master/openapi/owgw.yaml)) to get interactive docs page.
-
 ## The flow
 In order to use any of the API calls, you must obtain a token (I know - shocking). You do so by calling the end-point
 `/oauth2`. Once you obtain that `access-token`, you will need to pass it in the headers under `Authorization: Bearer <place your token here>`.

PROTOCOL.md

@@ -298,8 +298,7 @@ Controller sends this command when it believes the device should upgrade its fir
      "params" : {
 	        "serial" : <serial number> ,
 	        "when"  : Optional - <UTC time when to upgrade the firmware, 0 mean immediate, this is a suggestion>,
-		    "uri"   : <URI to download the firmware>,
-            "FWsignature" : <string representation of the signature for the FW> (optional)
+		    "uri"   : <URI to download the firmware>
      },
      "id" : <some number>
 }
@@ -319,13 +318,6 @@ The device should answer:
       "id" : <same number>
 }
 ```
-Here are the error values
-```text
-0:  No error
-1:  Bad firmware
-2:  Missing signature
-```
-
 
 #### Controller wants the device to perform a factory reset
 Controller sends this command when it believes the device should upgrade its firmware.
@@ -431,6 +423,44 @@ The device should answer:
 - 1 : device cannot flash LEDs because it does not have any.
 - 2 : device rejects the request. `text` should include information as to why.
 
+#### Controller sends a device specific command
+Controller sends this command specific to this device. The command is proprietary and must be agreed upon by the device 
+and the controller.
+```json
+{     "jsonrpc" : "2.0" , 
+      "method" : "perform" , 
+      "params" : {
+          "serial" : <serial number> ,
+          "when" : Optional - <UTC time when to perform this command, 0 mean immediate, this is a suggestion>,
+          "command" : <this is device specific and is TEXT only>,
+          "payload" : <JSON Document: containing additional information about the command>
+      },
+      "id" : <some number>
+}
+```
+
+The device should answer:
+```json
+{     "jsonrpc" : "2.0" , 
+      "result" : {
+          "serial" : <serial number> ,
+          "status" : {
+            "error" : 0 or an error number,
+            "text" : <description of the error or success>,
+            "when" : <in UTC time in seconds>,
+            "resultCode" : <0 or an appropriate error code>,
+            "resultText" : <any text resulting from the command. This is propietary to each command>
+          }
+      },
+      "id" : <same number>
+}
+```
+##### The device answer
+The device should answer with teh above message. The `error` value should be interpreted the following way:
+- 0 : the command was performed as requested and the reults of the command is available in the `resultCode` and `resultText` parameters.
+- 1 : the command will be performed in the future and `when` shows that time. The `resultCode` and `resultText` dod not contain anything relevant.
+- 2 : the command cannot be performed as indicated. `resultCode` and `resultText` may contain some indication as to why.
+
 #### Controller wants the device to perform a trace
 Controller sends this command when it needs the device to perform a trace (i.e. tcpdump).
 ```json
@@ -681,11 +711,9 @@ Controller sends this command to run a predefined script. Extreme care must be t
      "method" : "script" , 
      "params" : {
         "serial" : <serial number>,
-        "type" : <one of "shell", "ucode", "bundle">,
-        "script" : <text blob containing the script, This must be vase64 encoded>,
-        "timeout" : <max timeout in seconds, default is 30, unused if URI is supplied>,
-        "uri":  "<upload script results using this URI>",
-        "signature" : "<signature for script>: must be supplied to restricted devices",
+        "type" : <one of "shell", "ucode">,
+        "script" : <text blob containing the script>,
+        "timeout" : <max timeout in seconds, default is 30>,
         "when" : <time when this will be performed as UTC seconds>
      },
      "id" : <some number>
@@ -721,10 +749,7 @@ Should other messages get larger, the client may decide to compress the. Only me
 
 #### Identifying a compressed message
 A compressed message has a single member to the `params` field. It's only parameter must be called `compress_64`. Any other elements under
-params will be dropped. Additional compression schemes may be developed later. The device should also include 
-a hint to the actual size of the uncompressed data. This would allow listeners to create sufficiently sized 
-buffers right away instead of guessing. If the device includes `compressed_sz` as the second field in the 
-params objects. This should be an unsigned int representing the total size of the uncompressed data. 
+params will be dropped. Additional compression schemes may be developed later.
 
 #### How to compress
 The original `params` element should be run through `zlib:compress` and then encoded using base64, and passed as a string. Here is an example
@@ -734,8 +759,7 @@ of the completed message. The following should how the `state` event could be co
 {   "jsonrpc" : "2.0" , 
     "method" : "state" , 
     "params" : {
-	    "compress_64" : "kqlwhfoihffhwleihfi3uhfkjehfqlkwhfqkhfiu3hffhkjwehfqkwjehfqwiefkjehq.....qwjqkfhqjwk",
-        "compress_sz" : 212322
+	    "compress_64" : "kqlwhfoihffhwleihfi3uhfkjehfqlkwhfqkhfiu3hffhkjwehfqkwjehfqwiefkjehq.....qwjqkfhqjwk"
   }
 }
 ```

README.md

@@ -11,16 +11,16 @@ In order to build the uCentralGW, you will need to install its dependencies, whi
 - boost
 - POCO 1.10.1 or later
 - a C++17 compiler
+- libyaml
 - openssl
 - libpq-dev (PortgreSQL development libraries)
 - mysql-client (MySQL client)
 - librdkafka
 - cppkafka
-- 
 
 The build is done in 2 parts. The first part is to build a local copy of the framework tailored to your environment. This 
 framework is called [Poco](https://github.com/pocoproject/poco). The version used in this project has a couple of fixes
-from the master copy needed for cmake. Please use the version of this [Poco fix](https://github.com/AriliaWireless/poco). Building 
+from the master copy needed for cmake. Please use the version of this [Poco fix](https://github.com/stephb9959/poco). Building 
 Poco may take several minutes depending on the platform you are building on.
 
 ### Ubuntu
@@ -29,10 +29,9 @@ These instructions have proven to work on Ubuntu 20.4.
 sudo apt install git cmake g++ libssl-dev libmariadb-dev 
 sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
 sudo apt install librdkafka-dev // default-libmysqlclient-dev
-sudo apt install nlohmann-json-dev
 
 cd ~
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
+git clone https://github.com/stephb9959/poco
 cd poco
 mkdir cmake-build
 cd cmake-build
@@ -41,7 +40,7 @@ cmake --build . --config Release
 sudo cmake --build . --target install
 
 cd ~
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
+git clone https://github.com/stephb9959/cppkafka
 cd cppkafka
 mkdir cmake-build
 cd cmake-build
@@ -50,21 +49,23 @@ cmake --build . --config Release
 sudo cmake --build . --target install
 
 cd ~
-git clone https://github.com/pboettch/json-schema-validator.git --branch 2.1.0
-cd json-schema-validator
+git clone https://github.com/nlohmann/json.git
+cd json
+git checkout tags/v3.10.2
 mkdir cmake-build
 cd cmake-build
 cmake ..
 make -j
 sudo make install
 
-git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib
-cd fmtlib
+cd ~
+git clone https://github.com/pboettch/json-schema-validator.git
+cd json-schema-validator
 mkdir cmake-build
 cd cmake-build
 cmake ..
-make
-make install
+make -j
+sudo make install
 
 cd ~
 git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
@@ -80,12 +81,12 @@ make -j 8
 ### Fedora
 The following instructions have proven to work on Fedora 33
 ```
-sudo yum install cmake g++ openssl-devel mysql-devel mysql apr-util-devel boost boost-devel
+sudo yum install cmake g++ openssl-devel unixODBC-devel mysql-devel mysql apr-util-devel boost boost-devel
 sudo yum install yaml-cpp-devel lua-devel 
 sudo dnf install postgresql.x86_64 librdkafka-devel
-sudo dnf install postgresql-devel json-devel
+sudo dnf install postgresql-devel
 
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
+git clone https://github.com/stephb9959/poco
 cd poco
 mkdir cmake-build
 cd cmake-build
@@ -93,7 +94,7 @@ cmake ..
 cmake --build . --config Release
 sudo cmake --build . --target install
 
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
+git clone https://github.com/stephb9959/cppkafka
 cd cppkafka
 mkdir cmake-build
 cd cmake-build
@@ -101,15 +102,6 @@ cmake ..
 cmake --build . --config Release
 sudo cmake --build . --target install
 
-cd ~
-git clone https://github.com/pboettch/json-schema-validator.git --branch 2.1.0
-cd json-schema-validator
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make -j
-sudo make install
-
 cd ~
 git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
 cd wlan-cloud-ucentralgw
@@ -119,61 +111,45 @@ cmake ..
 make
 
 ```
-
-### macOS Build
-The following instructions have proven to work on macOS Big Sur. You need to install [Homebrew](https://brew.sh/). You must also have installed [XCode for OS X](https://www.freecodecamp.org/news/how-to-download-and-install-xcode/).
+ 
+### OSX Build
+The following instructions have proven to work on OSX Big Sur. You need to install [Homebrew](https://brew.sh/). You must also have installed [XCode for OS X](https://www.freecodecamp.org/news/how-to-download-and-install-xcode/).
 ```
-brew install openssl \
-	cmake \
-	libpq \
-	mysql-client \
-	apr \
-	apr-util \
-	boost \
-	yaml-cpp \
-	postgresql \
-	librdkafka \
-	nlohmann-json \
-	fmt
+brew install openssl
+brew install cmake
+brew install libpq
+brew install mysql-client
+brew install apr
+brew install apr-util
+brew install boost
+brew install yaml-cpp
+brew install postgresql
+brew install unixodbc
+brew install librdkafka
 
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
-pushd poco
-mkdir cmake-build
-push cmake-build
-cmake -DOPENSSL_ROOT_DIR=</path/to/openssl> -DENABLE_NETSSL=1 -DENABLE_JWT=1 -DENABLE_CRYPTO=1 ..
-cmake --build . --config Release
+git clone https://github.com/stephb9959/poco
+cd poco
+mkdir cmake-build 
+cd cmake-build
+cmake ..
+cmake --build . --config Release -j
 sudo cmake --build . --target install
-popd
-popd
 
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
-pushd cppkafka
+git clone https://github.com/stephb9959/cppkafka
+cd cppkafka
 mkdir cmake-build
-pushd cmake-build
+cd cmake-build
 cmake ..
 cmake --build . --config Release
 sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/pboettch/json-schema-validator.git --branch 2.1.0
-pushd json-schema-validator
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-make -j
-sudo make install
-popd
-popd
 
+cd ~
 git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
-pushd wlan-cloud-ucentralgw
+cd wlan-cloud-ucentralgw
 mkdir cmake-build
-pushd cmake-build
+cd cmake-build
 cmake ..
 make -j
-popd
-popd
 ```
 
 ### Raspberry
@@ -273,7 +249,7 @@ little changes if you keep the suggested directory structure. For the sample con
 environment variables. 
 ```
 export OWGW_ROOT=`pwd`
-export OWGW_CONFIG=`pwd`
+export UCENTRALGW_CONFIG=`pwd`
 ```
 If you current working directory is the root of the project, this will set the variables properly. Otherwise, you can set the variables 
 to point to wherever is necessary.
@@ -585,31 +561,6 @@ Toe read more about Kafka, follow the [document](https://github.com/Telecominfra
 #### Securing `kafka`
 This is beyond the scope of this document. As it stands today, the communication between the gateway and `kafka` is expected to be behind a firewall.
 
-#### `iptocountry` feature
-In the UI, you will notice the presence of small flags showing where the device connections are from. This feature is 
-available through the `iptocountry` settings in the configuration. This feature is then also available through the `OpenAPI` for the CLI 
-and other applications.
-
-##### Config file entries
-In the configuration file, you must include the following lines:
-
-```asm
-iptocountry.default = US
-iptocountry.provider = ipinfo
-#iptocountry.provider = ipdata
-#iptocountry.provider = ipdata
-iptocountry.ipinfo.token = 
-#ip2location.ipinfo.token =
-#iptocountry.ipdata.apikey =
-#iptocountry.ip2location.apikey =
-```
-So you select your provider with the `iptocountry.provider` be specifying ipinfo, or ipdata, or ip2location. 
-And then you provide the corresponding api key or token.
-Only select one. If you select 2, undefined behaviour. All the line you do not need, just put a `#` before to comment it 
-out.
-You will find the supported providers at: `ip2location.com`, `ipinfo.io`, or `ipdata.co`. You MUST supply a valid default 
-country code in `iptocountry.default`.
-
 ## Contributors
 We love ya! We need more of ya! If you want to contribute, make sure you review 
 the [coding style](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CODING_STYLE.md) document. 

RESTRICTED_DEVICES.md

@@ -1,82 +0,0 @@
-# Restricted devices
-
-## What is a restricted device?
-A restricted device is one that because of regulations or a desire for utmost security, requires signatures to access restricted or blocked 
-features. The restriction process is burnt in the device at manufacturing or later by running a specific command on the device. Once a device
-is restricted, it cannot be unlocked. 
-
-## Current restrictions
-Restrictions are stored on the AP in a protected partition. They are contained in a file called `restrictions.json`. Here is a sample:
-```json
-{
-        "country": [
-                "US", "CA"
-        ],
-        "dfs": true,
-        "rtty": true,
-        "tty": true,
-        "developer": true,
-        "sysupgrade": true,
-        "commands": true,
-        "key_info": {
-                "vendor": "dummy",
-                "algo": "static"
-        }
-}
-```
-- country
-  - List of countries where this device may be used
-- dfs
-  - Disallow DFS Override during wifi-scan. If set to `true`, device will not allow to override DFS channels
-- rtty
-  - Disallow the use of the RTTY command for this device
-- tty
-  - Do not allow the AP to accept `tty` connection
-- developer
-  - Internal use only.
-- sysupgrade
-  - If set to `true`, only signed firmware upgrade command will be allowed.
-- commands
-  - If set to `true`, do not allow commands.
-- key_info
-  - This structure defines how signatures should be generated and verified in a secure system
-    - vendor
-      - An identified that must match the vendor name provided in the controller
-    - algo
-      - The signature algorithm. Here are the supported algorithms
-        - `static`
-          - A test algorithm that always returns and uses a value of `aaaaaaaaaa`. This should never be used in the field.
-        - `dgst-sha256`
-          - The default OpenSSL RSA signature generation and verification. The controller will use the following command to generate the signature
-          ```sh
-          openssl dgst -sha256 -sign private-key.pem -out signature.txt myfile
-          ```
-          - The AP will be using the following to verify the signature
-          ```sh
-          openssl dgst -sha256 -verify public-key.pem -signature signature.txt myfile
-          ```
-
-## Creating signatures on the controller
-When a device is restricted and a signature is required, the controller can generate the signature 
-for the specified `vendor`. However, on the controlelr side, you must configure the vendors. In
-order to do so we suggest the following.
-- Create a directory called `signatures` under your `certs` directory
-- Copy the public and private keys for each `vendor` name. We suggest naming them accordingly
-  - `vendor`-private-key.pem
-  - `vendor`-public-key.pem
-- In the `owgw.properties` file, you need to declare these signatures the following way
-```properties
-    signature.manager.0.key.public = $OWGW_ROOT/certs/signatures/test1-public-key.pem
-    signature.manager.0.key.private = $OWGW_ROOT/certs/signatures/test1-private-key.pem
-    signature.manager.0.vendor = test1
-    
-    signature.manager.1.key.public = $OWGW_ROOT/certs/signatures/test2-public-key.pem
-    signature.manager.1.key.private = $OWGW_ROOT/certs/signatures/test2-private-key.pem
-    signature.manager.1.vendor = test2
-```
-
-## How do you use the signatures?
-There is nothing to do really. Now the controller will use the proper key to create the signatures 
-when it sends commands to the AP. It will use the algorithm that the device understands too. This is transparent 
-to the user. The `vendor` name used in the controller configuration must match the `vendor` name provided in the 
-`restrictions.json` file.

ap_scripts/Author 1/content.yaml

@@ -1,36 +0,0 @@
-
-scripts:
-  - name: List Antennas
-    description: A script to list all antennas on a device
-    type: shell
-    runtype:
-      timeout: 30
-    filename: listantennas.sh
-    readme: listantennas.md
-    help: https://authors.com/scripts/index.html
-  - name: List AP Noise
-    description: A script to list all noise values on all APs
-    type: shell
-    runtype:
-      deferred: true
-    filename: listnoise.sh
-    readme: listnoise.md
-    help: https://authors.com/scripts/index.html
-  - name: Reset AP Statistics
-    description: A script to reset the statistics on a given AP
-    type: shell
-    runtype:
-      timeout: 30
-    filename: resetstats.sh
-    readme: resetstats.md
-    help: https://authors.com/scripts/index.html
-  - name: Gather kernel stats
-    description: A script to all the kernel stats for an AP
-    type: bundle
-    runtype:
-      deferred: true
-    filename: kstats.uci
-    readme: kstats.md
-    help: https://authors.com/scripts/index.html
-
-

ap_scripts/Author 1/listantennas.sh

@@ -1 +0,0 @@
-#!/bin/sh

ap_scripts/Author 1/listnoise.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-

ap_scripts/Author 1/resetstats.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-

ap_scripts/README.md

@@ -1 +0,0 @@
-# Repo for scripts

build

@@ -1 +1 @@
-94
+151

cmake-build-debug/rdkafka_version_test.cpp

@@ -0,0 +1,4 @@
+#include <librdkafka/rdkafka.h>
+ #if RD_KAFKA_VERSION >= 0x00090400
+ int main() { }
+ #endif

config.yaml

@@ -0,0 +1,26 @@
+tip:
+  port: 6051
+  server: ssc.wlan.local
+  username: support@example.com
+  password: support
+
+certificates:
+  keyfile: keyfile.pem
+  certfile: certfile.pem
+  password: mypassword
+
+ucentral:
+  port: 1991
+  listeners: 100
+
+logger:
+  size: 10
+  days: 31
+
+ui:
+  port: 9771
+  username: support@example.com
+  password: support
+
+
+

docker-entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 if [ "$SELFSIGNED_CERTS" = 'true' ]; then
@@ -38,7 +38,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17002"} \
     SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16002"} \
     SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-    SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
     SIMULATORID=${SIMULATORID:-""} \
     IPTOCOUNTRY_PROVIDER=${IPTOCOUNTRY_PROVIDER:-"ipinfo"} \
     IPTOCOUNTRY_IPINFO_TOKEN=${IPTOCOUNTRY_IPINFO_TOKEN:-""} \
@@ -52,10 +51,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     RTTY_TIMEOUT=${RTTY_TIMEOUT:-"60"} \
     RTTY_VIEWPORT=${RTTY_VIEWPORT:-"5913"} \
     RTTY_ASSETS=${RTTY_ASSETS:-"\$OWGW_ROOT/rtty_ui"} \
-    RADIUS_PROXY_ENABLE=${RADIUS_PROXY_ENABLE:-"false"} \
-    RADIUS_PROXY_ACCOUNTING_PORT=${RADIUS_PROXY_ACCOUNTING_PORT:-"1813"} \
-    RADIUS_PROXY_AUTHENTICATION_PORT=${RADIUS_PROXY_AUTHENTICATION_PORT:-"1812"} \
-    RADIUS_PROXY_COA_PORT=${RADIUS_PROXY_COA_PORT:-"3799"} \
     KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
     KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
     KAFKA_SSL_CA_LOCATION=${KAFKA_SSL_CA_LOCATION:-""} \
@@ -73,7 +68,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owgw"} \
     STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owgw"} \
     STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-    CERTIFICATES_ALLOWMISMATCH=${CERTIFICATES_ALLOWMISMATCH:-"false"} \
     envsubst < /owgw.properties.tmpl > $OWGW_CONFIG/owgw.properties
 fi
 
@@ -96,7 +90,7 @@ if [ "$1" = '/openwifi/owgw' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
         chown -R "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
     fi
-    exec gosu "$OWGW_USER" "$@"
+    exec su-exec "$OWGW_USER" "$@"
 fi
 
 exec "$@"

docker_build.sh

@@ -0,0 +1,14 @@
+USERNAME=arilia
+HUBNAME=tip-tip-wlan-cloud-ucentral.jfrog.io
+IMAGE_NAME=ucentralgw
+
+echo "Removing docker images before build..."
+docker rmi -f $(docker images -a -q)
+echo "Building $IMAGE_NAME image..."
+docker build --no-cache --tag $IMAGE_NAME .
+IMAGE_ID=`docker images -q $IMAGE_NAME`
+docker login --username=$USERNAME $HUBNAME
+docker tag $IMAGE_ID $HUBNAME/$IMAGE_NAME:latest
+echo "Updating $HUBNAME with the latest $IMAGE_NAME image..."
+docker push $HUBNAME/$IMAGE_NAME
+docker logout $HUBNAME

docker_clean.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Removes all local images. This is dangerous but good when debugging
+docker rmi -f $(docker images -a -q)
+

docker_run.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+HUBNAME=tip-tip-wlan-cloud-ucentral.jfrog.io
+IMAGE_NAME=ucentralgw
+DOCKER_NAME=$HUBNAME/$IMAGE_NAME:master
+
+CONTAINER_NAME=ucentralgw
+
+#stop previously running images
+docker container stop $CONTAINER_NAME
+docker container rm $CONTAINER_NAME --force
+
+if [[ ! -d logs ]]
+then
+    mkdir logs
+fi
+
+if [[ ! -d uploads ]]
+then
+    mkdir uploads
+fi
+
+if [[ ! -d certs ]]
+then
+  echo "certs directory does not exist. Please create and add the proper certificates."
+  exit 1
+fi
+
+if [[ ! -f owgw.properties ]]
+then
+  echo "Configuration file ucentral.properties is missing in the current directory"
+  exit 2
+fi
+
+docker run -d -p 15002:15002 \
+              -p 16001:16001 \
+              -p 16003:16003 \
+              --init \
+              --volume="$PWD:/ucentral-data" \
+              -e UCENTRALGW_ROOT="/ucentral-data" \
+              -e UCENTRALGW_CONFIG="/ucentral-data" \
+              --name="ucentralgw" $DOCKER_NAME
+

helm/README.md

@@ -79,8 +79,7 @@ The following table lists the configurable parameters of the chart and their def
 | persistence.size | string | Defines PV size | `'10Gi'` |
 | public_env_variables | hash | Defines list of environment variables to be passed to the Gateway | |
 | configProperties | hash | Configuration properties that should be passed to the application in `owgw.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| existingCertsSecret | string | Existing Kubernetes secret containing all required certificates and private keys for microservice operation. If set, certificates from `certs` key are ignored | `""` |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owgw` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
+| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owgw` on where it is mounted) |  |
 | certsCAs | hash | Defines files with CAs that should be passed to the Gateway (see `volumes.owgw` on where it is mounted) |  |
 
 

helm/templates/deployment.yaml

@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -49,38 +48,6 @@ spec:
             - tcp://{{ index .Values.configProperties "openwifi.kafka.brokerlist" }}
             - -timeout
             - 600s
-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owgw.repository }}:{{ .Values.images.owgw.tag }}"
-          imagePullPolicy: {{ .Values.images.owgw.pullPolicy }}
-          command:
-            - /wait-for-postgres.sh
-            - {{ index .Values.configProperties "storage.type.postgresql.host" }}
-            - echo
-            - "PostgreSQL is ready"
-          env:
-            - name: KUBERNETES_DEPLOYED
-              value: "{{ now }}"
-          {{- range $key, $value := .Values.public_env_variables }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-          {{- end }}
-          {{- range $key, $value := .Values.secret_env_variables }}
-            - name: {{ $key }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "owgw.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owgw }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
 
       containers:
 
@@ -109,11 +76,6 @@ spec:
               containerPort: {{ $portValue.targetPort }}
               protocol: {{ $portValue.protocol }}
           {{- end }}
-          {{- range $port, $portValue := .Values.services.radius.ports }}
-            - name: {{ $port }}
-              containerPort: {{ $portValue.targetPort }}
-              protocol: {{ $portValue.protocol }}
-          {{- end }}
 
           volumeMounts:
           {{- range .Values.volumes.owgw }}

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owgw:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: v2.8.0
+    tag: v2.6.2
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -46,21 +46,6 @@ services:
       rttys-view:
         servicePort: 5913
         targetPort: 5913
-  radius:
-    type: ClusterIP
-    ports:
-      acc:
-        servicePort: 1813
-        targetPort: 1813
-        protocol: UDP
-      auth:
-        servicePort: 1812
-        targetPort: 1812
-        protocol: UDP
-      coa:
-        servicePort: 3799
-        targetPort: 3799
-        protocol: UDP
 
 checks:
   owgw:
@@ -112,7 +97,7 @@ volumes:
       mountPath: /owgw-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owgw.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owgw.fullname" . }}-certs
     - name: certs-cas
       mountPath: /owgw-data/certs/cas
       volumeDefinition: |
@@ -138,7 +123,7 @@ resources: {}
   #  memory: 128Mi
 
 securityContext:
-  fsGroup: 1000
+  fsGroup: 101
   # Usage of unsafe sysctls requires multiple things:
   # - allow these unsafe sysctls on kubelet level (by adding --allowed-unsafe-sysctls flag)
   # - enabling addition of PodSecurityContext setting podSecurityPolicy.enabled to "true" below
@@ -230,7 +215,6 @@ configProperties:
   openwifi.devicetypes.0: AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
   openwifi.devicetypes.1: SWITCH:edgecore_ecs4100-12ph
   openwifi.devicetypes.2: IOT:esp32
-  openwifi.certificates.allowmismatch: "false"
   oui.download.uri: https://standards-oui.ieee.org/oui/oui.txt
   firmware.autoupdate.policy.default: auto
   iptocountry.provider: ipinfo
@@ -247,11 +231,6 @@ configProperties:
   rtty.timeout: 60
   rtty.viewport: 5913
   rtty.assets: $OWGW_ROOT/rtty_ui
-  # RADIUS proxy
-  radius.proxy.enable: "true"
-  radius.proxy.accounting.port: 1813
-  radius.proxy.authentication.port: 1812
-  radius.proxy.coa.port: 3799
   # ALB
   alb.enable: "true"
   alb.port: 16102
@@ -292,7 +271,6 @@ configProperties:
   openwifi.system.debug: "true"
   openwifi.system.uri.private: https://localhost:17002
   openwifi.system.uri.public: https://localhost:16002
-  openwifi.system.uri.ui: https://localhost
   openwifi.system.commandchannel: /tmp/app_owgw
   # Logging
   logging.type: console
@@ -332,22 +310,166 @@ configProperties:
   storage.type.mysql.username: stephb
   storage.type.mysql.password: snoopy99
 
-# NOTE: List of required certificates may be found in "certs" key. Alternative way to pass required certificates is to create external secret with all required certificates and set secret name in "existingCertsSecret" key. Details may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart#tldr
-existingCertsSecret: ""
-
 certs:
-  clientcas.pem: ""
-  issuer.pem: ""
-  restapi-ca.pem: ""
-  restapi-cert.pem: ""
-  restapi-key.pem: ""
-  root.pem: ""
-  websocket-cert.pem: ""
-  websocket-key.pem: ""
+  clientcas.pem: |
+    -----BEGIN CERTIFICATE-----
+    MIIEnDCCA4SgAwIBAgIUVpyCUx1MUeUwxg+7I1BvGFTz7HkwDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjUxMjZaFw0yNjA0MTMyMjM4NDZaMGwx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEpMCcGA1UEAxMgVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IElzc3VpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtKBrq
+    qd2aKVSk25KfL5xHu8X7/8rJrz3IvyPuVKWhk/N1zabot3suBcGaYNKjnRHxg78R
+    yKwKzajKYWtiQFqztu24g16LQeAnoUxZnF6a0z3JkkRPsz14A2y8TUhdEe1tx+UU
+    4VGsk3n+FMmOQHL+79FO57zQC1LwylgfLSltrI6mF3jowVUQvnwzKhUzT87AJ6EO
+    ndK/q0T/Bgi+aI39zfVOjJjsTJwghvrmYW3iarP1THSKxeib2s02bZKrvvHa5HL4
+    UI8+LvREpVZl4mzt1z6Nl344Y6f+UeJlYa/Ci0jJqaXJmyVnUbAz+c0i5JfwAVn3
+    YQzfC4eLnZCmdF8zAgMBAAGjggE3MIIBMzAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+    DgQWBBSzG1S44EerPfM4gOQ85f0AYW3R6DAfBgNVHSMEGDAWgBQCRpZgebFT9qny
+    98WfIUDk6ZEB+jAOBgNVHQ8BAf8EBAMCAYYwgYMGCCsGAQUFBwEBBHcwdTAoBggr
+    BgEFBQcwAYYcaHR0cDovL29jc3Aub25lLmRpZ2ljZXJ0LmNvbTBJBggrBgEFBQcw
+    AoY9aHR0cDovL2NhY2VydHMub25lLmRpZ2ljZXJ0LmNvbS9UZWxlY29tSW5mcmFQ
+    cm9qZWN0Um9vdENBLmNydDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLm9u
+    ZS5kaWdpY2VydC5jb20vVGVsZWNvbUluZnJhUHJvamVjdFJvb3RDQS5jcmwwDQYJ
+    KoZIhvcNAQELBQADggEBAFbz+K94bHIkBMJqps0dApniUmOn0pO6Q6cGh47UP/kX
+    IiPIsnYgG+hqYD/qtsiqJhaWi0hixRWn38UmvZxMRk27aSTGE/TWx0JTC3qDGsSe
+    XkUagumbSfmS0ZyiTwMPeGAjXwyzGorqZWeA95eKfImntMiOf3E7//GK0K7HpCx8
+    IPCnLZsZD2q/mLyBsduImFIRQJbLAhwIxpcd1qYJk+BlGFL+HtBpEbq6JxW2Xy+v
+    DpNWc2WIsUTle0rTc9JNJrLX4ChUJmKqf8obKHap3Xh3//qw/jDB9pOAinA33FLJ
+    EmCnwBvQr9mfNmPBGMYZVU8cPruDQJ57GjmmvdisbJY=
+    -----END CERTIFICATE-----
+    -----BEGIN CERTIFICATE-----
+    MIIDojCCAoqgAwIBAgIUPVYBpqNbcLYygF6Mx+qxSWwQyFowDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjQyNDRaFw0zMTA0MTMyMjM4NDZaMGkx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEmMCQGA1UEAxMdVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIGCibwf5u
+    AAwZ+1H8U0e3u2V+0d2gSctucoK86XwUmfe1V2a/qlCYZd29r80IuN1IIeB0naIm
+    KnK/MzXW87clF6tFd1+HzEvmlY/W4KyIXalVCTEzirFSvBEG2oZpM0yC3AefytAO
+    aOpA00LaM3xTfTqMKIRhJBuLy0I4ANUVG6ixVebbGuc78IodleqiLoWy2Q9QHyEO
+    t/7hZndJhiVogh0PveRhho45EbsACu7ymDY+JhlIleevqwlE3iQoq0YcmYADHno6
+    Eq8vcwLpZFxihupUafkd1T3WJYQAJf9coCjBu2qIhNgrcrGD8R9fGswwNRzMRMpX
+    720+GjcDW3bJAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAJG
+    lmB5sVP2qfL3xZ8hQOTpkQH6MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+    AAOCAQEAVjl9dm4epG9NUYnagT9sg7scVQEPfz3Lt6w1NXJXgD8mAUlK0jXmEyvM
+    dCPD4514n+8+lM7US8fh+nxc7jO//LwK17Wm9FblgjNFR7+anv0Q99T9fP19DLlF
+    PSNHL2emogy1bl1lLTAoj8nxg2wVKPDSHBGviQ5LR9fsWUIJDv9Bs5k0qWugWYSj
+    19S6qnHeskRDB8MqRLhKMG82oDVLerSnhD0P6HjySBHgTTU7/tYS/OZr1jI6MPbG
+    L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
+    5IOM7ItsRmen6u3qu+JXros54e4juQ==
+    -----END CERTIFICATE-----
+  issuer.pem: |
+    -----BEGIN CERTIFICATE-----
+    MIIEnDCCA4SgAwIBAgIUVpyCUx1MUeUwxg+7I1BvGFTz7HkwDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjUxMjZaFw0yNjA0MTMyMjM4NDZaMGwx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEpMCcGA1UEAxMgVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IElzc3VpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtKBrq
+    qd2aKVSk25KfL5xHu8X7/8rJrz3IvyPuVKWhk/N1zabot3suBcGaYNKjnRHxg78R
+    yKwKzajKYWtiQFqztu24g16LQeAnoUxZnF6a0z3JkkRPsz14A2y8TUhdEe1tx+UU
+    4VGsk3n+FMmOQHL+79FO57zQC1LwylgfLSltrI6mF3jowVUQvnwzKhUzT87AJ6EO
+    ndK/q0T/Bgi+aI39zfVOjJjsTJwghvrmYW3iarP1THSKxeib2s02bZKrvvHa5HL4
+    UI8+LvREpVZl4mzt1z6Nl344Y6f+UeJlYa/Ci0jJqaXJmyVnUbAz+c0i5JfwAVn3
+    YQzfC4eLnZCmdF8zAgMBAAGjggE3MIIBMzAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+    DgQWBBSzG1S44EerPfM4gOQ85f0AYW3R6DAfBgNVHSMEGDAWgBQCRpZgebFT9qny
+    98WfIUDk6ZEB+jAOBgNVHQ8BAf8EBAMCAYYwgYMGCCsGAQUFBwEBBHcwdTAoBggr
+    BgEFBQcwAYYcaHR0cDovL29jc3Aub25lLmRpZ2ljZXJ0LmNvbTBJBggrBgEFBQcw
+    AoY9aHR0cDovL2NhY2VydHMub25lLmRpZ2ljZXJ0LmNvbS9UZWxlY29tSW5mcmFQ
+    cm9qZWN0Um9vdENBLmNydDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLm9u
+    ZS5kaWdpY2VydC5jb20vVGVsZWNvbUluZnJhUHJvamVjdFJvb3RDQS5jcmwwDQYJ
+    KoZIhvcNAQELBQADggEBAFbz+K94bHIkBMJqps0dApniUmOn0pO6Q6cGh47UP/kX
+    IiPIsnYgG+hqYD/qtsiqJhaWi0hixRWn38UmvZxMRk27aSTGE/TWx0JTC3qDGsSe
+    XkUagumbSfmS0ZyiTwMPeGAjXwyzGorqZWeA95eKfImntMiOf3E7//GK0K7HpCx8
+    IPCnLZsZD2q/mLyBsduImFIRQJbLAhwIxpcd1qYJk+BlGFL+HtBpEbq6JxW2Xy+v
+    DpNWc2WIsUTle0rTc9JNJrLX4ChUJmKqf8obKHap3Xh3//qw/jDB9pOAinA33FLJ
+    EmCnwBvQr9mfNmPBGMYZVU8cPruDQJ57GjmmvdisbJY=
+    -----END CERTIFICATE-----
+  # restapi-ca.pem: ""
+  # restapi-cert.pem: ""
+  # restapi-key.pem: ""
+  root.pem: |
+    -----BEGIN CERTIFICATE-----
+    MIIDojCCAoqgAwIBAgIUPVYBpqNbcLYygF6Mx+qxSWwQyFowDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjQyNDRaFw0zMTA0MTMyMjM4NDZaMGkx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEmMCQGA1UEAxMdVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIGCibwf5u
+    AAwZ+1H8U0e3u2V+0d2gSctucoK86XwUmfe1V2a/qlCYZd29r80IuN1IIeB0naIm
+    KnK/MzXW87clF6tFd1+HzEvmlY/W4KyIXalVCTEzirFSvBEG2oZpM0yC3AefytAO
+    aOpA00LaM3xTfTqMKIRhJBuLy0I4ANUVG6ixVebbGuc78IodleqiLoWy2Q9QHyEO
+    t/7hZndJhiVogh0PveRhho45EbsACu7ymDY+JhlIleevqwlE3iQoq0YcmYADHno6
+    Eq8vcwLpZFxihupUafkd1T3WJYQAJf9coCjBu2qIhNgrcrGD8R9fGswwNRzMRMpX
+    720+GjcDW3bJAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAJG
+    lmB5sVP2qfL3xZ8hQOTpkQH6MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+    AAOCAQEAVjl9dm4epG9NUYnagT9sg7scVQEPfz3Lt6w1NXJXgD8mAUlK0jXmEyvM
+    dCPD4514n+8+lM7US8fh+nxc7jO//LwK17Wm9FblgjNFR7+anv0Q99T9fP19DLlF
+    PSNHL2emogy1bl1lLTAoj8nxg2wVKPDSHBGviQ5LR9fsWUIJDv9Bs5k0qWugWYSj
+    19S6qnHeskRDB8MqRLhKMG82oDVLerSnhD0P6HjySBHgTTU7/tYS/OZr1jI6MPbG
+    L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
+    5IOM7ItsRmen6u3qu+JXros54e4juQ==
+    -----END CERTIFICATE-----
+  # websocket-cert.pem: ""
+  # websocket-key.pem: ""
 
 certsCAs:
-  issuer.pem: ""
-  root.pem: ""
+  issuer.pem: |
+    -----BEGIN CERTIFICATE-----
+    MIIEnDCCA4SgAwIBAgIUVpyCUx1MUeUwxg+7I1BvGFTz7HkwDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjUxMjZaFw0yNjA0MTMyMjM4NDZaMGwx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEpMCcGA1UEAxMgVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IElzc3VpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtKBrq
+    qd2aKVSk25KfL5xHu8X7/8rJrz3IvyPuVKWhk/N1zabot3suBcGaYNKjnRHxg78R
+    yKwKzajKYWtiQFqztu24g16LQeAnoUxZnF6a0z3JkkRPsz14A2y8TUhdEe1tx+UU
+    4VGsk3n+FMmOQHL+79FO57zQC1LwylgfLSltrI6mF3jowVUQvnwzKhUzT87AJ6EO
+    ndK/q0T/Bgi+aI39zfVOjJjsTJwghvrmYW3iarP1THSKxeib2s02bZKrvvHa5HL4
+    UI8+LvREpVZl4mzt1z6Nl344Y6f+UeJlYa/Ci0jJqaXJmyVnUbAz+c0i5JfwAVn3
+    YQzfC4eLnZCmdF8zAgMBAAGjggE3MIIBMzAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+    DgQWBBSzG1S44EerPfM4gOQ85f0AYW3R6DAfBgNVHSMEGDAWgBQCRpZgebFT9qny
+    98WfIUDk6ZEB+jAOBgNVHQ8BAf8EBAMCAYYwgYMGCCsGAQUFBwEBBHcwdTAoBggr
+    BgEFBQcwAYYcaHR0cDovL29jc3Aub25lLmRpZ2ljZXJ0LmNvbTBJBggrBgEFBQcw
+    AoY9aHR0cDovL2NhY2VydHMub25lLmRpZ2ljZXJ0LmNvbS9UZWxlY29tSW5mcmFQ
+    cm9qZWN0Um9vdENBLmNydDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLm9u
+    ZS5kaWdpY2VydC5jb20vVGVsZWNvbUluZnJhUHJvamVjdFJvb3RDQS5jcmwwDQYJ
+    KoZIhvcNAQELBQADggEBAFbz+K94bHIkBMJqps0dApniUmOn0pO6Q6cGh47UP/kX
+    IiPIsnYgG+hqYD/qtsiqJhaWi0hixRWn38UmvZxMRk27aSTGE/TWx0JTC3qDGsSe
+    XkUagumbSfmS0ZyiTwMPeGAjXwyzGorqZWeA95eKfImntMiOf3E7//GK0K7HpCx8
+    IPCnLZsZD2q/mLyBsduImFIRQJbLAhwIxpcd1qYJk+BlGFL+HtBpEbq6JxW2Xy+v
+    DpNWc2WIsUTle0rTc9JNJrLX4ChUJmKqf8obKHap3Xh3//qw/jDB9pOAinA33FLJ
+    EmCnwBvQr9mfNmPBGMYZVU8cPruDQJ57GjmmvdisbJY=
+    -----END CERTIFICATE-----
+  root.pem: |
+    -----BEGIN CERTIFICATE-----
+    MIIDojCCAoqgAwIBAgIUPVYBpqNbcLYygF6Mx+qxSWwQyFowDQYJKoZIhvcNAQEL
+    BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+    dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+    b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjQyNDRaFw0zMTA0MTMyMjM4NDZaMGkx
+    CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+    Yy4xDDAKBgNVBAsTA1RJUDEmMCQGA1UEAxMdVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+    IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIGCibwf5u
+    AAwZ+1H8U0e3u2V+0d2gSctucoK86XwUmfe1V2a/qlCYZd29r80IuN1IIeB0naIm
+    KnK/MzXW87clF6tFd1+HzEvmlY/W4KyIXalVCTEzirFSvBEG2oZpM0yC3AefytAO
+    aOpA00LaM3xTfTqMKIRhJBuLy0I4ANUVG6ixVebbGuc78IodleqiLoWy2Q9QHyEO
+    t/7hZndJhiVogh0PveRhho45EbsACu7ymDY+JhlIleevqwlE3iQoq0YcmYADHno6
+    Eq8vcwLpZFxihupUafkd1T3WJYQAJf9coCjBu2qIhNgrcrGD8R9fGswwNRzMRMpX
+    720+GjcDW3bJAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAJG
+    lmB5sVP2qfL3xZ8hQOTpkQH6MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+    AAOCAQEAVjl9dm4epG9NUYnagT9sg7scVQEPfz3Lt6w1NXJXgD8mAUlK0jXmEyvM
+    dCPD4514n+8+lM7US8fh+nxc7jO//LwK17Wm9FblgjNFR7+anv0Q99T9fP19DLlF
+    PSNHL2emogy1bl1lLTAoj8nxg2wVKPDSHBGviQ5LR9fsWUIJDv9Bs5k0qWugWYSj
+    19S6qnHeskRDB8MqRLhKMG82oDVLerSnhD0P6HjySBHgTTU7/tYS/OZr1jI6MPbG
+    L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
+    5IOM7ItsRmen6u3qu+JXros54e4juQ==
+    -----END CERTIFICATE-----
 
 # PostgreSQL (https://github.com/bitnami/charts/tree/master/bitnami/postgresql)
 postgresql:

openapi/owgw.yaml

@@ -49,38 +49,6 @@ components:
         - IOT
         - MESH
 
-    DeviceRestrictionsKeyInfo:
-      type: object
-      properties:
-        vendor:
-          type: string
-        algo:
-          type: string
-
-    DeviceRestrictions:
-      type: object
-      properties:
-        dfs:
-          type: boolean
-        ssh:
-          type: boolean
-        rtty:
-          type: boolean
-        tty:
-          type: boolean
-        developer:
-          type: boolean
-        upgrade:
-          type: boolean
-        commands:
-          type: boolean
-        country:
-          type: array
-          items:
-            type: string
-        key_info:
-          $ref: '#/components/schemas/DeviceRestrictionsKeyInfo'
-
     Device:
       type: object
       description: Definition of uCentral device
@@ -139,19 +107,6 @@ components:
           type: string
           minLength: 2
           maxLength: 2
-        restrictedDevice:
-          type: boolean
-          default: false
-        certificateExpiryDate:
-          type: integer
-          format: int64
-        pendingConfiguration:
-          type: string
-        pendingConfigurationCmd:
-          type: string
-          format: uuid
-        restrictionDetails:
-          $ref: '#/components/schemas/DeviceRestrictions'
 
     DeviceWithStatus:
       type: object
@@ -235,31 +190,6 @@ components:
           type: string
           minLength: 2
           maxLength: 2
-        started:
-          type: integer
-          format: int64
-        sessionId:
-          type: integer
-          format: int64
-        connectionCompletionTime:
-          type: number
-          format: double
-        totalConnectionTime:
-          type: integer
-          format: int64
-        restrictedDevice:
-          type: boolean
-          default: false
-        certificateDate:
-          type: integer
-          format: int64
-        pendingConfiguration:
-          type: string
-        pendingConfigurationCmd:
-          type: string
-          format: uuid
-        restrictionDetails:
-          $ref: '#/components/schemas/DeviceRestrictions'
 
     DeviceList:
       type: object
@@ -352,17 +282,6 @@ components:
           type: integer
           format: int64
 
-    DeviceConnectionStatistics:
-      type: object
-      description: Return some basic device statistics.
-      properties:
-        connectedDevices:
-          type: integer
-          format: int64
-        averageConnectionTime:
-          type: integer
-          format: int64
-
     StatisticsDetails:
       type: object
       properties:
@@ -558,69 +477,18 @@ components:
         type:
           type: string
           enum:
+            - uci
+            - ucode
             - shell
-            - bundle
-            - diagnostic
         script:
           type: string
         scriptId:
           type: string
+          format: uuid
         when:
           type: integer
           format: int64
           default: 0
-        signature:
-          type: string
-        deferred:
-          type: boolean
-        uri:
-          type: string
-
-    ScriptEntry:
-      type: object
-      properties:
-        id:
-          type: string
-        name:
-          type: string
-        description:
-          type: string
-        uri:
-          type: string
-        content:
-          type: string
-        version:
-          type: string
-        type:
-          enum:
-            - shell
-            - bundle
-        created:
-          type: integer
-        modified:
-          type: integer
-        author:
-          type: string
-        restricted:
-          type: array
-          items:
-            type: string
-        deferred:
-          type: boolean
-          default: false
-        timeout:
-          type: integer
-          default: 30
-        defaultUploadURI:
-          type: string
-
-    ScriptEntryList:
-      type: object
-      properties:
-        scripts:
-          type: array
-          items:
-            $ref: '#/components/schemas/ScriptEntry'
 
     FactoryRequest:
       type: object
@@ -1030,26 +898,9 @@ components:
           items:
             $ref: '#/components/schemas/TagValuePair'
 
-    ExtraSystemConfiguration:
-      type: array
-      items:
-        type: object
-        properties:
-          parameterName:
-            type: string
-          parameterType:
-            type: string
-            enum:
-              - string
-              - integer
-              - boolean
-              - path
-          parameterValue:
-            {}
-
     #########################################################################################
     ##
-    ## End of uCentral system-wide values
+    ## End of uCentral system wide values
     ##
     #########################################################################################
     BlackDeviceInfo:
@@ -1198,33 +1049,6 @@ components:
           type: string
         certificate:
           type: string
-        radsec:
-          type: boolean
-          default: false
-        radsecPort:
-          type: integer
-          minimum: 1
-          maximum: 65535
-        radsecSecret:
-          type: string
-        radsecCacerts:
-          type: array
-          items:
-            type: string
-        radsecCert:
-          type: string
-          description: this must be the base64 encoded of the entire content of the certificate file, including the -----BEGIN lines
-        radsecKey:
-          type: string
-          description: this must be the base64 encoded of the entire content of the key file, including the -----BEGIN lines
-        radsecRealms:
-          description: each entry must be the base64 encoded of the entire content of the ca files, including the -----BEGIN lines
-          type: array
-          items:
-            type: string
-        ignore:
-          type: boolean
-          default: false
 
     RadiusProxyServerConfig:
       type: object
@@ -1338,13 +1162,6 @@ paths:
             type: boolean
             default: false
           required: false
-        - in: query
-          description: return extended information
-          name: connectionStatistics
-          schema:
-            type: boolean
-            default: false
-          required: false
       responses:
         200:
           description: List devices
@@ -1356,7 +1173,6 @@ paths:
                   - $ref: '#/components/schemas/DeviceListWithStatus'
                   - $ref: '#/components/schemas/SerialNumberList'
                   - $ref: '#/components/schemas/DeviceCount'
-                  - $ref: '#/components/schemas/DeviceConnectionStatistics'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -2016,12 +1832,6 @@ paths:
           schema:
             type: boolean
           required: false
-        - in: query
-          description: Return the number of matching records.
-          name: countOnly
-          schema:
-            type: boolean
-          required: false
 
       responses:
         200:
@@ -2031,8 +1841,6 @@ paths:
               schema:
                 oneOf:
                   - $ref: '#/components/schemas/StatisticsRecords'
-                  - $ref: '#/components/schemas/DeviceCount'
-
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -2210,11 +2018,6 @@ paths:
           schema:
             type: string
           required: true
-        - in: query
-          name: FWsignature
-          schema:
-            type: string
-          required: false
       requestBody:
         description: Command details
         content:
@@ -2569,148 +2372,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /scripts:
-    get:
-      tags:
-        - Scripting
-      summary: Returns a list scripts.
-      description: Get a list of scripts.
-      operationId: getScripts
-      parameters:
-        - in: query
-          description: Pagination start (starts at 0. If not specified, 0 is assumed)
-          name: offset
-          schema:
-            type: integer
-          required: false
-        - in: query
-          description: Maximum number of entries to return (if absent, no limit is assumed)
-          name: limit
-          schema:
-            type: integer
-          required: false
-        - in: query
-          description: Filter the results
-          name: filter
-          schema:
-            type: string
-          required: false
-      responses:
-        200:
-          description: List all scripts
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ScriptEntryList'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /script/{uuid}:
-    get:
-      tags:
-        - Scripting
-      summary: Returns a script entry.
-      description: Get a specific script entry.
-      operationId: getScript
-      parameters:
-        - in: path
-          description: The UUID of the script
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      responses:
-        200:
-          description: A script entry
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ScriptEntry'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    post:
-      tags:
-        - Scripting
-      summary: Create a new script.
-      operationId: createScript
-      parameters:
-        - in: path
-          description: The UUID of the script. Must be set to 0 for creation
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      requestBody:
-        description: Complet script entry
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ScriptEntry'
-      responses:
-        200:
-          $ref: '#/components/schemas/ScriptEntry'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - Scripting
-      summary: Modify a script.
-      operationId: modifyScript
-      parameters:
-        - in: path
-          description: The UUID of the script.
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      requestBody:
-        description: Complete script entry. You may only modify the name, description, version, uri, and content
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ScriptEntry'
-      responses:
-        200:
-          $ref: '#/components/schemas/ScriptEntry'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    delete:
-      tags:
-        - Scripting
-      summary: Delete a script.
-      operationId: deleteScript
-      parameters:
-        - in: path
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      responses:
-        204:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-
-
-
   /blacklist:
     get:
       tags:
@@ -3012,51 +2673,4 @@ paths:
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
-          $ref: '#/components/responses/NotFound'
-
-  /systemConfiguration:
-    get:
-      tags:
-        - SystemConfiguration
-      summary: Retrieve system configuration items
-      operationId: getSystemConfiguration
-      responses:
-        200:
-          $ref: '#/components/schemas/ExtraSystemConfiguration'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - SystemConfiguration
-      summary: Set some or all system configuration
-      operationId: setSystemConfiguration
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ExtraSystemConfiguration'
-
-      responses:
-        200:
-          $ref: '#/components/schemas/ExtraSystemConfiguration'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    delete:
-      tags:
-        - SystemConfiguration
-      summary: Delete all additional system configuration
-      operationId: deleteSystemConfiguration
-
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
+          $ref: '#/components/responses/NotFound'

owgw.properties

@@ -65,7 +65,6 @@ openwifi.system.debug = true
 openwifi.system.uri.private = https://localhost:17002
 openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16002
 openwifi.system.uri.ui = https://ucentral-ui.arilia.com
-openwifi.security.restapi.disable = false
 openwifi.system.commandchannel = /tmp/app.ucentralgw
 
 #
@@ -178,4 +177,4 @@ archiver.db.3.keep = 7
 ########################################################################
 logging.type = file
 logging.path = $OWGW_ROOT/logs
-logging.level = information
+logging.level = debug

owgw.properties.tmpl

@@ -65,7 +65,6 @@ openwifi.system.debug = true
 openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
 openwifi.system.commandchannel = /tmp/app.ucentralgw
 
 #
@@ -75,7 +74,6 @@ openwifi.autoprovisioning = true
 openwifi.devicetypes.0 = AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
 openwifi.devicetypes.1 = SWITCH:edgecore_ecs4100-12ph
 openwifi.devicetypes.2 = IOT:esp32
-openwifi.certificates.allowmismatch = ${CERTIFICATES_ALLOWMISMATCH}
 oui.download.uri = https://standards-oui.ieee.org/oui/oui.txt
 simulatorid = ${SIMULATORID}
 iptocountry.default = US
@@ -97,12 +95,6 @@ rtty.timeout = ${RTTY_TIMEOUT}
 rtty.viewport = ${RTTY_VIEWPORT}
 rtty.assets = ${RTTY_ASSETS}
 
-### RADIUS proxy config
-radius.proxy.enable = ${RADIUS_PROXY_ENABLE}
-radius.proxy.accounting.port = ${RADIUS_PROXY_ACCOUNTING_PORT}
-radius.proxy.authentication.port = ${RADIUS_PROXY_AUTHENTICATION_PORT}
-radius.proxy.coa.port = ${RADIUS_PROXY_COA_PORT}
-
 #############################
 # Generic information for all micro services
 #############################
@@ -175,4 +167,4 @@ archiver.db.3.keep = 7
 ########################################################################
 logging.type = console
 logging.path = $OWGW_ROOT/logs
-logging.level = information
+logging.level = debug

pcap/radius

@@ -0,0 +1,41 @@
+/* Frame (255 bytes) */
+static const unsigned char pkt41[255] = {
+0x14, 0x98, 0x77, 0x71, 0xc6, 0xe7, 0x34, 0xef, /* ..wq..4. */
+0xb6, 0xaf, 0x4a, 0x5c, 0x08, 0x00, 0x45, 0x00, /* ..J\..E. */
+0x00, 0xf1, 0x87, 0x50, 0x00, 0x00, 0x40, 0x11, /* ...P..@. */
+0x0c, 0xdf, 0xc0, 0xa8, 0xb2, 0x1b, 0xc0, 0xa8, /* ........ */
+0xb2, 0x60, 0xc3, 0xfe, 0x07, 0x14, 0x00, 0xdd, /* .`...... */
+0x26, 0x63, 0x01, 0x04, 0x00, 0xd5, 0xcc, 0x29, /* &c.....) */
+0x82, 0x36, 0xd6, 0x57, 0x3d, 0xa7, 0xd5, 0x62, /* .6.W=..b */
+0x70, 0x12, 0x00, 0xc0, 0xf2, 0x19, 0x01, 0x03, /* p....... */
+0x61, 0x1e, 0x1c, 0x33, 0x34, 0x2d, 0x45, 0x46, /* a..34-EF */
+0x2d, 0x42, 0x36, 0x2d, 0x41, 0x46, 0x2d, 0x34, /* -B6-AF-4 */
+0x41, 0x2d, 0x36, 0x30, 0x3a, 0x4f, 0x70, 0x65, /* A-60:Ope */
+0x6e, 0x57, 0x69, 0x66, 0x69, 0x3d, 0x06, 0x00, /* nWifi=.. */
+0x00, 0x00, 0x13, 0x06, 0x06, 0x00, 0x00, 0x00, /* ........ */
+0x02, 0x05, 0x06, 0x00, 0x00, 0x00, 0x01, 0x1f, /* ........ */
+0x13, 0x42, 0x36, 0x2d, 0x43, 0x34, 0x2d, 0x30, /* .B6-C4-0 */
+0x36, 0x2d, 0x30, 0x39, 0x2d, 0x31, 0x35, 0x2d, /* 6-09-15- */
+0x42, 0x37, 0x4d, 0x18, 0x43, 0x4f, 0x4e, 0x4e, /* B7M.CONN */
+0x45, 0x43, 0x54, 0x20, 0x35, 0x34, 0x4d, 0x62, /* ECT 54Mb */
+0x70, 0x73, 0x20, 0x38, 0x30, 0x32, 0x2e, 0x31, /* ps 802.1 */
+0x31, 0x61, 0x2c, 0x12, 0x33, 0x42, 0x45, 0x44, /* 1a,.3BED */
+0x37, 0x32, 0x39, 0x30, 0x44, 0x30, 0x43, 0x38, /* 7290D0C8 */
+0x35, 0x36, 0x44, 0x33, 0xba, 0x06, 0x00, 0x0f, /* 56D3.... */
+0xac, 0x04, 0xbb, 0x06, 0x00, 0x0f, 0xac, 0x04, /* ........ */
+0xbc, 0x06, 0x00, 0x0f, 0xac, 0x05, 0xbd, 0x06, /* ........ */
+0x00, 0x0f, 0xac, 0x06, 0x1a, 0x1b, 0x00, 0x00, /* ........ */
+0xe6, 0x08, 0x47, 0x15, 0x01, 0x13, 0x33, 0x34, /* ..G...34 */
+0x2d, 0x65, 0x66, 0x2d, 0x62, 0x36, 0x2d, 0x61, /* -ef-b6-a */
+0x66, 0x2d, 0x34, 0x61, 0x2d, 0x35, 0x63, 0x0c, /* f-4a-5c. */
+0x06, 0x00, 0x00, 0x05, 0x78, 0x4f, 0x08, 0x02, /* ....xO.. */
+0x01, 0x00, 0x06, 0x01, 0x61, 0x50, 0x12, 0x20, /* ....aP.  */
+0x9c, 0xae, 0xe5, 0xe3, 0x77, 0xaf, 0x0b, 0x1b, /* ....w... */
+0xaf, 0x0e, 0xb5, 0x08, 0x82, 0x9e, 0xeb        /* ....... */
+};
+
+/* Reassembled EAP (6 bytes) */
+static const unsigned char pkt41_1[6] = {
+0x02, 0x01, 0x00, 0x06, 0x01, 0x61              /* .....a */
+};
+

pcap/radius.blob.bin

@@ -0,0 +1 @@
+192.168.178.1

radius-proxy-orion.json

@@ -1,205 +0,0 @@
-{
-    "interfaces": [
-        {
-            "ethernet": [
-                {
-                    "select-ports": [
-                        "WAN*"
-                    ]
-                }
-            ],
-            "ipv4": {
-                "addressing": "dynamic"
-            },
-            "ipv6": {
-                "addressing": "dynamic"
-            },
-            "name": "wan",
-            "role": "upstream",
-            "services": [
-                "ssh"
-            ],
-            "ssids": []
-        },
-        {
-            "ethernet": [
-                {
-                    "select-ports": [
-                        "LAN*"
-                    ]
-                }
-            ],
-            "ipv4": {
-                "addressing": "static",
-                "dhcp": {
-                    "lease-count": 100,
-                    "lease-first": 10,
-                    "lease-time": "6h"
-                },
-                "gateway": "192.168.1.1",
-                "send-hostname": true,
-                "subnet": "192.168.1.1/24",
-                "use-dns": []
-            },
-            "ipv6": {
-                "addressing": "dynamic"
-            },
-            "name": "lan",
-            "role": "downstream",
-            "services": [
-                "wifi-steering",
-                "ssh"
-            ],
-            "ssids": [
-                {
-                    "bss-mode": "ap",
-                    "encryption": {
-                        "ieee80211w": "required",
-                        "proto": "wpa"
-                    },
-                    "hidden-ssid": false,
-                    "isolate-clients": false,
-                    "maximum-clients": 64,
-                    "name": "arilia-rad",
-                    "radius": {
-                        "authentication": {
-                            "host": "0.0.0.0",
-                            "port": 1812,
-                            "secret": "radsec"
-                        },
-                        "accounting": {
-                            "host": "0.0.0.0",
-                            "port": 1813,
-                            "secret": "radsec"
-                        }
-                    },
-                    "services": [
-                        "radius-gw-proxy"
-                    ],
-                    "wifi-bands": [
-                        "2G",
-                        "5G"
-                    ],
-                     "pass-point": {
-                         "venue-name": [
-                             "eng:Example passpoint_venue",
-                             "fra:Exemple de lieu"
-                         ],
-                         "domain-name": [
-                             "onboard.almondlabs.net",
-                             "test.com"
-                         ],
-                         "asra": false,
-                         "internet": true,
-                         "esr": false,
-                         "uesa": false,
-                         "access-network-type": 0,
-                         "hessid":"11:22:33:44:55:66",
-                         "venue-group": 2,
-                         "venue-type": 8,
-                         "connection-capability":[
-                             "1:0:2",
-                             "6:22:1",
-                             "17:5060:0"
-                         ],
-                         "roaming-consortium": [
-                             "F4F5E8F5F4",
-                             "BAA2D00100",
-                             "BAA2D00000"
-                         ],
-                         "disable-dgaf": true,
-                         "anqp-domain": 8888,
-                         "ipaddr-type-available": 14,
-                         "nai-realm": [
-                         ],
-                         "osen": false,
-                         "anqp-3gpp-cell-net": [
-                         ],
-                         "friendly-name": [
-                             "eng:AlmondLabs",
-                             "fra:AlmondLabs"
-                         ],
-                         "venue-url": [
-                             "http://www.example.com/info-fra",
-                             "http://www.example.com/info-eng"
-                         ],
-                         "auth-type": {
-                             "type": "terms-and-conditions"
-                         }
-                     }
-                 }
-            ]
-        }
-    ],
-    "metrics": {
-        "dhcp-snooping": {
-            "filters": [
-                "ack",
-                "discover",
-                "offer",
-                "request",
-                "solicit",
-                "reply",
-                "renew"
-            ]
-        },
-        "health": {
-            "interval": 60
-        },
-        "statistics": {
-            "interval": 60,
-            "types": [
-                "ssids",
-                "lldp",
-                "clients"
-            ]
-        },
-        "wifi-frames": {
-            "filters": [
-                "probe",
-                "auth",
-                "assoc",
-                "disassoc",
-                "deauth",
-                "local-deauth",
-                "inactive-deauth",
-                "key-mismatch",
-                "beacon-report",
-                "radar-detected"
-            ]
-        }
-    },
-    "radios": [
-        {
-            "band": "2G",
-            "bandwidth": 10,
-            "beacon-interval": 100,
-            "channel": "auto",
-            "channel-mode": "HT",
-            "channel-width": 20,
-            "country": "CA",
-            "dtim-period": 2,
-            "maximum-clients": 64,
-            "tx-power": 0
-        },
-        {
-            "band": "5G",
-            "bandwidth": 20,
-            "beacon-interval": 100,
-            "channel": "auto",
-            "channel-mode": "HE",
-            "channel-width": 40,
-            "country": "CA",
-            "dtim-period": 2,
-            "maximum-clients": 64,
-            "tx-power": 0
-        }
-    ],
-    "services": {
-        "ssh": {
-            "password-authentication": true,
-            "port": 22
-        }
-    },
-    "uuid": 1661312631
-}

radsec-config-sample.json

@@ -1,33 +0,0 @@
-{
-    "pools" : [
-        {
-            "name" : "master" ,
-            "description" : "master pool",
-            "useByDefault" : true,
-            "authConfig" : {
-                "strategy" : "weighted",
-                "monitor" : false,
-                "monitorMethod" : "none",
-                "methodParameters" : [],
-                "servers" : [ {
-                        "name" : "orion",
-                        "ip" : "216.239.32.91",
-                        "port" : 2083,
-                        "weight" : 10,
-                        "radsec" : true,
-                        "radsecPort" : 2083,
-                        "allowSelfSigned" : false,
-                        "radsecSecret" : "radsec",
-                        "radsecKey" : "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUR6RnpXeTZlYXg0QVoxTySG9VUURRZ0FFS3BnWVBHMktPTVd2S0w1Z3NMRXpUc09rREg1M3NHaEQyS3RsRXBDTXVnNDNIZlFnTFVpUgpTR1R2S1l0bDFmbmJaU1lnY0RJdncxdjNYRy9hVDhOY2JBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=",
-                        "radsecCert" : "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNRVENDQWVpZ0F3SUJBZ0lVY3BKS3pVM0Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBb1RDa0oxZEhSdmJuZHZiMlF4SFRBYkJnTlZCQU1URkVKMQpkSFJ2Ym5kdmIyUWdVbUZrYzJWaklFTkJNQjRYRFRJeU1EY3dNekExTWpVeE5Gb1hEVEkzTURVeE9UQTFNalV4Ck5Gb3dkVEVMTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFvVENrSjFkSFJ2Ym5kdmIyUXhOakEwQmdOVkJBTVQKTFdGeWFXeHBZUzVqWWpFd2FtTnVjemgxYlhCbk9HWnBjRFowTUM1dmNtbHZiaTVoY21WaE1USXdMbU52YlRFWgpNQmNHQ2dtU0pvbVQ4aXhrQVFFVENVZHZiMmRzWlRwVlV6QlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VICkEwSUFCQ3FZR0R4dGlqakZyeWkrWUxDeE0wN0RwQXgrZDdCb1E5aXJaUktRakxvT054MzBJQzFJa1Voazd5bUwKWmRYNTIyVW1JSEF5TDhOYjkxeHYyay9EWEd5amdZa3dnWVl3RGdZRFZSMFBBUUgvQkFRREFnZUFNQk1HQTFVZApKUVFNTUFvR0NDc0dBUVVGQndNQ01Bd0dBMVVkRXdFQi93UUNNQUF3T0FZRFZSMFJCREV3TDRJdFlYSnBiR2xoCkxtTmlNVEJxWTI1ek9IVnRjR2M0Wm1sd05uUXdMbTl5YVc5dUxtRnlaV0V4TWpBdVkyOXRNQmNHQTFVZElBUVEKTUE0d0RBWUtLd1lCQkFIdUtnRUJCVEFLQmdncWhrak9QUVFEQWdOSEFEQkVBaUFwTmM1dUNBSkp6KzVyakdqdwpCWGtOdHE3UU83bWU5dUg5bkNsTDZnSVE5Z0lnUHM2VkVKVW5CcEZ0RktXbFF4eWJ1YlBxYnpJNjBPSERHQ0ExCmhXUk1PS1U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-                        "radsecCacerts" : [
-				                    "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ0akNDQVZ1Z0F3SUJBZ0lCQyOXZaREVkTUJzR0ExVUVBeE1VUW5WMGRHOXVkMjl2WkNCU1lXUnpaV01nUTBFdwpJQmNOTVRrd05qQTJNVFV4TlRNeVdoZ1BNalV4T1RBMk1EY3hOVEUxTXpKYU1FRXhDekFKQmdOVkJBWVRBbFZUCk1STXdFUVlEVlFRS0V3cENkWFIwYjI1M2IyOWtNUjB3R3dZRFZRUURFeFJDZFhSMGIyNTNiMjlrSUZKaFpITmwKWXlCRFFUQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJJUW40QVBKaXdvUVFQblR1cFgrZTk1Ugp0ZzVoQVFVbUhCN1E0UkpwSG4welF6TUJpMDdSejkxV05RamFHeERydktLVlQ1OThIM2dxYkI4TTViOHN3aytqClFqQkFNQTRHQTFVZER3RUIvd1FFQXdJQ2hEQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBZ1lJS3dZQkJRVUgKQXdFd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBS0JnZ3Foa2pPUFFRREFnTkpBREJHQWlFQTkrbHUwN2NlaGc1OQpxSi81dWtzN05oL3F2aXFHWCs1WDFwSVVxdENGVlJjQ0lRREZmUGhwZzZJOFE0SUdBbzNuamlHRTdDWC9nMm56CkRzSW5FcG9vRlkxV0xRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
-                         ],
-                         "radsecRealms" : [],
-                         "ignore" : false
-                    }
-                ]
-            }
-        }
-    ]
-}

run.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+daemon=ucentralgw
+
+if [[ "$1" == "aws" ]]
+then
+	cp ${daemon}.properties.aws ${daemon}.properties
+	. ./set_env.sh
+	cd cmake-build
+	./${daemon} --daemon
+	echo "Running AWS version as daemon..."
+fi
+
+if [[ "$1" == "priv" ]]
+then
+  cp ${daemon}.properties.priv ${daemon}.properties
+  . ./set_env.sh
+  cd cmake-build
+  ./${daemon} --daemon
+  echo "Running private version as daemon..."
+fi
+
+
+

src/AP_WS_Connection.cpp

@@ -1,808 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-03.
-//
-
-#include "AP_WS_Connection.h"
-
-#include "Poco/Net/SecureStreamSocketImpl.h"
-#include "Poco/Net/HTTPServerResponseImpl.h"
-#include "Poco/Net/HTTPServerRequestImpl.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/Net/SSLException.h"
-#include "Poco/Net/Context.h"
-#include "Poco/Base64Decoder.h"
-#include "Poco/Net/WebSocketImpl.h"
-#include "Poco/zlib.h"
-
-#include "AP_WS_Server.h"
-#include "CentralConfig.h"
-#include "CommandManager.h"
-#include "ConfigurationCache.h"
-#include "StorageService.h"
-#include "TelemetryStream.h"
-
-#include "framework/KafkaManager.h"
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-#include "UI_GW_WebSocketNotifications.h"
-
-#include "fmt/format.h"
-
-#include "framework/ow_constants.h"
-
-
-#include "RADIUS_proxy_server.h"
-
-namespace OpenWifi {
-
-#define DBL					{ std::cout << __LINE__ << "  ID: " << ConnectionId_ << "  Ser: " << SerialNumber_ << std::endl; }
-
-	void AP_WS_Connection::LogException(const Poco::Exception &E) {
-		poco_information(Logger_,fmt::format("EXCEPTION({}): {}", CId_, E.displayText()));
-	}
-
-	AP_WS_Connection::AP_WS_Connection(Poco::Net::HTTPServerRequest &request,
-									   Poco::Net::HTTPServerResponse &response,
-									   uint64_t connection_id,
-									   Poco::Logger &L,
-									   Poco::Net::SocketReactor &R)
-		: Logger_(L) ,
-		  Reactor_(R)
-	{
-		State_.sessionId = connection_id;
-		WS_ = std::make_unique<Poco::Net::WebSocket>(request,response);
-
-		auto TS = Poco::Timespan(360, 0);
-
-		WS_->setMaxPayloadSize(BufSize);
-		WS_->setReceiveTimeout(TS);
-		WS_->setNoDelay(true);
-		WS_->setKeepAlive(true);
-		WS_->setBlocking(false);
-
-		Reactor_.addEventHandler(
-			*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
-					  *this, &AP_WS_Connection::OnSocketReadable));
-		Reactor_.addEventHandler(
-			*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
-					  *this, &AP_WS_Connection::OnSocketShutdown));
-		Reactor_.addEventHandler(
-			*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
-					  *this, &AP_WS_Connection::OnSocketError));
-		Registered_ = true;
-		Valid_ = true;
-	}
-
-	bool AP_WS_Connection::ValidatedDevice() {
-		if(DeviceValidated_)
-			return true;
-
-		if(!Valid_)
-			return false;
-
-		std::lock_guard	Lock(ConnectionMutex_);
-		try {
-			auto SockImpl = dynamic_cast<Poco::Net::WebSocketImpl *>(WS_->impl());
-			auto SS = dynamic_cast<Poco::Net::SecureStreamSocketImpl*>(SockImpl->streamSocketImpl());
-
-			PeerAddress_ = SS->peerAddress().host();
-			CId_ = Utils::FormatIPv6(SS->peerAddress().toString());
-
-			State_.started = Utils::Now();
-
-			if (!SS->secure()) {
-				poco_warning(Logger_,fmt::format("TLS-CONNECTION({}): Session={} Connection is NOT secure. Device is not allowed.", CId_, State_.sessionId ));
-				EndConnection();
-				return false;
-			}
-
-			poco_debug(Logger_,fmt::format("TLS-CONNECTION({}): Session={} Connection is secure.", CId_, State_.sessionId ));
-
-			if (!SS->havePeerCertificate()) {
-				State_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
-				poco_warning(Logger_,fmt::format("TLS-CONNECTION({}): Session={} No certificates available..", CId_, State_.sessionId ));
-				EndConnection();
-				return false;
-			}
-
-			Poco::Crypto::X509Certificate PeerCert(SS->peerCertificate());
-			if (!AP_WS_Server()->ValidateCertificate(CId_, PeerCert)) {
-				State_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
-				poco_warning(Logger_, fmt::format("TLS-CONNECTION({}): Session={} Device certificate is not valid. Device is not allowed.",
-												  CId_, State_.sessionId ));
-				EndConnection();
-				return false;
-			}
-
-			CN_ = Poco::trim(Poco::toLower(PeerCert.commonName()));
-			State_.VerifiedCertificate = GWObjects::VALID_CERTIFICATE;
-			poco_debug(Logger_,
-					   fmt::format("TLS-CONNECTION({}): Session={} Valid certificate: CN={}", CId_, State_.sessionId , CN_));
-
-			if (AP_WS_Server::IsSim(CN_) && !AP_WS_Server()->IsSimEnabled()) {
-				poco_warning(
-					Logger_,
-					fmt::format("TLS-CONNECTION({}): Session={} Sim Device {} is not allowed. Disconnecting.",
-								CId_, State_.sessionId , CN_));
-				EndConnection();
-				return false;
-			}
-
-			if (!CN_.empty() && StorageService()->IsBlackListed(CN_)) {
-				poco_warning(
-					Logger_,
-					fmt::format("TLS-CONNECTION({}): Session={} Device {} is black listed. Disconnecting.",
-								CId_, State_.sessionId , CN_));
-				EndConnection();
-				return false;
-			}
-
-			State_.certificateExpiryDate = PeerCert.expiresOn().timestamp().epochTime();
-			SerialNumber_ = CN_;
-			SerialNumberInt_ = Utils::SerialNumberToInt(SerialNumber_);
-
-			poco_debug(Logger_, fmt::format("TLS-CONNECTION({}): Session={} CN={} Completed. (t={})", CId_, State_.sessionId , CN_, ConcurrentStartingDevices_));
-			DeviceValidated_ = true;
-			return true;
-
-		} catch (const Poco::Net::CertificateValidationException &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Poco::CertificateValidationException Certificate Validation failed during connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Net::WebSocketException &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Poco::WebSocketException WebSocket error during connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Net::ConnectionAbortedException &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}):Session:{}  Poco::ConnectionAbortedException Connection was aborted during connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Net::ConnectionResetException &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Poco::ConnectionResetException Connection was reset during connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Net::InvalidCertificateException &E) {
-			poco_error(Logger_,fmt::format(
-									"CONNECTION({}): Session:{} Poco::InvalidCertificateException Invalid certificate. Device will have to retry.",
-									CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Net::SSLException &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Poco::SSLException SSL Exception during connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (const Poco::Exception &E) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Poco::Exception caught during device connection. Device will have to retry.",
-											CId_, State_.sessionId ));
-			Logger_.log(E);
-		} catch (...) {
-			poco_error(Logger_,fmt::format("CONNECTION({}): Session:{} Exception caught during device connection. Device will have to retry. Unsecure connect denied.",
-											CId_, State_.sessionId ));
-		}
-		EndConnection();
-		return false;
-	}
-
-	static void NotifyKafkaDisconnect(const std::string & SerialNumber) {
-		try {
-			Poco::JSON::Object Disconnect;
-			Poco::JSON::Object Details;
-			Details.set(uCentralProtocol::SERIALNUMBER, SerialNumber);
-			Details.set(uCentralProtocol::TIMESTAMP, Utils::Now());
-			Disconnect.set(uCentralProtocol::DISCONNECTION, Details);
-			Poco::JSON::Stringifier Stringify;
-			std::ostringstream OS;
-			Stringify.condense(Disconnect, OS);
-			KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber, OS.str());
-		} catch (...) {
-		}
-	}
-
-	AP_WS_Connection::~AP_WS_Connection() {
-		Valid_=false;
-		EndConnection();
-	}
-
-	void AP_WS_Connection::EndConnection() {
-		Valid_=false;
-		if(!Dead_.test_and_set()) {
-
-			if (Registered_) {
-				Registered_ = false;
-				Reactor_.removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
-							  *this, &AP_WS_Connection::OnSocketReadable));
-				Reactor_.removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
-							  *this, &AP_WS_Connection::OnSocketShutdown));
-				Reactor_.removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
-							  *this, &AP_WS_Connection::OnSocketError));
-			}
-			WS_->close();
-
-			if (KafkaManager()->Enabled() && !SerialNumber_.empty()) {
-				std::string s(SerialNumber_);
-				std::thread t([s]() { NotifyKafkaDisconnect(s); });
-				t.detach();
-			}
-
-			auto SessionDeleted = AP_WS_Server()->EndSession(State_.sessionId, SerialNumberInt_);
-			if (SessionDeleted) {
-				GWWebSocketNotifications::SingleDevice_t	N;
-				N.content.serialNumber = SerialNumber_;
-				GWWebSocketNotifications::DeviceDisconnected(N);
-			}
-		}
-	}
-
-	bool AP_WS_Connection::LookForUpgrade(const uint64_t UUID, uint64_t & UpgradedUUID) {
-
-		//	A UUID of zero means ignore updates for that connection.
-		if (UUID == 0)
-			return false;
-
-		uint64_t GoodConfig = ConfigurationCache().CurrentConfig(SerialNumberInt_);
-		if (GoodConfig && (GoodConfig == UUID || GoodConfig == State_.PendingUUID)) {
-			UpgradedUUID = UUID;
-			return false;
-		}
-
-		GWObjects::Device D;
-		if (StorageService()->GetDevice(SerialNumber_, D)) {
-
-			//	This is the case where the cache is empty after a restart. So GoodConfig will 0. If the device already 	has the right UUID, we just return.
-			if (D.UUID == UUID) {
-				UpgradedUUID = UUID;
-				ConfigurationCache().Add(SerialNumberInt_, UUID);
-				return false;
-			}
-
-			if(UUID>D.UUID) {
-				//	so we have a problem, the device has a newer config than we have. So we need to make sure our config
-				//	is newer.
-				Config::Config	Cfg(D.Configuration);
-				D.UUID = UUID+2;
-				UpgradedUUID = D.UUID;
-				Cfg.SetUUID(D.UUID);
-				D.Configuration = Cfg.get();
-				StorageService()->UpdateDevice(D);
-			}
-
-			UpgradedUUID = D.UUID;
-			State_.PendingUUID = D.UUID;
-			GWObjects::CommandDetails Cmd;
-			Cmd.SerialNumber = SerialNumber_;
-			Cmd.UUID = MicroServiceCreateUUID();
-			Cmd.SubmittedBy = uCentralProtocol::SUBMITTED_BY_SYSTEM;
-			Cmd.Status = uCentralProtocol::PENDING;
-			Cmd.Command = uCentralProtocol::CONFIGURE;
-			Poco::JSON::Parser P;
-			auto ParsedConfig = P.parse(D.Configuration).extract<Poco::JSON::Object::Ptr>();
-			Poco::JSON::Object Params;
-			Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-			Params.set(uCentralProtocol::UUID, D.UUID);
-			Params.set(uCentralProtocol::WHEN, 0);
-			Params.set(uCentralProtocol::CONFIG, ParsedConfig);
-
-			std::ostringstream O;
-			Poco::JSON::Stringifier::stringify(Params, O);
-			Cmd.Details = O.str();
-			poco_information(Logger_,fmt::format("CFG-UPGRADE({}): Current ID: {}, newer configuration {}.",
-										   CId_, UUID, D.UUID));
-			bool Sent;
-
-			StorageService()->AddCommand(SerialNumber_, Cmd, Storage::CommandExecutionType::COMMAND_EXECUTED);
-			CommandManager()->PostCommand(CommandManager()->Next_RPC_ID(), APCommands::to_apcommand(Cmd.Command.c_str()),SerialNumber_, Cmd.Command, Params, Cmd.UUID, Sent);
-
-			GWWebSocketNotifications::SingleDeviceConfigurationChange_t	Notification;
-			Notification.content.serialNumber = D.SerialNumber;
-			Notification.content.oldUUID = UUID;
-			Notification.content.newUUID = UpgradedUUID;
-			GWWebSocketNotifications::DeviceConfigurationChange(Notification);
-
-			return true;
-		}
-		return false;
-	}
-
-	void AP_WS_Connection::ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc) {
-		poco_debug(Logger_,fmt::format("RECEIVED-RPC({}): {}.", CId_, Doc->get(uCentralProtocol::ID).toString()));
-		CommandManager()->PostCommandResult(SerialNumber_, Doc);
-	}
-
-	void AP_WS_Connection::ProcessJSONRPCEvent(Poco::JSON::Object::Ptr &Doc) {
-		auto Method = Doc->get(uCentralProtocol::METHOD).toString();
-		auto EventType = uCentralProtocol::Events::EventFromString(Method);
-		if (EventType == uCentralProtocol::Events::ET_UNKNOWN) {
-			poco_warning(Logger_,fmt::format("ILLEGAL-PROTOCOL({}): Unknown message type '{}'", CId_, Method));
-			Errors_++;
-			return;
-		}
-
-		if (!Doc->isObject(uCentralProtocol::PARAMS)) {
-			poco_warning(Logger_,fmt::format("MISSING-PARAMS({}): params must be an object.", CId_));
-			Errors_++;
-			return;
-		}
-
-		//  expand params if necessary
-		auto ParamsObj = Doc->get(uCentralProtocol::PARAMS).extract<Poco::JSON::Object::Ptr>();
-		if (ParamsObj->has(uCentralProtocol::COMPRESS_64)) {
-			std::string UncompressedData;
-			try {
-				auto CompressedData = ParamsObj->get(uCentralProtocol::COMPRESS_64).toString();
-				uint64_t compress_sz = 0 ;
-				if(ParamsObj->has("compress_sz")) {
-					compress_sz = ParamsObj->get("compress_sz");
-				}
-
-				if (Utils::ExtractBase64CompressedData(CompressedData, UncompressedData, compress_sz)) {
-					poco_trace(Logger_,fmt::format("EVENT({}): Found compressed payload expanded to '{}'.",
-													  CId_, UncompressedData));
-					Poco::JSON::Parser Parser;
-					ParamsObj = Parser.parse(UncompressedData).extract<Poco::JSON::Object::Ptr>();
-				} else {
-					poco_warning(Logger_,fmt::format("INVALID-COMPRESSED-DATA({}): Compressed cannot be uncompressed - content must be corrupt..: size={}",
-														CId_, CompressedData.size()));
-					Errors_++;
-					return;
-				}
-			} catch (const Poco::Exception &E) {
-				poco_warning(Logger_,fmt::format("INVALID-COMPRESSED-JSON-DATA({}): Compressed cannot be parsed - JSON must be corrupt..",
-													CId_));
-				Logger_.log(E);
-				return;
-			}
-		}
-
-		if (!ParamsObj->has(uCentralProtocol::SERIAL)) {
-			poco_warning(Logger_,fmt::format("MISSING-PARAMS({}): Serial number is missing in message.", CId_));
-			return;
-		}
-
-		auto Serial = Poco::trim(Poco::toLower(ParamsObj->get(uCentralProtocol::SERIAL).toString()));
-		if (!Utils::ValidSerialNumber(Serial)) {
-			Poco::Exception E(
-				fmt::format(
-					"ILLEGAL-DEVICE-NAME({}): device name is illegal and not allowed to connect.",
-					Serial),
-				EACCES);
-			E.rethrow();
-		}
-
-		if (StorageService()->IsBlackListed(Serial)) {
-			Poco::Exception E(
-				fmt::format("BLACKLIST({}): device is blacklisted and not allowed to connect.",
-							 Serial),
-				EACCES);
-			E.rethrow();
-		}
-
-		switch (EventType) {
-			case uCentralProtocol::Events::ET_CONNECT: {
-				Process_connect(ParamsObj, Serial);
-			} break;
-
-			case uCentralProtocol::Events::ET_STATE: {
-				Process_state(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_HEALTHCHECK: {
-				Process_healthcheck(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_LOG: {
-				Process_log(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_CRASHLOG: {
-				Process_crashlog(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_PING: {
-				Process_ping(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_CFGPENDING: {
-				Process_cfgpending(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_RECOVERY: {
-				Process_recovery(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_DEVICEUPDATE: {
-				Process_deviceupdate(ParamsObj, Serial);
-			} break;
-
-			case uCentralProtocol::Events::ET_TELEMETRY: {
-				Process_telemetry(ParamsObj);
-			} break;
-
-			case uCentralProtocol::Events::ET_VENUEBROADCAST: {
-				Process_venuebroadcast(ParamsObj);
-			} break;
-
-			// 	this will never be called but some compilers will complain if we do not have a case for
-			//	every single values of an enum
-			case uCentralProtocol::Events::ET_UNKNOWN: {
-				poco_warning(Logger_, fmt::format("ILLEGAL-EVENT({}): Event '{}' unknown. CN={}", CId_, Method, CN_));
-				Errors_++;
-			}
-		}
-	}
-
-	bool AP_WS_Connection::StartTelemetry(uint64_t RPCID) {
-		poco_information(Logger_, fmt::format("TELEMETRY({}): Starting.", CId_));
-		Poco::JSON::Object StartMessage;
-		StartMessage.set("jsonrpc", "2.0");
-		StartMessage.set("method", "telemetry");
-		Poco::JSON::Object Params;
-		Params.set("serial", SerialNumber_);
-		Params.set("interval", (uint64_t)TelemetryInterval_);
-		Poco::JSON::Array Types;
-		Types.add("wifi-frames");
-		Types.add("dhcp-snooping");
-		Types.add("state");
-		Params.set(RESTAPI::Protocol::TYPES, Types);
-		StartMessage.set("id", RPCID);
-		StartMessage.set("params", Params);
-		Poco::JSON::Stringifier Stringify;
-		std::ostringstream OS;
-		Stringify.condense(StartMessage, OS);
-		return Send(OS.str());
-	}
-
-	bool AP_WS_Connection::StopTelemetry(uint64_t RPCID) {
-		poco_information(Logger_, fmt::format("TELEMETRY({}): Stopping.", CId_));
-		Poco::JSON::Object StopMessage;
-		StopMessage.set("jsonrpc", "2.0");
-		StopMessage.set("method", "telemetry");
-		Poco::JSON::Object Params;
-		Params.set("serial", SerialNumber_);
-		Params.set("interval", 0);
-		StopMessage.set("id", RPCID);
-		StopMessage.set("params", Params);
-		Poco::JSON::Stringifier Stringify;
-		std::ostringstream OS;
-		Stringify.condense(StopMessage, OS);
-		TelemetryKafkaPackets_ = TelemetryWebSocketPackets_ = TelemetryInterval_ =
-			TelemetryKafkaTimer_ = TelemetryWebSocketTimer_ = 0;
-		return Send(OS.str());
-	}
-
-	void AP_WS_Connection::UpdateCounts() {
-		State_.kafkaClients = TelemetryKafkaRefCount_;
-		State_.webSocketClients = TelemetryWebSocketRefCount_;
-	}
-
-	bool AP_WS_Connection::SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t Interval,
-														  uint64_t LifeTime) {
-		std::unique_lock Lock(TelemetryMutex_);
-		TelemetryWebSocketRefCount_++;
-		TelemetryInterval_ = TelemetryInterval_ ? ( Interval< TelemetryInterval_ ? Interval : TelemetryInterval_) : Interval;
-		auto TelemetryWebSocketTimer = LifeTime + Utils::Now();
-		TelemetryWebSocketTimer_ = TelemetryWebSocketTimer > TelemetryWebSocketTimer_ ? TelemetryWebSocketTimer : TelemetryWebSocketTimer_;
-		UpdateCounts();
-		if (!TelemetryReporting_) {
-			TelemetryReporting_ = true;
-			return StartTelemetry(RPCID);
-		}
-		return true;
-	}
-
-	bool AP_WS_Connection::SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t Interval, uint64_t LifeTime) {
-		std::unique_lock Lock(TelemetryMutex_);
-		TelemetryKafkaRefCount_++;
-		TelemetryInterval_ = TelemetryInterval_ ? ( Interval<TelemetryInterval_ ? Interval : TelemetryInterval_) : Interval;
-		auto TelemetryKafkaTimer = LifeTime + Utils::Now();
-		TelemetryKafkaTimer_ = TelemetryKafkaTimer > TelemetryKafkaTimer_ ? TelemetryKafkaTimer : TelemetryKafkaTimer_;
-		UpdateCounts();
-		if (!TelemetryReporting_) {
-			TelemetryReporting_ = true;
-			return StartTelemetry(RPCID);
-		}
-		return true;
-	}
-
-	bool AP_WS_Connection::StopWebSocketTelemetry(uint64_t RPCID) {
-		std::unique_lock Lock(TelemetryMutex_);
-		if (TelemetryWebSocketRefCount_)
-			TelemetryWebSocketRefCount_--;
-		UpdateCounts();
-		if (TelemetryWebSocketRefCount_ == 0 && TelemetryKafkaRefCount_ == 0) {
-			TelemetryReporting_ = false;
-			StopTelemetry(RPCID);
-		}
-		return true;
-	}
-
-	bool AP_WS_Connection::StopKafkaTelemetry(uint64_t RPCID) {
-		std::unique_lock Lock(TelemetryMutex_);
-		if (TelemetryKafkaRefCount_)
-			TelemetryKafkaRefCount_--;
-		UpdateCounts();
-		if (TelemetryWebSocketRefCount_ == 0 && TelemetryKafkaRefCount_ == 0) {
-			TelemetryReporting_ = false;
-			StopTelemetry(RPCID);
-		}
-		return true;
-	}
-
-	void AP_WS_Connection::OnSocketShutdown([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
-		poco_trace(Logger_, fmt::format("SOCKET-SHUTDOWN({}): Closing.", CId_));
-		return EndConnection();
-	}
-
-	void AP_WS_Connection::OnSocketError([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
-		poco_trace(Logger_, fmt::format("SOCKET-ERROR({}): Closing.", CId_));
-		return EndConnection();
-	}
-
-	void AP_WS_Connection::OnSocketReadable([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-
-		if(!Valid_)
-			return;
-
-		if(!AP_WS_Server()->Running())
-			return EndConnection();
-
-		if(!ValidatedDevice())
-			return;
-
-		try {
-			return ProcessIncomingFrame();
-		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
-			return EndConnection();
-		} catch (const std::exception &E) {
-			std::string W = E.what();
-			poco_information(Logger_, fmt::format("std::exception caught: {}. Connection terminated with {}", W, CId_));
-			return EndConnection();
-		} catch (...) {
-			poco_information(Logger_, fmt::format("Unknown exception for {}. Connection terminated.", CId_));
-			return EndConnection();
-		}
-	}
-
-	void AP_WS_Connection::ProcessIncomingFrame() {
-		Poco::Buffer<char> IncomingFrame(0);
-		try {
-			int Op, flags;
-			auto IncomingSize = WS_->receiveFrame(IncomingFrame, flags);
-
-			Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
-
-			if (IncomingSize == 0 && flags == 0 && Op == 0) {
-				poco_information(Logger_, fmt::format("DISCONNECT({}): device has disconnected. Session={}", CId_, State_.sessionId));
-				return EndConnection();
-			}
-
-			IncomingFrame.append(0);
-
-			State_.RX += IncomingSize;
-			State_.MessageCount++;
-			State_.LastContact = Utils::Now();
-
-			switch (Op) {
-				case Poco::Net::WebSocket::FRAME_OP_PING: {
-					poco_trace(Logger_, fmt::format("WS-PING({}): received. PONG sent back.", CId_));
-					WS_->sendFrame("", 0,
-								   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-									   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
-
-					if (KafkaManager()->Enabled()) {
-						Poco::JSON::Object PingObject;
-						Poco::JSON::Object PingDetails;
-						PingDetails.set(uCentralProtocol::FIRMWARE, State_.Firmware);
-						PingDetails.set(uCentralProtocol::SERIALNUMBER, SerialNumber_);
-						PingDetails.set(uCentralProtocol::COMPATIBLE, Compatible_);
-						PingDetails.set(uCentralProtocol::CONNECTIONIP, CId_);
-						PingDetails.set(uCentralProtocol::TIMESTAMP, Utils::Now());
-						PingDetails.set("locale", State_.locale );
-						PingObject.set(uCentralProtocol::PING, PingDetails);
-						Poco::JSON::Stringifier Stringify;
-						std::ostringstream OS;
-						Stringify.condense(PingObject, OS);
-						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, OS.str());
-					}
-					return;
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_PONG: {
-					poco_trace(Logger_, fmt::format("PONG({}): received and ignored.", CId_));
-					return;
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_TEXT: {
-					poco_trace(Logger_, fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}", CId_,
-									 IncomingSize, flags, IncomingFrame.begin()));
-
-					Poco::JSON::Parser parser;
-					auto ParsedMessage = parser.parse(IncomingFrame.begin());
-					auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();
-
-					if (IncomingJSON->has(uCentralProtocol::JSONRPC)) {
-						if (IncomingJSON->has(uCentralProtocol::METHOD) &&
-							IncomingJSON->has(uCentralProtocol::PARAMS)) {
-							ProcessJSONRPCEvent(IncomingJSON);
-						} else if (IncomingJSON->has(uCentralProtocol::RESULT) &&
-								   IncomingJSON->has(uCentralProtocol::ID)) {
-							poco_trace(Logger_, fmt::format("RPC-RESULT({}): payload: {}", CId_, IncomingFrame.begin()));
-							ProcessJSONRPCResult(IncomingJSON);
-						} else {
-							poco_warning(Logger_,
-								fmt::format("INVALID-PAYLOAD({}): Payload is not JSON-RPC 2.0: {}",
-											 CId_, IncomingFrame.begin()));
-						}
-					} else if (IncomingJSON->has(uCentralProtocol::RADIUS)) {
-						ProcessIncomingRadiusData(IncomingJSON);
-					} else {
-						std::ostringstream iS;
-						IncomingJSON->stringify(iS);
-						std::cout << iS.str() << std::endl;
-						poco_warning(Logger_, fmt::format(
-												   "FRAME({}): illegal transaction header, missing 'jsonrpc'", CId_));
-						Errors_++;
-					}
-					return;
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-					poco_information(Logger_,
-						fmt::format("CLOSE({}): Device is closing its connection.", CId_));
-					return EndConnection();
-				} break;
-
-				default: {
-					poco_warning(Logger_, fmt::format("UNKNOWN({}): unknown WS Frame operation: {}", CId_,
-												  std::to_string(Op)));
-				} break;
-			}
-		} catch (const Poco::Net::ConnectionResetException &E) {
-			poco_warning(Logger_, fmt::format("ConnectionResetException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-			   	IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-			    State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::JSON::JSONException &E) {
-			poco_warning(Logger_, fmt::format("JSONException({}): Text:{} Payload:{} Session:{}",
-		   		CId_,
-			   	E.displayText(),
-			   	IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::Net::WebSocketException &E) {
-			poco_warning(Logger_, fmt::format("WebSocketException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::Net::SSLConnectionUnexpectedlyClosedException &E) {
-			poco_warning(Logger_, fmt::format("SSLConnectionUnexpectedlyClosedException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::Net::SSLException &E) {
-			poco_warning(Logger_, fmt::format("SSLException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::Net::NetException &E) {
-			poco_warning(Logger_, fmt::format("NetException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::IOException &E) {
-			poco_warning(Logger_, fmt::format("IOException({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const Poco::Exception &E) {
-			poco_warning(Logger_, fmt::format("Exception({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.displayText(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (const std::exception &E) {
-			poco_warning(Logger_, fmt::format("std::exception({}): Text:{} Payload:{} Session:{}",
-				CId_,
-				E.what(),
-				IncomingFrame.begin()==nullptr ? "" : IncomingFrame.begin(),
-											   State_.sessionId));
-			return EndConnection();
-		} catch (...) {
-			poco_error(Logger_,fmt::format("UnknownException({}): Device must be disconnected. Unknown exception.  Session:{}", CId_, State_.sessionId));
-			return EndConnection();
-		}
-
-		if (Errors_ < 10)
-			return;
-
-		poco_warning(Logger_, fmt::format("DISCONNECTING({}): Too many errors", CId_));
-		return EndConnection();
-	}
-
-	bool AP_WS_Connection::Send(const std::string &Payload) {
-		try {
-			size_t BytesSent = WS_->sendFrame(Payload.c_str(), (int)Payload.size());
-			State_.TX += BytesSent;
-			return BytesSent == Payload.size();
-		} catch(const Poco::Exception &E) {
-			Logger_.log(E);
-		}
-		return false;
-	}
-
-	std::string Base64Encode(const unsigned char *buffer, std::size_t size) {
-		return Utils::base64encode(buffer,size);
-	}
-
-	std::string Base64Decode(const std::string &F) {
-		std::istringstream ifs(F);
-		Poco::Base64Decoder b64in(ifs);
-		std::ostringstream ofs;
-		Poco::StreamCopier::copyStream(b64in, ofs);
-		return ofs.str();
-	}
-
-	bool AP_WS_Connection::SendRadiusAuthenticationData(const unsigned char * buffer, std::size_t size) {
-		Poco::JSON::Object	Answer;
-		Answer.set(uCentralProtocol::RADIUS,uCentralProtocol::RADIUSAUTH);
-		Answer.set(uCentralProtocol::RADIUSDATA, Base64Encode(buffer,size));
-
-		std::ostringstream Payload;
-		Answer.stringify(Payload);
-		return Send(Payload.str());
-	}
-
-	bool AP_WS_Connection::SendRadiusAccountingData(const unsigned char * buffer, std::size_t size) {
-		Poco::JSON::Object	Answer;
-		Answer.set(uCentralProtocol::RADIUS,uCentralProtocol::RADIUSACCT);
-		Answer.set(uCentralProtocol::RADIUSDATA, Base64Encode(buffer,size));
-
-		std::ostringstream Payload;
-		Answer.stringify(Payload);
-		return Send(Payload.str());
-	}
-
-	bool AP_WS_Connection::SendRadiusCoAData(const unsigned char * buffer, std::size_t size) {
-		Poco::JSON::Object	Answer;
-		Answer.set(uCentralProtocol::RADIUS,uCentralProtocol::RADIUSCOA);
-		Answer.set(uCentralProtocol::RADIUSDATA, Base64Encode(buffer,size));
-
-		std::ostringstream Payload;
-		Answer.stringify(Payload);
-		return Send(Payload.str());
-	}
-
-	void AP_WS_Connection::ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc) {
-		if( Doc->has(uCentralProtocol::RADIUSDATA)) {
-			auto Type = Doc->get(uCentralProtocol::RADIUS).toString();
-			if(Type==uCentralProtocol::RADIUSACCT) {
-				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
-				auto DecodedData = Base64Decode(Data);
-				RADIUS_proxy_server()->SendAccountingData(SerialNumber_,DecodedData.c_str(),DecodedData.size());
-			} else if(Type==uCentralProtocol::RADIUSAUTH) {
-				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
-				auto DecodedData = Base64Decode(Data);
-				RADIUS_proxy_server()->SendAuthenticationData(SerialNumber_,DecodedData.c_str(),DecodedData.size());
-			} else if(Type==uCentralProtocol::RADIUSCOA) {
-				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
-				auto DecodedData = Base64Decode(Data);
-				RADIUS_proxy_server()->SendCoAData(SerialNumber_,DecodedData.c_str(),DecodedData.size());
-			}
-		}
-	}
-}

src/AP_WS_Connection.h

@@ -1,161 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-03.
-//
-
-#pragma once
-
-#include <string>
-#include <shared_mutex>
-
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/Net/StreamSocket.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/Net/SocketNotification.h"
-#include "Poco/Logger.h"
-#include "Poco/Net/WebSocket.h"
-
-#include "RESTObjects/RESTAPI_GWobjects.h"
-
-namespace OpenWifi {
-
-	class AP_WS_Connection {
-		static constexpr int BufSize = 256000;
-	  public:
-		explicit AP_WS_Connection(	Poco::Net::HTTPServerRequest &request,
-									Poco::Net::HTTPServerResponse &response,
-									uint64_t connection_id,
-									Poco::Logger &L,
-									Poco::Net::SocketReactor &R);
-		~AP_WS_Connection();
-
-		void EndConnection();
-		void ProcessJSONRPCEvent(Poco::JSON::Object::Ptr & Doc);
-		void ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc);
-		void ProcessIncomingFrame();
-		void ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc);
-
-		bool Send(const std::string &Payload);
-
-		bool SendRadiusAuthenticationData(const unsigned char * buffer, std::size_t size);
-		bool SendRadiusAccountingData(const unsigned char * buffer, std::size_t size);
-		bool SendRadiusCoAData(const unsigned char * buffer, std::size_t size);
-
-		void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf);
-		void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification>& pNf);
-		void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification>& pNf);
-		bool LookForUpgrade(uint64_t UUID, uint64_t & UpgradedUUID);
-		static bool ExtractBase64CompressedData(const std::string & CompressedData, std::string & UnCompressedData, uint64_t compress_sz);
-		void LogException(const Poco::Exception &E);
-		inline Poco::Logger & Logger() { return Logger_; }
-		bool SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t interval, uint64_t TelemetryWebSocketTimer);
-		bool SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t interval, uint64_t TelemetryKafkaTimer);
-		bool StopWebSocketTelemetry(uint64_t RPCID);
-		bool StopKafkaTelemetry(uint64_t RPCID);
-
-		inline void GetLastStats(std::string &LastStats) const {
-			std::shared_lock	G(ConnectionMutex_);
-			LastStats = RawLastStats_;
-		}
-
-		inline void SetLastStats(const std::string &LastStats) {
-			std::unique_lock	G(ConnectionMutex_);
-			RawLastStats_ = LastStats;
-		}
-
-		inline void SetLastHealthCheck(const GWObjects::HealthCheck &H) {
-			std::unique_lock	G(ConnectionMutex_);
-			RawLastHealthcheck_ = H;
-		}
-
-		inline void GetLastHealthCheck(GWObjects::HealthCheck &H) {
-			std::shared_lock	G(ConnectionMutex_);
-			H = RawLastHealthcheck_;
-		}
-
-		inline void GetState(GWObjects::ConnectionState &State) const {
-			std::shared_lock	G(ConnectionMutex_);
-			State = State_;
-		}
-
-		inline void GetRestrictions(GWObjects::DeviceRestrictions & R) const {
-			std::shared_lock	G(ConnectionMutex_);
-			R = Restrictions_;
-		}
-
-		void Process_connect(Poco::JSON::Object::Ptr ParamsObj, const std::string &Serial);
-		void Process_state(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_healthcheck(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_log(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_crashlog(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_ping(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_cfgpending(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_recovery(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj, std::string &Serial);
-		void Process_telemetry(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_venuebroadcast(Poco::JSON::Object::Ptr ParamsObj);
-
-		bool ValidatedDevice();
-
-		inline bool GetTelemetryParameters(bool & Reporting, uint64_t & Interval,
-										   uint64_t & WebSocketTimer, uint64_t & KafkaTimer,
-										   uint64_t &WebSocketCount, uint64_t & KafkaCount,
-										   uint64_t &WebSocketPackets,
-										   uint64_t &KafkaPackets ) const {
-			Reporting = TelemetryReporting_;
-			WebSocketTimer = TelemetryWebSocketTimer_;
-			KafkaTimer = TelemetryKafkaTimer_;
-			WebSocketCount = TelemetryWebSocketRefCount_;
-			KafkaCount = TelemetryKafkaRefCount_;
-			Interval = TelemetryInterval_;
-			WebSocketPackets = TelemetryWebSocketPackets_;
-			KafkaPackets = TelemetryKafkaPackets_;
-			return true;
-		}
-
-		friend class AP_WS_Server;
-
-        inline GWObjects::DeviceRestrictions Restrictions() const {
-			std::shared_lock	G(ConnectionMutex_);
-			return Restrictions_;
-		}
-
-	  private:
-		mutable std::shared_mutex	 		ConnectionMutex_;
-		std::shared_mutex					TelemetryMutex_;
-		Poco::Logger                    	&Logger_;
-		Poco::Net::SocketReactor			&Reactor_;
-		std::unique_ptr<Poco::Net::WebSocket> WS_;
-		std::string                         SerialNumber_;
-		uint64_t 							SerialNumberInt_=0;
-		std::string 						Compatible_;
-		std::atomic_bool                    Registered_ = false ;
-		std::string 						CId_;
-		std::string							CN_;
-		uint64_t 							Errors_=0;
-		Poco::Net::IPAddress				PeerAddress_;
-		volatile bool 						TelemetryReporting_ = false;
-		volatile uint64_t				    TelemetryWebSocketRefCount_ = 0;
-		volatile uint64_t				    TelemetryKafkaRefCount_ = 0;
-		volatile uint64_t 				    TelemetryWebSocketTimer_ = 0;
-		volatile uint64_t 				    TelemetryKafkaTimer_ = 0 ;
-		volatile uint64_t 				    TelemetryInterval_ = 0;
-		volatile uint64_t				    TelemetryWebSocketPackets_=0;
-		volatile uint64_t				    TelemetryKafkaPackets_=0;
-		GWObjects::ConnectionState			State_;
-		std::string        					RawLastStats_;
-		GWObjects::HealthCheck				RawLastHealthcheck_;
-		std::chrono::time_point<std::chrono::high_resolution_clock> ConnectionStart_ = std::chrono::high_resolution_clock::now();
-		std::chrono::duration<double, std::milli> ConnectionCompletionTime_{0.0};
-		std::atomic_flag 					Dead_=false;
-		std::atomic_bool 					DeviceValidated_=false;
-		std::atomic_bool 					Valid_=false;
-        OpenWifi::GWObjects::DeviceRestrictions       Restrictions_;
-
-		static inline std::atomic_uint64_t 	ConcurrentStartingDevices_=0;
-
-		bool StartTelemetry(uint64_t RPCID);
-		bool StopTelemetry(uint64_t RPCID);
-		void UpdateCounts();
-	};
-
-}

src/AP_WS_Process_cfgpending.cpp

@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "fmt/format.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_cfgpending(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
-			poco_warning(Logger_, fmt::format(
-									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-		if (ParamsObj->has(uCentralProtocol::UUID) && ParamsObj->has(uCentralProtocol::ACTIVE)) {
-
-			[[maybe_unused]] uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
-			[[maybe_unused]] uint64_t Active = ParamsObj->get(uCentralProtocol::ACTIVE);
-			poco_trace(Logger_, fmt::format("CFG-PENDING({}): Active: {} Target: {}", CId_, Active, UUID));
-		} else {
-			poco_warning(Logger_, fmt::format("CFG-PENDING({}): Missing some parameters", CId_));
-		}
-	}
-}

src/AP_WS_Process_connect.cpp

@@ -1,162 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "AP_WS_Server.h"
-#include "StorageService.h"
-#include "FindCountry.h"
-#include "Daemon.h"
-#include "CentralConfig.h"
-
-#include "CommandManager.h"
-
-#include "framework/KafkaManager.h"
-#include "framework/utils.h"
-
-#include "UI_GW_WebSocketNotifications.h"
-
-namespace OpenWifi {
-
-	void AP_WS_Connection::Process_connect(Poco::JSON::Object::Ptr ParamsObj, const std::string &Serial) {
-		if (ParamsObj->has(uCentralProtocol::UUID) &&
-			ParamsObj->has(uCentralProtocol::FIRMWARE) &&
-			ParamsObj->has(uCentralProtocol::CAPABILITIES)) {
-			uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
-			auto Firmware = ParamsObj->get(uCentralProtocol::FIRMWARE).toString();
-			auto Capabilities = ParamsObj->getObject(uCentralProtocol::CAPABILITIES);
-
-			SerialNumber_ = Serial;
-			SerialNumberInt_ = Utils::SerialNumberToInt(SerialNumber_);
-
-			CommandManager()->ClearQueue(SerialNumberInt_);
-
-			AP_WS_Server()->SetSessionDetails(State_.sessionId,SerialNumberInt_);
-
-			std::lock_guard	    	Lock(ConnectionMutex_);
-			Config::Capabilities    Caps(Capabilities);
-
-			Compatible_ = Caps.Compatible();
-
-			State_.UUID = UUID;
-			State_.Firmware = Firmware;
-			State_.PendingUUID = 0;
-			State_.Address = Utils::FormatIPv6(WS_->peerAddress().toString());
-			CId_ = SerialNumber_ + "@" + CId_;
-
-			auto IP = PeerAddress_.toString();
-			if(IP.substr(0,7)=="::ffff:") {
-				IP = IP.substr(7);
-			}
-
-			bool RestrictedDevice = false;
-			if(Capabilities->has("restrictions")){
-                RestrictedDevice = true;
-				Poco::JSON::Object::Ptr RestrictionObject = Capabilities->getObject("restrictions");
-				Restrictions_.from_json(RestrictionObject);
-			}
-
-			State_.locale = FindCountryFromIP()->Get(IP);
-			GWObjects::Device	DeviceInfo;
-			auto DeviceExists = StorageService()->GetDevice(SerialNumber_,DeviceInfo);
-			if (Daemon()->AutoProvisioning() && !DeviceExists) {
-				StorageService()->CreateDefaultDevice(SerialNumber_, Caps, Firmware, PeerAddress_);
-			} else if (DeviceExists) {
-				StorageService()->UpdateDeviceCapabilities(SerialNumber_, Caps );
-				int Updated{0};
-				if(!Firmware.empty()) {
-					if(Firmware!=DeviceInfo.Firmware) {
-						DeviceInfo.Firmware = Firmware;
-						DeviceInfo.LastFWUpdate = Utils::Now();
-						++Updated;
-
-						GWWebSocketNotifications::SingleDeviceFirmwareChange_t	Notification;
-						Notification.content.serialNumber = SerialNumber_;
-						Notification.content.newFirmware = Firmware;
-						GWWebSocketNotifications::DeviceFirmwareUpdated(Notification);
-					} else if(DeviceInfo.LastFWUpdate==0) {
-						DeviceInfo.LastFWUpdate = Utils::Now();
-						++Updated;
-					}
-				}
-
-				if(DeviceInfo.locale != State_.locale) {
-					DeviceInfo.locale = State_.locale;
-                    ++Updated;
-				}
-
-				if(Compatible_ != DeviceInfo.DeviceType) {
-					DeviceInfo.DeviceType = Compatible_;
-                    ++Updated;
-				}
-
-				if(RestrictedDevice != DeviceInfo.restrictedDevice) {
-					DeviceInfo.restrictedDevice = RestrictedDevice;
-                    ++Updated;
-				}
-
-				if(Restrictions_ != DeviceInfo.restrictionDetails) {
-					DeviceInfo.restrictionDetails = Restrictions_;
-					++Updated;
-				}
-
-				if(Updated) {
-					StorageService()->UpdateDevice(DeviceInfo);
-				}
-
-				uint64_t UpgradedUUID=0;
-				LookForUpgrade(UUID,UpgradedUUID);
-				State_.UUID = UpgradedUUID;
-			}
-
-			State_.Compatible = Compatible_;
-			State_.Connected = true;
-			ConnectionCompletionTime_ = std::chrono::high_resolution_clock::now() - ConnectionStart_;
-			State_.connectionCompletionTime = ConnectionCompletionTime_.count();
-
-			if(State_.VerifiedCertificate == GWObjects::VALID_CERTIFICATE) {
-				if ((	Utils::SerialNumberMatch(CN_, SerialNumber_, (int)AP_WS_Server()->MismatchDepth())) ||
-						AP_WS_Server()->IsSimSerialNumber(CN_)) {
-					State_.VerifiedCertificate = GWObjects::VERIFIED;
-					poco_information(Logger_, fmt::format("CONNECT({}): Fully validated and authenticated device. Session={} ConnectionCompletion Time={}",
-														   CId_,
-														   State_.sessionId,
-														   State_.connectionCompletionTime ));
-				} else {
-					State_.VerifiedCertificate = GWObjects::MISMATCH_SERIAL;
-					if(AP_WS_Server()->AllowSerialNumberMismatch()) {
-						poco_information(
-							Logger_, fmt::format("CONNECT({}): Serial number mismatch allowed. CN={} Serial={} Session={} ConnectionCompletion Time={}",
-												 CId_, CN_, SerialNumber_, State_.sessionId,
-												 State_.connectionCompletionTime));
-					} else {
-						poco_information(
-							Logger_, fmt::format("CONNECT({}): Serial number mismatch disallowed. Device rejected. CN={} Serial={} Session={}",
-												 CId_, CN_, SerialNumber_, State_.sessionId));
-						return EndConnection();
-					}
-				}
-			}
-
-			GWWebSocketNotifications::SingleDevice_t	Notification;
-			Notification.content.serialNumber = SerialNumber_;
-			GWWebSocketNotifications::DeviceConnected(Notification);
-
-			// std::cout << "Serial: " << SerialNumber_ << "Session: " << State_.sessionId << std::endl;
-
-			if (KafkaManager()->Enabled()) {
-				Poco::JSON::Stringifier Stringify;
-				ParamsObj->set(uCentralProtocol::CONNECTIONIP, CId_);
-				ParamsObj->set("locale", State_.locale );
-				ParamsObj->set(uCentralProtocol::TIMESTAMP, Utils::Now());
-				std::ostringstream OS;
-				Stringify.condense(ParamsObj, OS);
-				KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, OS.str());
-			}
-		} else {
-			poco_warning(Logger_,fmt::format("INVALID-PROTOCOL({}): Missing one of uuid, firmware, or capabilities", CId_));
-			Errors_++;
-		}
-	}
-
-}

src/AP_WS_Process_crashlog.cpp

@@ -1,38 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "framework/utils.h"
-#include "framework/ow_constants.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_crashlog(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has(uCentralProtocol::UUID) && ParamsObj->has(uCentralProtocol::LOGLINES)) {
-			poco_trace(Logger_, fmt::format("CRASH-LOG({}): new entry.", CId_));
-			auto LogLines = ParamsObj->get(uCentralProtocol::LOGLINES);
-			std::string LogText;
-			if (LogLines.isArray()) {
-				auto LogLinesArray = LogLines.extract<Poco::JSON::Array::Ptr>();
-				for (const auto &i : *LogLinesArray)
-					LogText += i.toString() + "\r\n";
-			}
-
-			GWObjects::DeviceLog DeviceLog{.SerialNumber = SerialNumber_,
-										   .Log = LogText,
-										   .Data = "",
-										   .Severity = GWObjects::DeviceLog::LOG_EMERG,
-										   .Recorded = (uint64_t)time(nullptr),
-										   .LogType = 1,
-										   .UUID = 0};
-			StorageService()->AddLog(DeviceLog);
-
-		} else {
-			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
-			return;
-		}
-	}
-}

src/AP_WS_Process_deviceupdate.cpp

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "fmt/format.h"
-
-namespace OpenWifi {
-
-	void AP_WS_Connection::Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj, std::string &Serial) {
-		if (!State_.Connected) {
-			poco_warning(Logger_, fmt::format(
-									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-		if (ParamsObj->has("currentPassword")) {
-			auto Password = ParamsObj->get("currentPassword").toString();
-
-			StorageService()->SetDevicePassword(Serial, Password);
-			poco_trace(Logger_, fmt::format("DEVICEUPDATE({}): Device is updating its login password.", Serial));
-		}
-	}
-
-}

src/AP_WS_Process_healthcheck.cpp

@@ -1,74 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "framework/KafkaManager.h"
-#include "framework/utils.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-
-	void AP_WS_Connection::Process_healthcheck(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
-			poco_warning(Logger_, fmt::format(
-									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-		if (ParamsObj->has(uCentralProtocol::UUID) && ParamsObj->has(uCentralProtocol::SANITY) &&
-			ParamsObj->has(uCentralProtocol::DATA)) {
-			uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
-			auto Sanity = ParamsObj->get(uCentralProtocol::SANITY);
-			auto CheckData = ParamsObj->get(uCentralProtocol::DATA).toString();
-			if (CheckData.empty())
-				CheckData = uCentralProtocol::EMPTY_JSON_DOC;
-
-			std::string request_uuid;
-			if (ParamsObj->has(uCentralProtocol::REQUEST_UUID))
-				request_uuid = ParamsObj->get(uCentralProtocol::REQUEST_UUID).toString();
-
-			if (request_uuid.empty()) {
-				poco_trace(Logger_,
-						   fmt::format("HEALTHCHECK({}): UUID={} Updating.", CId_, UUID));
-			} else {
-				poco_trace(Logger_,
-						   fmt::format("HEALTHCHECK({}): UUID={} Updating for CMD={}.", CId_,
-									   UUID, request_uuid));
-			}
-
-			uint64_t UpgradedUUID;
-			LookForUpgrade(UUID,UpgradedUUID);
-			State_.UUID = UpgradedUUID;
-
-			GWObjects::HealthCheck Check;
-
-			Check.SerialNumber = SerialNumber_;
-			Check.Recorded = Utils::Now();
-			Check.UUID = UUID;
-			Check.Data = CheckData;
-			Check.Sanity = Sanity;
-
-			StorageService()->AddHealthCheckData(Check);
-
-			if (!request_uuid.empty()) {
-				StorageService()->SetCommandResult(request_uuid, CheckData);
-			}
-
-			SetLastHealthCheck(Check);
-			if (KafkaManager()->Enabled()) {
-				Poco::JSON::Stringifier Stringify;
-				std::ostringstream OS;
-				ParamsObj->set("timestamp", Utils::Now());
-				Stringify.condense(ParamsObj, OS);
-				KafkaManager()->PostMessage(KafkaTopics::HEALTHCHECK, SerialNumber_, OS.str());
-			}
-		} else {
-			poco_warning(Logger_, fmt::format("HEALTHCHECK({}): Missing parameter", CId_));
-			return;
-		}
-	}
-
-}

src/AP_WS_Process_log.cpp

@@ -1,44 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "framework/ow_constants.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_log(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
-			poco_warning(
-				Logger_,
-				fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-		if (ParamsObj->has(uCentralProtocol::LOG) && ParamsObj->has(uCentralProtocol::SEVERITY)) {
-			poco_trace(Logger_, fmt::format("LOG({}): new entry.", CId_));
-			auto Log = ParamsObj->get(uCentralProtocol::LOG).toString();
-			auto Severity = ParamsObj->get(uCentralProtocol::SEVERITY);
-			std::string DataStr = uCentralProtocol::EMPTY_JSON_DOC;
-			if (ParamsObj->has(uCentralProtocol::DATA)) {
-				auto DataObj = ParamsObj->get(uCentralProtocol::DATA);
-				if (DataObj.isStruct())
-					DataStr = DataObj.toString();
-			}
-
-			GWObjects::DeviceLog DeviceLog{.SerialNumber = SerialNumber_,
-										   .Log = Log,
-										   .Data = DataStr,
-										   .Severity = Severity,
-										   .Recorded = (uint64_t)time(nullptr),
-										   .LogType = 0,
-										   .UUID = State_.UUID};
-			StorageService()->AddLog(DeviceLog);
-		} else {
-			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
-			return;
-		}
-	}
-}

src/AP_WS_Process_ping.cpp

@@ -1,18 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "fmt/format.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_ping(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has(uCentralProtocol::UUID)) {
-			[[maybe_unused]] uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
-			poco_trace(Logger_, fmt::format("PING({}): Current config is {}", CId_, UUID));
-		} else {
-			poco_warning(Logger_, fmt::format("PING({}): Missing parameter.", CId_));
-		}
-	}
-}

src/AP_WS_Process_recovery.cpp

@@ -1,67 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-#include "CommandManager.h"
-
-#include "framework/ow_constants.h"
-#include "framework/MicroServiceFuncs.h"
-#include "fmt/format.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_recovery(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has(uCentralProtocol::SERIAL) &&
-			ParamsObj->has(uCentralProtocol::FIRMWARE) && ParamsObj->has(uCentralProtocol::UUID) &&
-			ParamsObj->has(uCentralProtocol::REBOOT) &&
-			ParamsObj->has(uCentralProtocol::LOGLINES)) {
-
-			auto LogLines = ParamsObj->get(uCentralProtocol::LOGLINES);
-			std::string LogText;
-
-			LogText = "Firmware: " + ParamsObj->get(uCentralProtocol::FIRMWARE).toString() + "\r\n";
-			if (LogLines.isArray()) {
-				auto LogLinesArray = LogLines.extract<Poco::JSON::Array::Ptr>();
-				for (const auto &i : *LogLinesArray)
-					LogText += i.toString() + "\r\n";
-			}
-
-			GWObjects::DeviceLog DeviceLog{.SerialNumber = SerialNumber_,
-										   .Log = LogText,
-										   .Data = "",
-										   .Severity = GWObjects::DeviceLog::LOG_EMERG,
-										   .Recorded = (uint64_t)time(nullptr),
-										   .LogType = 1,
-										   .UUID = 0};
-
-			StorageService()->AddLog(DeviceLog);
-
-			if (ParamsObj->get(uCentralProtocol::REBOOT).toString() == "true") {
-				GWObjects::CommandDetails Cmd;
-				Cmd.SerialNumber = SerialNumber_;
-				Cmd.UUID = MicroServiceCreateUUID();
-				Cmd.SubmittedBy = uCentralProtocol::SUBMITTED_BY_SYSTEM;
-				Cmd.Status = uCentralProtocol::PENDING;
-				Cmd.Command = uCentralProtocol::REBOOT;
-				Poco::JSON::Object Params;
-				Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-				Params.set(uCentralProtocol::WHEN, 0);
-				std::ostringstream O;
-				Poco::JSON::Stringifier::stringify(Params, O);
-				Cmd.Details = O.str();
-				bool Sent;
-				CommandManager()->PostCommand(CommandManager()->Next_RPC_ID(), APCommands::Commands::reboot, SerialNumber_, Cmd.Command, Params, Cmd.UUID, Sent);
-				StorageService()->AddCommand(SerialNumber_, Cmd, Storage::CommandExecutionType::COMMAND_EXECUTED);
-				poco_information(Logger_, fmt::format("RECOVERY({}): Recovery mode received, need for a reboot.", CId_));
-			} else {
-				poco_information(Logger_, fmt::format(
-											   "RECOVERY({}): Recovery mode received, no need for a reboot.", CId_));
-			}
-		} else {
-			poco_warning(Logger_, fmt::format("RECOVERY({}): Recovery missing one of serialnumber, firmware, uuid, loglines, reboot",
-											   CId_));
-		}
-	}
-}

src/AP_WS_Process_state.cpp

@@ -1,74 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-#include "StateUtils.h"
-
-#include "UI_GW_WebSocketNotifications.h"
-
-#include "framework/KafkaManager.h"
-#include "framework/utils.h"
-
-#include "fmt/format.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_state(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
-			poco_warning(Logger_, fmt::format(
-									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-
-		if (ParamsObj->has(uCentralProtocol::UUID) && ParamsObj->has(uCentralProtocol::STATE)) {
-			uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
-			auto StateStr = ParamsObj->get(uCentralProtocol::STATE).toString();
-			auto StateObj = ParamsObj->getObject(uCentralProtocol::STATE);
-
-			std::string request_uuid;
-			if (ParamsObj->has(uCentralProtocol::REQUEST_UUID))
-				request_uuid = ParamsObj->get(uCentralProtocol::REQUEST_UUID).toString();
-
-			if (request_uuid.empty()) {
-				poco_trace(Logger_, fmt::format("STATE({}): UUID={} Updating.", CId_, UUID));
-			} else {
-				poco_trace(Logger_, fmt::format("STATE({}): UUID={} Updating for CMD={}.",
-												 CId_, UUID, request_uuid));
-			}
-
-			uint64_t UpgradedUUID;
-			LookForUpgrade(UUID,UpgradedUUID);
-			State_.UUID = UpgradedUUID;
-			SetLastStats(StateStr);
-
-			GWObjects::Statistics Stats{
-				.SerialNumber = SerialNumber_, .UUID = UUID, .Data = StateStr};
-			Stats.Recorded = Utils::Now();
-			StorageService()->AddStatisticsData(Stats);
-			if (!request_uuid.empty()) {
-				StorageService()->SetCommandResult(request_uuid, StateStr);
-			}
-
-			StateUtils::ComputeAssociations(StateObj, 	State_.Associations_2G,
-														State_.Associations_5G,
-														State_.Associations_6G
-											);
-
-			if (KafkaManager()->Enabled()) {
-				Poco::JSON::Stringifier Stringify;
-				std::ostringstream OS;
-				Stringify.condense(ParamsObj, OS);
-				KafkaManager()->PostMessage(KafkaTopics::STATE, SerialNumber_, OS.str());
-			}
-
-			GWWebSocketNotifications::SingleDevice_t	N;
-			N.content.serialNumber = SerialNumber_;
-			GWWebSocketNotifications::DeviceStatistics(N);
-
-		} else {
-			poco_warning(Logger_, fmt::format("STATE({}): Invalid request. Missing serial, uuid, or state", CId_));
-		}
-	}
-}

src/AP_WS_Process_telemetry.cpp

@@ -1,59 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "TelemetryStream.h"
-#include "CommandManager.h"
-
-#include "framework/KafkaManager.h"
-#include "framework/utils.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_telemetry(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
-			poco_warning(Logger_, fmt::format(
-									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-			Errors_++;
-			return;
-		}
-		poco_trace(Logger_,fmt::format("Telemetry data received for {}", SerialNumber_));
-		if (TelemetryReporting_) {
-			if (ParamsObj->has("data")) {
-				auto Payload = ParamsObj->get("data").extract<Poco::JSON::Object::Ptr>();
-				Payload->set("timestamp", Utils::Now());
-				std::ostringstream SS;
-				Payload->stringify(SS);
-				auto now=Utils::Now();
-				if (TelemetryWebSocketRefCount_) {
-					if(now<TelemetryWebSocketTimer_) {
-						// std::cout << SerialNumber_ << ": Updating WebSocket telemetry" << std::endl;
-						TelemetryWebSocketPackets_++;
-						State_.websocketPackets = TelemetryWebSocketPackets_;
-						TelemetryStream()->NotifyEndPoint(SerialNumberInt_, SS.str());
-					} else {
-						StopWebSocketTelemetry(CommandManager()->Next_RPC_ID());
-					}
-				}
-				if (TelemetryKafkaRefCount_) {
-					if(KafkaManager()->Enabled() && now<TelemetryKafkaTimer_) {
-						// std::cout << SerialNumber_ << ": Updating Kafka telemetry" << std::endl;
-						TelemetryKafkaPackets_++;
-						State_.kafkaPackets = TelemetryKafkaPackets_;
-						KafkaManager()->PostMessage(KafkaTopics::DEVICE_TELEMETRY, SerialNumber_,
-													SS.str());
-					} else {
-						StopKafkaTelemetry(CommandManager()->Next_RPC_ID());
-					}
-				}
-			} else {
-				poco_debug(Logger_,fmt::format("TELEMETRY({}): Invalid telemetry packet.",SerialNumber_));
-			}
-		} else {
-			// if we are ignoring telemetry, then close it down on the device.
-			poco_debug(Logger_,fmt::format("TELEMETRY({}): Stopping runaway telemetry.",SerialNumber_));
-			StopTelemetry(CommandManager()->Next_RPC_ID());
-		}
-	}
-}

src/AP_WS_Process_venuebroadcast.cpp

@@ -1,17 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-26.
-//
-
-#include "AP_WS_Connection.h"
-#include "VenueBroadcaster.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_venuebroadcast(Poco::JSON::Object::Ptr ParamsObj) {
-		if(ParamsObj->has("data") && ParamsObj->has("serial") && ParamsObj->has("timestamp")) {
-			VenueBroadcaster()->Broadcast(
-				ParamsObj->get("serial").toString(),
-				ParamsObj->get("data").toString(),
-				ParamsObj->get("timestamp"));
-		}
-	}
-}

src/AP_WS_Server.cpp

@@ -1,477 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/Net/HTTPHeaderStream.h"
-#include "Poco/Net/Context.h"
-#include "Poco/Net/HTTPServerRequest.h"
-
-#include "AP_WS_Server.h"
-#include "AP_WS_Connection.h"
-#include "ConfigurationCache.h"
-#include "TelemetryStream.h"
-
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-#include "UI_GW_WebSocketNotifications.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-
-	void AP_WS_RequestHandler::handleRequest(Poco::Net::HTTPServerRequest &request,
-											 Poco::Net::HTTPServerResponse &response)  {
-		try {
-			AP_WS_Server()->AddConnection(id_,std::make_shared<AP_WS_Connection>(request,response,id_, Logger_, AP_WS_Server()->NextReactor()));
-		} catch (...) {
-			poco_warning(Logger_,"Exception during WS creation");
-		}
-	};
-
-	bool AP_WS_Server::ValidateCertificate(const std::string & ConnectionId, const Poco::Crypto::X509Certificate & Certificate) {
-		if(IsCertOk()) {
-			if(!Certificate.issuedBy(*IssuerCert_)) {
-				poco_warning(Logger(),fmt::format("CERTIFICATE({}): issuer mismatch. Local='{}' Incoming='{}'", ConnectionId, IssuerCert_->issuerName(), Certificate.issuerName()));
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	int AP_WS_Server::Start() {
-
-		AllowSerialNumberMismatch_ = MicroServiceConfigGetBool("openwifi.certificates.allowmismatch",true);
-		MismatchDepth_ = MicroServiceConfigGetInt("openwifi.certificates.mismatchdepth",2);
-
-		Reactor_pool_ = std::make_unique<AP_WS_ReactorThreadPool>();
-		Reactor_pool_->Start();
-
-		for(const auto & Svr : ConfigServersList_ ) {
-
-			poco_notice(Logger(),fmt::format("Starting: {}:{} Keyfile:{} CertFile: {}", Svr.Address(),
-										Svr.Port(), Svr.KeyFile(), Svr.CertFile()));
-
-			Svr.LogCert(Logger());
-			if (!Svr.RootCA().empty())
-				Svr.LogCas(Logger());
-
-			if (!IsCertOk()) {
-				IssuerCert_ = std::make_unique<Poco::Crypto::X509Certificate>(Svr.IssuerCertFile());
-				poco_information(Logger(),
-					fmt::format("Certificate Issuer Name:{}", IssuerCert_->issuerName()));
-			}
-
-			Poco::Net::Context::Params P;
-
-			P.verificationMode = Poco::Net::Context::VERIFY_ONCE;
-			P.verificationDepth = 9;
-			P.loadDefaultCAs = Svr.RootCA().empty();
-			P.cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
-			P.dhUse2048Bits = true;
-			P.caLocation = Svr.Cas();
-
-			auto Context = Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
-
-/*			if(!Svr.KeyFilePassword().empty()) {
-				auto PassphraseHandler = Poco::SharedPtr<MyPrivateKeyPassphraseHandler>( new MyPrivateKeyPassphraseHandler(Svr.KeyFilePassword(),Logger()));
-				Poco::Net::SSLManager::instance().initializeServer(PassphraseHandler, nullptr,Context);
-			}
-*/
-			Poco::Crypto::X509Certificate Cert(Svr.CertFile());
-			Poco::Crypto::X509Certificate Root(Svr.RootCA());
-
-			Context->useCertificate(Cert);
-			Context->addChainCertificate(Root);
-
-			Context->addCertificateAuthority(Root);
-			Poco::Crypto::X509Certificate Issuing(Svr.IssuerCertFile());
-			Context->addChainCertificate(Issuing);
-			Context->addCertificateAuthority(Issuing);
-
-			Poco::Crypto::RSAKey Key("", Svr.KeyFile(), Svr.KeyFilePassword());
-			Context->usePrivateKey(Key);
-
-			Context->setSessionCacheSize(0);
-			Context->setSessionTimeout(120);
-			Context->flushSessionCache();
-			Context->enableSessionCache(true);
-			Context->enableExtendedCertificateVerification(false);
-			// Context->disableStatelessSessionResumption();
-			Context->disableProtocols(Poco::Net::Context::PROTO_TLSV1 | Poco::Net::Context::PROTO_TLSV1_1);
-
-			auto WebServerHttpParams = new Poco::Net::HTTPServerParams;
-			WebServerHttpParams->setMaxThreads(50);
-			WebServerHttpParams->setMaxQueued(200);
-			WebServerHttpParams->setKeepAlive(true);
-			WebServerHttpParams->setName("ws:ap_dispatch");
-
-			if (Svr.Address() == "*") {
-				Poco::Net::IPAddress Addr(Poco::Net::IPAddress::wildcard(
-					Poco::Net::Socket::supportsIPv6() ? Poco::Net::AddressFamily::IPv6
-													  : Poco::Net::AddressFamily::IPv4));
-				Poco::Net::SocketAddress SockAddr(Addr, Svr.Port());
-				auto NewWebServer = std::make_unique<Poco::Net::HTTPServer>(
-					new AP_WS_RequestHandlerFactory(Logger()), DeviceConnectionPool_, Poco::Net::SecureServerSocket(SockAddr, Svr.Backlog(), Context), WebServerHttpParams);
-				WebServers_.push_back(std::move(NewWebServer));
-			} else {
-				Poco::Net::IPAddress Addr(Svr.Address());
-				Poco::Net::SocketAddress SockAddr(Addr, Svr.Port());
-				auto NewWebServer = std::make_unique<Poco::Net::HTTPServer>(
-					new AP_WS_RequestHandlerFactory(Logger()), DeviceConnectionPool_, Poco::Net::SecureServerSocket(SockAddr, Svr.Backlog(), Context), WebServerHttpParams);
-				WebServers_.push_back(std::move(NewWebServer));
-			}
-		}
-
-		for(auto &server:WebServers_) {
-			server->start();
-		}
-
-		ReactorThread_.start(Reactor_);
-
-		auto ProvString = MicroServiceConfigGetString("autoprovisioning.process","default");
-		if(ProvString!="default") {
-			auto Tokens = Poco::StringTokenizer(ProvString, ",");
-			for (const auto &i : Tokens) {
-				if (i == "prov")
-					LookAtProvisioning_ = true;
-				else
-					UseDefaultConfig_ = true;
-			}
-		} else {
-			UseDefaultConfig_ = true;
-		}
-
-		SimulatorId_ = MicroServiceConfigGetString("simulatorid","");
-		SimulatorEnabled_ = !SimulatorId_.empty();
-		Utils::SetThreadName(ReactorThread_,"dev:react:head");
-
-		GarbageCollectorCallback_ = std::make_unique<Poco::TimerCallback<AP_WS_Server>>(*this,&AP_WS_Server::onGarbageCollecting);
-		Timer_.setStartInterval(10 * 1000);
-		Timer_.setPeriodicInterval(5 * 1000); // every minute
-		Timer_.start(*GarbageCollectorCallback_, MicroServiceTimerPool());
-
-		Running_ = true;
-		return 0;
-	}
-
-	void AP_WS_Server::onGarbageCollecting([[maybe_unused]] Poco::Timer &timer) {
-		std::lock_guard			Lock(WSServerMutex_);
-		if(!Garbage_.empty()) {
-			Garbage_.clear();
-		}
-
-		static uint64_t last_log = Utils::Now();
-
-		NumberOfConnectedDevices_ = 0;
-		NumberOfConnectingDevices_ = 0;
-		AverageDeviceConnectionTime_ = 0;
-		uint64_t	total_connected_time=0;
-
-		auto now = Utils::Now();
-		for (const auto & connection:SerialNumbers_) {
-			if(connection.second.second == nullptr) {
-				continue;
-			}
-			if (connection.second.second->State_.Connected) {
-				NumberOfConnectedDevices_++;
-				total_connected_time += (now - connection.second.second->State_.started);
-			} else {
-				NumberOfConnectingDevices_++;
-			}
-		}
-
-		AverageDeviceConnectionTime_ = (NumberOfConnectedDevices_!=0) ? total_connected_time/NumberOfConnectedDevices_ : 0;
-		if((now-last_log)>120) {
-			last_log = now;
-			poco_information(Logger(),
-							 fmt::format("Active AP connections: {} Connecting: {} Average connection time: {} seconds",
-										 NumberOfConnectedDevices_, NumberOfConnectingDevices_, AverageDeviceConnectionTime_));
-		}
-
-		GWWebSocketNotifications::NumberOfConnection_t	Notification;
-		Notification.content.numberOfConnectingDevices = NumberOfConnectingDevices_;
-		Notification.content.numberOfDevices = NumberOfConnectedDevices_;
-		Notification.content.averageConnectedTime = AverageDeviceConnectionTime_;
-		GWWebSocketNotifications::NumberOfConnections(Notification);
-	}
-
-	void AP_WS_Server::Stop() {
-		poco_information(Logger(),"Stopping...");
-		Running_ = false;
-
-		Timer_.stop();
-
-		for(auto &server:WebServers_) {
-			server->stopAll();
-		}
-		Reactor_pool_->Stop();
-		Reactor_.stop();
-		ReactorThread_.join();
-		poco_information(Logger(),"Stopped...");
-	}
-
-	bool AP_WS_Server::GetStatistics(uint64_t SerialNumber, std::string &Statistics) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->GetLastStats(Statistics);
-		return true;
-	}
-
-	bool AP_WS_Server::GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->GetState(State);
-		return true;
-	}
-
-	bool AP_WS_Server::GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->GetLastHealthCheck(CheckData);
-		return true;
-	}
-
-	void AP_WS_Server::SetSessionDetails(uint64_t connection_id, uint64_t SerialNumber) {
-		std::lock_guard			Lock(WSServerMutex_);
-
-		auto Conn = Sessions_.find(connection_id);
-		if(Conn == end(Sessions_))
-			return;
-
-		auto CurrentSerialNumber = SerialNumbers_.find(SerialNumber);
-		if(	(CurrentSerialNumber==SerialNumbers_.end())	||
-			(CurrentSerialNumber->second.first<connection_id)) {
-			SerialNumbers_[SerialNumber] = std::make_pair(connection_id, Conn->second);
-			return;
-		}
-	}
-
-	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t serial_number) {
-		std::lock_guard G(WSServerMutex_);
-
-		auto Session = Sessions_.find(session_id);
-		if(Session==end(Sessions_))
-			return false;
-
-		Garbage_.push_back(Session->second);
-
-		auto Device = SerialNumbers_.find(serial_number);
-		if (Device == end(SerialNumbers_)) {
-			Sessions_.erase(Session);
-			return false;
-		}
-
-		if(Device->second.first==session_id) {
-			Sessions_.erase(Session);
-			SerialNumbers_.erase(Device);
-			return true;
-		}
-
-		Sessions_.erase(Session);
-		return false;
-	}
-
-	bool AP_WS_Server::Connected(uint64_t SerialNumber, GWObjects::DeviceRestrictions & Restrictions) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->GetRestrictions(Restrictions);
-		return  DevicePtr->State_.Connected;
-	}
-
-	bool AP_WS_Server::Connected(uint64_t SerialNumber) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		return  DevicePtr->State_.Connected;
-	}
-
-	bool AP_WS_Server::SendFrame(uint64_t SerialNumber, const std::string & Payload) const {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-		try {
-			return DevicePtr->Send(Payload);
-		} catch (...) {
-			poco_debug(Logger(),fmt::format(": SendFrame: Could not send data to device '{}'", Utils::IntToSerialNumber(SerialNumber)));
-		}
-		return false;
-	}
-
-	void AP_WS_Server::StopWebSocketTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->StopWebSocketTelemetry(RPCID);
-	}
-
-	void AP_WS_Server::SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->SetWebSocketTelemetryReporting(RPCID, Interval, Lifetime);
-	}
-
-	void AP_WS_Server::SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->SetKafkaTelemetryReporting(RPCID, Interval, Lifetime);
-	}
-
-	void AP_WS_Server::StopKafkaTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->StopKafkaTelemetry(RPCID);
-	}
-
-	void AP_WS_Server::GetTelemetryParameters(uint64_t SerialNumber , bool & TelemetryRunning,
-												uint64_t & TelemetryInterval,
-												uint64_t & TelemetryWebSocketTimer,
-												uint64_t & TelemetryKafkaTimer,
-												uint64_t & TelemetryWebSocketCount,
-												uint64_t & TelemetryKafkaCount,
-												uint64_t & TelemetryWebSocketPackets,
-												uint64_t & TelemetryKafkaPackets) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(SerialNumber);
-			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
-				return;
-			}
-			DevicePtr = Device->second.second;
-		}
-		DevicePtr->GetTelemetryParameters(
-			TelemetryRunning, TelemetryInterval, TelemetryWebSocketTimer, TelemetryKafkaTimer,
-			TelemetryWebSocketCount, TelemetryKafkaCount, TelemetryWebSocketPackets,
-			TelemetryKafkaPackets);
-	}
-
-	bool AP_WS_Server::SendRadiusAccountingData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-
-		try {
-			return DevicePtr->SendRadiusAccountingData(buffer,size);
-		} catch (...) {
-			poco_debug(Logger(),fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'", SerialNumber));
-		}
-		return false;
-	}
-
-	bool AP_WS_Server::SendRadiusAuthenticationData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-
-		try {
-			return DevicePtr->SendRadiusAuthenticationData(buffer,size);
-		} catch (...) {
-			poco_debug(Logger(),fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'", SerialNumber));
-		}
-		return false;
-	}
-
-	bool AP_WS_Server::SendRadiusCoAData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-		std::shared_ptr<AP_WS_Connection>	DevicePtr;
-		{
-			std::lock_guard Lock(WSServerMutex_);
-			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
-				return false;
-			}
-			DevicePtr = Device->second.second;
-		}
-
-		try {
-			return DevicePtr->SendRadiusCoAData(buffer,size);
-		} catch (...) {
-			poco_debug(Logger(),fmt::format(": SendRadiusCoAData: Could not send data to device '{}'", SerialNumber));
-		}
-		return false;
-	}
-
-}      //namespace

src/AP_WS_Server.h

@@ -1,210 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#pragma once
-
-#include <mutex>
-#include <thread>
-#include <array>
-#include <ctime>
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/Net/ParallelSocketAcceptor.h"
-#include "Poco/Net/SocketAcceptor.h"
-#include "Poco/Timer.h"
-#include "Poco/Net/HTTPRequestHandler.h"
-#include "Poco/Net/HTTPRequestHandlerFactory.h"
-#include "Poco/Net/HTTPServer.h"
-#include "Poco/Net/HTTPServerRequest.h"
-
-#include "AP_WS_Connection.h"
-#include "AP_WS_ReactorPool.h"
-
-#include "framework/utils.h"
-#include "framework/SubSystemServer.h"
-
-namespace OpenWifi {
-
-	class AP_WS_RequestHandler : public Poco::Net::HTTPRequestHandler {
-	  public:
-		explicit AP_WS_RequestHandler(Poco::Logger &L, uint64_t id)
-			: Logger_(L),
-			  id_(id){
-		};
-
-		void handleRequest(Poco::Net::HTTPServerRequest &request,
-						   Poco::Net::HTTPServerResponse &response) override;
-	  private:
-		Poco::Logger 				&Logger_;
-		uint64_t 				id_=0;
-	};
-
-	class AP_WS_RequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
-	  public:
-		inline explicit AP_WS_RequestHandlerFactory(Poco::Logger &L)
-		: Logger_(L) {
-		}
-
-		inline Poco::Net::HTTPRequestHandler *
-		createRequestHandler(const Poco::Net::HTTPServerRequest &request) override {
-			if (request.find("Upgrade") != request.end() &&
-				Poco::icompare(request["Upgrade"], "websocket") == 0) {
-				Utils::SetThreadName("ws:conn-init");
-				return new AP_WS_RequestHandler(Logger_,id_++);
-			} else {
-				return nullptr;
-			}
-		}
-	  private:
-		Poco::Logger 				&Logger_;
-		inline static uint64_t 		id_=1;
-	};
-
-	class AP_WS_Server : public SubSystemServer {
-	  public:
-		static auto instance() {
-			static auto instance_ = new AP_WS_Server;
-			return instance_;
-		}
-
-		int Start() override;
-		void Stop() override;
-		bool IsCertOk() { return IssuerCert_!= nullptr; }
-		bool ValidateCertificate(const std::string & ConnectionId, const Poco::Crypto::X509Certificate & Certificate);
-		// Poco::Net::SocketReactor & GetNextReactor() { return ReactorPool_.NextReactor(); }
-
-		inline bool IsSimSerialNumber(const std::string & SerialNumber) const {
-			return IsSim(Poco::toLower(SerialNumber)) && Poco::toLower(SerialNumber) == Poco::toLower(SimulatorId_);
-		}
-
-		inline static bool IsSim(const std::string & SerialNumber) {
-			return SerialNumber.substr(0,6) == "53494d";
-		}
-
-		inline bool IsSimEnabled() const {
-			return SimulatorEnabled_;
-		}
-
-		inline bool AllowSerialNumberMismatch() const {
-			return AllowSerialNumberMismatch_;
-		}
-
-		inline uint64_t MismatchDepth() const {
-			return MismatchDepth_;
-		}
-
-		inline bool UseProvisioning() const { return LookAtProvisioning_; }
-		inline bool UseDefaults() const { return UseDefaultConfig_; }
-
-		[[nodiscard]] inline Poco::Net::SocketReactor & NextReactor() { return Reactor_pool_->NextReactor(); }
-		[[nodiscard]] inline bool Running() const { return Running_; }
-
-		inline void AddConnection(uint64_t session_id, std::shared_ptr<AP_WS_Connection> Connection ) {
-			std::lock_guard			Lock(WSServerMutex_);
-			Sessions_[session_id] = std::move(Connection);
-		}
-
-		inline std::shared_ptr<AP_WS_Connection> FindConnection(uint64_t session_id) const {
-			std::lock_guard			Lock(WSServerMutex_);
-
-			auto Connection = Sessions_.find(session_id);
-			if(Connection!=end(Sessions_))
-				return Connection->second;
-			return nullptr;
-		}
-
-		inline bool GetStatistics(const std::string &SerialNumber, std::string & Statistics) const {
-			return GetStatistics(Utils::SerialNumberToInt(SerialNumber),Statistics);
-		}
-		bool GetStatistics(uint64_t SerialNumber, std::string & Statistics) const ;
-
-		inline bool GetState(const std::string & SerialNumber, GWObjects::ConnectionState & State) const {
-			return GetState(Utils::SerialNumberToInt(SerialNumber), State);
-		}
-		bool GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State) const;
-
-		inline bool GetHealthcheck(const std::string &SerialNumber, GWObjects::HealthCheck & CheckData) const {
-			return GetHealthcheck(Utils::SerialNumberToInt(SerialNumber), CheckData);
-		}
-		bool GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData) const ;
-
-		bool Connected(uint64_t SerialNumber, GWObjects::DeviceRestrictions & Restrictions) const ;
-		bool Connected(uint64_t SerialNumber) const ;
-
-		inline bool SendFrame(const std::string & SerialNumber, const std::string & Payload) const {
-			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
-		}
-
-		bool SendFrame(uint64_t SerialNumber, const std::string & Payload) const ;
-
-		bool SendRadiusAuthenticationData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
-		bool SendRadiusAccountingData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
-		bool SendRadiusCoAData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
-
-		void SetSessionDetails(uint64_t connection_id, uint64_t SerialNumber);
-		bool EndSession(uint64_t connection_id, uint64_t serial_number);
-
-		void SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime);
-		void StopWebSocketTelemetry(uint64_t RPCID, uint64_t SerialNumber);
-		void SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime);
-		void StopKafkaTelemetry(uint64_t RPCID, uint64_t SerialNumber);
-		void GetTelemetryParameters(uint64_t SerialNumber , bool & TelemetryRunning,
-									uint64_t & TelemetryInterval,
-									uint64_t & TelemetryWebSocketTimer,
-									uint64_t & TelemetryKafkaTimer,
-									uint64_t & TelemetryWebSocketCount,
-									uint64_t & TelemetryKafkaCount,
-									uint64_t & TelemetryWebSocketPackets,
-									uint64_t & TelemetryKafkaPackets);
-
-		void onGarbageCollecting(Poco::Timer & timer);
-
-		inline void AverageDeviceStatistics( uint64_t & Connections, uint64_t & AverageConnectionTime, uint64_t & NumberOfConnectingDevices) const {
-			Connections = NumberOfConnectedDevices_;
-			AverageConnectionTime = AverageDeviceConnectionTime_;
-			NumberOfConnectingDevices = NumberOfConnectingDevices_;
-		}
-
-	private:
-		mutable std::recursive_mutex								WSServerMutex_;
-		std::unique_ptr<Poco::Crypto::X509Certificate>				IssuerCert_;
-		std::list<std::unique_ptr<Poco::Net::HTTPServer>>			WebServers_;
-		Poco::Net::SocketReactor									Reactor_;
-		Poco::Thread												ReactorThread_;
-		std::string 												SimulatorId_;
-		Poco::ThreadPool											DeviceConnectionPool_{"ws:dev-pool", 2, 64};
-		bool 														LookAtProvisioning_ = false;
-		bool 														UseDefaultConfig_ = true;
-		bool 														SimulatorEnabled_=false;
-		std::unique_ptr<AP_WS_ReactorThreadPool>					Reactor_pool_;
-		std::atomic_bool 											Running_=false;
-		// std::map<uint64_t,	std::pair<std::shared_ptr<AP_WS_Connection>,bool>>	Sessions_;
-		std::map<std::uint64_t, std::shared_ptr<AP_WS_Connection>>	Sessions_;
-		std::map<uint64_t, std::pair<uint64_t,std::shared_ptr<AP_WS_Connection>>>	SerialNumbers_;
-		std::atomic_bool 											AllowSerialNumberMismatch_=true;
-		std::atomic_uint64_t 										MismatchDepth_=2;
-
-		std::atomic_uint64_t 										NumberOfConnectedDevices_=0;
-		std::atomic_uint64_t 										AverageDeviceConnectionTime_=0;
-		std::atomic_uint64_t 										NumberOfConnectingDevices_=0;
-
-		std::vector<std::shared_ptr<AP_WS_Connection>>				Garbage_;
-
-		std::unique_ptr<Poco::TimerCallback<AP_WS_Server>>   		GarbageCollectorCallback_;
-		Poco::Timer                     							Timer_;
-		Poco::Thread												GarbageCollector_;
-
-		AP_WS_Server() noexcept:
-			SubSystemServer("WebSocketServer", "WS-SVR", "ucentral.websocket") {
-		}
-	};
-
-	inline auto AP_WS_Server() { return AP_WS_Server::instance(); }
-
-} //namespace

src/CapabilitiesCache.h

@@ -4,15 +4,8 @@
 
 #pragma once
 
-#include <string>
-#include <map>
-#include <mutex>
-#include <fstream>
-
-#include "framework/MicroServiceFuncs.h"
-
+#include "framework/MicroService.h"
 #include "nlohmann/json.hpp"
-#include "CentralConfig.h"
 
 namespace OpenWifi {
 	const std::string PlatformCacheFileName{"/plat_cache.json"};
@@ -28,17 +21,17 @@ namespace OpenWifi {
 			return instance;
 		}
 
-		inline void Add(const Config::Capabilities &Caps) {
-			if(Caps.Compatible().empty() || Caps.Platform().empty())
+		inline void Add(const std::string & DeviceType, const std::string & Platform, const std::string & FullCapabilities) {
+			if(DeviceType.empty() || Platform.empty())
 				return;
 
 			std::lock_guard	G(Mutex_);
 			if(!PlatformsLoaded_)
 				LoadPlatforms();
-			auto P = Poco::toUpper(Caps.Platform());
-			auto Hint = Platforms_.find(Caps.Compatible());
+			auto P = Poco::toUpper(Platform);
+			auto Hint = Platforms_.find(DeviceType);
 			if(Hint==Platforms_.end()) {
-				Platforms_.insert(std::make_pair(Caps.Compatible(),P));
+				Platforms_.insert(std::make_pair(DeviceType,P));
 				SavePlatforms();
 			} else if(Hint->second != P) {
 				Hint->second = P;
@@ -48,14 +41,12 @@ namespace OpenWifi {
 			if(!CapabilitiesLoaded_)
 				LoadCapabilities();
 
-			auto CapHint = Capabilities_.find(Caps.Compatible());
+			auto CapHint = Capabilities_.find(DeviceType);
 			if(CapHint==Capabilities_.end()) {
-                auto C = nlohmann::json::parse(Caps.AsString());
-                C.erase("restrictions");
-				Capabilities_[Caps.Compatible()] = nlohmann::json::parse(Caps.AsString());
+				Capabilities_[DeviceType] = nlohmann::json::parse(FullCapabilities);
 				SaveCapabilities();
 			} else {
-				CapHint->second = nlohmann::json::parse(Caps.AsString());
+				CapHint->second = nlohmann::json::parse(FullCapabilities);
 				SaveCapabilities();
 			}
 		}
@@ -100,8 +91,8 @@ namespace OpenWifi {
 		std::atomic_bool 						CapabilitiesLoaded_=false;
 		std::map<std::string,std::string>		Platforms_;
 		CapabilitiesCache_t						Capabilities_;
-		std::string 							PlatformCacheFileName_{ MicroServiceDataDirectory()+PlatformCacheFileName };
-		std::string 							CapabilitiesCacheFileName_{ MicroServiceDataDirectory()+CapabilitiesCacheFileName };
+		std::string 							PlatformCacheFileName_{ MicroService::instance().DataDir()+PlatformCacheFileName };
+		std::string 							CapabilitiesCacheFileName_{ MicroService::instance().DataDir()+CapabilitiesCacheFileName };
 
 		inline void LoadPlatforms() {
 			try {
@@ -153,7 +144,4 @@ namespace OpenWifi {
 			}
 		}
 	};
-
-    inline auto CapabilitiesCache() { return CapabilitiesCache::instance(); };
-
 }

src/CentralConfig.cpp

@@ -12,141 +12,110 @@
 #include "Poco/File.h"
 
 #include "CentralConfig.h"
+#include "framework/MicroService.h"
 #include "Daemon.h"
 
 namespace OpenWifi::Config {
 
 	const static std::string BasicConfig {
-R"lit(
-{
-  "interfaces": [
-    {
-      "ethernet": [
-        {
-          "select-ports": [
-            "WAN*"
-          ]
-        }
-      ],
-      "ipv4": {
-        "addressing": "dynamic"
-      },
-      "name": "WAN",
-      "role": "upstream",
-      "services": [
-        "ssh",
-        "lldp",
-        "dhcp-snooping"
-      ],
-      "ssids": [
-        {
-          "bss-mode": "ap",
-          "encryption": {
-            "ieee80211w": "optional",
-            "key": "OpenWifi",
-            "proto": "psk2"
-          },
-          "name": "OpenWifi",
-          "services": [
-            "wifi-frames"
-          ],
-          "wifi-bands": [
-           "2G","5G"
-          ]
-        }
-      ]
-    },
-    {
-      "ethernet": [
-        {
-          "select-ports": [
-            "LAN*"
-          ]
-        }
-      ],
-      "ipv4": {
-        "addressing": "static",
-        "dhcp": {
-          "lease-count": 100,
-          "lease-first": 10,
-          "lease-time": "6h"
-        },
-        "subnet": "192.168.1.1/24"
-      },
-      "name": "LAN",
-      "role": "downstream",
-      "services": [
-        "ssh",
-        "lldp",
-        "dhcp-snooping"
-      ]
-    }
-  ],
-  "metrics": {
-    "dhcp-snooping": {
-      "filters": [
-        "ack",
-        "discover",
-        "offer",
-        "request",
-        "solicit",
-        "reply",
-        "renew"
-      ]
-    },
-    "health": {
-      "interval": 120
-    },
-    "statistics": {
-      "interval": 60,
-      "types": [
-        "ssids",
-        "lldp",
-        "clients"
-      ]
-    },
-    "wifi-frames": {
-      "filters": [
-        "probe",
-        "auth",
-        "assoc",
-        "disassoc",
-        "deauth",
-        "local-deauth",
-        "inactive-deauth",
-        "key-mismatch",
-        "beacon-report",
-        "radar-detected"
-      ]
-    }
-  },
-  "radios": [
-    {
-      "band": "2G",
-      "channel": "auto",
-      "channel-mode": "HE",
-      "country": "CA"
-    },
-    {
-      "allow-dfs": true,
-      "band": "5G",
-      "channel": "auto",
-      "channel-mode": "HE",
-      "country": "CA"
-    }
-  ],
-  "services": {
-    "lldp": {
-      "describe": "TIP OpenWiFi",
-      "location": "QA"
-    },
-    "ssh": {
-      "port": 22
-    }
-  },
-  "uuid": 2
-}
-)lit"};
+			R"lit({
+			"uuid": 1,
+			"radios": [
+				{
+					"band": "5G",
+					"country": "CA",
+					"channel-mode": "HE",
+					"channel-width": 80,
+					"channel": 32
+				}
+			],
+
+			"interfaces": [
+				{
+					"name": "WAN",
+					"role": "upstream",
+					"services": [ "lldp" ],
+					"ethernet": [
+						{
+							"select-ports": [
+								"WAN*"
+							]
+						}
+					],
+					"ipv4": {
+						"addressing": "dynamic"
+					},
+					"ssids": [
+						{
+							"name": "OpenWifi",
+							"wifi-bands": [
+								"5G"
+							],
+							"bss-mode": "ap",
+							"encryption": {
+								"proto": "psk2",
+								"key": "OpenWifi",
+								"ieee80211w": "optional"
+							}
+						}
+					]
+				},
+				{
+					"name": "LAN",
+					"role": "downstream",
+					"services": [ "ssh", "lldp" ],
+					"ethernet": [
+						{
+							"select-ports": [
+								"LAN*"
+							]
+						}
+					],
+					"ipv4": {
+						"addressing": "static",
+						"subnet": "192.168.1.1/24",
+						"dhcp": {
+							"lease-first": 10,
+							"lease-count": 100,
+							"lease-time": "6h"
+						}
+					},
+					"ssids": [
+						{
+							"name": "OpenWifi",
+							"wifi-bands": [
+								"5G"
+							],
+							"bss-mode": "ap",
+							"encryption": {
+								"proto": "psk2",
+								"key": "OpenWifi",
+								"ieee80211w": "optional"
+							}
+						}
+					]
+
+				}
+			],
+			"metrics": {
+				"statistics": {
+					"interval": 120,
+					"types": [ "ssids", "lldp", "clients" ]
+				},
+				"health": {
+					"interval": 120
+				}
+			},
+			"services": {
+				"lldp": {
+					"describe": "uCentral",
+					"location": "universe"
+				},
+				"ssh": {
+					"port": 22
+				}
+			}
+		})lit"};
 
 	void Config::SetBasicConfigFile() {
 		try {
@@ -228,7 +197,7 @@ R"lit(
 		return DefaultConfiguration_;
 	}
 
-/*    std::string Capabilities::Default() {
+    std::string Capabilities::Default() {
         return std::string(R"lit({"model":{"id":"linksys,ea8300","name":"Linksys EA8300 (Dallas)"},
                         "network":{"lan":{"ifname":"eth0","protocol":"static"},"wan":{"ifname":"eth1","protocol":"dhcp"}},
                         "switch":{"switch0":{"enable":true,"reset":true,"ports":[{"num":0,"device":"eth0","need_tag":false,
@@ -242,23 +211,27 @@ R"lit(
                         "platform/soc/a800000.wifi":{"band":["5l"],"ht_capa":6639,"vht_capa":865687986,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],
                         "tx_ant":3,"rx_ant":3,"channels":[36,40,44,48,52,56,60,64]}}})lit");
     }
-*/
 
-    Capabilities::Capabilities(const Poco::JSON::Object::Ptr &Caps) {
+    void Capabilities::Parse() {
+        if(Capabilities_.empty())
+            Capabilities_=Default();
+
         try {
+            Poco::JSON::Parser parser;
 
-            if(Caps->has("compatible"))
-				Compatible_ = Caps->get("compatible").toString();
+            auto Result = parser.parse(Capabilities_);
+            auto Objects = Result.extract<Poco::JSON::Object::Ptr>();
 
-			if(Caps->has("model"))
-				Model_ = Caps->get("model").toString();
+			if(Objects->has("compatible"))
+				Compatible_ = Objects->get("compatible").toString();
 
-			if(Caps->has("platform"))
-				Platform_ = Caps->get("platform").toString();
+			if(Objects->has("model"))
+				Model_ = Objects->get("model").toString();
 
-            std::ostringstream OS;
-            Caps->stringify(OS);
-            AsString_ = OS.str();
+			if(Objects->has("platform"))
+				Platform_ = Objects->get("platform").toString();
+
+            Parsed_ = true ;
         }
         catch ( const Poco::Exception & E )
         {
@@ -266,20 +239,22 @@ R"lit(
         }
     }
 
-	const std::string & Capabilities::Compatible() const {
+	const std::string & Capabilities::Compatible() {
+		if(!Parsed_)
+			Parse();
 		return Compatible_;
 	}
 
-	const std::string & Capabilities::Model() const {
+	const std::string & Capabilities::Model() {
+		if(!Parsed_)
+			Parse();
 		return Model_;
 	}
 
-	const std::string & Capabilities::Platform() const {
+	const std::string & Capabilities::Platform() {
+		if(!Parsed_)
+			Parse();
 		return Platform_;
 	}
 
-	const std::string & Capabilities::AsString() const {
-        return AsString_;
-    }
-
 } // namespace

src/CentralConfig.h

@@ -35,28 +35,29 @@ namespace OpenWifi::Config {
 
     class Capabilities {
     public:
-        explicit Capabilities(const Poco::JSON::Object::Ptr &Caps);
+        explicit Capabilities(std::string Caps)
+        :   Capabilities_(std::move(Caps))
+        {
 
-/*        Capabilities()
+        }
+
+        Capabilities()
         {
             Capabilities_ = Default();
         }
 
         static std::string Default();
-
         [[nodiscard]] const std::string & Get() const { return Capabilities_; };
-*/
-
-        [[nodiscard]] const std::string & Compatible() const;
-        [[nodiscard]] const std::string & Model() const;
-		[[nodiscard]] const std::string & Platform() const;
-		[[nodiscard]] const std::string & AsString() const;
+        [[nodiscard]] const std::string & Compatible();
+        [[nodiscard]] const std::string & Model();
+		[[nodiscard]] const std::string & Platform();
 
     private:
+        std::string Capabilities_;
+        bool        Parsed_=false;
         std::string Compatible_;
         std::string Model_;
 		std::string Platform_;
-        std::string AsString_;
 
 		void Parse();
     };

src/CommandManager.cpp

@@ -11,328 +11,211 @@
 #include "Poco/JSON/Parser.h"
 
 #include "CommandManager.h"
-#include "AP_WS_Server.h"
+#include "DeviceRegistry.h"
 #include "StorageService.h"
+#include "framework/MicroService.h"
 #include "framework/ow_constants.h"
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-
-using namespace std::chrono_literals;
 
 namespace OpenWifi {
 
 	void CommandManager::run() {
-		Utils::SetThreadName("cmd:mgr");
+		Utils::SetThreadName("cmd-mgr");
 		Running_ = true;
+		Poco::AutoPtr<Poco::Notification>	NextMsg(ResponseQueue_.waitDequeueNotification());
+		while(NextMsg && Running_) {
+			auto Resp = dynamic_cast<RPCResponseNotification*>(NextMsg.get());
 
-		Poco::AutoPtr<Poco::Notification> NextMsg(ResponseQueue_.waitDequeueNotification());
-		while (NextMsg && Running_) {
-			auto Resp = dynamic_cast<RPCResponseNotification *>(NextMsg.get());
+			if(Resp!= nullptr) {
+				const Poco::JSON::Object & Payload = Resp->Payload_;
+				const std::string & SerialNumber = Resp->SerialNumber_;
 
-			try {
-				if (Resp != nullptr) {
-					Poco::JSON::Object::Ptr Payload = Resp->Payload_;
-					std::string SerialNumberStr = Utils::IntToSerialNumber(Resp->SerialNumber_);
+				std::ostringstream SS;
+				Payload.stringify(SS);
 
-					bool NoReply = false;
-
-					if (!Payload->has(uCentralProtocol::ID)) {
-						poco_error(Logger(), fmt::format("({}): Invalid RPC response.", SerialNumberStr));
+				Logger().debug(fmt::format("({}): RPC Response received.", SerialNumber));
+				if(!Payload.has(uCentralProtocol::ID)){
+					Logger().error(fmt::format("({}): Invalid RPC response.", SerialNumber));
+				} else {
+					uint64_t ID = Payload.get(uCentralProtocol::ID);
+					if (ID < 2) {
+						Logger().debug(fmt::format("({}): Ignoring RPC response.", SerialNumber));
 					} else {
-						uint64_t ID = Payload->get(uCentralProtocol::ID);
-						std::shared_ptr<promise_type_t> TmpRpcEntry;
-						poco_debug(Logger(),fmt::format("({}): Processing {} response.", SerialNumberStr, ID));
-						if (ID > 1) {
-							std::lock_guard	Lock(LocalMutex_);
-							auto RPC = OutStandingRequests_.find(ID);
-							if (RPC == OutStandingRequests_.end() ||
-								RPC->second.SerialNumber != Resp->SerialNumber_) {
-								poco_debug(Logger(),
-									fmt::format("({}): RPC {} completed.", SerialNumberStr, ID));
-							} else {
-								std::chrono::duration<double, std::milli> rpc_execution_time =
-									std::chrono::high_resolution_clock::now() -
-									RPC->second.submitted;
-
-								poco_debug(Logger(),
-									fmt::format("({}): Received RPC answer {}. Command={}",
-													   SerialNumberStr, ID, APCommands::to_string(RPC->second.Command)));
-								if(RPC->second.Command==APCommands::Commands::script) {
-									if(RPC->second.State==2) {
-										//	 look at the payload to see if we should continue or not...
-										if (RPC->second.rpc_entry) {
-											TmpRpcEntry = RPC->second.rpc_entry;
-										}
-
-										// Payload->stringify(std::cout);
-
-										if (Payload->has("result")) {
-											auto Result = Payload->getObject("result");
-											if (Result->has("status")) {
-												auto Status = Result->getObject("status");
-												// Status->stringify(std::cout);
-												std::uint64_t Error = Status->get("error");
-												if(Error==0) {
-													StorageService()->CommandCompleted(RPC->second.UUID, Payload,
-																					   rpc_execution_time, true);
-													RPC->second.State = 1 ;
-												} else {
-													StorageService()->CommandCompleted(RPC->second.UUID, Payload,
-																					   rpc_execution_time, true);
-													std::string ErrorTxt = Status->get("result");
-													StorageService()->CancelWaitFile(RPC->second.UUID, ErrorTxt);
-													RPC->second.State = 0 ;
-												}
-											}
-										} else {
-//											std::cout << "Bad payload on command result" << std::endl;
-											RPC->second.State=0;
-										}
-									} else {
-//										std::cout << "Completing script 2 phase commit." << std::endl;
-										StorageService()->CommandCompleted(RPC->second.UUID, Payload,
-																		   rpc_execution_time, true);
-										NoReply = true;
-										RPC->second.State=0;
-									}
-								} else {
-									if(RPC->second.Command!=APCommands::Commands::telemetry) {
-										StorageService()->CommandCompleted(
-											RPC->second.UUID, Payload, rpc_execution_time, true);
-									}
-									if (RPC->second.rpc_entry) {
-										TmpRpcEntry = RPC->second.rpc_entry;
-									}
-									RPC->second.State = 0 ;
-								}
-
-								if(RPC->second.State==0) {
-									OutStandingRequests_.erase(ID);
-								}
+						auto Idx = CommandTagIndex{.Id = ID, .SerialNumber = SerialNumber};
+						std::lock_guard G(Mutex_);
+						auto RPC = OutStandingRequests_.find(Idx);
+						if (RPC == OutStandingRequests_.end()) {
+							Logger().warning(
+								fmt::format("({}): Outdated RPC {}", SerialNumber, ID));
+						} else {
+							std::chrono::duration<double, std::milli> rpc_execution_time =
+								std::chrono::high_resolution_clock::now() - RPC->second->submitted;
+							StorageService()->CommandCompleted(RPC->second->uuid, Payload,
+															   rpc_execution_time, true);
+							if (RPC->second->rpc_entry) {
+								RPC->second->rpc_entry->set_value(Payload);
 							}
-							if(!NoReply && TmpRpcEntry != nullptr)
-								TmpRpcEntry->set_value(Payload);
+							OutstandingUUIDs_.erase(RPC->second->uuid);
+							OutStandingRequests_.erase(Idx);
+							Logger().information(
+								fmt::format("({}): Received RPC answer {}", SerialNumber, ID));
 						}
 					}
 				}
-			} catch (const Poco::Exception &E) {
-				Logger().log(E);
-			} catch (...) {
-				poco_warning(Logger(),"Exception occurred during run.");
 			}
 			NextMsg = ResponseQueue_.waitDequeueNotification();
 		}
-		poco_information(Logger(),"RPC Command processor stopping.");
    	}
 
     int CommandManager::Start() {
-        poco_notice(Logger(),"Starting...");
-
-		ManagerThread.start(*this);
-
+        Logger().notice("Starting...");
+        ManagerThread.start(*this);
 		JanitorCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(*this,&CommandManager::onJanitorTimer);
 		JanitorTimer_.setStartInterval( 10000 );
 		JanitorTimer_.setPeriodicInterval(10 * 60 * 1000); // 1 hours
-		JanitorTimer_.start(*JanitorCallback_, MicroServiceTimerPool());
+		JanitorTimer_.start(*JanitorCallback_);
 
 		CommandRunnerCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(*this,&CommandManager::onCommandRunnerTimer);
 		CommandRunnerTimer_.setStartInterval( 10000 );
 		CommandRunnerTimer_.setPeriodicInterval(30 * 1000); // 1 hours
-		CommandRunnerTimer_.start(*CommandRunnerCallback_, MicroServiceTimerPool());
+		CommandRunnerTimer_.start(*CommandRunnerCallback_);
 
         return 0;
     }
 
     void CommandManager::Stop() {
-        poco_notice(Logger(),"Stopping...");
+        Logger().notice("Stopping...");
 		Running_ = false;
 		JanitorTimer_.stop();
 		CommandRunnerTimer_.stop();
 		ResponseQueue_.wakeUpAll();
 		ManagerThread.wakeUp();
         ManagerThread.join();
-		poco_notice(Logger(),"Stopped...");
     }
 
     void CommandManager::WakeUp() {
-		poco_notice(Logger(),"Waking up...");
+        Logger().notice("Waking up...");
         ManagerThread.wakeUp();
     }
 
 	void CommandManager::onJanitorTimer([[maybe_unused]] Poco::Timer & timer) {
-		std::lock_guard	Lock(LocalMutex_);
-		Utils::SetThreadName("cmd:janitor");
+		std::lock_guard G(Mutex_);
+		Utils::SetThreadName("cmd-janitor");
 		Poco::Logger	& MyLogger = Poco::Logger::get("CMD-MGR-JANITOR");
+		MyLogger.information(
+			fmt::format("Removing expired commands: start. {} outstanding-requests {} outstanding-uuids commands.",
+						OutStandingRequests_.size(), OutstandingUUIDs_.size() ));
 		auto now = std::chrono::high_resolution_clock::now();
-		for(auto request=OutStandingRequests_.begin();request!=OutStandingRequests_.end();) {
-			std::chrono::duration<double, std::milli> delta = now - request->second.submitted;
-			if(delta > 10min) {
-				MyLogger.debug(fmt::format("{}: Command={} for {} Timed out.",
-										   request->second.UUID,
-										   APCommands::to_string(request->second.Command),
-										   Utils::IntToSerialNumber(request->second.SerialNumber)));
-				request = OutStandingRequests_.erase(request);
+		for(auto i=OutStandingRequests_.begin();i!=OutStandingRequests_.end();) {
+			std::chrono::duration<double, std::milli> delta = now - i->second->submitted;
+			if(delta > 6000000ms) {
+				MyLogger.debug(fmt::format("{}: Timed out.", i->second->uuid));
+				OutstandingUUIDs_.erase(i->second->uuid);
+				i = OutStandingRequests_.erase(i);
 			} else {
-				++request;
+				++i;
 			}
 		}
-		poco_information(MyLogger,
-			fmt::format("Outstanding-requests {}", OutStandingRequests_.size()));
-	}
-
-	bool CommandManager::IsCommandRunning(const std::string &C) {
-		std::lock_guard	Lock(LocalMutex_);
-		for (const auto &request : OutStandingRequests_) {
-			if (request.second.UUID == C) {
-				return true;
-			}
-		}
-		return false;
+		MyLogger.information("Removing expired commands: done.");
 	}
 
 	void CommandManager::onCommandRunnerTimer([[maybe_unused]] Poco::Timer &timer) {
-		Utils::SetThreadName("cmd:schdlr");
-		Poco::Logger &MyLogger = Poco::Logger::get("CMD-MGR-SCHEDULER");
+		Utils::SetThreadName("cmd-schdlr");
+		Poco::Logger	& MyLogger = Poco::Logger::get("CMD-MGR-SCHEDULER");
 
-		poco_trace(MyLogger,"Scheduler starting.");
-
-		try {
-
-			StorageService()->RemovedExpiredCommands();
-			StorageService()->RemoveTimedOutCommands();
-
-			std::vector<GWObjects::CommandDetails> Commands;
-			if (StorageService()->GetReadyToExecuteCommands(0, 200, Commands)) {
-				poco_trace(MyLogger,fmt::format("Scheduler about to process {} commands.", Commands.size()));
-				for (auto &Cmd : Commands) {
-					if (!Running_) {
-						poco_warning(MyLogger,"Scheduler quitting because service is stopping.");
-						break;
+		std::vector<GWObjects::CommandDetails> Commands;
+		if(StorageService()->GetReadyToExecuteCommands(0,200,Commands))
+		{
+			for(auto & Cmd: Commands)
+			{
+				if(!Running_)
+					break;
+				try {
+					{
+						std::lock_guard M(Mutex_);
+						if(OutstandingUUIDs_.find(Cmd.UUID)!=OutstandingUUIDs_.end())
+							continue;
 					}
-					poco_trace(
-						MyLogger, fmt::format("{}: Serial={} Command={} Starting processing.",
-											  Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-					try {
 
-						//	Skip an already running command
-						if(IsCommandRunning(Cmd.UUID))
-							continue;
-
-						auto now = Utils::Now();
-						// 2 hour timeout for commands
-						if ((now - Cmd.Submitted) > (1 * 60 * 60)) {
-							poco_information(
-								MyLogger, fmt::format("{}: Serial={} Command={} has expired.",
-													  Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-							StorageService()->SetCommandTimedOut(Cmd.UUID);
-							continue;
-						}
-
-						if (!AP_WS_Server()->Connected(
-								Utils::SerialNumberToInt(Cmd.SerialNumber))) {
-							poco_trace(
-								MyLogger,
-								fmt::format(
-									"{}: Serial={} Command={} Device is not connected.",
-									Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-							continue;
-						}
-
-						std::string 			ExecutingUUID;
-						APCommands::Commands	ExecutingCommand=APCommands::Commands::unknown;
-						if (CommandRunningForDevice(Utils::SerialNumberToInt(Cmd.SerialNumber),
-													ExecutingUUID, ExecutingCommand)) {
-							poco_trace(
-								MyLogger,
-								fmt::format(
-									"{}: Serial={} Command={} Device is already busy with command {} (Command={})."
-									, Cmd.UUID, Cmd.SerialNumber, Cmd.Command, ExecutingUUID, APCommands::to_string(ExecutingCommand)));
-							continue;
-						}
-
-						Poco::JSON::Parser P;
-						bool Sent;
-						poco_information(MyLogger, fmt::format("{}: Serial={} Command={} Preparing execution.",
-														 Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						auto Params = P.parse(Cmd.Details).extract<Poco::JSON::Object::Ptr>();
-						auto Result = PostCommandDisk(Next_RPC_ID(), APCommands::to_apcommand(Cmd.Command.c_str()), Cmd.SerialNumber, Cmd.Command,
-													  *Params, Cmd.UUID, Sent);
-						if (Sent) {
-							StorageService()->SetCommandExecuted(Cmd.UUID);
-							poco_debug(MyLogger,
-								fmt::format("{}: Serial={} Command={} Sent.",
-									 Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						} else {
-							poco_debug(MyLogger,
-								fmt::format("{}: Serial={} Command={} Re-queued command.",
-									 Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						}
-					} catch (const Poco::Exception &E) {
-						poco_debug(MyLogger,
-							fmt::format("{}: Serial={} Command={} Failed. Command marked as completed.",
-									 Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						MyLogger.log(E);
-						StorageService()->SetCommandExecuted(Cmd.UUID);
-					} catch (...) {
-						poco_debug(MyLogger,
-							 fmt::format("{}: Serial={} Command={} Hard failure. Command marked as completed.",
-										 Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
+					Poco::JSON::Parser	P;
+					bool Sent;
+					MyLogger.information(fmt::format("{}: Preparing execution of {} for {}.", Cmd.UUID, Cmd.Command, Cmd.SerialNumber));
+					auto Params = P.parse(Cmd.Details).extract<Poco::JSON::Object::Ptr>();
+					auto Result = PostCommandDisk(	Cmd.SerialNumber,
+												  Cmd.Command,
+												  *Params,
+												  Cmd.UUID,
+												  Sent);
+					if(Sent) {
 						StorageService()->SetCommandExecuted(Cmd.UUID);
+						std::lock_guard M(Mutex_);
+						OutstandingUUIDs_.insert(Cmd.UUID);
+						MyLogger.information(fmt::format("{}: Queued command.", Cmd.UUID));
+					} else {
+						MyLogger.information(fmt::format("{}: Could queue command.", Cmd.UUID));
 					}
+				} catch (const Poco::Exception &E) {
+					MyLogger.information(fmt::format("{}: Failed. Command marked as completed.", Cmd.UUID));
+					MyLogger.log(E);
+					StorageService()->SetCommandExecuted(Cmd.UUID);
+				} catch (...) {
+					MyLogger.information(fmt::format("{}: Hard failure.", Cmd.UUID));
+					StorageService()->SetCommandExecuted(Cmd.UUID);
 				}
 			}
-		} catch (Poco::Exception &E) {
-			MyLogger.log(E);
-		} catch (...) {
-			poco_warning(MyLogger,"Exception during command processing.");
 		}
-		poco_trace(MyLogger,"Scheduler done.");
 	}
 
-	std::shared_ptr<CommandManager::promise_type_t> CommandManager::PostCommand(
-		uint64_t RPC_ID,
-		APCommands::Commands Command,
-		const std::string &SerialNumber,
-		const std::string &CommandStr,
-		const Poco::JSON::Object &Params,
-		const std::string &UUID,
-		bool oneway_rpc,
-		bool disk_only,
-		bool & Sent) {
+	std::shared_ptr<CommandManager::promise_type_t> CommandManager::PostCommand(const std::string &SerialNumber,
+							  			const std::string &Method,
+										const Poco::JSON::Object &Params,
+							  			const std::string &UUID,
+									 	bool oneway_rpc,
+									 	bool disk_only,
+										bool & Sent) {
 
-		auto SerialNumberInt = Utils::SerialNumberToInt(SerialNumber);
 		Sent=false;
-
-		std::stringstream 	ToSend;
-
-		CommandInfo		Idx;
-		Idx.Id = oneway_rpc ? 1 : RPC_ID;
-		Idx.SerialNumber = SerialNumberInt;
-		Idx.Command = Command;
-		if(Command == APCommands::Commands::script)
-			Idx.State=2;
-		Idx.UUID = UUID;
-
-		Poco::JSON::Object CompleteRPC;
-		CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
-		CompleteRPC.set(uCentralProtocol::ID, RPC_ID);
-		CompleteRPC.set(uCentralProtocol::METHOD, CommandStr);
-		CompleteRPC.set(uCentralProtocol::PARAMS, Params);
-		Poco::JSON::Stringifier::stringify(CompleteRPC, ToSend);
-		Idx.rpc_entry = disk_only ? nullptr : std::make_shared<CommandManager::promise_type_t>();
-
-		poco_debug(Logger(), fmt::format("{}: Sending command {} to {}. ID: {}", UUID, CommandStr, SerialNumber, RPC_ID));
-		if(AP_WS_Server()->SendFrame(SerialNumber, ToSend.str())) {
-			if(!oneway_rpc) {
-				std::lock_guard M(Mutex_);
-				OutStandingRequests_[RPC_ID] = Idx;
-			}
-			poco_debug(Logger(), fmt::format("{}: Sent command. ID: {}", UUID, RPC_ID));
-			Sent=true;
-			return Idx.rpc_entry;
+		if(!DeviceRegistry()->Connected(SerialNumber)) {
+			return nullptr;
 		}
 
-		poco_warning(Logger(), fmt::format("{}: Failed to send command. ID: {}", UUID, RPC_ID));
+		std::stringstream 	ToSend;
+		auto Object = std::make_shared<RpcObject>();
+
+		CommandTagIndex 	Idx;
+		{
+			std::lock_guard M(Mutex_);
+			if (oneway_rpc)
+				Idx.Id = 1;
+			else
+				Idx.Id = ++Id_;
+			Idx.SerialNumber = SerialNumber;
+
+			Poco::JSON::Object CompleteRPC;
+			CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
+			CompleteRPC.set(uCentralProtocol::ID, Idx.Id);
+			CompleteRPC.set(uCentralProtocol::METHOD, Method);
+			CompleteRPC.set(uCentralProtocol::PARAMS, Params);
+			Poco::JSON::Stringifier::stringify(CompleteRPC, ToSend);
+			Object->submitted = std::chrono::high_resolution_clock::now();
+			Object->uuid = UUID;
+			if(disk_only) {
+				Object->rpc_entry = nullptr;
+			} else {
+				Object->rpc_entry = std::make_shared<CommandManager::promise_type_t>();
+			}
+			if(!oneway_rpc) {
+				OutStandingRequests_[Idx] = Object;
+				OutstandingUUIDs_.insert(UUID);
+			}
+		}
+
+		Logger().information(fmt::format("{}: Sending command. ID: {}", UUID, Idx.Id));
+		if(DeviceRegistry()->SendFrame(SerialNumber, ToSend.str())) {
+			Logger().information(fmt::format("{}: Sent command. ID: {}", UUID, Idx.Id));
+			Sent=true;
+			return Object->rpc_entry;
+		}
+		Logger().information(fmt::format("{}: Failed to send command. ID: {}", UUID, Idx.Id));
 		return nullptr;
 	}
 }  // namespace

src/CommandManager.h

@@ -13,79 +13,87 @@
 #include <map>
 #include <utility>
 #include <functional>
-#include <shared_mutex>
 
 #include "Poco/JSON/Object.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/Timer.h"
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
-
-#include "framework/SubSystemServer.h"
-#include "fmt/format.h"
 
 #include "RESTObjects/RESTAPI_GWobjects.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
+	struct CommandTagIndex {
+		uint64_t 	Id=0;
+		std::string SerialNumber;
+	};
+
+	inline bool operator <(const CommandTagIndex& lhs, const CommandTagIndex& rhs) {
+		if(lhs.Id<rhs.Id)
+			return true;
+		if(lhs.Id>rhs.Id)
+			return false;
+		return lhs.SerialNumber<rhs.SerialNumber;
+	}
+
+	inline bool operator ==(const CommandTagIndex& lhs, const CommandTagIndex& rhs) {
+		if(lhs.Id == rhs.Id && lhs.SerialNumber == rhs.SerialNumber)
+			return true;
+		return false;
+	}
+
 	class RPCResponseNotification: public Poco::Notification {
 	  public:
-		RPCResponseNotification(std::uint64_t ser,
-								Poco::JSON::Object::Ptr pl) :
+		RPCResponseNotification(const std::string &ser,
+								const Poco::JSON::Object &pl) :
  			SerialNumber_(ser),
-			Payload_(std::move(pl))
+			Payload_(pl)
 		{
 
 		}
-		std::uint64_t 				SerialNumber_;
-		Poco::JSON::Object::Ptr		Payload_;
+		std::string			SerialNumber_;
+		Poco::JSON::Object	Payload_;
 	};
 
 
 	class CommandManager : public SubSystemServer, Poco::Runnable {
 	    public:
-		  	using objtype_t = Poco::JSON::Object::Ptr;
-		  	using promise_type_t = std::promise<objtype_t>;
-
-			struct CommandInfo {
-				std::uint64_t 			Id=0;
-				std::uint64_t 			SerialNumber=0;
-				APCommands::Commands 	Command;
-				std::string 			UUID;
-				std::uint64_t 			State=1;
+		  	typedef Poco::JSON::Object 		objtype_t;
+		  	typedef std::promise<objtype_t> promise_type_t;
+			struct RpcObject {
+				std::string uuid;
 				std::chrono::time_point<std::chrono::high_resolution_clock> submitted = std::chrono::high_resolution_clock::now();
 				std::shared_ptr<promise_type_t> rpc_entry;
 			};
 
 			struct RPCResponse {
-				std::uint64_t 				serialNumber;
-				Poco::JSON::Object::Ptr		payload;
+				std::string 			serialNumber;
+				Poco::JSON::Object		payload;
 
-				explicit RPCResponse(std::uint64_t ser, Poco::JSON::Object::Ptr pl)
+				explicit RPCResponse(const std::string &ser, const Poco::JSON::Object &pl)
 					:
 						serialNumber(ser),
-						payload(std::move(pl)) {
+						payload(pl) {
 				}
 			};
 
 			int Start() override;
 			void Stop() override;
 			void WakeUp();
-			inline void PostCommandResult(const std::string &SerialNumber, Poco::JSON::Object::Ptr Obj) {
-				ResponseQueue_.enqueueNotification(new RPCResponseNotification(Utils::SerialNumberToInt(SerialNumber),std::move(Obj)));
+			inline void PostCommandResult(const std::string &SerialNumber, const Poco::JSON::Object &Obj) {
+				std::lock_guard		G(Mutex_);
+				// RPCResponseQueue_->Write(RPCResponse{.serialNumber=SerialNumber, .payload = Obj});
+				ResponseQueue_.enqueueNotification(new RPCResponseNotification(SerialNumber,Obj));
 			}
 
-			std::shared_ptr<promise_type_t> PostCommandOneWayDisk(uint64_t RPC_ID,
-				APCommands::Commands Command,
+			std::shared_ptr<promise_type_t> PostCommandOneWayDisk(
 				const std::string &SerialNumber,
 				const std::string &Method,
 				const Poco::JSON::Object &Params,
 				const std::string &UUID,
 				bool & Sent) {
-					return 	PostCommand(RPC_ID,
-								   Command,
-								   SerialNumber,
+					return 	PostCommand(SerialNumber,
 									Method,
 									Params,
 									UUID,
@@ -93,16 +101,12 @@ namespace OpenWifi {
 			}
 
 			std::shared_ptr<promise_type_t> PostCommandDisk(
-				uint64_t RPC_ID,
-				APCommands::Commands Command,
 				const std::string &SerialNumber,
 				const std::string &Method,
 				const Poco::JSON::Object &Params,
 				const std::string &UUID,
 				bool & Sent) {
-					return 	PostCommand(RPC_ID,
-								   Command,
-								   SerialNumber,
+					return 	PostCommand(SerialNumber,
 								   Method,
 								   Params,
 								   UUID,
@@ -110,16 +114,12 @@ namespace OpenWifi {
 			}
 
 			std::shared_ptr<promise_type_t> PostCommand(
-				uint64_t RPC_ID,
-				APCommands::Commands Command,
 				const std::string &SerialNumber,
 				const std::string &Method,
 				const Poco::JSON::Object &Params,
 				const std::string &UUID,
 				bool & Sent) {
-					return 	PostCommand(RPC_ID,
-								   Command,
-								   SerialNumber,
+					return 	PostCommand(SerialNumber,
 								   Method,
 								   Params,
 								   UUID,
@@ -128,16 +128,12 @@ namespace OpenWifi {
 			}
 
 			std::shared_ptr<promise_type_t> PostCommandOneWay(
-				uint64_t RPC_ID,
-				APCommands::Commands Command,
 				const std::string &SerialNumber,
 				const std::string &Method,
 				const Poco::JSON::Object &Params,
 				const std::string &UUID,
 				bool & Sent) {
-					return 	PostCommand(RPC_ID,
-								   Command,
-								   SerialNumber,
+					return 	PostCommand(SerialNumber,
 								   Method,
 								   Params,
 								   UUID,
@@ -145,8 +141,6 @@ namespace OpenWifi {
 								   false, Sent  );
 			}
 
-			bool IsCommandRunning(const std::string &C);
-
 			void run() override;
 
 			static auto instance() {
@@ -157,42 +151,14 @@ namespace OpenWifi {
 			inline bool Running() const { return Running_; }
 			void onJanitorTimer(Poco::Timer & timer);
 			void onCommandRunnerTimer(Poco::Timer & timer);
-			inline uint64_t Next_RPC_ID() { return ++Id_; }
-
-			void RemovePendingCommand(std::uint64_t Id) {
-				std::unique_lock	Lock(LocalMutex_);
-				OutStandingRequests_.erase(Id);
-			}
-
-			inline bool CommandRunningForDevice(std::uint64_t SerialNumber, std::string & uuid, APCommands::Commands &command) {
-				std::lock_guard	Lock(LocalMutex_);
-
-				for(const auto &[Request,Command]:OutStandingRequests_) {
-					if(Command.SerialNumber==SerialNumber) {
-						uuid = Command.UUID;
-						command = Command.Command;
-						return true;
-					}
-				}
-				return false;
-			}
-
-			inline void ClearQueue(std::uint64_t SerialNumber) {
-				std::lock_guard	Lock(LocalMutex_);
-				for(auto Request = OutStandingRequests_.begin(); Request != OutStandingRequests_.end() ; ) {
-					if(Request->second.SerialNumber==SerialNumber)
-						Request = OutStandingRequests_.erase(Request);
-					else
-						++Request;
-				}
-			}
+			void onRPCAnswer(bool& b);
 
 	    private:
-		  	mutable std::recursive_mutex			LocalMutex_;
-			std::atomic_bool 						Running_ = false;
+			volatile bool 							Running_ = false;
 			Poco::Thread    						ManagerThread;
-			std::atomic_uint64_t 					Id_=3;	//	do not start @1. We ignore ID=1 & 0 is illegal..
-			std::map<std::uint64_t , CommandInfo>	OutStandingRequests_;
+			volatile uint64_t 						Id_=3;	//	do not start @1. We ignore ID=1 & 0 is illegal..
+			std::map<CommandTagIndex,std::shared_ptr<RpcObject>>		OutStandingRequests_;
+			std::set<std::string>					OutstandingUUIDs_;
 			Poco::Timer                     		JanitorTimer_;
 			std::unique_ptr<Poco::TimerCallback<CommandManager>>   JanitorCallback_;
 			Poco::Timer                     		CommandRunnerTimer_;
@@ -200,8 +166,6 @@ namespace OpenWifi {
 			Poco::NotificationQueue					ResponseQueue_;
 
 			std::shared_ptr<promise_type_t> PostCommand(
-				uint64_t RPCID,
-				APCommands::Commands Command,
 				const std::string &SerialNumber,
 				const std::string &Method,
 				const Poco::JSON::Object &Params,

src/ConfigurationCache.h

@@ -7,6 +7,7 @@
 #include <map>
 #include <string>
 #include <mutex>
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class ConfigurationCache {

src/Daemon.cpp

@@ -9,27 +9,23 @@
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
 #include "Poco/Environment.h"
-#include "Poco/Net/SSLManager.h"
 
-
-#include "AP_WS_Server.h"
 #include "CommandManager.h"
 #include "Daemon.h"
+#include "DeviceRegistry.h"
 #include "FileUploader.h"
-#include "FindCountry.h"
 #include "OUIServer.h"
-#include "RADIUS_proxy_server.h"
 #include "SerialNumberCache.h"
 #include "StorageArchiver.h"
 #include "StorageService.h"
 #include "TelemetryStream.h"
-#include "VenueBroadcaster.h"
+#include "WS_Server.h"
 #include "framework/ConfigurationValidator.h"
+#include "framework/MicroService.h"
+#include "FindCountry.h"
 #include "rttys/RTTYS_server.h"
-#include "framework/UI_WebSocketClientServer.h"
-#include "UI_GW_WebSocketNotifications.h"
-#include "ScriptManager.h"
-#include "SignatureMgr.h"
+#include "RADIUS_proxy_server.h"
+#include "VenueBroadcaster.h"
 
 namespace OpenWifi {
 	class Daemon *Daemon::instance() {
@@ -42,19 +38,18 @@ namespace OpenWifi {
 										StorageService(),
 										SerialNumberCache(),
 										ConfigurationValidator(),
-								   		UI_WebSocketClientServer(),
+								   		WebSocketClientServer(),
 										OUIServer(),
 										FindCountryFromIP(),
+										DeviceRegistry(),
 										CommandManager(),
 										FileUploader(),
 										StorageArchiver(),
 										TelemetryStream(),
 										RTTYS_server(),
+										WebSocketServer(),
 								   		RADIUS_proxy_server(),
-								   		VenueBroadcaster(),
-								   		ScriptManager(),
-								   		SignatureManager(),
-									   	AP_WS_Server()
+								   		VenueBroadcaster()
 							   });
         return &instance;
 	}
@@ -107,33 +102,19 @@ namespace OpenWifi {
         }
         return "AP";
     }
-
-	void DaemonPostInitialization(Poco::Util::Application &self) {
-		Daemon()->PostInitialization(self);
-		GWWebSocketNotifications::Register();
-	}
 }
 
 int main(int argc, char **argv) {
-	int ExitCode;
 	try {
-		Poco::Net::SSLManager::instance().initializeServer(nullptr, nullptr, nullptr);
-		auto App = OpenWifi::Daemon::instance();
-		ExitCode =  App->run(argc, argv);
-		Poco::Net::SSLManager::instance().shutdown();
-	} catch (Poco::Exception &exc) {
-		ExitCode = Poco::Util::Application::EXIT_SOFTWARE;
-		std::cout << exc.displayText() << std::endl;
-	} catch (std::exception &exc) {
-		ExitCode = Poco::Util::Application::EXIT_TEMPFAIL;
-		std::cout << exc.what() << std::endl;
-	} catch (...) {
-		ExitCode = Poco::Util::Application::EXIT_TEMPFAIL;
-		std::cout << "Exception on closure" << std::endl;
-	}
 
-	std::cout << "Exitcode: " << ExitCode << std::endl;
-	return ExitCode;
+		auto App = OpenWifi::Daemon::instance();
+		auto ExitCode =  App->run(argc, argv);
+		return ExitCode;
+
+	} catch (Poco::Exception &exc) {
+		std::cerr << exc.displayText() << std::endl;
+		return Poco::Util::Application::EXIT_SOFTWARE;
+	}
 }
 
 // end of namespace

src/Daemon.h

@@ -14,10 +14,18 @@
 #include <vector>
 #include <set>
 
-#include "framework/MicroServiceNames.h"
-#include "framework/MicroService.h"
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
 
 #include "Dashboard.h"
+#include "framework/MicroService.h"
 #include "framework/OpenWifiTypes.h"
 #include "GwWebSocketClient.h"
 
@@ -53,6 +61,8 @@ namespace OpenWifi {
     };
 
 	inline Daemon * Daemon() { return Daemon::instance(); }
-	void DaemonPostInitialization(Poco::Util::Application &self);
+	inline void DaemonPostInitialization(Poco::Util::Application &self) {
+		Daemon()->PostInitialization(self);
+	}
 }
 

src/Dashboard.cpp

@@ -3,49 +3,18 @@
 //
 
 #include "Dashboard.h"
+#include "DeviceRegistry.h"
 #include "StorageService.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
+	void DeviceDashboard::Create() {
+		uint64_t Now = OpenWifi::Now();
 
-	bool DeviceDashboard::Get(GWObjects::Dashboard &D, Poco::Logger & Logger) {
-		uint64_t Now = Utils::Now();
-		if(!ValidDashboard_ || LastRun_==0 || (Now-LastRun_)>120) {
-			Generate(D, Logger);
-		} else {
-			std::lock_guard	G(DataMutex_);
-			D = DB_;
-		}
-		return ValidDashboard_;
-	};
-
-	void DeviceDashboard::Generate(GWObjects::Dashboard &D, Poco::Logger & Logger ) {
-		if (GeneratingDashboard_.load()) {
-			// std::cout << "Trying to generate dashboard but already being generated" << std::endl;
-			while(GeneratingDashboard_.load()) {
-				Poco::Thread::trySleep(100);
-			}
-			std::lock_guard	G(DataMutex_);
-			D = DB_;
-		} else {
-			GeneratingDashboard_ = true;
-			ValidDashboard_ = false;
-			try {
-				// std::cout << "Generating dashboard." << std::endl;
-				poco_information(Logger, "DASHBOARD: Generating a new dashboard.");
-				GWObjects::Dashboard	NewData;
-				StorageService()->AnalyzeCommands(NewData.commands);
-				StorageService()->AnalyzeDevices(NewData);
-				LastRun_ = Utils::Now();
-				NewData.snapshot = LastRun_;
-				D = NewData;
-				std::lock_guard	G(DataMutex_);
-				DB_ = NewData;
-				ValidDashboard_=true;
-			} catch(...) {
-
-			}
-			GeneratingDashboard_ = false;
+		if(LastRun_==0 || (Now-LastRun_)>120) {
+			DB_.reset();
+			StorageService()->AnalyzeCommands(DB_.commands);
+			StorageService()->AnalyzeDevices(DB_);
+			LastRun_ = Now;
 		}
 	}
 }

src/Dashboard.h

@@ -4,24 +4,19 @@
 
 #pragma once
 
-#include <mutex>
-
 #include "RESTObjects//RESTAPI_GWobjects.h"
 #include "framework/OpenWifiTypes.h"
-#include "Poco/Logger.h"
 
 namespace OpenWifi {
 	class DeviceDashboard {
 	  public:
-			bool Get(GWObjects::Dashboard &D, Poco::Logger & Logger);
+			DeviceDashboard() { DB_.reset(); }
+			void Create();
+			[[nodiscard]] const GWObjects::Dashboard & Report() const { return DB_;}
 	  private:
-			std::mutex					DataMutex_;
-			volatile std::atomic_bool 	GeneratingDashboard_=false;
-			volatile bool 				ValidDashboard_=false;
-			GWObjects::Dashboard 		DB_;
-			uint64_t 					LastRun_=0;
-
-			void Generate(GWObjects::Dashboard &D, Poco::Logger & Logger);
+			GWObjects::Dashboard 	DB_;
+			uint64_t 				LastRun_=0;
+			inline void Reset() { DB_.reset(); }
 	};
 }
 

src/DeviceRegistry.cpp

@@ -0,0 +1,201 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+
+#include "DeviceRegistry.h"
+#include "WS_Server.h"
+#include "OUIServer.h"
+
+namespace OpenWifi {
+
+	int DeviceRegistry::Start() {
+		std::lock_guard		Guard(Mutex_);
+        Logger().notice("Starting ");
+        return 0;
+    }
+
+    void DeviceRegistry::Stop() {
+		std::lock_guard		Guard(Mutex_);
+        Logger().notice("Stopping ");
+    }
+
+    bool DeviceRegistry::GetStatistics(uint64_t SerialNumber, std::string & Statistics) {
+		std::lock_guard		Guard(Mutex_);
+        auto Device = Devices_.find(SerialNumber);
+        if(Device == Devices_.end())
+			return false;
+		Statistics = Device->second->LastStats;
+		return true;
+    }
+
+    void DeviceRegistry::SetStatistics(uint64_t SerialNumber, const std::string &Statistics) {
+		std::lock_guard		Guard(Mutex_);
+
+        auto Device = Devices_.find(SerialNumber);
+        if(Device != Devices_.end())
+        {
+			Device->second->Conn_.LastContact = time(nullptr);
+            Device->second->LastStats = Statistics;
+        }
+    }
+
+    bool DeviceRegistry::GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State) {
+		std::lock_guard		Guard(Mutex_);
+        auto Device = Devices_.find(SerialNumber);
+        if(Device == Devices_.end())
+			return false;
+
+		State = Device->second->Conn_;
+		return true;
+    }
+
+    void DeviceRegistry::SetState(uint64_t SerialNumber, const GWObjects::ConnectionState & State) {
+		std::lock_guard		Guard(Mutex_);
+        auto Device = Devices_.find(SerialNumber);
+        if(Device != Devices_.end())
+        {
+			Device->second->Conn_.LastContact = time(nullptr);
+            Device->second->Conn_ = State;
+        }
+    }
+
+	bool DeviceRegistry::GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData) {
+		std::lock_guard		Guard(Mutex_);
+
+		auto Device = Devices_.find(SerialNumber);
+		if(Device != Devices_.end()) {
+			CheckData = Device->second->LastHealthcheck;
+			return true;
+		}
+		return false;
+	}
+
+	void DeviceRegistry::SetHealthcheck(uint64_t SerialNumber, const GWObjects::HealthCheck & CheckData) {
+		std::lock_guard		Guard(Mutex_);
+
+		auto Device = Devices_.find(SerialNumber);
+		if(Device != Devices_.end())
+		{
+			Device->second->LastHealthcheck = CheckData;
+		}
+	}
+
+	std::shared_ptr<DeviceRegistry::ConnectionEntry> DeviceRegistry::Register(uint64_t SerialNumber, WSConnection *Ptr, uint64_t & ConnectionId )
+    {
+		std::lock_guard		Guard(Mutex_);
+
+		const auto & E = Devices_[SerialNumber] = std::make_shared<ConnectionEntry>();
+		E->WSConn_ = Ptr;
+		E->Conn_.LastContact = OpenWifi::Now();
+		E->Conn_.Connected = true ;
+		E->Conn_.UUID = 0 ;
+		E->Conn_.MessageCount = 0 ;
+		E->Conn_.Address = "";
+		E->Conn_.TX = 0 ;
+		E->Conn_.RX = 0;
+		E->Conn_.VerifiedCertificate = GWObjects::CertificateValidation::NO_CERTIFICATE;
+		ConnectionId = E->ConnectionId = ++Id_;
+		return E;
+    }
+
+    bool DeviceRegistry::Connected(uint64_t SerialNumber) {
+		std::lock_guard		Guard(Mutex_);
+        auto Device = Devices_.find(SerialNumber);
+        if(Device == Devices_.end())
+            return false;
+        return Device->second->Conn_.Connected;
+    }
+
+    void DeviceRegistry::UnRegister(uint64_t SerialNumber, uint64_t ConnectionId) {
+		std::lock_guard		Guard(Mutex_);
+		auto It = Devices_.find(SerialNumber);
+		if(It!=Devices_.end()) {
+			if(It->second->ConnectionId == ConnectionId)
+				Devices_.erase(SerialNumber);
+		}
+	}
+
+	bool DeviceRegistry::SendFrame(uint64_t SerialNumber, const std::string & Payload) {
+		std::lock_guard		Guard(Mutex_);
+		auto Device = Devices_.find(SerialNumber);
+		if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
+			try {
+				return Device->second->WSConn_->Send(Payload);
+			} catch (...) {
+				Logger().debug(fmt::format("Could not send data to device '{}'", SerialNumber));
+				Device->second->Conn_.Address = "";
+				Device->second->WSConn_ = nullptr;
+				Device->second->Conn_.Connected = false;
+				Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
+			}
+		}
+		return false;
+	}
+
+	bool DeviceRegistry::SendRadiusAccountingData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
+		std::lock_guard		Guard(Mutex_);
+		auto Device = 		Devices_.find(Utils::SerialNumberToInt(SerialNumber));
+		if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
+			try {
+				return Device->second->WSConn_->SendRadiusAccountingData(buffer,size);
+			} catch (...) {
+				Logger().debug(fmt::format("Could not send data to device '{}'", SerialNumber));
+				Device->second->Conn_.Address = "";
+				Device->second->WSConn_ = nullptr;
+				Device->second->Conn_.Connected = false;
+				Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
+			}
+		}
+		return false;
+	}
+
+	bool DeviceRegistry::SendRadiusAuthenticationData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
+		std::lock_guard		Guard(Mutex_);
+		auto Device = 		Devices_.find(Utils::SerialNumberToInt(SerialNumber));
+		if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
+			try {
+				return Device->second->WSConn_->SendRadiusAuthenticationData(buffer,size);
+			} catch (...) {
+				Logger().debug(fmt::format("Could not send data to device '{}'", SerialNumber));
+				Device->second->Conn_.Address = "";
+				Device->second->WSConn_ = nullptr;
+				Device->second->Conn_.Connected = false;
+				Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
+			}
+		}
+		return false;
+	}
+
+	bool DeviceRegistry::SendRadiusCoAData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
+		std::lock_guard		Guard(Mutex_);
+		auto Device = 		Devices_.find(Utils::SerialNumberToInt(SerialNumber));
+		if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
+			try {
+				return Device->second->WSConn_->SendRadiusCoAData(buffer,size);
+			} catch (...) {
+				Logger().debug(fmt::format("Could not send data to device '{}'", SerialNumber));
+				Device->second->Conn_.Address = "";
+				Device->second->WSConn_ = nullptr;
+				Device->second->Conn_.Connected = false;
+				Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
+			}
+		}
+		return false;
+	}
+
+	void DeviceRegistry::SetPendingUUID(uint64_t SerialNumber, uint64_t PendingUUID) {
+		std::lock_guard		Guard(Mutex_);
+		auto Device = Devices_.find(SerialNumber);
+		if(Device!=Devices_.end()) {
+			Device->second->Conn_.PendingUUID = PendingUUID;
+		}
+	}
+
+}  // namespace

src/DeviceRegistry.h

@@ -0,0 +1,122 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#pragma once
+
+#include "Poco/JSON/Object.h"
+
+#include "RESTObjects//RESTAPI_GWobjects.h"
+#include "framework/MicroService.h"
+
+// class uCentral::WebSocket::WSConnection;
+
+namespace OpenWifi {
+
+	class WSConnection;
+    class DeviceRegistry : public SubSystemServer {
+    public:
+		struct ConnectionEntry {
+			WSConnection 				* WSConn_ = nullptr;
+			GWObjects::ConnectionState 	Conn_;
+			std::string        			LastStats;
+			GWObjects::HealthCheck		LastHealthcheck;
+			uint64_t 					ConnectionId=0;
+		};
+
+        static auto instance() {
+            static auto instance_ = new DeviceRegistry;
+            return instance_;
+        }
+
+		int Start() override;
+		void Stop() override;
+
+		inline bool GetStatistics(const std::string &SerialNumber, std::string & Statistics) {
+			return GetStatistics(Utils::SerialNumberToInt(SerialNumber),Statistics);
+		}
+		bool GetStatistics(uint64_t SerialNumber, std::string & Statistics);
+
+		inline void SetStatistics(const std::string &SerialNumber, const std::string &Statistics) {
+			return SetStatistics(Utils::SerialNumberToInt(SerialNumber),Statistics);
+		}
+		void SetStatistics(uint64_t SerialNumber, const std::string &stats);
+
+		inline bool GetState(const std::string & SerialNumber, GWObjects::ConnectionState & State) {
+			return GetState(Utils::SerialNumberToInt(SerialNumber), State);
+		}
+		bool GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State);
+
+		inline void SetState(const std::string & SerialNumber, const GWObjects::ConnectionState & State) {
+			return SetState(Utils::SerialNumberToInt(SerialNumber), State);
+		}
+		void SetState(uint64_t SerialNumber, const GWObjects::ConnectionState & State);
+
+		inline bool GetHealthcheck(const std::string &SerialNumber, GWObjects::HealthCheck & CheckData) {
+			return GetHealthcheck(Utils::SerialNumberToInt(SerialNumber), CheckData);
+		}
+		bool GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData);
+
+		inline void SetHealthcheck(const std::string &SerialNumber, const GWObjects::HealthCheck &H) {
+			return SetHealthcheck(Utils::SerialNumberToInt(SerialNumber),H);
+		}
+		void SetHealthcheck(uint64_t SerialNumber, const GWObjects::HealthCheck &H);
+
+		std::shared_ptr<ConnectionEntry> Register(uint64_t SerialNumber, WSConnection *Conn, uint64_t & ConnectionId);
+
+		inline void UnRegister(const std::string & SerialNumber, uint64_t ConnectionId) {
+			return UnRegister(Utils::SerialNumberToInt(SerialNumber),ConnectionId);
+		}
+		void UnRegister(uint64_t SerialNumber, uint64_t ConnectionId);
+
+		inline bool Connected(const std::string & SerialNumber) {
+			return Connected(Utils::SerialNumberToInt(SerialNumber));
+		}
+
+		bool Connected(uint64_t SerialNumber);
+
+		inline bool SendFrame(const std::string & SerialNumber, const std::string & Payload) {
+			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
+		}
+
+		bool SendFrame(uint64_t SerialNumber, const std::string & Payload);
+
+		inline void SetPendingUUID(const std::string & SerialNumber, uint64_t PendingUUID) {
+			return SetPendingUUID(Utils::SerialNumberToInt(SerialNumber), PendingUUID);
+		}
+		void SetPendingUUID(uint64_t SerialNumber, uint64_t PendingUUID);
+
+		[[nodiscard]] inline std::shared_ptr<ConnectionEntry> GetDeviceConnection(const std::string & SerialNumber) {
+			return GetDeviceConnection(Utils::SerialNumberToInt(SerialNumber));
+		}
+
+		[[nodiscard]] inline std::shared_ptr<ConnectionEntry> GetDeviceConnection(uint64_t SerialNumber) {
+			std::lock_guard		Guard(Mutex_);
+			auto Device = Devices_.find(SerialNumber);
+			if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
+				return Device->second;
+			}
+			return nullptr;
+		}
+
+		bool SendRadiusAuthenticationData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
+		bool SendRadiusAccountingData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
+		bool SendRadiusCoAData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size);
+
+	  private:
+		inline static std::atomic_uint64_t 						Id_=1;
+		std::map<uint64_t ,std::shared_ptr<ConnectionEntry>>  	Devices_;
+
+		DeviceRegistry() noexcept:
+    		SubSystemServer("DeviceRegistry", "DevStatus", "devicestatus") {
+		}
+	};
+
+	inline auto DeviceRegistry() { return DeviceRegistry::instance(); }
+
+}  // namespace
+

src/FileUploader.cpp

@@ -7,6 +7,8 @@
 //
 
 #include <iostream>
+#include <fstream>
+#include <cstdio>
 
 #include "Poco/Net/HTTPServerParams.h"
 #include "Poco/Net/HTTPServerResponse.h"
@@ -17,25 +19,19 @@
 #include "Poco/CountingStream.h"
 #include "Poco/StreamCopier.h"
 #include "Poco/Exception.h"
-#include "Poco/File.h"
-#include "Poco/StringTokenizer.h"
-
-#include "framework/MicroServiceFuncs.h"
-#include "framework/ow_constants.h"
-#include "framework/utils.h"
 
 #include "FileUploader.h"
 #include "StorageService.h"
-#include "fmt/format.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
     static const std::string URI_BASE{"/v1/upload/"};
 
     int FileUploader::Start() {
-		poco_notice(Logger(),"Starting.");
+        Logger().notice("Starting.");
 
-        Poco::File UploadsDir(MicroServiceConfigPath("openwifi.fileuploader.path","/tmp"));
+        Poco::File UploadsDir(MicroService::instance().ConfigPath("openwifi.fileuploader.path","/tmp"));
         Path_ = UploadsDir.path();
         if(!UploadsDir.exists()) {
         	try {
@@ -47,37 +43,35 @@ namespace OpenWifi {
         }
 
         for(const auto & Svr: ConfigServersList_) {
-			if(MicroServiceNoAPISecurity()) {
-				poco_notice(Logger(), fmt::format("Starting: {}:{}",Svr.Address(),Svr.Port()));
+			if(MicroService::instance().NoAPISecurity()) {
+				Logger().information(fmt::format("Starting: {}:{}",Svr.Address(),Svr.Port()));
 
 				auto Sock{Svr.CreateSocket(Logger())};
 
 				auto Params = new Poco::Net::HTTPServerParams;
 				Params->setMaxThreads(16);
 				Params->setMaxQueued(100);
-				Params->setName("ws:upldr");
 
 				if (FullName_.empty()) {
 					std::string TmpName =
-						MicroServiceConfigGetString("openwifi.fileuploader.uri", "");
+						MicroService::instance().ConfigGetString("openwifi.fileuploader.uri", "");
 					if (TmpName.empty()) {
 						FullName_ =
 							"https://" + Svr.Name() + ":" + std::to_string(Svr.Port()) + URI_BASE;
 					} else {
 						FullName_ = TmpName + URI_BASE;
 					}
-					poco_information(Logger(),fmt::format("Uploader URI base is '{}'", FullName_));
+					Logger().information(fmt::format("Uploader URI base is '{}'", FullName_));
 				}
 
 				auto NewServer = std::make_unique<Poco::Net::HTTPServer>(
 					new FileUpLoaderRequestHandlerFactory(Logger()), Sock, Params);
-				Params->setName("file-upldr");
 				NewServer->start();
 				Servers_.push_back(std::move(NewServer));
 			} else {
 				std::string l{"Starting: " + Svr.Address() + ":" + std::to_string(Svr.Port()) +
 							  " key:" + Svr.KeyFile() + " cert:" + Svr.CertFile()};
-				poco_information(Logger(),l);
+				Logger().information(l);
 
 				auto Sock{Svr.CreateSecureSocket(Logger())};
 
@@ -88,18 +82,17 @@ namespace OpenWifi {
 				auto Params = new Poco::Net::HTTPServerParams;
 				Params->setMaxThreads(16);
 				Params->setMaxQueued(100);
-				Params->setName("ws:upldr");
 
 				if (FullName_.empty()) {
 					std::string TmpName =
-						MicroServiceConfigGetString("openwifi.fileuploader.uri", "");
+						MicroService::instance().ConfigGetString("openwifi.fileuploader.uri", "");
 					if (TmpName.empty()) {
 						FullName_ =
 							"https://" + Svr.Name() + ":" + std::to_string(Svr.Port()) + URI_BASE;
 					} else {
 						FullName_ = TmpName + URI_BASE;
 					}
-					poco_information(Logger(), fmt::format("Uploader URI base is '{}'", FullName_));
+					Logger().information(fmt::format("Uploader URI base is '{}'", FullName_));
 				}
 
 				auto NewServer = std::make_unique<Poco::Net::HTTPServer>(
@@ -109,14 +102,14 @@ namespace OpenWifi {
 			}
         }
 
-        MaxSize_ = 1000 * MicroServiceConfigGetInt("openwifi.fileuploader.maxsize", 10000);
+        MaxSize_ = 1000 * MicroService::instance().ConfigGetInt("openwifi.fileuploader.maxsize", 10000);
 
         return 0;
     }
 
 	void FileUploader::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
-		MicroServiceLoadConfigurationFile();
-		poco_information(Logger(),"Reinitializing.");
+		MicroService::instance().LoadConfigurationFile();
+    	Logger().information("Reinitializing.");
 		Stop();
 		Start();
 	}
@@ -126,32 +119,34 @@ namespace OpenWifi {
     }
 
     //  if you pass in an empty UUID, it will just clean the list and not add it.
-    bool FileUploader::AddUUID( const std::string & UUID, std::chrono::seconds WaitTimeInSeconds, const std::string &Type) {
+    bool FileUploader::AddUUID( const std::string & UUID) {
 		std::lock_guard		Guard(Mutex_);
 
-        uint64_t now = Utils::Now();
-		auto Func=[now](const UploadId &I) -> bool {
-			return (now > I.Expires);
-		};
-		OutStandingUploads_.erase(std::remove_if(OutStandingUploads_.begin(),OutStandingUploads_.end(),Func),OutStandingUploads_.end());
-		OutStandingUploads_.emplace_back(UploadId{UUID, now + WaitTimeInSeconds.count(), Type});
+        uint64_t now = OpenWifi::Now();
+
+        // remove old stuff...
+        for(auto i=OutStandingUploads_.begin();i!=OutStandingUploads_.end();) {
+            if ((now-i->second) > (60 * 30))
+                i = OutStandingUploads_.erase(i);
+            else
+                ++i;
+        }
+
+        if(!UUID.empty())
+            OutStandingUploads_[UUID] = now;
+
         return true;
     }
 
     bool FileUploader::ValidRequest(const std::string &UUID) {
 		std::lock_guard		Guard(Mutex_);
-		auto Func = [UUID](const UploadId &P) -> bool {
-			return (P.UUID==UUID);
-		};
-        return std::find_if(OutStandingUploads_.begin(), OutStandingUploads_.end(), Func) != end(OutStandingUploads_);
+
+        return OutStandingUploads_.find(UUID)!=OutStandingUploads_.end();
     }
 
     void FileUploader::RemoveRequest(const std::string &UUID) {
 		std::lock_guard		Guard(Mutex_);
-		auto Func = [UUID](const UploadId &P) -> bool {
-			return (P.UUID==UUID);
-		};
-		OutStandingUploads_.erase(std::remove_if(OutStandingUploads_.begin(),OutStandingUploads_.end(),Func),OutStandingUploads_.end());
+        OutStandingUploads_.erase(UUID);
     }
 
 	class FileUploaderPartHandler2 : public Poco::Net::PartHandler {
@@ -191,10 +186,9 @@ namespace OpenWifi {
     class FormRequestHandler: public Poco::Net::HTTPRequestHandler
     {
     public:
-        explicit FormRequestHandler(std::string UUID, Poco::Logger & L, const std::string &Type):
+        explicit FormRequestHandler(std::string UUID, Poco::Logger & L):
             UUID_(std::move(UUID)),
-            Logger_(L),
-			Type_(Type)
+            Logger_(L)
         {
         }
 
@@ -204,7 +198,7 @@ namespace OpenWifi {
 			const auto ContentType = Request.getContentType();
 			const auto Tokens = Poco::StringTokenizer(ContentType,";",Poco::StringTokenizer::TOK_TRIM);
 
-			poco_debug(Logger(),fmt::format("{}: Preparing to upload trace file.",UUID_));
+			Logger().debug(fmt::format("{}: Preparing to upload trace file.",UUID_));
 			Poco::JSON::Object Answer;
 
 			try {
@@ -229,8 +223,8 @@ namespace OpenWifi {
 								Poco::StreamCopier::copyStream(Reader.stream(), FileContent);
 								Answer.set("filename", UUID_);
 								Answer.set("error", 0);
-								poco_debug(Logger(),fmt::format("{}: File uploaded.", UUID_));
-								StorageService()->AttachFileDataToCommand(UUID_, FileContent, Type_);
+								Logger().debug(fmt::format("{}: Trace file uploaded.", UUID_));
+								StorageService()->AttachFileDataToCommand(UUID_, FileContent);
 								std::ostream &ResponseStream = Response.send();
 								Poco::JSON::Stringifier::stringify(Answer, ResponseStream);
 								return;
@@ -247,10 +241,10 @@ namespace OpenWifi {
 			} catch (const Poco::Exception &E) {
 				Logger().log(E);
 			} catch (...) {
-				poco_debug(Logger(),"Exception while receiving trace file.");
+				Logger().debug("Exception while receiving trace file.");
 			}
 
-			poco_debug(Logger(),fmt::format("{}: Failed to upload trace file.",UUID_));
+			Logger().debug(fmt::format("{}: Failed to upload trace file.",UUID_));
 			std::string Error{"Trace file rejected"};
 			StorageService()->CancelWaitFile(UUID_, Error);
 			Answer.set("filename", UUID_);
@@ -266,18 +260,11 @@ namespace OpenWifi {
     private:
         std::string     UUID_;
         Poco::Logger    & Logger_;
-		std::string 	Type_;
     };
 
     Poco::Net::HTTPRequestHandler *FileUpLoaderRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
 
-		poco_debug(Logger(),fmt::format("REQUEST({}): {} {}", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
-
-		if(Request.getMethod()!=Poco::Net::HTTPRequest::HTTP_POST ||
-			Request.getURI().size()<(URI_BASE.size()+36)) {
-			poco_warning(Logger(),fmt::format("ILLEGAL-REQUEST({}): {} {}. Dropped.", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
-			return nullptr;
-		}
+		Logger().debug(fmt::format("REQUEST({}): {} {}", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
 
         //  The UUID should be after the /v1/upload/ part...
         auto UUIDLocation = Request.getURI().find_first_of(URI_BASE);
@@ -285,38 +272,25 @@ namespace OpenWifi {
         if( UUIDLocation != std::string::npos )
         {
             auto UUID = Request.getURI().substr(UUIDLocation+URI_BASE.size());
-
-			FileUploader::UploadId		E;
-            if(FileUploader()->Find(UUID,E))
+            if(FileUploader()->ValidRequest(UUID))
             {
+                //  make sure we do not allow anyone else to overwrite our file
 				FileUploader()->RemoveRequest(UUID);
-                return new FormRequestHandler(UUID,Logger(),E.Type);
+                return new FormRequestHandler(UUID,Logger());
             }
             else
             {
-				poco_warning(Logger(),fmt::format("Unknown UUID={}",UUID));
+                Logger().warning(fmt::format("Unknown UUID={}",UUID));
             }
         }
         return nullptr;
     }
 
-	 bool FileUploader::Find(const std::string &UUID, UploadId &V) {
-		std::lock_guard		G(Mutex_);
-		for(const auto &E:OutStandingUploads_) {
-			if (E.UUID == UUID) {
-				V = E;
-				return true;
-			}
-		}
-		return false;
-	}
-
     void FileUploader::Stop() {
-		poco_notice(Logger(),"Stopping...");
+        Logger().notice("Stopping ");
         for( const auto & svr : Servers_ )
-            svr->stopAll(true);
+            svr->stop();
 		Servers_.clear();
-		poco_notice(Logger(),"Stopped...");
     }
 
 }  //  Namespace

src/FileUploader.h

@@ -13,24 +13,17 @@
 #include "Poco/Net/HTTPServer.h"
 #include "Poco/Net/HTTPServerRequest.h"
 
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
     class FileUploader : public SubSystemServer {
     public:
-
-		struct UploadId {
-		  std::string 		UUID;
-		  std::uint64_t 	Expires;
-		  std::string 		Type;
-		};
-
 		int Start() override;
 		void Stop() override;
 		void reinitialize(Poco::Util::Application &self) override;
 		const std::string & FullName();
-		bool AddUUID( const std::string & UUID, std::chrono::seconds WaitTimeInSecond, const std::string &Type);
+		bool AddUUID( const std::string & UUID);
 		bool ValidRequest(const std::string & UUID);
 		void RemoveRequest(const std::string &UUID);
 		const std::string & Path() { return Path_; };
@@ -42,13 +35,12 @@ namespace OpenWifi {
 
 		[[nodiscard]] inline uint64_t MaxSize() const { return MaxSize_; }
 
-		bool Find(const std::string &UUID, UploadId &V);
     private:
         std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   Servers_;
-        std::string                     			FullName_;
-        std::list<UploadId>  						OutStandingUploads_;
-        std::string                     			Path_;
-		uint64_t 									MaxSize_=10000000;
+        std::string                     FullName_;
+        std::map<std::string,uint64_t>  OutStandingUploads_;
+        std::string                     Path_;
+		uint64_t 						MaxSize_=10000000;
 
 		explicit FileUploader() noexcept:
 			SubSystemServer("FileUploader", "FILE-UPLOAD", "openwifi.fileuploader")
@@ -59,13 +51,10 @@ namespace OpenWifi {
     class FileUpLoaderRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
     public:
         explicit FileUpLoaderRequestHandlerFactory(Poco::Logger &L) :
-			Logger_(L) {
-		}
+                Logger_(L){}
 
         Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
-		inline Poco::Logger & Logger() {
-			return Logger_;
-		}
+		inline Poco::Logger & Logger() { return Logger_; }
     private:
         Poco::Logger    & Logger_;
     };

src/FindCountry.h

@@ -4,11 +4,8 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "Poco/Net/IPAddress.h"
-
-#include "framework/SubSystemServer.h"
-#include "framework/MicroServiceFuncs.h"
-
 #include "nlohmann/json.hpp"
 
 namespace OpenWifi {
@@ -26,7 +23,7 @@ namespace OpenWifi {
 	  public:
 		static std::string Name() { return "ipinfo"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ipinfo.token", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ipinfo.token", "");
 			return !Key_.empty();
 		}
 
@@ -58,7 +55,7 @@ namespace OpenWifi {
 	  public:
 		static std::string Name() { return "ipdata"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ipdata.apikey", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ipdata.apikey", "");
 			return !Key_.empty();
 		}
 
@@ -88,7 +85,7 @@ namespace OpenWifi {
 	  public:
 		static std::string Name() { return "ip2location"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ip2location.apikey", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ip2location.apikey", "");
 			return !Key_.empty();
 		}
 
@@ -136,22 +133,18 @@ namespace OpenWifi {
 		}
 
 		inline int Start() final {
-			poco_notice(Logger(),"Starting...");
-			ProviderName_ = MicroServiceConfigGetString("iptocountry.provider","");
+			ProviderName_ = MicroService::instance().ConfigGetString("iptocountry.provider","");
 			if(!ProviderName_.empty()) {
 				Provider_ = IPLocationProvider<IPToCountryProvider, IPInfo, IPData, IP2Location>(ProviderName_);
 				if(Provider_!= nullptr) {
 					Enabled_ = Provider_->Init();
 				}
 			}
-			Default_ = MicroServiceConfigGetString("iptocountry.default", "US");
+			Default_ = MicroService::instance().ConfigGetString("iptocountry.default", "US");
 			return 0;
 		}
 
 		inline void Stop() final {
-			poco_notice(Logger(),"Stopping...");
-			//	Nothing to do - just to provide the same look at the others.
-			poco_notice(Logger(),"Stopped...");
 		}
 
 		[[nodiscard]] static inline std::string ReformatAddress(const std::string & I )

src/GwWebSocketClient.cpp

@@ -9,11 +9,11 @@ namespace OpenWifi {
 
 	GwWebSocketClient::GwWebSocketClient(Poco::Logger &Logger):
 		 Logger_(Logger){
-		UI_WebSocketClientServer()->SetProcessor(this);
+		WebSocketClientServer()->SetProcessor(this);
 	}
 
 	GwWebSocketClient::~GwWebSocketClient() {
-		UI_WebSocketClientServer()->SetProcessor(nullptr);
+		WebSocketClientServer()->SetProcessor(nullptr);
 	}
 
 	void GwWebSocketClient::Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done ) {
@@ -37,6 +37,7 @@ namespace OpenWifi {
 															  bool &Done, std::string &Answer) {
 		Done = false;
 		auto Prefix = O->get("serial_prefix").toString();
+		Logger().information(Poco::format("serial_number_search: %s", Prefix));
 		if (!Prefix.empty() && Prefix.length() < 13) {
 			std::vector<uint64_t> Numbers;
 			SerialNumberCache()->FindNumbers(Prefix, 50, Numbers);
@@ -60,4 +61,7 @@ namespace OpenWifi {
 		Done = false;
 		Answer = std::string{R"lit({ "error" : "invalid command" })lit"};
 	}
+
+
+
 }

src/GwWebSocketClient.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "framework/UI_WebSocketClientServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
-	class GwWebSocketClient : public UI_WebSocketClientProcessor {
+	class GwWebSocketClient : public WebSocketClientProcessor {
 	  public:
 		explicit GwWebSocketClient(Poco::Logger &Logger);
 		virtual ~GwWebSocketClient();

src/OUIServer.cpp

@@ -5,76 +5,55 @@
 #include <fstream>
 #include <vector>
 
+#include "OUIServer.h"
+
 #include "Poco/String.h"
 #include "Poco/StringTokenizer.h"
 #include "Poco/URIStreamOpener.h"
 #include "Poco/StreamCopier.h"
+#include "Poco/URI.h"
 #include "Poco/File.h"
 
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-
-#include "fmt/format.h"
-
 #include "OUIServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
 	int OUIServer::Start() {
 		Running_ = true;
-		LatestOUIFileName_ =  MicroServiceDataDirectory() + "/newOUIFile.txt";
-		CurrentOUIFileName_ = MicroServiceDataDirectory() + "/current_oui.txt";
-
-		bool Recovered = false;
-		Poco::File	OuiFile(CurrentOUIFileName_);
-		if(OuiFile.exists()) {
-			std::unique_lock	Lock(LocalMutex_);
-			Recovered = ProcessFile(CurrentOUIFileName_,OUIs_);
-			if(Recovered) {
-				poco_notice(Logger(),
-								 fmt::format("Recovered last OUI file - {}", CurrentOUIFileName_));
-			}
-		} else {
-			poco_notice(Logger(),
-							 fmt::format("No existing OUIFile.", CurrentOUIFileName_));
-		}
+		LatestOUIFileName_ =  MicroService::instance().DataDir() + "/newOUIFile.txt";
+		CurrentOUIFileName_ = MicroService::instance().DataDir() + "/current_oui.txt";
 
 		UpdaterCallBack_ = std::make_unique<Poco::TimerCallback<OUIServer>>(*this, &OUIServer::onTimer);
-		if(Recovered) {
-			Timer_.setStartInterval(60 * 60 * 1000); // first run in 1 hour
-		} else {
-			Timer_.setStartInterval(30 * 1000); // first run in 5 minutes
-		}
+		Timer_.setStartInterval(30 * 1000);  // first run in 5 minutes
 		Timer_.setPeriodicInterval(7 * 24 * 60 * 60 * 1000);
-		Timer_.start(*UpdaterCallBack_, MicroServiceTimerPool());
+		Timer_.start(*UpdaterCallBack_);
 		return 0;
 	}
 
 	void OUIServer::Stop() {
-		poco_notice(Logger(),"Stopping...");
 		Running_=false;
 		Timer_.stop();
-		poco_notice(Logger(),"Stopped...");
 	}
 
 	void OUIServer::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
-		MicroServiceLoadConfigurationFile();
-		poco_information(Logger(),"Reinitializing.");
+		MicroService::instance().LoadConfigurationFile();
+		Logger().information("Reinitializing.");
 		Stop();
 		Start();
 	}
 
 	bool OUIServer::GetFile(const std::string &FileName) {
 		try {
-			LastUpdate_ = Utils::Now();
-			poco_information(Logger(), fmt::format("Start: Retrieving OUI file: {}",MicroServiceConfigGetString("oui.download.uri","")));
+			LastUpdate_ = OpenWifi::Now();
+			Logger().information(fmt::format("Start: Retrieving OUI file: {}",MicroService::instance().ConfigGetString("oui.download.uri")));
 			std::unique_ptr<std::istream> pStr(
-				Poco::URIStreamOpener::defaultOpener().open(MicroServiceConfigGetString("oui.download.uri","")));
+				Poco::URIStreamOpener::defaultOpener().open(MicroService::instance().ConfigGetString("oui.download.uri")));
 			std::ofstream OS;
 			OS.open(FileName);
 			Poco::StreamCopier::copyStream(*pStr, OS);
 			OS.close();
-			poco_information(Logger(), fmt::format("Done: Retrieving OUI file: {}",MicroServiceConfigGetString("oui.download.uri","")));
+			Logger().information(fmt::format("Done: Retrieving OUI file: {}",MicroService::instance().ConfigGetString("oui.download.uri")));
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -124,17 +103,15 @@ namespace OpenWifi {
 			return;
 		Updating_ = true;
 
-		poco_information(Logger(),"Starting to process OUI file...");
-
 		//	fetch data from server, if not available, just use the file we already have.
 		Poco::File	Current(CurrentOUIFileName_);
 		if(Current.exists()) {
-			if((Utils::Now()-Current.getLastModified().epochTime()) < (7*24*60*60)) {
+			if((OpenWifi::Now()-Current.getLastModified().epochTime()) < (7*24*60*60)) {
 				if(!Initialized_) {
 					if(ProcessFile(CurrentOUIFileName_, OUIs_)) {
 						Initialized_ = true;
 						Updating_=false;
-						poco_information(Logger(), "Using cached file.");
+						Logger().information("Using cached file.");
 						return;
 					}
 				} else {
@@ -146,30 +123,28 @@ namespace OpenWifi {
 
 		OUIMap TmpOUIs;
 		if(GetFile(LatestOUIFileName_) && ProcessFile(LatestOUIFileName_, TmpOUIs)) {
-			std::unique_lock G(LocalMutex_);
+			std::lock_guard G(Mutex_);
 			OUIs_ = std::move(TmpOUIs);
-			LastUpdate_ = Utils::Now();
+			LastUpdate_ = OpenWifi::Now();
 			Poco::File F1(CurrentOUIFileName_);
 			if(F1.exists())
 				F1.remove();
 			Poco::File F2(LatestOUIFileName_);
 			F2.renameTo(CurrentOUIFileName_);
-			poco_information(Logger(), fmt::format("New OUI file {} downloaded.",LatestOUIFileName_));
+			Logger().information(fmt::format("New OUI file {} downloaded.",LatestOUIFileName_));
 		} else if(OUIs_.empty()) {
 			if(ProcessFile(CurrentOUIFileName_, TmpOUIs)) {
-				LastUpdate_ = Utils::Now();
-				std::unique_lock G(LocalMutex_);
+				LastUpdate_ = OpenWifi::Now();
+				std::lock_guard G(Mutex_);
 				OUIs_ = std::move(TmpOUIs);
 			}
 		}
 		Initialized_=true;
 		Updating_ = false;
-		poco_information(Logger(),"Done processing OUI file...");
 	}
 
 	std::string OUIServer::GetManufacturer(const std::string &MAC) {
-		std::shared_lock 	Lock(LocalMutex_);
-
+		std::lock_guard Guard(Mutex_);
 		auto Manufacturer = OUIs_.find(Utils::SerialNumberToOUI(MAC));
 		if(Manufacturer != OUIs_.end())
 			return Manufacturer->second;

src/OUIServer.h

@@ -4,10 +4,7 @@
 
 #pragma once
 
-#include <shared_mutex>
-
-#include "framework/SubSystemServer.h"
-
+#include "framework/MicroService.h"
 #include "Poco/Timer.h"
 
 namespace OpenWifi {
@@ -33,7 +30,6 @@ namespace OpenWifi {
 		[[nodiscard]] bool ProcessFile(const std::string &FileName, OUIMap &Map);
 
 	  private:
-		std::shared_mutex	LocalMutex_;
 		uint64_t 			LastUpdate_ = 0 ;
 		bool 				Initialized_ = false;
 		OUIMap 				OUIs_;

src/ParseWifiScan.h

@@ -4,12 +4,7 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-#include <map>
-#include <utility>
-
-#include "nlohmann/json.hpp"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -1570,7 +1565,6 @@ namespace OpenWifi {
 				ie["TLV Block"] = BufferToHex(&b[offset],l-offset);
 			} break;
 			default:
-				ie["Data"] = BufferToHex(&b[1],l-1);
 				break;
 			}
 		}
@@ -1618,7 +1612,7 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_wfa(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Wi-Fi Alliance";
-		ie["Data"] = BufferToHex(&b[1],l-1);
+
 		b++;l++;
 		return ie;
 	}
@@ -1626,7 +1620,6 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_aironet(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Cisco Wireless (Aironet)";
-		ie["Data"] = BufferToHex(&b[1],l-1);
 		b++;l++;
 		return ie;
 	}
@@ -1634,7 +1627,6 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_marvell(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Marvell Semiconductor";
-		ie["Data"] = BufferToHex(&b[1],l-1);
 		b++;l++;
 		return ie;
 	}
@@ -1642,7 +1634,6 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_atheros(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Atheros Communications";
-		ie["Data"] = BufferToHex(&b[1],l-1);
 		b++;l++;
 		return ie;
 	}
@@ -1650,7 +1641,6 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_aruba(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Aruba Networks";
-		ie["Data"] = BufferToHex(&b[1],l-1);
 		b++;l++;
 		return ie;
 	}
@@ -1658,7 +1648,6 @@ namespace OpenWifi {
 	inline nlohmann::json dissect_vendor_ie_nintendo(const unsigned char *b, uint l) {
 		nlohmann::json ie;
 		ie["vendor"] = "Nintendo";
-		ie["Data"] = BufferToHex(&b[1],l-1);
 		b++;l++;
 		return ie;
 	}
@@ -1716,7 +1705,7 @@ namespace OpenWifi {
 		nlohmann::json 	new_ie;
 		nlohmann::json 	content;
 
-		// std::cout << BufferToHex(&data[0],data.size()) << std::endl;
+		std::cout << BufferToHex(&data[0],data.size()) << std::endl;
 		uint offset=0;
 		auto sub_ie = data[offset++];
 		switch (sub_ie) {
@@ -1748,112 +1737,91 @@ namespace OpenWifi {
 		std::ostringstream	ofs;
 		Obj->stringify(ofs);
 
-		try {
-			nlohmann::json D = nlohmann::json::parse(ofs.str());
-			// std::cout << "Start of parsing wifi" << std::endl;
-			if (D.contains("status")) {
-				auto Status = D["status"];
-				if (Status.contains("scan") && Status["scan"].is_array()) {
-					nlohmann::json ScanArray = Status["scan"];
-					nlohmann::json ParsedScan = nlohmann::json::array();
-					for (auto &scan_entry : ScanArray) {
-						if (scan_entry.contains("ies") && scan_entry["ies"].is_array()) {
-							auto ies = scan_entry["ies"];
-							nlohmann::json new_ies = nlohmann::json::array();
-							for (auto &ie : ies) {
-								try {
-									if (ie.contains("type") && ie.contains("data")) {
-										uint64_t ie_type = ie["type"];
-										std::string ie_data = ie["data"];
-										// std::cout << "TYPE:" << ie_type << "  DATA:" << ie_data << std::endl;
-										auto data = Base64Decode2Vec(ie_data);
-										if (ie_type == ieee80211_eid::WLAN_EID_COUNTRY) {
-											new_ies.push_back(WFS_WLAN_EID_COUNTRY(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_SUPP_RATES) {
-											new_ies.push_back(WFS_WLAN_EID_SUPP_RATES(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_FH_PARAMS) {
-											new_ies.push_back(WFS_WLAN_EID_FH_PARAMS(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_DS_PARAMS) {
-											new_ies.push_back(WFS_WLAN_EID_DS_PARAMS(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_TIM) {
-											new_ies.push_back(WFS_WLAN_EID_TIM(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_QBSS_LOAD) {
-											new_ies.push_back(WFS_WLAN_EID_QBSS_LOAD(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_PWR_CONSTRAINT) {
-											new_ies.push_back(WFS_WLAN_EID_PWR_CONSTRAINT(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_ERP_INFO) {
-											new_ies.push_back(WFS_WLAN_EID_ERP_INFO(data));
-										} else if (ie_type ==
-												   ieee80211_eid::
-													   WLAN_EID_SUPPORTED_REGULATORY_CLASSES) {
-											new_ies.push_back(
-												WFS_WLAN_EID_SUPPORTED_REGULATORY_CLASSES(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_HT_CAPABILITY) {
-											new_ies.push_back(WFS_WLAN_EID_HT_CAPABILITY(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_EXT_SUPP_RATES) {
-											new_ies.push_back(WFS_WLAN_EID_EXT_SUPP_RATES(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_TX_POWER_ENVELOPE) {
-											new_ies.push_back(WFS_WLAN_EID_TX_POWER_ENVELOPE(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_VHT_CAPABILITY) {
-											new_ies.push_back(WFS_WLAN_EID_VHT_CAPABILITY(data));
-										} else if (ie_type ==
-												   ieee80211_eid::
-													   WLAN_EID_RRM_ENABLED_CAPABILITIES) {
-											new_ies.push_back(
-												WFS_WLAN_EID_RRM_ENABLED_CAPABILITIES(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_EXT_CAPABILITY) {
-											new_ies.push_back(WFS_WLAN_EID_EXT_CAPABILITY(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_TPC_REPORT) {
-											new_ies.push_back(WFS_WLAN_EID_TPC_REPORT(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_RSN) {
-											new_ies.push_back(WFS_WLAN_EID_RSN(data));
-										} else if (ie_type ==
-												   ieee80211_eid::WLAN_EID_VENDOR_SPECIFIC) {
-											new_ies.push_back(WFS_WLAN_EID_VENDOR_SPECIFIC(data));
-										} else if (ie_type == ieee80211_eid::WLAN_EID_EXTENSION) {
-											new_ies.push_back(WFS_WLAN_EID_EXTENSION(data));
-										} else {
-											// std::cout
-											//	<< "Skipping IE: no parsing available: " << ie_type
-											//	<< std::endl;
-											new_ies.push_back(ie);
-										}
+		nlohmann::json D = nlohmann::json::parse(ofs.str());
+		std::cout << "Start of parsing wifi" << std::endl;
+		if (D.contains("status")) {
+			auto Status = D["status"];
+			if (Status.contains("scan") && Status["scan"].is_array()) {
+				nlohmann::json ScanArray = Status["scan"];
+				nlohmann::json ParsedScan = nlohmann::json::array();
+				for (auto &scan_entry : ScanArray) {
+					if (scan_entry.contains("ies") && scan_entry["ies"].is_array()) {
+						auto ies = scan_entry["ies"];
+						nlohmann::json 	new_ies=nlohmann::json::array();
+						for (auto &ie : ies) {
+							try {
+								if (ie.contains("type") && ie.contains("data")) {
+									uint64_t ie_type = ie["type"];
+									std::string ie_data = ie["data"];
+									// std::cout << "TYPE:" << ie_type << "  DATA:" << ie_data << std::endl;
+									auto data = Base64Decode2Vec(ie_data);
+									if (ie_type == ieee80211_eid::WLAN_EID_COUNTRY) {
+										new_ies.push_back(WFS_WLAN_EID_COUNTRY(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_SUPP_RATES) {
+										new_ies.push_back(WFS_WLAN_EID_SUPP_RATES(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_FH_PARAMS) {
+										new_ies.push_back(WFS_WLAN_EID_FH_PARAMS(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_DS_PARAMS) {
+										new_ies.push_back(WFS_WLAN_EID_DS_PARAMS(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_TIM) {
+										new_ies.push_back(WFS_WLAN_EID_TIM(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_QBSS_LOAD) {
+										new_ies.push_back(WFS_WLAN_EID_QBSS_LOAD(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_PWR_CONSTRAINT) {
+										new_ies.push_back(WFS_WLAN_EID_PWR_CONSTRAINT(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_ERP_INFO) {
+										new_ies.push_back(WFS_WLAN_EID_ERP_INFO(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_SUPPORTED_REGULATORY_CLASSES) {
+										new_ies.push_back(WFS_WLAN_EID_SUPPORTED_REGULATORY_CLASSES(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_HT_CAPABILITY) {
+										new_ies.push_back(WFS_WLAN_EID_HT_CAPABILITY(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_EXT_SUPP_RATES) {
+										new_ies.push_back(WFS_WLAN_EID_EXT_SUPP_RATES(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_TX_POWER_ENVELOPE) {
+										new_ies.push_back(WFS_WLAN_EID_TX_POWER_ENVELOPE(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_VHT_CAPABILITY) {
+										new_ies.push_back(WFS_WLAN_EID_VHT_CAPABILITY(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_RRM_ENABLED_CAPABILITIES) {
+										new_ies.push_back(WFS_WLAN_EID_RRM_ENABLED_CAPABILITIES(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_EXT_CAPABILITY) {
+										new_ies.push_back(WFS_WLAN_EID_EXT_CAPABILITY(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_TPC_REPORT) {
+										new_ies.push_back(WFS_WLAN_EID_TPC_REPORT(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_RSN) {
+										new_ies.push_back(WFS_WLAN_EID_RSN(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_VENDOR_SPECIFIC) {
+										new_ies.push_back(WFS_WLAN_EID_VENDOR_SPECIFIC(data));
+									} else if (ie_type == ieee80211_eid::WLAN_EID_EXTENSION) {
+										new_ies.push_back(WFS_WLAN_EID_EXTENSION(data));
 									} else {
-										// std::cout << "Skipping IE: no data and type" << std::endl;
+										std::cout
+											<< "Skipping IE: no parsing available: " << ie_type
+											<< std::endl;
 										new_ies.push_back(ie);
 									}
-								} catch (...) {
-									// std::cout << "Skipping IE: exception" << std::endl;
-									Logger.information(fmt::format("Error parsing IEs"));
+								} else {
+									std::cout << "Skipping IE: no data and type" << std::endl;
 									new_ies.push_back(ie);
 								}
+							} catch (...) {
+								std::cout << "Skipping IE: exception" << std::endl;
+								Logger.information(fmt::format("Error parsing IEs"));
+								new_ies.push_back(ie);
 							}
-							scan_entry["ies"] = new_ies;
-							ParsedScan.push_back(scan_entry);
-						} else {
-							// std::cout << "Skipping scan" << std::endl;
-							ParsedScan.push_back(scan_entry);
 						}
+						scan_entry["ies"] = new_ies;
+						ParsedScan.push_back(scan_entry);
+					} else {
+						std::cout << "Skipping scan" << std::endl;
+						ParsedScan.push_back(scan_entry);
 					}
-					Status["scan"] = ParsedScan;
-					D["status"] = Status;
 				}
+				Status["scan"] = ParsedScan;
+				D["status"] = Status;
 			}
-			Result << to_string(D);
-			// std::cout << "End of parsing wifi" << std::endl;
-			return true;
-		} catch (const Poco::Exception &E) {
-			Logger.log(E);
-			Logger.error(fmt::format("Failure to parse WifiScan."));
-		} catch (...) {
-			Logger.error(fmt::format("Failure to parse WifiScan."));
 		}
+		Result << to_string(D);
+		std::cout << "End of parsing wifi" << std::endl;
 		return false;
 	}
 

src/RADIUS_helpers.h

@@ -9,256 +9,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include "Poco/HMACEngine.h"
-#include "Poco/MD5Engine.h"
-#include "Poco/StringTokenizer.h"
-
 namespace OpenWifi::RADIUS {
 
-#define RADCMD_ACCESS_REQ   1 /* Access-Request      */
-#define RADCMD_ACCESS_ACC   2 /* Access-Accept       */
-#define RADCMD_ACCESS_REJ   3 /* Access-Reject       */
-#define RADCMD_ACCOUN_REQ   4 /* Accounting-Request  */
-#define RADCMD_ACCOUN_RES   5 /* Accounting-Response */
-#define RADCMD_ACCOUN_STATUS   	6 /* Accounting-Status */
-#define RADCMD_PASSWORD_REQUEST	7	/* Password-Request	[RFC3575] */
-#define RADCMD_PASSWORD_ACK		8	/* Password-Ack	[RFC3575] */
-#define RADCMD_PASSWORD_REJECT	9	/* Password-Reject	[RFC3575] */
-#define RADCMD_ACCOUN_MESSAGE	10	/* Accounting-Message	[RFC3575] */
-
-#define RADCMD_RES_FREE_REQ			21	/* Resource-Free-Request	[RFC3575] */
-#define RADCMD_RES_FREE_RES			22	/* Resource-Free-Response	[RFC3575] */
-#define RADCMD_RES_QUERY_REQ		23	/* Resource-Query-Request	[RFC3575] */
-#define RADCMD_RES_QUERY_RES		24	/* Resource-Query-Response	[RFC3575] */
-#define RADCMD_RES_ALT_RECLAIM_REQ	25	/* Alternate-Resource-Reclaim-Request	[RFC3575] */
-
-#define RADCMD_ACCESS_CHA  11 		/* Access-Challenge    */
-#define RADCMD_STATUS_SER  12 		/* Status-Server       */
-#define RADCMD_STATUS_CLI  13 		/* Status-Client       */
-#define RADCMD_DISCON_REQ  40 		/* Disconnect-Request  */
-#define RADCMD_DISCON_ACK  41 		/* Disconnect-ACK      */
-#define RADCMD_DISCON_NAK  42 		/* Disconnect-NAK      */
-#define RADCMD_COA_REQ     43 		/* CoA-Request         */
-#define RADCMD_COA_ACK     44 		/* CoA-ACK             */
-#define RADCMD_COA_NAK     45 		/* CoA-NAK             */
-#define RADCMD_RESERVED   255 		/* Reserved            */
-
-/*
-	21	Resource-Free-Request	[RFC3575]
-	22	Resource-Free-Response	[RFC3575]
-	23	Resource-Query-Request	[RFC3575]
-	24	Resource-Query-Response	[RFC3575]
-	25	Alternate-Resource-Reclaim-Request	[RFC3575]
-
-	26	NAS-Reboot-Request	[RFC3575]
-	27	NAS-Reboot-Response	[RFC3575]
-	28	Reserved
-	29	Next-Passcode	[RFC3575]
-	30	New-Pin	[RFC3575]
-	31	Terminate-Session	[RFC3575]
-	32	Password-Expired	[RFC3575]
-	33	Event-Request	[RFC3575]
-	34	Event-Response	[RFC3575]
-	35-39	Unassigned
-	40	Disconnect-Request	[RFC3575][RFC5176]
-	41	Disconnect-ACK	[RFC3575][RFC5176]
-	42	Disconnect-NAK	[RFC3575][RFC5176]
-	43	CoA-Request	[RFC3575][RFC5176]
-	44	CoA-ACK	[RFC3575][RFC5176]
-	45	CoA-NAK	[RFC3575][RFC5176]
-	46-49	Unassigned
-	50	IP-Address-Allocate	[RFC3575]
-	51	IP-Address-Release	[RFC3575]
-	52	Protocol-Error	[RFC7930]
-	53-249	Unassigned
-	250-253	Experimental Use	[RFC3575]
-	254	Reserved	[RFC3575]
-	255	Reserved	[RFC3575]
-*/
-
-struct tok {
-	uint 	cmd;
-	const char * name;
-};
-
-/*
-
-Radius commands
-
- char const *fr_packet_codes[FR_MAX_PACKET_CODE] = {
- "",					//!< 0
- "Access-Request",
- "Access-Accept",
- "Access-Reject",
- "Accounting-Request",
- "Accounting-Response",
- "Accounting-Status",
- "Password-Request",
- "Password-Accept",
- "Password-Reject",
- "Accounting-Message",			//!< 10
- "Access-Challenge",
- "Status-Server",
- "Status-Client",
- "14",
- "15",
- "16",
- "17",
- "18",
- "19",
- "20",					//!< 20
- "Resource-Free-Request",
- "Resource-Free-Response",
- "Resource-Query-Request",
- "Resource-Query-Response",
- "Alternate-Resource-Reclaim-Request",
- "NAS-Reboot-Request",
- "NAS-Reboot-Response",
- "28",
- "Next-Passcode",
- "New-Pin",				//!< 30
- "Terminate-Session",
- "Password-Expired",
- "Event-Request",
- "Event-Response",
- "35",
- "36",
- "37",
- "38",
- "39",
- "Disconnect-Request",			//!< 40
- "Disconnect-ACK",
- "Disconnect-NAK",
- "CoA-Request",
- "CoA-ACK",
- "CoA-NAK",
- "46",
- "47",
- "48",
- "49",
- "IP-Address-Allocate",
- "IP-Address-Release",			//!< 50
-};
-
-
- */
-
-static const struct tok radius_command_values[] = {
-	{ RADCMD_ACCESS_REQ, "Access-Request" },
-	{ RADCMD_ACCESS_ACC, "Access-Accept" },
-	{ RADCMD_ACCESS_REJ, "Access-Reject" },
-	{ RADCMD_ACCOUN_REQ, "Accounting-Request" },
-	{ RADCMD_ACCOUN_RES, "Accounting-Response" },
-	{ RADCMD_ACCESS_CHA, "Access-Challenge" },
-	{ RADCMD_STATUS_SER, "Status-Server" },
-	{ RADCMD_STATUS_CLI, "Status-Client" },
-	{ RADCMD_DISCON_REQ, "Disconnect-Request" },
-	{ RADCMD_DISCON_ACK, "Disconnect-ACK" },
-	{ RADCMD_DISCON_NAK, "Disconnect-NAK" },
-	{ RADCMD_COA_REQ,    "CoA-Request" },
-	{ RADCMD_COA_ACK,    "CoA-ACK" },
-	{ RADCMD_COA_NAK,    "CoA-NAK" },
-	{ RADCMD_RESERVED,   "Reserved" },
-	{ RADCMD_ACCOUN_STATUS, "Accounting-Status"},
-	{ RADCMD_PASSWORD_REQUEST, "Password-Request"},
-  	{ RADCMD_PASSWORD_ACK, "Password-Ack"},
-   	{ RADCMD_PASSWORD_REJECT, "Password-Reject"},
-	{ RADCMD_ACCOUN_MESSAGE, "Accounting-Message"},
-	{ RADCMD_RES_FREE_REQ,	"Resource-Free-Request"},
-	{ RADCMD_RES_FREE_RES,	"Resource-Free-Response"},
-	{ RADCMD_RES_QUERY_REQ, "Resource-Query-Request"},
-	{ RADCMD_RES_QUERY_RES, "Resource-Query-Response"},
-	{ RADCMD_RES_ALT_RECLAIM_REQ, "Alternate-Resource-Reclaim-Request"},
-	{ 0, nullptr}
-};
-
-static const struct tok radius_attribute_names[] = {
-	{1,"User-Name"},
-	{2,"User-Password"},
-	{3,"CHAP-Password"},
-	{4,"NAS-IP Address"},
-	{5,"NAS-Port"},
-	{6,"Service-Type"},
-	{7,"Framed-Protocol"},
-	{8,"Framed-IP-Address"},
-	{9,"Framed-IP-Netmask"},
-	{10,"Framed-Routing"},
-	{11,"Filter-Id"},
-	{12,"Framed-MTU"},
-	{13,"Framed-Compression"},
-	{14,"Login-IP-Host"},
-	{15,"Login-Service"},
-	{16,"Login-TCP-Port"},
-	{18,"Reply-Message"},
-	{19,"Callback-Number"},
-	{20,"Callback-ID"},
-	{22,"Framed-Route"},
-	{23,"Framed-IPX-Network"},
-	{24,"State"},
-	{25,"Class"},
-	{26,"Vendor-Specific"},
-	{27,"Session-Timeout"},
-	{28,"Idle-Timeout"},
-	{29,"Termination-Action"},
-	{30,"Called-Station-Id"},
-	{31,"Calling-Station-Id"},
-	{32,"NAS-Identifier"},
-	{33,"Proxy-State"},
-	{34,"Login-LAT-Service"},
-	{35,"Login-LAT-Node"},
-	{36,"Login-LAT-Group"},
-	{37,"Framed-AppleTalk-Link"},
-	{38,"Framed-AppleTalk-Network"},
-	{39,"Framed-AppleTalk-Zone"},
-	{40,"Acct-Status-Type"},
-	{41,"Acct-Delay-Time"},
-	{42,"Acct-Input-Octets"},
-	{43,"Acct-Output-Octets"},
-	{44,"Acct-Session-Id"},
-	{45,"Acct-Authentic"},
-	{46,"Acct-Session-Time"},
-	{47,"Acct-Input-Packets"},
-	{48,"Acct-Output-Packets"},
-	{49,"Acct-Terminate-Cause"},
-	{50,"Acct-Multi-Session-Id"},
-	{51,"Acct-Link-Count"},
-	{52,"Acct-Input-Gigawords"},
-	{53,"Acct-Output-Gigawords"},
-	{55,"Event-Timestamp"},
-	{60,"CHAP-Challenge"},
-	{61,"NAS-Port-Type"},
-	{62,"Port-Limit"},
-	{63,"Login-LAT-Port"},
-	{64,"Tunnel-Type3"},
-	{65,"Tunnel-Medium-Type1"},
-	{66,"Tunnel-Client-Endpoint"},
-	{67,"Tunnel-Server-Endpoint1"},
-	{68,"Acct-Tunnel-Connection-ID"},
-	{69,"Tunnel-Password1"},
-	{70,"ARAP-Password"},
-	{71,"ARAP-Features"},
-	{72,"ARAP-Zone-Access"},
-	{73,"ARAP-Security"},
-	{74,"ARAP-Security-Data"},
-	{75,"Password-Retry"},
-	{76,"Prompt"},
-	{77,"Connect-Info"},
-	{78,"Configuration-Token"},
-	{79,"EAP-Message"},
-	{80,"Message-Authenticator"},
-	{81,"Tunnel-Private-Group-ID"},
-	{82,"Tunnel-Assignment-ID1"},
-	{83,"Tunnel-Preference"},
-	{84,"ARAP-Challenge-Response"},
-	{85,"Acct-Interim-Interval"},
-	{86,"Acct-Tunnel-Packets-Lost"},
-	{87,"NAS-Port-ID"},
-	{88,"Framed-Pool"},
-	{90,"Tunnel-Client-Auth-ID"},
-	{91,"Tunnel-Server-Auth-ID"},
-	{0, nullptr}
-};
-
 #pragma pack(push,1)
 	struct RadiusAttribute {
 		unsigned char   type{0};
@@ -268,75 +20,12 @@ static const struct tok radius_attribute_names[] = {
 	struct RawRadiusPacket {
 		unsigned char   code{1};
 		unsigned char   identifier{0};
-		uint16_t        rawlen{0};
+		uint16_t        len{0};
 		unsigned char   authenticator[16]{0};
 		unsigned char   attributes[4096]{0};
 	};
 #pragma pack(pop)
 
-	constexpr unsigned char Access_Request = 1;
-	constexpr unsigned char Access_Accept = 2;
-	constexpr unsigned char Access_Reject = 3;
-	constexpr unsigned char Access_Challenge = 11;
-
-	constexpr unsigned char Accounting_Request = 4;
-	constexpr unsigned char Accounting_Response = 5;
-	constexpr unsigned char Accounting_Status = 6;
-	constexpr unsigned char Accounting_Message = 10;
-
-	constexpr unsigned char Disconnect_Request = 40;
-	constexpr unsigned char Disconnect_ACK	 = 41;
-	constexpr unsigned char Disconnect_NAK = 42;
-	constexpr unsigned char CoA_Request = 43;
-	constexpr unsigned char CoA_ACK = 44;
-	constexpr unsigned char CoA_NAK = 45;
-
-	constexpr unsigned char ATTR_MessageAuthenticator = 80;
-
-	inline bool IsAuthentication(unsigned char t) {
-		return (t == RADIUS::Access_Request ||
-				t == RADIUS::Access_Accept ||
-				t == RADIUS::Access_Challenge ||
-				t == RADIUS::Access_Reject);
-	}
-
-	inline bool IsAccounting(unsigned char t) {
-		return (t == RADIUS::Accounting_Request ||
-				t == RADIUS::Accounting_Response ||
-				t == RADIUS::Accounting_Status ||
-				t == RADIUS::Accounting_Message);
-	}
-
-	inline bool IsAuthority(unsigned char t) {
-		return (t == RADIUS::Disconnect_Request ||
-				t == RADIUS::Disconnect_ACK ||
-				t == RADIUS::Disconnect_NAK ||
-				t == RADIUS::CoA_Request ||
-				t == RADIUS::CoA_ACK ||
-				t == RADIUS::CoA_NAK);
-	}
-
-	inline const char * CommandName(uint cmd) {
-		auto cmds = radius_command_values;
-		while(cmds->cmd && (cmds->cmd!=cmd))
-			cmds++;
-		if(cmds->cmd==cmd) return cmds->name;
-		return "Unknown";
-	}
-
-	inline const char * AttributeName(uint cmd) {
-		auto cmds = radius_attribute_names;
-		while(cmds->cmd && (cmds->cmd!=cmd))
-			cmds++;
-		if(cmds->cmd==cmd) return cmds->name;
-		return "Unknown";
-	}
-
-	inline void MakeRadiusAuthenticator(unsigned char *authenticator) {
-		for(int i=0;i<16;i++)
-			authenticator[i]=std::rand() & 0xff;
-	}
-
 	//
 	// From: https://github.com/Telecominfraproject/wlan-dictionary/blob/main/dictionary.tip
 	//
@@ -345,21 +34,23 @@ static const struct tok radius_attribute_names[] = {
 	static const unsigned char TIP_AAAipaddr = 2;
 	static const unsigned char TIP_AAAipv6addr = 3;
 
+
 	using AttributeList = std::list<RadiusAttribute>;
 
-	inline std::ostream &operator<<(std::ostream &os, AttributeList const &P) {
+	std::ostream &operator<<(std::ostream &os, AttributeList const &P) {
 		for(const auto &attr:P) {
 			os << "\tAttr: " << (uint16_t) attr.type << "  Size: " << (uint16_t) attr.len << std::endl;
 		}
 		return os;
 	}
 
-	inline bool ParseRadius(uint32_t offset, const unsigned char *Buffer, uint16_t Size, AttributeList &Attrs) {
+	bool ParseRadius(uint32_t offset, const unsigned char *Buffer, uint16_t Size, AttributeList &Attrs) {
 		Attrs.clear();
 		uint16_t pos=0;
 		auto x=25;
 		while(pos<Size && x) {
-			RadiusAttribute Attr{ .type=Buffer[pos], .pos=(uint16_t)(pos+2+offset), .len=(unsigned int)(Buffer[pos+1]-2)};
+			RadiusAttribute Attr{ .type=Buffer[pos], .pos=(uint16_t )(pos+2+offset), .len=Buffer[pos+1]};
+			// std::cout << "POS: " << pos << "  P:" << (uint32_t) Attr.pos << "  T:" << (uint32_t) Attr.type << "  L:" << (uint32_t) Attr.len << "  S:" << (uint32_t) Size << std::endl;
 			if(pos+Attr.len<=Size) {
 				Attrs.emplace_back(Attr);
 			} else {
@@ -373,55 +64,25 @@ static const struct tok radius_attribute_names[] = {
 			pos+=Buffer[pos+1];
 			x--;
 		}
+		// std::cout << "Good parse" << std::endl;
 		return true;
 	}
 
 	class RadiusPacket {
 	  public:
-		explicit RadiusPacket(const Poco::Buffer<char> & Buf) {
-			if(Buf.size() >= sizeof(RawRadiusPacket)) {
-				Valid_ = false;
-				return;
-			}
-			memcpy((void *)&P_,Buf.begin(), Buf.size());
-			Size_=Buf.size();
-			Valid_ = (Size_== htons(P_.rawlen));
-			if(Valid_)
-				Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
-		}
-
 		explicit RadiusPacket(const unsigned char *buffer, uint16_t size) {
-			if(size >= sizeof(RawRadiusPacket)) {
-				Valid_ = false;
-				return;
-			}
 			memcpy((void *)&P_,buffer, size);
 			Size_=size;
-			Valid_ = (Size_== htons(P_.rawlen));
-			if(Valid_)
-				Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
+			Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
 		}
 
 		explicit RadiusPacket(const std::string &p) {
-			if(p.size() >= sizeof(RawRadiusPacket)) {
-				Valid_ = false;
-				return;
-			}
 			memcpy((void *)&P_,(const unsigned char*) p.c_str(), p.size());
 			Size_=p.size();
-			Valid_ = (Size_== htons(P_.rawlen));
-			if(Valid_)
-				Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
+			Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
 		}
 
-		explicit RadiusPacket(const RadiusPacket &P) {
-			Valid_ = P.Valid_;
-			Size_ = P.Size_;
-			P_ = P.P_;
-			Attrs_ = P.Attrs_;
-		}
-
-		explicit RadiusPacket() = default;
+		RadiusPacket() = default;
 
 		unsigned char * Buffer() { return (unsigned char *)&P_; }
 		[[nodiscard]] uint16_t BufferLen() const { return sizeof(P_);}
@@ -431,39 +92,11 @@ static const struct tok radius_attribute_names[] = {
 			Valid_ = ParseRadius(0,(unsigned char *)&P_.attributes[0],Size_-20,Attrs_);
 		}
 
-		[[nodiscard]]  uint16_t Len() const { return htons(P_.rawlen); }
+		[[nodiscard]]  uint16_t Len() const { return htons(P_.len); }
 		[[nodiscard]]  uint16_t Size() const { return Size_; }
 
 		friend std::ostream &operator<<(std::ostream &os, RadiusPacket const &P);
 
-		inline bool IsAuthentication() {
-			return (P_.code == RADIUS::Access_Request ||
-					P_.code == RADIUS::Access_Accept ||
-					P_.code == RADIUS::Access_Challenge ||
-					P_.code == RADIUS::Access_Reject ||
-					P_.code == RADCMD_RES_FREE_REQ ||
-					P_.code == RADCMD_RES_FREE_RES ||
-					P_.code == RADCMD_RES_QUERY_REQ ||
-					P_.code == RADCMD_RES_QUERY_RES ||
-					P_.code == RADCMD_RES_ALT_RECLAIM_REQ);
-		}
-
-		inline bool IsAccounting() {
-			return (P_.code == RADIUS::Accounting_Request ||
-					P_.code == RADIUS::Accounting_Response ||
-					P_.code == RADIUS::Accounting_Status ||
-					P_.code == RADIUS::Accounting_Message);
-		}
-
-		inline bool IsAuthority() {
-			return (P_.code == RADIUS::Disconnect_Request ||
-					P_.code == RADIUS::Disconnect_ACK ||
-					P_.code == RADIUS::Disconnect_NAK ||
-					P_.code == RADIUS::CoA_Request ||
-					P_.code == RADIUS::CoA_ACK ||
-					P_.code == RADIUS::CoA_NAK);
-		}
-
 		void Log(std::ostream &os) {
 			uint16_t p = 0;
 
@@ -477,102 +110,9 @@ static const struct tok radius_attribute_names[] = {
 				os << std::endl;
 				p+=16;
 			}
-			os << std::dec << std::endl << std::endl;
-			Print(os);
+			os << std::dec << std::endl;
 		}
 
-		inline const char * PacketType() {
-			return CommandName(P_.code);
-		}
-
-		inline int PacketTypeInt() {
-			return (int)(P_.code);
-		}
-
-		void ComputeMessageAuthenticator(const std::string &secret) {
-			RawRadiusPacket		P = P_;
-
-			if(P_.code==1) {
-				unsigned char OldAuthenticator[16]{0};
-				for (const auto &attr : Attrs_) {
-					if (attr.type == 80) {
-						memcpy(OldAuthenticator, &P_.attributes[attr.pos], 16);
-						memset(&P.attributes[attr.pos], 0, 16);
-					}
-				}
-
-				unsigned char NewAuthenticator[16]{0};
-				Poco::HMACEngine<Poco::MD5Engine> H(secret);
-				H.update((const unsigned char *)&P, Size_);
-				auto digest = H.digest();
-				int p = 0;
-				for (const auto &i : digest)
-					NewAuthenticator[p++] = i;
-
-				if (memcmp(OldAuthenticator, NewAuthenticator, 16) == 0) {
-					std::cout << "Authenticator match..." << std::endl;
-				} else {
-					std::cout << "Authenticator MIS-match..." << std::endl;
-					for (const auto &attr : Attrs_) {
-						if (attr.type == 80) {
-							memcpy(&P_.attributes[attr.pos], NewAuthenticator, 16);
-						}
-					}
-				}
-			}
-		}
-
-		bool VerifyMessageAuthenticator(const std::string &secret) {
-			RawRadiusPacket		P = P_;
-			if(P_.code==1) {
-				unsigned char OldAuthenticator[16]{0};
-				for (const auto &attr : Attrs_) {
-					if (attr.type == 80) {
-						memcpy(OldAuthenticator, &P_.attributes[attr.pos], 16);
-						memset(&P.attributes[attr.pos], 0, 16);
-					}
-				}
-				unsigned char NewAuthenticator[16]{0};
-				Poco::HMACEngine<Poco::MD5Engine> H(secret);
-				H.update((const unsigned char *)&P, Size_);
-				auto digest = H.digest();
-				int p = 0;
-				for (const auto &i : digest)
-					NewAuthenticator[p++] = i;
-				return memcmp(OldAuthenticator, NewAuthenticator, 16) == 0;
-			}
-			return true;
-		}
-
-		static void BufLog(std::ostream & os, const char * pre, const unsigned char *b, uint s) {
-			uint16_t p = 0;
-			while(p<s) {
-				os << pre << std::setfill('0') << std::setw(4) << p << ":  ";
-				uint16_t v=0;
-				while(v<16 && p+v<s) {
-					os << std::setfill('0') << std::setw(2) << std::right << std::hex << (uint16_t )b[p+v] << " ";
-					v++;
-				}
-				os << std::endl;
-				p+=16;
-			}
-			os << std::dec ;
-		}
-
-		inline void Print(std::ostream &os) {
-			os << "Packet type: (" << (uint) P_.code << ") " << CommandName(P_.code) << std::endl;
-			os << "  Identifier: " << (uint) P_.identifier << std::endl;
-			os << "  Length: " << Size_ << std::endl;
-			os << "  Authenticator: " ;
-			BufLog(os, "", P_.authenticator, sizeof(P_.authenticator));
-			os << "  Attributes: " << std::endl;
-			for(const auto &attr:Attrs_) {
-				os << "    " << std::setfill(' ') << "(" << std::setw(4) << (uint) attr.type << ") " << AttributeName(attr.type) << "   Len:" << attr.len << std::endl;
-				BufLog(os, "           " , &P_.attributes[attr.pos], attr.len);
-			}
-			os << std::dec << std::endl << std::endl;
- 		}
-
 		std::string ExtractSerialNumberTIP() {
 			std::string     R;
 
@@ -581,7 +121,7 @@ static const struct tok radius_attribute_names[] = {
 					AttributeList   VendorAttributes;
 					uint32_t VendorId = htonl( *(const uint32_t *)&(P_.attributes[attribute.pos]));
 					// std::cout << VendorId << std::endl;
-					if(VendorId==TIP_vendor_id && attribute.len>(4+2)) {
+					if(VendorId==TIP_vendor_id) {
 						if (ParseRadius(attribute.pos + 4, &P_.attributes[attribute.pos + 4], attribute.len - 4 - 2,
 										VendorAttributes)) {
 							// std::cout << VendorAttributes << std::endl;
@@ -599,6 +139,7 @@ static const struct tok radius_attribute_names[] = {
 					}
 				}
 			}
+
 			return R;
 		}
 
@@ -656,16 +197,6 @@ static const struct tok radius_attribute_names[] = {
 			return Result;
 		}
 
-		[[nodiscard]] std::string UserName() const {
-			for(const auto &attr:Attrs_) {
-				if(attr.type==1) {
-					std::string 	user_name{(const char *)&P_.attributes[attr.pos],attr.len};
-					return user_name;
-				}
-			}
-			return "";
-		}
-
 	  private:
 		RawRadiusPacket     P_;
 		uint16_t            Size_{0};
@@ -673,45 +204,7 @@ static const struct tok radius_attribute_names[] = {
 		bool                Valid_=false;
 	};
 
-	class RadiusOutputPacket {
-	  public:
-		explicit RadiusOutputPacket(const std::string &Secret)
-			: Secret_(Secret) {
-		}
-
-		inline void MakeStatusMessage() {
-			P_.code = RADCMD_STATUS_SER;
-			P_.identifier = std::rand() & 0x00ff;
-			MakeRadiusAuthenticator(P_.authenticator);
-			unsigned char MessageAuthenticator[16]{0};
-			AddAttribute(ATTR_MessageAuthenticator,sizeof(MessageAuthenticator),MessageAuthenticator);
-			P_.rawlen = 1 + 1 + 2 + 16 + 1 + 1 + 16;
-
-			Poco::HMACEngine<Poco::MD5Engine> H(Secret_);
-			H.update((const unsigned char *)&P_, P_.rawlen);
-			auto digest = H.digest();
-			int p = 0;
-			for (const auto &i : digest)
-				P_.attributes[1 + 1 + p++] = i;
-		}
-
-		inline void AddAttribute(unsigned char attr, uint8_t len, const unsigned char * data) {
-			P_.attributes[AttributesLen_++] = attr;
-			P_.attributes[AttributesLen_++] = len;
-			memcpy(&P_.attributes[AttributesLen_],data,len);
-			AttributesLen_+=len;
-		}
-
-		[[nodiscard]] inline const unsigned char * Data() const { return (const unsigned char *) &P_;}
-		[[nodiscard]] inline std::uint16_t Len() const { return P_.rawlen; }
-
-	  private:
-		RawRadiusPacket		P_;
-		uint16_t 			AttributesLen_=0;
-		std::string 		Secret_;
-	};
-
-	inline std::ostream &operator<<(std::ostream &os, RadiusPacket const &P) {
+	std::ostream &operator<<(std::ostream &os, RadiusPacket const &P) {
 		os << P.Attrs_ ;
 		return os;
 	}

src/RADIUS_proxy_server.cpp

@@ -2,13 +2,9 @@
 // Created by stephane bourque on 2022-05-18.
 //
 
-#include "Poco/JSON/Parser.h"
-
 #include "RADIUS_proxy_server.h"
+#include "DeviceRegistry.h"
 #include "RADIUS_helpers.h"
-#include "AP_WS_Server.h"
-
-#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
@@ -19,155 +15,125 @@ namespace OpenWifi {
 
 	int RADIUS_proxy_server::Start() {
 
-		ConfigFilename_ = MicroServiceDataDirectory()+"/radius_pool_config.json";
-		Poco::File	Config(ConfigFilename_);
-
-		Enabled_ = MicroServiceConfigGetBool("radius.proxy.enable",false);
-		if(!Enabled_ && !Config.exists()) {
-			StopRADSECServers();
+		enabled_ = MicroService::instance().ConfigGetBool("radius.proxy.enable",false);
+		if(!enabled_)
 			return 0;
-		}
 
-		poco_notice(Logger(),"Starting...");
+		ConfigFilename_ = MicroService::instance().DataDir()+"/radius_pool_config.json";
+
 
-		Enabled_ = true;
 
 		Poco::Net::SocketAddress	AuthSockAddrV4(Poco::Net::AddressFamily::IPv4,
-									   MicroServiceConfigGetInt("radius.proxy.authentication.port",DEFAULT_RADIUS_AUTHENTICATION_PORT));
-		AuthenticationSocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV4,true,true);
+									   MicroService::instance().ConfigGetInt("radius.proxy.authentication.port",DEFAULT_RADIUS_AUTHENTICATION_PORT));
+		AuthenticationSocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV4,true);
 		Poco::Net::SocketAddress	AuthSockAddrV6(Poco::Net::AddressFamily::IPv6,
-											  MicroServiceConfigGetInt("radius.proxy.authentication.port",DEFAULT_RADIUS_AUTHENTICATION_PORT));
-		AuthenticationSocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV6,true,true);
+											  MicroService::instance().ConfigGetInt("radius.proxy.authentication.port",DEFAULT_RADIUS_AUTHENTICATION_PORT));
+		AuthenticationSocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV6,true);
 
 		Poco::Net::SocketAddress	AcctSockAddrV4(Poco::Net::AddressFamily::IPv4,
-									   MicroServiceConfigGetInt("radius.proxy.accounting.port",DEFAULT_RADIUS_ACCOUNTING_PORT));
-		AccountingSocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV4,true,true);
+									   MicroService::instance().ConfigGetInt("radius.proxy.accounting.port",DEFAULT_RADIUS_ACCOUNTING_PORT));
+		AccountingSocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV4,true);
 		Poco::Net::SocketAddress	AcctSockAddrV6(Poco::Net::AddressFamily::IPv6,
-											  MicroServiceConfigGetInt("radius.proxy.accounting.port",DEFAULT_RADIUS_ACCOUNTING_PORT));
-		AccountingSocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV6,true,true);
+											  MicroService::instance().ConfigGetInt("radius.proxy.accounting.port",DEFAULT_RADIUS_ACCOUNTING_PORT));
+		AccountingSocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV6,true);
 
 		Poco::Net::SocketAddress	CoASockAddrV4(Poco::Net::AddressFamily::IPv4,
-												MicroServiceConfigGetInt("radius.proxy.coa.port",DEFAULT_RADIUS_CoA_PORT));
-		CoASocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV4,true,true);
+												MicroService::instance().ConfigGetInt("radius.proxy.coa.port",DEFAULT_RADIUS_CoA_PORT));
+		CoASocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV4,true);
 		Poco::Net::SocketAddress	CoASockAddrV6(Poco::Net::AddressFamily::IPv6,
-												MicroServiceConfigGetInt("radius.proxy.coa.port",DEFAULT_RADIUS_CoA_PORT));
-		CoASocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV6,true,true);
+												MicroService::instance().ConfigGetInt("radius.proxy.coa.port",DEFAULT_RADIUS_CoA_PORT));
+		CoASocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV6,true);
 
-		RadiusReactor_.reset();
-		RadiusReactor_ = std::make_unique<Poco::Net::SocketReactor>();
-		RadiusReactor_->addEventHandler(*AuthenticationSocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		AuthenticationReactor_.addEventHandler(*AuthenticationSocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 														   *this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
-		RadiusReactor_->addEventHandler(*AuthenticationSocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		AuthenticationReactor_.addEventHandler(*AuthenticationSocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 																			 *this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
 
-		RadiusReactor_->addEventHandler(*AccountingSocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		AccountingReactor_.addEventHandler(*AccountingSocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 																		  *this, &RADIUS_proxy_server::OnAccountingSocketReadable));
-		RadiusReactor_->addEventHandler(*AccountingSocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		AccountingReactor_.addEventHandler(*AccountingSocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 																   *this, &RADIUS_proxy_server::OnAccountingSocketReadable));
 
 
-		RadiusReactor_->addEventHandler(*CoASocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		CoAReactor_.addEventHandler(*CoASocketV4_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 																			 *this, &RADIUS_proxy_server::OnCoASocketReadable));
-		RadiusReactor_->addEventHandler(*CoASocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+		CoAReactor_.addEventHandler(*CoASocketV6_,Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 																	 *this, &RADIUS_proxy_server::OnCoASocketReadable));
 
 		ParseConfig();
-		StartRADSECServers();
-		RadiusReactorThread_.start(*RadiusReactor_);
-		Utils::SetThreadName(RadiusReactorThread_,"rad:reactor");
-		Running_ = true;
+
+		AuthenticationReactorThread_.start(AuthenticationReactor_);
+		AccountingReactorThread_.start(AccountingReactor_);
+		CoAReactorThread_.start(CoAReactor_);
+
+		Utils::SetThreadName(AuthenticationReactorThread_,"radproxy-auth");
+		Utils::SetThreadName(AccountingReactorThread_,"radproxy-acct");
+		Utils::SetThreadName(CoAReactorThread_,"radproxy-coa");
 
 		return 0;
 	}
 
 	void RADIUS_proxy_server::Stop() {
-		if(Enabled_ && Running_) {
-			poco_information(Logger(),"Stopping...");
-			RadiusReactor_->removeEventHandler(
+		if(enabled_) {
+			AuthenticationReactor_.removeEventHandler(
 				*AuthenticationSocketV4_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
-			RadiusReactor_->removeEventHandler(
+			AuthenticationReactor_.removeEventHandler(
 				*AuthenticationSocketV6_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
 
-			RadiusReactor_->removeEventHandler(
+			AccountingReactor_.removeEventHandler(
 				*AccountingSocketV4_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
-			RadiusReactor_->removeEventHandler(
+			AccountingReactor_.removeEventHandler(
 				*AccountingSocketV6_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
 					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
 
-			RadiusReactor_->removeEventHandler(
+			CoAReactor_.removeEventHandler(
 				*CoASocketV4_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
-					*this, &RADIUS_proxy_server::OnCoASocketReadable));
-			RadiusReactor_->removeEventHandler(
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+			CoAReactor_.removeEventHandler(
 				*CoASocketV6_,
 				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
-					*this, &RADIUS_proxy_server::OnCoASocketReadable));
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
 
-			AuthenticationSocketV4_->close();
-			AuthenticationSocketV6_->close();
-			AccountingSocketV4_->close();
-			AccountingSocketV6_->close();
-			CoASocketV4_->close();
-			CoASocketV6_->close();
+			AuthenticationReactor_.stop();
+			AuthenticationReactorThread_.join();
 
-			AuthenticationSocketV4_.reset();
-			AuthenticationSocketV6_.reset();
-			AccountingSocketV4_.reset();
-			AccountingSocketV6_.reset();
-			CoASocketV4_.reset();
-			CoASocketV6_.reset();
+			AccountingReactor_.stop();
+			AccountingReactorThread_.join();
 
-			StopRADSECServers();
-			RadiusReactor_->stop();
-			RadiusReactorThread_.join();
-			Running_=false;
-			poco_information(Logger(),"Stopped...");
+			CoAReactor_.stop();
+			CoAReactorThread_.join();
+			enabled_=false;
 		}
 	}
 
-	void RADIUS_proxy_server::StartRADSECServers() {
-		std::lock_guard		G(Mutex_);
-		for(const auto &pool:PoolList_.pools) {
-			for(const auto &entry:pool.authConfig.servers) {
-				if(entry.radsec) {
-					RADSECservers_[ Poco::Net::SocketAddress(entry.ip,0) ] = std::make_unique<RADSEC_server>(*RadiusReactor_,entry);
-				}
-			}
-		}
-	}
-
-	void RADIUS_proxy_server::StopRADSECServers() {
-		std::lock_guard		G(Mutex_);
-		RADSECservers_.clear();
-	}
-
 	void RADIUS_proxy_server::OnAccountingSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf) {
 		Poco::Net::SocketAddress	Sender;
 		RADIUS::RadiusPacket		P;
 
 		auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(),P.BufferLen());
 		if(ReceiveSize<SMALLEST_RADIUS_PACKET) {
-			poco_warning(Logger(),"Accounting: bad packet received.");
+			Logger().warning("Accounting: bad packet received.");
 			return;
 		}
 		P.Evaluate(ReceiveSize);
 		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
 		if(SerialNumber.empty()) {
-			poco_warning(Logger(),"Accounting: missing serial number.");
+			Logger().warning("Accounting: missing serial number.");
 			return;
 		}
 		auto CallingStationID = P.ExtractCallingStationID();
 		auto CalledStationID = P.ExtractCalledStationID();
 
-		poco_debug(Logger(), fmt::format("Accounting Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
-		AP_WS_Server()->SendRadiusAccountingData(SerialNumber,P.Buffer(),P.Size());
+		Logger().information(fmt::format("Accounting Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
+		DeviceRegistry()->SendRadiusAccountingData(SerialNumber,P.Buffer(),P.Size());
 	}
 
 	void RADIUS_proxy_server::OnAuthenticationSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf) {
@@ -176,20 +142,20 @@ namespace OpenWifi {
 
 		auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(),P.BufferLen());
 		if(ReceiveSize<SMALLEST_RADIUS_PACKET) {
-			poco_warning(Logger(),"Authentication: bad packet received.");
+			Logger().warning("Authentication: bad packet received.");
 			return;
 		}
 		P.Evaluate(ReceiveSize);
 		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
 		if(SerialNumber.empty()) {
-			poco_warning(Logger(),"Authentication: missing serial number.");
+			Logger().warning("Authentication: missing serial number.");
 			return;
 		}
 		auto CallingStationID = P.ExtractCallingStationID();
 		auto CalledStationID = P.ExtractCalledStationID();
 
-		poco_debug(Logger(), fmt::format("Authentication Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
-		AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber,P.Buffer(),P.Size());
+		Logger().information(fmt::format("Authentication Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
+		DeviceRegistry()->SendRadiusAuthenticationData(SerialNumber,P.Buffer(),P.Size());
 	}
 
 	void RADIUS_proxy_server::OnCoASocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf) {
@@ -198,74 +164,36 @@ namespace OpenWifi {
 
 		auto ReceiveSize = pNf.get()->socket().impl()->receiveBytes(P.Buffer(),P.BufferLen());
 		if(ReceiveSize<SMALLEST_RADIUS_PACKET) {
-			poco_warning(Logger(),"CoA/DM: bad packet received.");
+			Logger().warning("CoA/DM: bad packet received.");
 			return;
 		}
 		P.Evaluate(ReceiveSize);
 		auto SerialNumber = P.ExtractSerialNumberTIP();
 		if(SerialNumber.empty()) {
-			poco_warning(Logger(),"CoA/DM: missing serial number.");
+			Logger().warning("CoA/DM: missing serial number.");
 			return;
 		}
 		auto CallingStationID = P.ExtractCallingStationID();
 		auto CalledStationID = P.ExtractCalledStationID();
 
-		poco_debug(Logger(), fmt::format("CoA Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
-		AP_WS_Server()->SendRadiusCoAData(SerialNumber,P.Buffer(),P.Size());
+		Logger().information(fmt::format("CoA Packet received for {}, CalledStationID: {}, CallingStationID:{}",SerialNumber, CalledStationID, CallingStationID));
+		DeviceRegistry()->SendRadiusCoAData(SerialNumber,P.Buffer(),P.Size());
 	}
 
 	void RADIUS_proxy_server::SendAccountingData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+		RADIUS::RadiusPacket	P((unsigned char *)buffer,size);
+		auto Destination = P.ExtractProxyStateDestination();
+		auto CallingStationID = P.ExtractCallingStationID();
+		auto CalledStationID = P.ExtractCalledStationID();
+		Poco::Net::SocketAddress	Dst(Destination);
 
-		if(!Continue())
-			return;
-
-		try {
-			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
-			auto Destination = P.ExtractProxyStateDestination();
-			auto CallingStationID = P.ExtractCallingStationID();
-			auto CalledStationID = P.ExtractCalledStationID();
-			Poco::Net::SocketAddress Dst(Destination);
-
-			std::lock_guard G(Mutex_);
-			bool UseRADSEC = false;
-			auto FinalDestination = Route(radius_type::acct, Dst, P, UseRADSEC);
-			if (UseRADSEC) {
-				Poco::Net::SocketAddress RSP(FinalDestination.host(), 0);
-				auto DestinationServer = RADSECservers_.find(RSP);
-				if (DestinationServer != end(RADSECservers_)) {
-					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer,
-														size);
-				}
-			} else {
-				if ((Dst.family() == Poco::Net::SocketAddress::IPv4 &&
-					 AccountingSocketV4_ == nullptr) ||
-					(Dst.family() == Poco::Net::SocketAddress::IPv6 &&
-					 AccountingSocketV6_ == nullptr)) {
-					poco_debug(
-						Logger(),
-						fmt::format(
-							"ACCT: Trying to use RADIUS GW PROXY but not configured. Device={}",
-							serialNumber));
-					return;
-				}
-				auto AllSent =
-					SendData(Dst.family() == Poco::Net::SocketAddress::IPv4 ? *AccountingSocketV4_
-																			: *AccountingSocketV6_,
-							 (const unsigned char *)buffer, size, FinalDestination);
-				if (!AllSent)
-					poco_error(Logger(),
-							   fmt::format("{}: Could not send Accounting packet packet to {}.",
-										   serialNumber, Destination));
-				else
-					poco_debug(Logger(), fmt::format("{}: Sending Accounting Packet to {}, CalledStationID: {}, CallingStationID:{}",
-													 serialNumber, FinalDestination.toString(),
-													 CalledStationID, CallingStationID));
-			}
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),fmt::format("Bad RADIUS ACCT Packet from {}. Dropped.",serialNumber));
-		}
+		std::lock_guard	G(Mutex_);
+		auto FinalDestination = Route(radius_type::auth, Dst);
+		auto AllSent = SendData(Dst.family()==Poco::Net::SocketAddress::IPv4 ? *AccountingSocketV4_ : *AccountingSocketV6_, (const unsigned char *)buffer, size, FinalDestination);
+		if(!AllSent)
+			Logger().error(fmt::format("{}: Could not send Accounting packet packet to {}.", serialNumber, Destination));
+		else
+			Logger().information(fmt::format("{}: Sending Accounting Packet to {}, CalledStationID: {}, CallingStationID:{}", serialNumber, FinalDestination.toString(), CalledStationID, CallingStationID));
 	}
 
 	bool RADIUS_proxy_server::SendData( Poco::Net::DatagramSocket & Sock, const unsigned char *buf , std::size_t size, const Poco::Net::SocketAddress &S) {
@@ -273,102 +201,39 @@ namespace OpenWifi {
 	}
 
 	void RADIUS_proxy_server::SendAuthenticationData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+		RADIUS::RadiusPacket	P((unsigned char *)buffer,size);
+		auto Destination = P.ExtractProxyStateDestination();
+		auto CallingStationID = P.ExtractCallingStationID();
+		auto CalledStationID = P.ExtractCalledStationID();
+		Poco::Net::SocketAddress	Dst(Destination);
 
-		if(!Continue())
-			return;
-
-		try {
-			RADIUS::RadiusPacket	P((unsigned char *)buffer,size);
-			auto Destination = P.ExtractProxyStateDestination();
-			auto CallingStationID = P.ExtractCallingStationID();
-			auto CalledStationID = P.ExtractCalledStationID();
-			Poco::Net::SocketAddress	Dst(Destination);
-
-			std::lock_guard	G(Mutex_);
-			bool UseRADSEC = false;
-			auto FinalDestination = Route(radius_type::auth, Dst, P, UseRADSEC);
-			if(UseRADSEC) {
-				Poco::Net::SocketAddress	RSP(FinalDestination.host(),0);
-				auto DestinationServer = RADSECservers_.find(RSP);
-				if(DestinationServer!=end(RADSECservers_)) {
-					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer, size);
-				}
-			} else {
-				if ((Dst.family() == Poco::Net::SocketAddress::IPv4 &&
-					 AuthenticationSocketV4_ == nullptr) ||
-					(Dst.family() == Poco::Net::SocketAddress::IPv6 &&
-					 AuthenticationSocketV6_ == nullptr)) {
-					poco_debug(
-						Logger(),
-						fmt::format("AUTH: Trying to use RADIUS GW PROXY but not configured. Device={}",
-									serialNumber));
-					return;
-				}
-				auto AllSent =
-					SendData(Dst.family() == Poco::Net::SocketAddress::IPv4 ? *AuthenticationSocketV4_
-																			: *AuthenticationSocketV6_,
-							 (const unsigned char *)buffer, size, FinalDestination);
-				if (!AllSent)
-					poco_error(Logger(),
-							   fmt::format("{}: Could not send Authentication packet packet to {}.",
-										   serialNumber, Destination));
-				else
-					poco_debug(Logger(), fmt::format("{}: Sending Authentication Packet to {}, CalledStationID: {}, CallingStationID:{}",
-													 serialNumber, FinalDestination.toString(),
-													 CalledStationID, CallingStationID));
-			}
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),fmt::format("Bad RADIUS AUTH Packet from {}. Dropped.",serialNumber));
-		}
-
+		std::lock_guard	G(Mutex_);
+		auto FinalDestination = Route(radius_type::auth, Dst);
+		auto AllSent = SendData(Dst.family()==Poco::Net::SocketAddress::IPv4 ? *AuthenticationSocketV4_ : *AuthenticationSocketV6_, (const unsigned char *)buffer, size, FinalDestination);
+		if(!AllSent)
+			Logger().error(fmt::format("{}: Could not send Authentication packet packet to {}.", serialNumber, Destination));
+		else
+			Logger().information(fmt::format("{}: Sending Authentication Packet to {}, CalledStationID: {}, CallingStationID:{}", serialNumber, FinalDestination.toString(), CalledStationID, CallingStationID));
 	}
 
 	void RADIUS_proxy_server::SendCoAData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+		RADIUS::RadiusPacket	P((unsigned char *)buffer,size);
+		auto Destination = P.ExtractProxyStateDestination();
+//		auto CallingStationID = P.ExtractCallingStationID();
+//		auto CalledStationID = P.ExtractCalledStationID();
 
-		if(!Continue())
-			return;
-
-		try {
-			RADIUS::RadiusPacket	P((unsigned char *)buffer,size);
-			auto Destination = P.ExtractProxyStateDestination();
-
-			if(Destination.empty()) {
-				Destination = "0.0.0.0:0";
-			}
-
-			Poco::Net::SocketAddress	Dst(Destination);
-			std::lock_guard	G(Mutex_);
-			bool UseRADSEC = false;
-			auto FinalDestination = Route(radius_type::coa, Dst, P, UseRADSEC);
-			if(UseRADSEC) {
-				Poco::Net::SocketAddress	RSP(FinalDestination.host(),0);
-				auto DestinationServer = RADSECservers_.find(RSP);
-				if(DestinationServer!=end(RADSECservers_)) {
-					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer, size);
-				}
-			} else {
-				if( (Dst.family() == Poco::Net::SocketAddress::IPv4 && CoASocketV4_== nullptr) ||
-					(Dst.family() == Poco::Net::SocketAddress::IPv6 && CoASocketV6_== nullptr)) {
-					poco_debug(Logger(),fmt::format("CoA: Trying to use RADIUS GW PROXY but not configured. Device={}",serialNumber));
-					return;
-				}
-				auto AllSent = SendData(Dst.family() == Poco::Net::SocketAddress::IPv4 ? *CoASocketV4_
-																					   : *CoASocketV6_,
-										(const unsigned char *)buffer, size, FinalDestination);
-				if (!AllSent)
-					poco_error(Logger(),fmt::format("{}: Could not send CoA packet packet to {}.",
-											   serialNumber, Destination));
-				else
-					poco_debug(Logger(), fmt::format("{}: Sending CoA Packet to {}", serialNumber,
-													 FinalDestination.toString()));
-			}
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),fmt::format("Bad RADIUS CoA/DM Packet from {}. Dropped.",serialNumber));
+		if(Destination.empty()) {
+			Destination = "0.0.0.0:0";
 		}
+
+		Poco::Net::SocketAddress	Dst(Destination);
+		std::lock_guard	G(Mutex_);
+		auto FinalDestination = Route(radius_type::auth, Dst);
+		auto AllSent = SendData(Dst.family()==Poco::Net::SocketAddress::IPv4 ? *CoASocketV4_ : *CoASocketV6_, (const unsigned char *)buffer, size, FinalDestination);
+		if(!AllSent)
+			Logger().error(fmt::format("{}: Could not send CoA packet packet to {}.", serialNumber, Destination));
+		else
+			Logger().information(fmt::format("{}: Sending CoA Packet to {}", serialNumber, FinalDestination.toString()));
 	}
 
 	void RADIUS_proxy_server::ParseServerList(const GWObjects::RadiusProxyServerConfig & Config, std::vector<Destination> &V4, std::vector<Destination> &V6, bool setAsDefault) {
@@ -377,7 +242,7 @@ namespace OpenWifi {
 		for(const auto &server:Config.servers) {
 			Poco::Net::IPAddress a;
 			if(!Poco::Net::IPAddress::tryParse(server.ip,a)) {
-				poco_error(Logger(),fmt::format("RADIUS-PARSE Config: server address {} is nto a valid address in v4 or v6. Entry skipped.",server.ip));
+				Logger().error(fmt::format("RADIUS-PARSE Config: server address {} is nto a valid address in v4 or v6. Entry skipped.",server.ip));
 				continue;
 			}
 			auto S = Poco::Net::SocketAddress(fmt::format("{}:{}",server.ip,server.port));
@@ -391,14 +256,9 @@ namespace OpenWifi {
 				.monitor = Config. monitor,
 				.monitorMethod = Config.monitorMethod,
 				.methodParameters = Config.methodParameters,
-				.useAsDefault = setAsDefault,
-				.useRADSEC = server.radsec,
-				.realms = server.radsecRealms
+				.useAsDefault = setAsDefault
 			};
 
-			if(setAsDefault && D.useRADSEC)
-				DefaultIsRADSEC_ = true;
-
 			if(S.family()==Poco::Net::IPAddress::IPv4) {
 				TotalV4 += server.weight;
 				V4.push_back(D);
@@ -448,121 +308,82 @@ namespace OpenWifi {
 						Pools_.push_back(NewPool);
 					}
 				} else {
-					poco_warning(Logger(),fmt::format("Configuration file '{}' is bad.",ConfigFilename_));
+					Logger().warning(fmt::format("Configuration file '{}' is bad.",ConfigFilename_));
 				}
 			} else {
-				poco_warning(Logger(),fmt::format("No configuration file '{}' exists.",ConfigFilename_));
+				Logger().warning(fmt::format("No configuration file '{}' exists.",ConfigFilename_));
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		} catch (...) {
-			poco_error(Logger(),fmt::format("Error while parsing configuration file '{}'",ConfigFilename_));
+			Logger().error(fmt::format("Error while parsing configuration file '{}'",ConfigFilename_));
 		}
 	}
 
-	static bool RealmMatch(const std::string &user_realm, const std::string & realm) {
-		if(realm.find_first_of('*') == std::string::npos)
-			return user_realm == realm;
-		return realm.find(user_realm) != std::string::npos;
-	}
-
-	Poco::Net::SocketAddress RADIUS_proxy_server::DefaultRoute(radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress, const RADIUS::RadiusPacket &P,  bool &UseRADSEC) {
+	Poco::Net::SocketAddress RADIUS_proxy_server::DefaultRoute([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress) {
 		bool IsV4 = RequestedAddress.family()==Poco::Net::SocketAddress::IPv4;
-
-		// find the realm...
-		auto UserName = P.UserName();
-		if(!UserName.empty()) {
-			auto UserTokens = Poco::StringTokenizer(UserName, "@");
-			auto UserRealm = ((UserTokens.count() > 1) ? UserTokens[1] : UserName);
-			Poco::toLowerInPlace(UserRealm);
-
-			for(const auto &pool:Pools_) {
-				for(const auto &server:pool.AuthV4) {
-					if(!server.realms.empty()) {
-						for(const auto &realm:server.realms) {
-							if (RealmMatch(UserRealm,realm)) {
-								std::cout << "Realm match..." << std::endl;
-								UseRADSEC = true;
-								return server.Addr;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if(DefaultIsRADSEC_) {
-			UseRADSEC = true;
-			return (IsV4 ? Pools_[DefaultPoolIndex_].AuthV4[0].Addr : Pools_[DefaultPoolIndex_].AuthV6[0].Addr );
-		}
-
 		switch(rtype) {
-			case radius_type::auth: {
-				return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].AuthV4
-										  : Pools_[DefaultPoolIndex_].AuthV6,
-									 RequestedAddress);
-				}
-			case radius_type::acct:
-			default: {
-				return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].AcctV4
-										  : Pools_[DefaultPoolIndex_].AcctV6,
-									 RequestedAddress);
-				}
-			case radius_type::coa: {
-				return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].CoaV4
-										  : Pools_[DefaultPoolIndex_].CoaV6,
-									 RequestedAddress);
-				}
-			}
+		case radius_type::coa: {
+			return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].CoaV4
+									  : Pools_[defaultPoolIndex_].CoaV6,
+								 RequestedAddress);
+		}
+		case radius_type::auth: {
+			return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].AuthV4
+									  : Pools_[defaultPoolIndex_].AuthV6,
+								 RequestedAddress);
+		}
+		case radius_type::acct:
+		default: {
+			return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].AcctV4
+									  : Pools_[defaultPoolIndex_].AcctV6,
+								 RequestedAddress);
+		}
+		}
 	}
 
-	Poco::Net::SocketAddress RADIUS_proxy_server::Route([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress, const RADIUS::RadiusPacket &P, bool &UseRADSEC) {
+	Poco::Net::SocketAddress RADIUS_proxy_server::Route([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress) {
 		std::lock_guard	G(Mutex_);
 
 		if(Pools_.empty()) {
-			UseRADSEC = false;
 			return RequestedAddress;
 		}
 
 		bool IsV4 = RequestedAddress.family()==Poco::Net::SocketAddress::IPv4;
-		bool useDefault;
+		bool useDefault = false;
 		useDefault = IsV4 ? RequestedAddress.host() == Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv4) : RequestedAddress.host() == Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv6) ;
 
 		if(useDefault) {
-			return DefaultRoute(rtype, RequestedAddress, P, UseRADSEC);
+			return DefaultRoute(rtype, RequestedAddress);
 		}
 
-		auto isAddressInPool = [&](const std::vector<Destination> & D, bool &UseRADSEC) -> bool {
+		auto isAddressInPool = [&](const std::vector<Destination> & D) -> bool {
 			for(const auto &entry:D)
-				if(entry.Addr.host()==RequestedAddress.host()) {
-					UseRADSEC = entry.useRADSEC;
+				if(entry.Addr.host()==RequestedAddress.host())
 					return true;
-				}
 			return false;
 		};
 
 		for(auto &i:Pools_) {
 			switch(rtype) {
 			case radius_type::coa: {
-				if (isAddressInPool((IsV4 ? i.CoaV4 : i.CoaV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.CoaV4 : i.CoaV6))) {
 					return ChooseAddress(IsV4 ? i.CoaV4 : i.CoaV6, RequestedAddress);
 				}
 			} break;
 			case radius_type::auth: {
-				if (isAddressInPool((IsV4 ? i.AuthV4 : i.AuthV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.AuthV4 : i.AuthV6))) {
 					return ChooseAddress(IsV4 ? i.AuthV4 : i.AuthV6, RequestedAddress);
 				}
 			} break;
 			case radius_type::acct: {
-				if (isAddressInPool((IsV4 ? i.AcctV4 : i.AcctV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.AcctV4 : i.AcctV6))) {
 					return ChooseAddress(IsV4 ? i.AcctV4 : i.AcctV6, RequestedAddress);
 				}
 			} break;
 			}
 		}
-
-		UseRADSEC = false;
-		return RequestedAddress;
+		return DefaultRoute(rtype, RequestedAddress);
 	}
 
 	Poco::Net::SocketAddress RADIUS_proxy_server::ChooseAddress(std::vector<Destination> &Pool, const Poco::Net::SocketAddress & OriginalAddress) {
@@ -629,6 +450,7 @@ namespace OpenWifi {
 
 	void RADIUS_proxy_server::SetConfig(const GWObjects::RadiusProxyPoolList &C) {
 		std::lock_guard	G(Mutex_);
+		PoolList_ = C;
 
 		Poco::JSON::Object	Disk;
 		C.to_json(Disk);
@@ -637,17 +459,13 @@ namespace OpenWifi {
 		Disk.stringify(ofs);
 		ofs.close();
 
-		Stop();
-		ResetConfig();
-		PoolList_ = C;
-		Start();
+		ParseConfig();
 	}
 
 	void RADIUS_proxy_server::ResetConfig() {
 		PoolList_.pools.clear();
 		Pools_.clear();
-		DefaultPoolIndex_=0;
-		DefaultIsRADSEC_=false;
+		defaultPoolIndex_=0;
 	}
 
 	void RADIUS_proxy_server::DeleteConfig() {
@@ -660,7 +478,6 @@ namespace OpenWifi {
 		} catch (...) {
 
 		}
-		Stop();
 		ResetConfig();
 	}
 

src/RADIUS_proxy_server.h

@@ -4,14 +4,10 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_GWobjects.h"
-
+#include "framework/MicroService.h"
 #include "Poco/Net/DatagramSocket.h"
 #include "Poco/Net/SocketReactor.h"
-
-#include "framework/SubSystemServer.h"
-
-#include "RADSEC_server.h"
+#include "RESTObjects/RESTAPI_GWobjects.h"
 
 namespace OpenWifi {
 
@@ -19,7 +15,6 @@ namespace OpenWifi {
 		auth, acct, coa
 	};
 
-
 	class RADIUS_proxy_server : public SubSystemServer {
 	  public:
 		inline static auto instance() {
@@ -29,7 +24,7 @@ namespace OpenWifi {
 
 		int Start() final;
 		void Stop() final;
-		inline bool Enabled() const { return Enabled_; }
+		inline bool Enabled() const { return enabled_; }
 
 		void OnAccountingSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf);
 		void OnAuthenticationSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf);
@@ -43,9 +38,6 @@ namespace OpenWifi {
 		void DeleteConfig();
 		void GetConfig(GWObjects::RadiusProxyPoolList &C);
 
-		void StartRADSECServers();
-		void StopRADSECServers();
-
 		struct Destination {
 			Poco::Net::SocketAddress 	Addr;
 			uint64_t 					state = 0;
@@ -57,14 +49,8 @@ namespace OpenWifi {
 			std::string 				monitorMethod;
 			std::vector<std::string>	methodParameters;
 			bool 						useAsDefault=false;
-			bool 						useRADSEC=false;
-			std::vector<std::string>	realms;
 		};
 
-		inline bool Continue() const {
-			return Running_ && Enabled_ && !Pools_.empty();
-		}
-
 	  private:
 		std::unique_ptr<Poco::Net::DatagramSocket>	AccountingSocketV4_;
 		std::unique_ptr<Poco::Net::DatagramSocket>	AccountingSocketV6_;
@@ -72,14 +58,16 @@ namespace OpenWifi {
 		std::unique_ptr<Poco::Net::DatagramSocket>	AuthenticationSocketV6_;
 		std::unique_ptr<Poco::Net::DatagramSocket>	CoASocketV4_;
 		std::unique_ptr<Poco::Net::DatagramSocket>	CoASocketV6_;
-		std::unique_ptr<Poco::Net::SocketReactor>	RadiusReactor_;
-		Poco::Thread								RadiusReactorThread_;
+		Poco::Net::SocketReactor		AccountingReactor_;
+		Poco::Net::SocketReactor		AuthenticationReactor_;
+		Poco::Net::SocketReactor		CoAReactor_;
+		Poco::Thread					AuthenticationReactorThread_;
+		Poco::Thread					AccountingReactorThread_;
+		Poco::Thread					CoAReactorThread_;
 
 		GWObjects::RadiusProxyPoolList	PoolList_;
 		std::string 					ConfigFilename_;
 
-		std::map<Poco::Net::SocketAddress, std::unique_ptr<RADSEC_server>> RADSECservers_;
-
 		struct RadiusPool {
 			std::vector<Destination>	AuthV4;
 			std::vector<Destination>	AuthV6;
@@ -90,10 +78,8 @@ namespace OpenWifi {
 		};
 
 		std::vector<RadiusPool>			Pools_;
-		uint 							DefaultPoolIndex_=0;
-		bool 							Enabled_=false;
-		bool 							DefaultIsRADSEC_=false;
-		std::atomic_bool 				Running_=false;
+		uint 							defaultPoolIndex_=0;
+		bool 							enabled_=false;
 
 		RADIUS_proxy_server() noexcept:
 		   SubSystemServer("RADIUS-PROXY", "RADIUS-PROXY", "radius.proxy")
@@ -104,10 +90,10 @@ namespace OpenWifi {
 
 		void ParseConfig();
 		void ResetConfig();
-		Poco::Net::SocketAddress Route(radius_type rtype, const Poco::Net::SocketAddress &A, const RADIUS::RadiusPacket &P, bool &UseRADSEC);
+		Poco::Net::SocketAddress Route(radius_type rtype, const Poco::Net::SocketAddress &A);
 		void ParseServerList(const GWObjects::RadiusProxyServerConfig & Config, std::vector<Destination> &V4, std::vector<Destination> &V6, bool setAsDefault);
 		static Poco::Net::SocketAddress ChooseAddress(std::vector<Destination> &Pool, const Poco::Net::SocketAddress & OriginalAddress);
-		Poco::Net::SocketAddress DefaultRoute([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress, const RADIUS::RadiusPacket &P, bool &UseRADSEC);
+		Poco::Net::SocketAddress DefaultRoute([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress);
 	};
 
 	inline auto RADIUS_proxy_server() { return RADIUS_proxy_server::instance(); }

src/RADSEC_server.h

@@ -1,303 +0,0 @@
-//
-// Created by stephane bourque on 2022-08-15.
-//
-
-#pragma once
-
-#include <iostream>
-#include <fstream>
-
-#include "RESTObjects/RESTAPI_GWobjects.h"
-
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/Net/SecureStreamSocket.h"
-#include "Poco/Net/Context.h"
-#include "Poco/Crypto/X509Certificate.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/TemporaryFile.h"
-
-#include "framework/MicroServiceFuncs.h"
-
-#include "fmt/format.h"
-
-#include "RADIUS_helpers.h"
-#include "AP_WS_Server.h"
-
-namespace OpenWifi {
-
-	class RADSEC_server : public Poco::Runnable {
-	  public:
-		RADSEC_server(Poco::Net::SocketReactor & R, GWObjects::RadiusProxyServerEntry E) :
- 			Reactor_(R),
-			Server_(std::move(E)),
-			Logger_(Poco::Logger::get(fmt::format("RADSEC: {}@{}:{}",
-								Server_.name ,
-								Server_.ip,
-								Server_.port))) {
-			Start();
-		}
-
-		~RADSEC_server() {
-			Stop();
-		}
-
-		inline int Start() {
-			ReconnectThread_.start(*this);
-			return 0;
-		}
-
-		inline void Stop() {
-			TryAgain_ = false;
-			Disconnect();
-			ReconnectThread_.wakeUp();
-			ReconnectThread_.join();
-		}
-
-		inline void run() final {
-			Poco::Thread::trySleep(3000);
-			std::uint64_t LastStatus=0 ;
-			auto RadSecKeepAlive = MicroServiceConfigGetInt("radsec.keepalive",120);
-			while(TryAgain_) {
-				if(!Connected_) {
-					std::lock_guard G(LocalMutex_);
-					LastStatus = Utils::Now() ;
-					Connect();
-				} else if( (Utils::Now() - LastStatus) > RadSecKeepAlive) {
-					RADIUS::RadiusOutputPacket P(Server_.radsecSecret);
-					P.MakeStatusMessage();
-					poco_information(Logger_,"Keep-Alive message.");
-					Socket_->sendBytes(P.Data(), P.Len());
-					LastStatus = Utils::Now();
-				}
-				Poco::Thread::trySleep(!Connected_ ? 3000 : 10000);
-			}
-		}
-
-		inline bool SendData(const std::string &serial_number, const unsigned char *buffer, int length) {
-			try {
-				if (Connected_) {
-					RADIUS::RadiusPacket P(buffer, length);
-					int sent_bytes;
-					if (P.VerifyMessageAuthenticator(Server_.radsecSecret)) {
-						poco_debug(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						sent_bytes = Socket_->sendBytes(buffer, length);
-					} else {
-						poco_debug(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						P.ComputeMessageAuthenticator(Server_.radsecSecret);
-						sent_bytes = Socket_->sendBytes(P.Buffer(), length);
-					}
-					return (sent_bytes == length);
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			} catch (...) {
-				poco_warning(Logger_,"Exception occurred: while sending data.");
-			}
-			return false;
-		}
-
-		inline void onData([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf) {
-			unsigned char Buffer[4096];
-
-			try {
-				auto NumberOfReceivedBytes = Socket_->receiveBytes(Buffer,sizeof(Buffer));
-				if(NumberOfReceivedBytes>=20) {
-					RADIUS::RadiusPacket P(Buffer,NumberOfReceivedBytes);
-					if (P.IsAuthentication()) {
-						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-						if(!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
-												   P.PacketType(), NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, Buffer,
-																		 NumberOfReceivedBytes);
-						} else {
-							poco_debug(Logger_, "AUTH packet dropped.");
-						}
-					} else if (P.IsAccounting()) {
-						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-						if(!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
-												   P.PacketType(), NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusAccountingData(SerialNumber, Buffer,
-																	 NumberOfReceivedBytes);
-						} else {
-							poco_debug(Logger_, "ACCT packet dropped.");
-						}
-					} else if (P.IsAuthority()) {
-						auto SerialNumber = P.ExtractSerialNumberTIP();
-						if(!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
-												   P.PacketType(), NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusCoAData(SerialNumber, Buffer,
-																	 NumberOfReceivedBytes);
-						} else {
-							poco_debug(Logger_, "CoA/DM packet dropped.");
-						}
-					} else {
-						poco_warning(Logger_,fmt::format("Unknown packet: Type: {} (type={}) Length={}", P.PacketType(), P.PacketTypeInt(), P.BufferLen()));
-					}
-				} else {
-					poco_warning(Logger_,"Invalid packet received. Resetting the connection.");
-					Disconnect();
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-				Disconnect();
-			} catch (...) {
-				Disconnect();
-				poco_warning(Logger_,"Exception occurred. Resetting the connection.");
-			}
-		}
-
-		inline void onError([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification>& pNf) {
-			poco_warning(Logger_,"Socker error. Terminating connection.");
-			Disconnect();
-		}
-
-		inline void onShutdown([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification>& pNf) {
-			poco_warning(Logger_,"Socker socket shutdown. Terminating connection.");
-			Disconnect();
-		}
-
-		inline bool Connect() {
-			if(TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-
-				Poco::TemporaryFile	CertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile	KeyFile_(MicroServiceDataDirectory());
-				std::vector<std::unique_ptr<Poco::TemporaryFile>> CaCertFiles_;
-
-				DecodeFile(CertFile_.path(), Server_.radsecCert);
-				DecodeFile(KeyFile_.path(), Server_.radsecKey);
-
-				for(auto &cert:Server_.radsecCacerts) {
-					CaCertFiles_.emplace_back(std::make_unique<Poco::TemporaryFile>(MicroServiceDataDirectory()));
-					DecodeFile(CaCertFiles_[CaCertFiles_.size()-1]->path(), cert);
-				}
-
-				Poco::Net::Context::Ptr SecureContext = Poco::AutoPtr<Poco::Net::Context>(
-					new Poco::Net::Context(Poco::Net::Context::TLS_CLIENT_USE,
-										   KeyFile_.path(),
-										   CertFile_.path(),""));
-				if(Server_.allowSelfSigned) {
-					SecureContext->setSecurityLevel(Poco::Net::Context::SECURITY_LEVEL_NONE);
-					SecureContext->enableExtendedCertificateVerification(false);
-				}
-
-				for(const auto &ca:CaCertFiles_) {
-					Poco::Crypto::X509Certificate	cert(ca->path());
-					SecureContext->addCertificateAuthority(cert);
-				}
-
-				Socket_ = std::make_unique<Poco::Net::SecureStreamSocket>(SecureContext);
-
-				Poco::Net::SocketAddress Destination(Server_.ip, Server_.port);
-
-				try {
-					poco_information(Logger_, "Attempting to connect");
-					Socket_->connect(Destination, Poco::Timespan(100, 0));
-					Socket_->completeHandshake();
-
-					if(!Server_.allowSelfSigned) {
-						Socket_->verifyPeerCertificate();
-					}
-
-					if(Socket_->havePeerCertificate()) {
-						Peer_Cert_ = std::make_unique<Poco::Crypto::X509Certificate>(Socket_->peerCertificate());
-					}
-
-					Socket_->setBlocking(false);
-					Socket_->setNoDelay(true);
-					Socket_->setKeepAlive(true);
-					Socket_->setReceiveTimeout(Poco::Timespan(1 * 60 * 60,0));
-
-					Reactor_.addEventHandler(
-						*Socket_,
-						Poco::NObserver<RADSEC_server, Poco::Net::ReadableNotification>(
-							*this, &RADSEC_server::onData));
-					Reactor_.addEventHandler(
-						*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ErrorNotification>(
-										  *this, &RADSEC_server::onError));
-					Reactor_.addEventHandler(
-						*Socket_,
-						Poco::NObserver<RADSEC_server, Poco::Net::ShutdownNotification>(
-							*this, &RADSEC_server::onShutdown));
-
-					Connected_ = true;
-					poco_information(Logger_,fmt::format("Connected. CN={}",CommonName()));
-					return true;
-				} catch (const Poco::Net::NetException &E) {
-					poco_information(Logger_,"Could not connect.");
-					Logger_.log(E);
-				} catch (const Poco::Exception &E) {
-					poco_information(Logger_,"Could not connect.");
-					Logger_.log(E);
-				} catch (...) {
-					poco_information(Logger_,"Could not connect.");
-				}
-			}
-			return false;
-		}
-
-		inline void Disconnect() {
-			if(Connected_) {
-				std::lock_guard G(LocalMutex_);
-
-				Reactor_.removeEventHandler(
-					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ReadableNotification>(
-								  *this, &RADSEC_server::onData));
-				Reactor_.removeEventHandler(
-					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ErrorNotification>(
-								  *this, &RADSEC_server::onError));
-				Reactor_.removeEventHandler(
-					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ShutdownNotification>(
-								  *this, &RADSEC_server::onShutdown));
-				Socket_->close();
-				Connected_ = false;
-			}
-			poco_information(Logger_,"Disconnecting.");
-		}
-
-		static void DecodeFile(const std::string &filename, const std::string &s) {
-			std::ofstream sec_file(filename,std::ios_base::out|std::ios_base::trunc|std::ios_base::binary);
-			std::stringstream is(s);
-			Poco::Base64Decoder	ds(is);
-			Poco::StreamCopier::copyStream(ds,sec_file);
-			sec_file.close();
-		}
-
-		[[nodiscard]] inline std::string CommonName() {
-			if(Peer_Cert_)
-				return Peer_Cert_->commonName();
-			return "";
-		}
-
-		[[nodiscard]] inline std::string IssuerName() {
-			if(Peer_Cert_)
-				return Peer_Cert_->issuerName();
-			return "";
-		}
-
-		[[nodiscard]] inline std::string SubjectName() {
-			if(Peer_Cert_)
-				return Peer_Cert_->subjectName();
-			return "";
-		}
-
-	  private:
-		std::recursive_mutex								LocalMutex_;
-		Poco::Net::SocketReactor							&Reactor_;
-		GWObjects::RadiusProxyServerEntry					Server_;
-		Poco::Logger										&Logger_;
-		std::unique_ptr<Poco::Net::SecureStreamSocket>		Socket_;
-		Poco::Thread										ReconnectThread_;
-		std::unique_ptr<Poco::Crypto::X509Certificate>		Peer_Cert_;
-		volatile bool 										Connected_=false;
-		volatile bool 	 									TryAgain_=true;
-	};
-}

src/RESTAPI/RESTAPI_RPC.cpp

@@ -8,12 +8,10 @@
 #include "RESTAPI_RPC.h"
 
 #include "CommandManager.h"
-#include "AP_WS_Server.h"
+#include "DeviceRegistry.h"
 #include "StorageService.h"
 #include "framework/ow_constants.h"
-#include "framework/RESTAPI_Handler.h"
 #include "ParseWifiScan.h"
-#include "framework/utils.h"
 
 namespace OpenWifi::RESTAPI_RPC {
 	void SetCommandStatus(GWObjects::CommandDetails &Cmd,
@@ -33,10 +31,7 @@ namespace OpenWifi::RESTAPI_RPC {
 			return Handler->ReturnStatus(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
 	}
 
-	void WaitForCommand(uint64_t RPCID,
-						APCommands::Commands Command,
-						bool RetryLater,
-						GWObjects::CommandDetails &Cmd,
+	void WaitForCommand(GWObjects::CommandDetails &Cmd,
 						Poco::JSON::Object  & Params,
 						Poco::Net::HTTPServerRequest &Request,
 						Poco::Net::HTTPServerResponse &Response,
@@ -45,59 +40,53 @@ namespace OpenWifi::RESTAPI_RPC {
 						RESTAPIHandler * Handler,
 						Poco::Logger &Logger) {
 
-		Logger.information(fmt::format("{},{}: New {} command. User={} Serial={}. ", Cmd.UUID, RPCID, Cmd.Command, Cmd.SubmittedBy, Cmd.SerialNumber));
+		Logger.information(fmt::format("{}: New {} command. User={} Serial={}. ", Cmd.UUID, Cmd.Command, Cmd.SubmittedBy, Cmd.SerialNumber));
 
 		// 	if the command should be executed in the future, or if the device is not connected,
 		// 	then we should just add the command to
 		//	the DB and let it figure out when to deliver the command.
-		auto SerialNumberInt = Utils::SerialNumberToInt(Cmd.SerialNumber);
-		if (Cmd.RunAt || (!AP_WS_Server()->Connected(SerialNumberInt) && RetryLater)) {
-			Logger.information(fmt::format("{},{}: Command will be run in the future or when device is connected again.", Cmd.UUID, RPCID));
-			SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_PENDING, Logger);
+		if (Cmd.RunAt || !DeviceRegistry()->Connected(Cmd.SerialNumber)) {
+			Logger.information(fmt::format("{}: Command will be run in the future or when device is connected again.", Cmd.UUID));
+			SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
 			return;
-		} else if ((!AP_WS_Server()->Connected(SerialNumberInt) && !RetryLater)){
-			Logger.information(fmt::format("{},{}: Command canceled. Device is not connected. Command will not be retried.", Cmd.UUID, RPCID));
-			return SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_FAILED, Logger);
 		}
 
-		Cmd.Executed = Utils::Now();
+		Cmd.Executed = OpenWifi::Now();
 
 		bool Sent;
 		std::chrono::time_point<std::chrono::high_resolution_clock> rpc_submitted = std::chrono::high_resolution_clock::now();
 		std::shared_ptr<CommandManager::promise_type_t> rpc_endpoint =
-			CommandManager()->PostCommand(RPCID, Command, Cmd.SerialNumber, Cmd.Command, Params, Cmd.UUID, Sent);
+			CommandManager()->PostCommand(Cmd.SerialNumber, Cmd.Command, Params, Cmd.UUID, Sent);
 
-		if(RetryLater && (!Sent || rpc_endpoint== nullptr)) {
-			Logger.information(fmt::format("{},{}: Pending completion. Device is not connected.", Cmd.UUID, RPCID));
-			return SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_PENDING, Logger);
+		if(!Sent || rpc_endpoint== nullptr) {
+			Logger.information(fmt::format("{}: Pending completion. Device is not connected.", Cmd.UUID));
+			return SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
 		}
 
-		if(!RetryLater && !Sent) {
-			Logger.information(fmt::format("{},{}: Command canceled. Device is not connected. Command will not be retried.", Cmd.UUID, RPCID));
-			return SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_FAILED, Logger);
-		}
+		Logger.information(fmt::format("{}: Command sent.", Cmd.UUID));
+
+		Poco::JSON::Object	L;
 
-		Logger.information(fmt::format("{},{}: Command sent.", Cmd.UUID, RPCID));
 		std::future<CommandManager::objtype_t> rpc_future(rpc_endpoint->get_future());
 		auto rpc_result = rpc_future.wait_for(WaitTimeInMs);
 		if (rpc_result == std::future_status::ready) {
 			std::chrono::duration<double, std::milli> rpc_execution_time = std::chrono::high_resolution_clock::now() - rpc_submitted;
 			auto rpc_answer = rpc_future.get();
-			if (!rpc_answer->has(uCentralProtocol::RESULT) || !rpc_answer->isObject(uCentralProtocol::RESULT)) {
-				SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_FAILED, Logger);
-				Logger.information(fmt::format("{},{}: Invalid response. Missing result.", Cmd.UUID, RPCID));
+			if (!rpc_answer.has(uCentralProtocol::RESULT) || !rpc_answer.isObject(uCentralProtocol::RESULT)) {
+				SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
+				Logger.information(fmt::format("{}: Invalid response. Missing result.", Cmd.UUID));
 				return;
 			}
 
-			auto ResultFields = rpc_answer->get(uCentralProtocol::RESULT).extract<Poco::JSON::Object::Ptr>();
+			auto ResultFields = rpc_answer.get(uCentralProtocol::RESULT).extract<Poco::JSON::Object::Ptr>();
 			if (!ResultFields->has(uCentralProtocol::STATUS) || !ResultFields->isObject(uCentralProtocol::STATUS)) {
 				Cmd.executionTime = rpc_execution_time.count();
 				if(Cmd.Command=="ping") {
-					SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_COMPLETED, Logger);
-					Logger.information(fmt::format("{},{}: Invalid response from device (ping: fix override). Missing status.", Cmd.UUID, RPCID));
+					SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_COMPLETED, Logger);
+					Logger.information(fmt::format("{}: Invalid response from device (ping: fix override). Missing status.", Cmd.UUID));
 				} else {
-					SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_FAILED, Logger);
-					Logger.information(fmt::format("{},{}: Invalid response from device. Missing status.", Cmd.UUID,RPCID));
+					SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
+					Logger.information(fmt::format("{}: Invalid response from device. Missing status.", Cmd.UUID));
 				}
 				return;
 			}
@@ -108,36 +97,36 @@ namespace OpenWifi::RESTAPI_RPC {
 			if (StatusInnerObj->has(uCentralProtocol::TEXT))
 				Cmd.ErrorText = StatusInnerObj->get(uCentralProtocol::TEXT).toString();
 			std::stringstream ResultText;
-			if(rpc_answer->has(uCentralProtocol::RESULT)) {
+			if(rpc_answer.has(uCentralProtocol::RESULT)) {
 				if(Cmd.Command==uCentralProtocol::WIFISCAN) {
-					auto ScanObj = rpc_answer->get(uCentralProtocol::RESULT).extract<Poco::JSON::Object::Ptr>();
+					auto ScanObj = rpc_answer.get(uCentralProtocol::RESULT).extract<Poco::JSON::Object::Ptr>();
 					ParseWifiScan(ScanObj, ResultText, Logger);
 				} else {
 					Poco::JSON::Stringifier::stringify(
-						rpc_answer->get(uCentralProtocol::RESULT), ResultText);
+						rpc_answer.get(uCentralProtocol::RESULT), ResultText);
 				}
-			} if (rpc_answer->has(uCentralProtocol::RESULT_64)) {
+			} if (rpc_answer.has(uCentralProtocol::RESULT_64)) {
 				uint64_t sz=0;
-				if(rpc_answer->has(uCentralProtocol::RESULT_SZ))
-					sz=rpc_answer->get(uCentralProtocol::RESULT_SZ);
+				if(rpc_answer.has(uCentralProtocol::RESULT_SZ))
+					sz=rpc_answer.get(uCentralProtocol::RESULT_SZ);
 				std::string UnCompressedData;
-				Utils::ExtractBase64CompressedData(rpc_answer->get(uCentralProtocol::RESULT_64).toString(),
+				Utils::ExtractBase64CompressedData(rpc_answer.get(uCentralProtocol::RESULT_64).toString(),
 												   UnCompressedData,sz);
 				Poco::JSON::Stringifier::stringify(UnCompressedData, ResultText);
 			}
 			Cmd.Results = ResultText.str();
 			Cmd.Status = "completed";
-			Cmd.Completed = Utils::Now();
+			Cmd.Completed = OpenWifi::Now();
 			Cmd.executionTime = rpc_execution_time.count();
 
-			if (Cmd.ErrorCode && (Cmd.Command == uCentralProtocol::TRACE || Cmd.Command == uCentralProtocol::SCRIPT)) {
+			if (Cmd.ErrorCode && Cmd.Command == uCentralProtocol::TRACE) {
 				Cmd.WaitingForFile = 0;
 				Cmd.AttachDate = Cmd.AttachSize = 0;
 				Cmd.AttachType = "";
 			}
 
 			//	Add the completed command to the database...
-			StorageService()->AddCommand(Cmd.SerialNumber, Cmd, Storage::CommandExecutionType::COMMAND_COMPLETED);
+			StorageService()->AddCommand(Cmd.SerialNumber, Cmd, Storage::COMMAND_COMPLETED);
 
 			if (ObjectToReturn && Handler) {
 				Handler->ReturnObject(*ObjectToReturn);
@@ -147,16 +136,10 @@ namespace OpenWifi::RESTAPI_RPC {
 				if(Handler)
 					Handler->ReturnObject(O);
 			}
-			Logger.information( fmt::format("{},{}: Completed in {:.3f}ms.", Cmd.UUID, RPCID, Cmd.executionTime));
+			Logger.information( fmt::format("{}: Completed in {:.3f}ms.", Cmd.UUID, Cmd.executionTime));
 			return;
 		}
-		CommandManager()->RemovePendingCommand(RPCID);
-		if(RetryLater) {
-			Logger.information(fmt::format("{},{}: Pending completion.", Cmd.UUID, RPCID));
-			SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_PENDING, Logger);
-		} else {
-			Logger.information(fmt::format("{},{}: Command canceled. Device is not connected. Command will not be retried.", Cmd.UUID, RPCID));
-			return SetCommandStatus(Cmd, Request, Response, Handler, Storage::CommandExecutionType::COMMAND_FAILED, Logger);
-		}
+		Logger.information(fmt::format( "{}: Pending completion.", Cmd.UUID));
+		SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
 	}
 }

src/RESTAPI/RESTAPI_RPC.h

@@ -16,24 +16,18 @@
 
 #include "RESTObjects/RESTAPI_GWobjects.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
-
-#include "framework/ow_constants.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi::RESTAPI_RPC {
 
-	void WaitForCommand(
-					uint64_t RPCID,
-					APCommands::Commands Command,
-					bool RetryLater,
-					GWObjects::CommandDetails &Cmd,
-					Poco::JSON::Object  & Params,
-					Poco::Net::HTTPServerRequest &Request,
-					Poco::Net::HTTPServerResponse &Response,
-					std::chrono::milliseconds WaitTimeInMs,
-					Poco::JSON::Object * ObjectToReturn,
-					RESTAPIHandler * Handler,
-					Poco::Logger &Logger);
+	void WaitForCommand( 	GWObjects::CommandDetails &Cmd,
+		Poco::JSON::Object  & Params,
+		Poco::Net::HTTPServerRequest &Request,
+		Poco::Net::HTTPServerResponse &Response,
+		std::chrono::milliseconds WaitTimeInMs,
+		Poco::JSON::Object * ObjectToReturn,
+		RESTAPIHandler * Handler,
+		Poco::Logger &Logger);
 
 	void SetCommandStatus(	GWObjects::CommandDetails &Cmd,
 		Poco::Net::HTTPServerRequest &Request,

src/RESTAPI/RESTAPI_blacklist.cpp

@@ -6,22 +6,22 @@
 //	Arilia Wireless Inc.
 //
 
+#include <ctime>
+
 #include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
 #include "RESTAPI_blacklist.h"
 #include "StorageService.h"
 #include "framework/ow_constants.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
 	void RESTAPI_blacklist::DoDelete() {
 		auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
 
-		if(!Utils::NormalizeMac(SerialNumber)) {
+		if(SerialNumber.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
 		}
 
-		poco_debug(Logger(),fmt::format("BLACKLIST-DELETE: {}", SerialNumber));
-
 		GWObjects::BlackListedDevice	D;
 		if(!StorageService()->GetBlackListDevice(SerialNumber, D)) {
 			return NotFound();
@@ -36,51 +36,54 @@ namespace OpenWifi {
 	void RESTAPI_blacklist::DoGet() {
 		auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
 
-		if(!Utils::NormalizeMac(SerialNumber)) {
+		if(SerialNumber.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
 		}
 
-		poco_debug(Logger(),fmt::format("BLACKLIST-GET: {}", SerialNumber));
 		GWObjects::BlackListedDevice	D;
 		if(!StorageService()->GetBlackListDevice(SerialNumber, D)) {
 			return NotFound();
 		}
-		return Object(D);
+
+		Poco::JSON::Object	Answer;
+		D.to_json(Answer);
+		return ReturnObject(Answer);
 	}
 
 	void RESTAPI_blacklist::DoPost() {
-
 		const auto &Obj = ParsedBody_;
 		GWObjects::BlackListedDevice	D;
 		if(!D.from_json(Obj)) {
 			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
 		}
 
-		if(D.serialNumber.empty() || !Utils::NormalizeMac(D.serialNumber)) {
+		if(D.serialNumber.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
 		}
 
-		poco_debug(Logger(),fmt::format("BLACKLIST-POST: {}", D.serialNumber));
-
 		Poco::toLowerInPlace(D.serialNumber);
 		if(StorageService()->IsBlackListed(D.serialNumber)) {
 			return BadRequest(RESTAPI::Errors::SerialNumberExists);
 		}
 
 		D.author = UserInfo_.userinfo.email;
-		D.created = Utils::Now();
+		D.created = OpenWifi::Now();
 
 		if(StorageService()->AddBlackListDevice(D)) {
 			GWObjects::BlackListedDevice	CreatedDevice;
+
 			StorageService()->GetBlackListDevice(D.serialNumber,CreatedDevice);
-			return Object(CreatedDevice);
+			Poco::JSON::Object	Answer;
+
+			CreatedDevice.to_json(Answer);
+			return ReturnObject(Answer);
 		}
 		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 	}
 
 	void RESTAPI_blacklist::DoPut() {
 		auto SerialNumber = Poco::toLower(GetBinding(RESTAPI::Protocol::SERIALNUMBER, ""));
-		if(!Utils::NormalizeMac(SerialNumber)) {
+		if(SerialNumber.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
 		}
 
@@ -90,8 +93,6 @@ namespace OpenWifi {
 			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
 		}
 
-		poco_debug(Logger(),fmt::format("BLACKLIST-PUT: {}", SerialNumber));
-
 		GWObjects::BlackListedDevice	NewDevice;
 		if(!NewDevice.from_json(Obj)) {
 			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
@@ -104,7 +105,10 @@ namespace OpenWifi {
 			GWObjects::BlackListedDevice	CreatedDevice;
 
 			StorageService()->GetBlackListDevice(SerialNumber,CreatedDevice);
-			return Object(CreatedDevice);
+			Poco::JSON::Object	Answer;
+
+			CreatedDevice.to_json(Answer);
+			return ReturnObject(Answer);
 		}
 		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 	}

src/RESTAPI/RESTAPI_blacklist.h

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_blacklist : public RESTAPIHandler {
 	  public:
-		RESTAPI_blacklist(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server , uint64_t TransactionId , bool Internal)
+		RESTAPI_blacklist(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server , uint64_t TransactionId , bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 													  Poco::Net::HTTPRequest::HTTP_POST,

src/RESTAPI/RESTAPI_blacklist_list.cpp

@@ -10,16 +10,22 @@
 namespace OpenWifi {
 	void RESTAPI_blacklist_list::DoGet() {
 
-		poco_debug(Logger(),fmt::format("BLACKLIST-GET: Device serial number list"));
-
 		std::vector<GWObjects::BlackListedDevice>	Devices;
 
+		Poco::JSON::Array	Arr;
+		Poco::JSON::Object	Answer;
+
 		if(QB_.CountOnly) {
 			auto Count = StorageService()->GetBlackListDeviceCount();
 			return ReturnCountOnly(Count);
 		} else if(StorageService()->GetBlackListDevices(QB_.Offset, QB_.Limit, Devices)) {
-			return Object("devices",Devices);
+			for(const auto &i:Devices) {
+				Poco::JSON::Object O;
+				i.to_json(O);
+				Arr.add(O);
+			}
 		}
-		NotFound();
+		Answer.set("devices", Arr);
+		return ReturnObject(Answer);
 	}
 }

src/RESTAPI/RESTAPI_blacklist_list.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_blacklist_list : public RESTAPIHandler {
 	  public:
-		RESTAPI_blacklist_list(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+		RESTAPI_blacklist_list(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},

src/RESTAPI/RESTAPI_capabilities_handler.cpp

@@ -8,7 +8,7 @@
 namespace OpenWifi {
 
 	void RESTAPI_capabilities_handler::DoGet() {
-		CapabilitiesCache_t Caps = CapabilitiesCache()->AllCapabilities();
+		CapabilitiesCache_t Caps = CapabilitiesCache().AllCapabilities();
 
 		Poco::JSON::Array	ObjArr;
 		for(const auto &[deviceType,capabilities]:Caps) {

src/RESTAPI/RESTAPI_capabilities_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_capabilities_handler : public RESTAPIHandler {
 	  public:
-		RESTAPI_capabilities_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+		RESTAPI_capabilities_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},

src/RESTAPI/RESTAPI_command.cpp

@@ -20,7 +20,9 @@ namespace OpenWifi {
 
 		GWObjects::CommandDetails Command;
 		if (StorageService()->GetCommand(CommandUUID, Command)) {
-			return Object(Command);
+			Poco::JSON::Object RetObj;
+			Command.to_json(RetObj);
+			return ReturnObject(RetObj);
 		}
 		return NotFound();
 	}

src/RESTAPI/RESTAPI_command.h

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 class RESTAPI_command : public RESTAPIHandler {
   public:
-	RESTAPI_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+	RESTAPI_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_DELETE,

src/RESTAPI/RESTAPI_commands.cpp

@@ -13,10 +13,6 @@
 namespace OpenWifi {
 	void RESTAPI_commands::DoGet() {
 		auto SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-		if(!Utils::NormalizeMac(SerialNumber)) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
 		std::vector<GWObjects::CommandDetails> Commands;
 		if (QB_.Newest) {
 			StorageService()->GetNewestCommands(SerialNumber, QB_.Limit, Commands);
@@ -24,15 +20,23 @@ namespace OpenWifi {
 			StorageService()->GetCommands(SerialNumber, QB_.StartDate, QB_.EndDate, QB_.Offset, QB_.Limit,
 								   Commands);
 		}
-		return Object(RESTAPI::Protocol::COMMANDS, Commands);
+		Poco::JSON::Array ArrayObj;
+		for (const auto &i : Commands) {
+			Poco::JSON::Object Obj;
+			i.to_json(Obj);
+			ArrayObj.add(Obj);
+		}
+		Poco::JSON::Object RetObj;
+		RetObj.set(RESTAPI::Protocol::COMMANDS, ArrayObj);
+		ReturnObject(RetObj);
 	}
 
 	void RESTAPI_commands::DoDelete() {
 		auto SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-		if(!Utils::NormalizeMac(SerialNumber)) {
+
+		if(SerialNumber.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
 		}
-
 		if (StorageService()->DeleteCommands(SerialNumber, QB_.StartDate, QB_.EndDate)) {
 			return OK();
 		}

src/RESTAPI/RESTAPI_commands.h

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_commands : public RESTAPIHandler {
 	  public:
-		RESTAPI_commands(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+		RESTAPI_commands(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 													  Poco::Net::HTTPRequest::HTTP_DELETE,

src/RESTAPI/RESTAPI_default_configuration.cpp

@@ -14,21 +14,21 @@
 #include "StorageService.h"
 #include "framework/ow_constants.h"
 #include "framework/ConfigurationValidator.h"
-#include "framework/orm.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
 	void RESTAPI_default_configuration::DoGet() {
-		std::string Name = ORM::Escape(GetBinding(RESTAPI::Protocol::NAME, ""));
+		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
 		GWObjects::DefaultConfiguration DefConfig;
 		if (StorageService()->GetDefaultConfiguration(Name, DefConfig)) {
-			return Object(DefConfig);
+			Poco::JSON::Object Obj;
+			DefConfig.to_json(Obj);
+			return ReturnObject(Obj);
 		}
 		NotFound();
 	}
 
 	void RESTAPI_default_configuration::DoDelete() {
-		std::string Name = ORM::Escape(GetBinding(RESTAPI::Protocol::NAME, ""));
+		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
 		if(Name.empty()) {
 			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 		}
@@ -65,7 +65,7 @@ namespace OpenWifi {
 			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
 		}
 
-		DefConfig.Created = DefConfig.LastModified = Utils::Now();
+		DefConfig.Created = DefConfig.LastModified = OpenWifi::Now();
 		if (StorageService()->CreateDefaultConfiguration(Name, DefConfig)) {
 			return OK();
 		}
@@ -95,7 +95,7 @@ namespace OpenWifi {
 			Existing.Configuration = NewConfig.Configuration;
 		}
 
-		Existing.LastModified = Utils::Now();
+		Existing.LastModified = OpenWifi::Now();
 		AssignIfPresent(Obj,"description",Existing.Description);
 		if(Obj->has("modelIds"))
 			Existing.Models = NewConfig.Models;
@@ -104,9 +104,12 @@ namespace OpenWifi {
 			GWObjects::DefaultConfiguration	ModifiedConfig;
 
 			StorageService()->GetDefaultConfiguration(Name,ModifiedConfig);
-			return Object(ModifiedConfig);
+			Poco::JSON::Object	Answer;
+			ModifiedConfig.to_json(Answer);
+			return ReturnObject(Answer);
 		}
 
 		BadRequest(RESTAPI::Errors::RecordNotUpdated);
+
 	}
 }

src/RESTAPI/RESTAPI_default_configuration.h

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_default_configuration : public RESTAPIHandler {
 	  public:
-		RESTAPI_default_configuration(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+		RESTAPI_default_configuration(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{
 								 Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,

src/RESTAPI/RESTAPI_default_configurations.cpp

@@ -23,6 +23,16 @@ namespace OpenWifi {
 
 		std::vector<GWObjects::DefaultConfiguration> DefConfigs;
 		StorageService()->GetDefaultConfigurations(QB_.Offset, QB_.Limit, DefConfigs);
-		return Object(RESTAPI::Protocol::CONFIGURATIONS, DefConfigs);
+
+		Poco::JSON::Array Objects;
+		for (const auto &i : DefConfigs) {
+			Poco::JSON::Object Obj;
+			i.to_json(Obj);
+			Objects.add(Obj);
+		}
+
+		Poco::JSON::Object RetObj;
+		RetObj.set(RESTAPI::Protocol::CONFIGURATIONS, Objects);
+		ReturnObject(RetObj);
 	}
 }

src/RESTAPI/RESTAPI_default_configurations.h

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 class RESTAPI_default_configurations : public RESTAPIHandler {
   public:
-	RESTAPI_default_configurations(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
+	RESTAPI_default_configurations(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},