Chg: update image tag in helm values to v2.6.0-RC2

Merge pull request #7 from Telecominfraproject/main
https://telecominfraproject.atlassian.net/browse/WIFI-9632
2026-03-20 03:39:59 +00:00 · 2022-06-17 13:39:31 +00:00 · 2022-06-16 07:51:40 -07:00 · 2022-06-03 19:10:15 +03:00 · 2022-06-03 19:09:38 +03:00 · 2022-05-23 13:12:19 +00:00
34 changed files with 444 additions and 15691 deletions
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -4,7 +4,6 @@ on:
  pull_request:
    branches:
      - main
-      - 'release/*'
    types: [ closed ]

 defaults:
@@ -17,10 +16,4 @@ jobs:
    steps:
      - run: |
          export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-
-          if [[ ! $PR_BRANCH_TAG =~ (main|master|release-*) ]]; then
-            echo "PR branch is $PR_BRANCH_TAG, deleting Docker image"
-            curl -s -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owanalytics/$PR_BRANCH_TAG"
-          else
-            echo "PR branch is $PR_BRANCH_TAG, not deleting Docker image"
-          fi
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owanalytics/$PR_BRANCH_TAG"
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@
 *.app

 test_scripts/curl/token.json
-test_scripts/curl/result.json
 .vscode/c_cpp_properties.json
 test_scripts/curl/result.json
 *.swp
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owanalytics VERSION 2.7.0)
+project(owanalytics VERSION 2.6.0)

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_GENERATOR "Unix Makefiles")
--- a/54
+++ b/54
@@ -1,10 +1,4 @@
-ARG ALPINE_VERSION=3.16.2
-ARG POCO_VERSION=poco-tip-v1
-ARG FMTLIB_VERSION=9.0.0
-ARG CPPKAFKA_VERSION=tip-v1
-ARG JSON_VALIDATOR_VERSION=2.1.0
-
-FROM alpine:$ALPINE_VERSION AS build-base
+FROM alpine:3.15 AS build-base

 RUN apk add --update --no-cache \
    make cmake g++ git \
@@ -15,10 +9,8 @@ RUN apk add --update --no-cache \

 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
@@ -27,26 +19,10 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS fmtlib-build
-
-ARG FMTLIB_VERSION
-
-ADD https://api.github.com/repos/fmtlib/fmt/git/refs/tags/${FMTLIB_VERSION} version.json
-RUN git clone https://github.com/fmtlib/fmt --branch ${FMTLIB_VERSION} /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
@@ -57,10 +33,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
@@ -69,6 +43,18 @@ RUN cmake ..
 RUN make
 RUN make 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 owanalytics-build

 ADD CMakeLists.txt build /owanalytics/
@@ -91,7 +77,7 @@ WORKDIR /owanalytics/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8

-FROM alpine:$ALPINE_VERSION
+FROM alpine:3.15

 ENV OWANALYTICS_USER=owanalytics \
    OWANALYTICS_ROOT=/owanalytics-data \
--- a/2
+++ b/2
@@ -1 +1 @@
-13
+68
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -5,7 +5,7 @@ if [ "$SELFSIGNED_CERTS" = 'true' ]; then
    update-ca-certificates
 fi

-if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
+if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWANALYTICS_CONFIG"/owanalytics.properties ]]; then
  RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWANALYTICS_ROOT/certs/restapi-ca.pem"} \
  RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16009"} \
  RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWANALYTICS_ROOT/certs/restapi-cert.pem"} \
--- a/helm/.gitignore
+++ b/helm/.gitignore
@@ -1,3 +1 @@
 *.swp
-Chart.lock
-charts/
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -47,39 +46,6 @@ spec:
            - -timeout
            - 600s

-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owanalytics.repository }}:{{ .Values.images.owanalytics.tag }}"
-          imagePullPolicy: {{ .Values.images.owanalytics.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 "owanalytics.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owanalytics }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
      containers:

        - name: owanalytics
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
  owanalytics:
    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owanalytics
-    tag: v2.7.0-RC1
+    tag: v2.6.0-RC2
    pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
--- a/openapi/owanalytics.yaml
+++ b/openapi/owanalytics.yaml
@@ -27,13 +27,71 @@ components:

  responses:
    NotFound:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/NotFound'
+      description: The specified resource was not found.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
    Unauthorized:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Unauthorized'
+      description: The requested does not have sufficient rights to perform the operation.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+                enum:
+                  - 0     # Success
+                  - 1     # PASSWORD_CHANGE_REQUIRED,
+                  - 2     # INVALID_CREDENTIALS,
+                  - 3     # PASSWORD_ALREADY_USED,
+                  - 4     # USERNAME_PENDING_VERIFICATION,
+                  - 5     # PASSWORD_INVALID,
+                  - 6     # INTERNAL_ERROR,
+                  - 7     # ACCESS_DENIED,
+                  - 8     # INVALID_TOKEN
+                  - 9     # EXPIRED_TOKEN
+                  - 10    # RATE_LIMIT_EXCEEDED
+                  - 11    # BAD_MFA_TRANSACTION
+                  - 12    # MFA_FAILURE
+                  - 13    # SECURITY_SERVICE_UNREACHABLE
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
    Success:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Success'
+      description: The requested operation was performed.
+      content:
+        application/json:
+          schema:
+            properties:
+              Operation:
+                type: string
+              Details:
+                type: string
+              Code:
+                type: integer
+
    BadRequest:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/BadRequest'
+      description: The requested operation failed.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: integer

  schemas:
    ObjectInfo:
@@ -1076,6 +1134,42 @@ paths:
        404:
          $ref: '#/components/responses/NotFound'

+
+  /iptocountry:
+    get:
+      tags:
+        - Utility
+      summary: Get the country code for an IP address
+      operationId: getIpToCountry
+      parameters:
+        - in: query
+          name: iplist
+          schema:
+            type: string
+            example:
+              10.2.2.2,10.3.4.3
+          required: true
+      responses:
+        200:
+          description: List of country codes.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  enabled:
+                    type: boolean
+                  countryCodes:
+                    type: array
+                    items:
+                      type: string
+        400:
+          $ref: '#/components/responses/BadRequest'
+        403:
+          $ref: '#/components/responses/Unauthorized'
+        404:
+          $ref: '#/components/responses/NotFound'
+
  /wifiClientHistory:
    get:
      tags:
--- a/src/APStats.cpp
+++ b/src/APStats.cpp
@@ -158,7 +158,6 @@ namespace OpenWifi {
            auto interfaces = (*State)["interfaces"];
            DI_.associations_2g = DI_.associations_5g = DI_.associations_6g = 0;
            for(const auto &interface:interfaces) {
-                std::string InterfaceName = fmt::format("{}: {}", DI_.serialNumber, interface.contains("name") ? to_string(interface["name"]) : "unknown");
                if(interface.contains("counters")) {
                    auto counters = interface["counters"];
                    GetJSON("collisions", counters, DTP.ap_data.collisions, (uint64_t) 0);
@@ -173,34 +172,6 @@ namespace OpenWifi {
                    GetJSON("tx_packets", counters, DTP.ap_data.tx_packets, (uint64_t) 0);
                }

-                InterfaceClientEntryMap_t ICEM;
-                if(interface.contains("clients") && interface["clients"].is_array()) {
-                    try {
-                        auto Clients = interface["clients"];
-                        for(const auto & client: Clients) {
-                            if(client.contains("mac") && client["mac"].is_string()) {
-                                InterfaceClientEntry E;
-                                if(client.contains("ipv4_addresses") && client["ipv4_addresses"].is_array()) {
-                                    for(const auto &ip:client["ipv4_addresses"]) {
-                                        E.ipv4_addresses.push_back(ip);
-                                    }
-                                }
-                                if(client.contains("ipv6_addresses") && client["ipv6_addresses"].is_array()) {
-                                    for(const auto &ip:client["ipv6_addresses"]) {
-                                        E.ipv6_addresses.push_back(ip);
-                                    }
-                                }
-                                auto M = mac_filter(client["mac"]);
-                                ICEM[M] = E;
-                            }
-                        }
-                    } catch(...) {
-                        std::cout << "Exception will parsing clients: " << InterfaceName << std::endl;
-                    }
-                } else {
-                    // std::cout <<"Interface: No clients: " << InterfaceName << std::endl;
-                }
-
                if(interface.contains("ssids")) {
                    auto ssids = interface["ssids"];
                    for (const auto &ssid: ssids) {
@@ -272,19 +243,8 @@ namespace OpenWifi {
                                GetJSON("rx_packets",association,WFH.rx_packets,(uint64_t)0);
                                GetJSON("tx_packets",association,WFH.tx_packets,(uint64_t)0);

-                                // try to locate the IP addresses
-                                auto ClientInfo = ICEM.find(WFH.station_id);
-                                if(ClientInfo!=end(ICEM)) {
-                                    if(!ClientInfo->second.ipv4_addresses.empty()) {
-                                        WFH.ipv4 = ClientInfo->second.ipv4_addresses[0];
-                                    }
-                                    if(!ClientInfo->second.ipv6_addresses.empty()) {
-                                        WFH.ipv6 = ClientInfo->second.ipv6_addresses[0];
-                                    }
-                                    std::cout << __LINE__ << ": " << InterfaceName << "   Mac Found: " << ICEM.size() << " entries. " << WFH.station_id << std::endl;
-                                } else {
-                                    std::cout << __LINE__ << ": " << InterfaceName << "   Mac NOT found: " << ICEM.size() << " entries. " << WFH.station_id << std::endl;
-                                }
+                                WFH.ipv4 = "---";
+                                WFH.ipv6 = "----";

                                for(const auto &rd:DTP.radio_data) {
                                    if(rd.band == SSIDTP.band) {
--- a/src/APStats.h
+++ b/src/APStats.h
@@ -11,13 +11,6 @@

 namespace OpenWifi {

-    struct InterfaceClientEntry {
-        std::vector<std::string>        ipv4_addresses;
-        std::vector<std::string>        ipv6_addresses;
-    };
-
-    using InterfaceClientEntryMap_t = std::map<std::string,InterfaceClientEntry>;
-
    class AP {
    public:
        explicit AP(uint64_t mac, const std::string &venue_id, const std::string &BoardId, Poco::Logger &L) :
--- a/src/DeviceStatusReceiver.cpp
+++ b/src/DeviceStatusReceiver.cpp
@@ -23,7 +23,6 @@ namespace OpenWifi {
    }

    void DeviceStatusReceiver::run() {
-        Utils::SetThreadName("dev-status");
        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
        while(Note && Running_) {
            auto Msg = dynamic_cast<DeviceStatusMessage *>(Note.get());
--- a/src/HealthReceiver.cpp
+++ b/src/HealthReceiver.cpp
@@ -23,7 +23,6 @@ namespace OpenWifi {
    }

    void HealthReceiver::run() {
-        Utils::SetThreadName("dev-health");
        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
        while(Note && Running_) {
            auto Msg = dynamic_cast<HealthMessage *>(Note.get());
--- a/src/RESTAPI/RESTAPI_board_devices_handler.cpp
+++ b/src/RESTAPI/RESTAPI_board_devices_handler.cpp
@@ -8,13 +8,8 @@

 namespace OpenWifi {
    void RESTAPI_board_devices_handler::DoGet() {
-
        auto id = GetBinding("id","");

-        if(id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUUID);
-        }
-
        AnalyticsObjects::BoardInfo BI;
        if(!StorageService()->BoardsDB().GetRecord("id",id,BI)) {
            return NotFound();
--- a/src/RESTAPI/RESTAPI_board_handler.cpp
+++ b/src/RESTAPI/RESTAPI_board_handler.cpp
@@ -90,7 +90,7 @@ namespace OpenWifi {
        }

        if(StorageService()->BoardsDB().UpdateRecord("id",Existing.info.id,Existing)) {
-            VenueCoordinator()->UpdateBoard(Existing.info.id);
+            VenueCoordinator()->ModifyBoard(Existing.info.id);
            AnalyticsObjects::BoardInfo NewBoard;
            StorageService()->BoardsDB().GetRecord("id",Existing.info.id,NewBoard);
            Poco::JSON::Object  Answer;
--- a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
+++ b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
@@ -5,11 +5,54 @@
 #include "RESTAPI_board_timepoint_handler.h"
 #include "StorageService.h"

-#include <algorithm>
-
 namespace OpenWifi {
-    typedef std::vector<std::pair<std::uint64_t , std::uint64_t >>          bucket_timespans;
-    typedef std::vector< std::vector<AnalyticsObjects::DeviceTimePoint>>    split_points;
+    static auto find_number_of_buckets(std::vector<AnalyticsObjects::DeviceTimePoint> &p) {
+        uint32_t buckets=0,cur_buckets=0;
+        std::string current_serialNumber;
+        for(const auto &i:p) {
+            if(current_serialNumber.empty()) {
+                current_serialNumber = i.device_info.serialNumber;
+                cur_buckets=0;
+            }
+            if(current_serialNumber==i.device_info.serialNumber) {
+                cur_buckets++;
+            } else {
+                buckets = std::max(buckets,cur_buckets);
+                current_serialNumber=i.device_info.serialNumber;
+                cur_buckets=1;
+            }
+        }
+        return std::max(buckets,cur_buckets);
+    }
+
+    typedef std::vector< std::vector<AnalyticsObjects::DeviceTimePoint>> split_points;
+
+    static void split_in_buckets([[maybe_unused]] uint32_t buckets,std::vector<AnalyticsObjects::DeviceTimePoint> &p,split_points &sp) {
+        std::string cur_sn;
+        uint32_t cur_bucket=0;
+        for(const auto &i:p) {
+            if(cur_sn.empty()) {
+                cur_bucket=1;
+                cur_sn=i.device_info.serialNumber;
+            }
+            if(cur_sn==i.device_info.serialNumber) {
+                if (cur_bucket>sp.size()) {
+                    std::vector<AnalyticsObjects::DeviceTimePoint>  tmp_p;
+                    tmp_p.push_back(i);
+                    sp.push_back(tmp_p);
+                    cur_bucket++;
+                } else {
+                    sp[cur_bucket-1].push_back(i);
+                    cur_bucket++;
+                }
+            } else {
+                cur_bucket=1;
+                sp[cur_bucket-1].push_back(i);
+                cur_bucket++;
+                cur_sn=i.device_info.serialNumber;
+            }
+        }
+    }

    template <typename X, typename M> void AverageAPData( X T, const std::vector<M> &Values, AnalyticsObjects::AveragePoint &P) {
        if(Values.empty())
@@ -46,81 +89,6 @@ namespace OpenWifi {
            P.avg = 0.0;
    }

-    static void NewSort(const AnalyticsObjects::DeviceTimePointList &l,split_points &sp) {
-
-        struct {
-            bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
-                if (lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
-                if (lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
-                return lhs.timestamp < rhs.timestamp;
-            }
-        } sort_serial_ts;
-
-        // attempt at finding an interval
-        AnalyticsObjects::DeviceTimePointList tmp{l};
-        std::sort(tmp.points.begin(),tmp.points.end(),sort_serial_ts);
-
-        std::string     cur_ser;
-        std::uint64_t   cur_int=0,start_val, last_val, first_val = 0;
-        for(const auto &point:tmp.points) {
-            if(cur_ser.empty()) {
-                start_val = point.timestamp;
-                cur_ser = point.serialNumber;
-                first_val = point.timestamp;
-                continue;
-            }
-
-            if(cur_ser==point.serialNumber) {
-                auto this_int = point.timestamp - start_val;
-                if(cur_int) {
-                    if(this_int<cur_int) {
-                        cur_int = this_int;
-                    }
-                } else {
-                    cur_int = this_int;
-                }
-                start_val = point.timestamp;
-            } else {
-                cur_ser = point.serialNumber;
-                start_val = point.timestamp;
-            }
-            last_val = point.timestamp;
-        }
-
-        // std::cout << "Intervals: " << cur_int << std::endl;
-
-        std::vector<std::pair<std::uint64_t,std::uint64_t>>     time_slots;         //  timeslot 0 has <t1,t2>
-        std::vector<std::set<std::string>>                      serial_numbers;     //  serial number already in a timeslot.
-
-
-        std::uint64_t cur_first=first_val,cur_end=0;
-        sp.clear();
-        while(cur_end<last_val) {
-            std::pair<std::uint64_t,std::uint64_t>  e;
-            e.first = cur_first;
-            e.second = e.first + cur_int-1;
-            cur_first = e.second+1;
-            cur_end = e.second;
-            time_slots.emplace_back(e);
-            std::set<std::string> q;
-            serial_numbers.emplace_back(q);
-            std::vector<AnalyticsObjects::DeviceTimePoint>  qq;
-            sp.emplace_back(qq);
-        }
-
-        for(const auto &point:tmp.points) {
-            std::uint64_t slot_index=0;
-            for(const auto &slot:time_slots) {
-                if(point.timestamp >= slot.first && point.timestamp <= slot.second) {
-                    serial_numbers[slot_index].insert(point.serialNumber);
-                    sp[slot_index].emplace_back(point);
-                }
-                slot_index++;
-            }
-        }
-
-    }
-
    void RESTAPI_board_timepoint_handler::DoGet() {
        auto id = GetBinding("id","");
        if(id.empty() || !Utils::ValidUUID(id)) {
@@ -134,12 +102,7 @@ namespace OpenWifi {

        auto fromDate = GetParameter("fromDate",0);
        auto endDate = GetParameter("endDate",0);
-        std::uint64_t maxRecords;
-        if(Request->has("limit"))
-            maxRecords = QB_.Limit;
-        else
-            maxRecords = GetParameter("maxRecords",1000);
-
+        auto maxRecords = GetParameter("maxRecords",1000);
        auto statsOnly = GetBoolParameter("statsOnly");
        auto pointsOnly = GetBoolParameter("pointsOnly");
        auto pointsStatsOnly = GetBoolParameter("pointsStatsOnly");
@@ -152,39 +115,71 @@ namespace OpenWifi {
            return ReturnObject(Answer);
        }

-        AnalyticsObjects::DeviceTimePointList Points;
-        StorageService()->TimePointsDB().SelectRecords(id,fromDate, endDate, maxRecords, Points.points);
-        std::cout << "1 MaxRecords=" << maxRecords << " retrieved=" << Points.points.size() << std::endl;
+        auto Points = std::make_unique<AnalyticsObjects::DeviceTimePointList>();
+        StorageService()->TimePointsDB().SelectRecords(id,fromDate, endDate, maxRecords, Points->points);

-        split_points sp;
+        // sort by timestamp & serial number.
+        struct {
+            bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
+                if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
+                if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
+                return lhs.timestamp < rhs.timestamp;
+            }
+        } DeviceTimePoint_sort;

-        NewSort(Points,sp);
-        std::cout << __LINE__ << std::endl;
+        struct {
+            bool operator()(const AnalyticsObjects::SSIDTimePoint &lhs, const AnalyticsObjects::SSIDTimePoint &rhs) const {
+                if(lhs.ssid < rhs.ssid) return true;
+                if(lhs.ssid > rhs.ssid) return false;
+                return lhs.bssid < rhs.bssid;
+            }
+        } SSID_sort;

-        Poco::JSON::Object  Answer;
+        struct {
+            bool operator()(const AnalyticsObjects::UETimePoint &lhs, const AnalyticsObjects::UETimePoint &rhs) const {
+                if(lhs.station < rhs.station) return true;
+                return false;
+            }
+        } Association_sort;
+
+        std::sort( Points->points.begin(), Points->points.end(), DeviceTimePoint_sort);
+        auto BucketsNeeded = find_number_of_buckets(Points->points);
+
+        auto sp = std::make_unique<split_points>();
+        split_in_buckets(BucketsNeeded,Points->points, *sp);
+        // must sort each bucket according to serial number.
+        for(auto &i: *sp) {
+            std::sort(i.begin(),i.end(),DeviceTimePoint_sort);
+            // now sort according to UEs within a block
+            for(auto &j:i) {
+                std::sort(j.ssid_data.begin(),j.ssid_data.end(),SSID_sort);
+                for(auto &k:j.ssid_data) {
+                    std::sort(k.associations.begin(),k.associations.end(),Association_sort);
+                }
+            }
+        }
+
+        auto Answer = std::make_unique<Poco::JSON::Object>();
        if(!pointsStatsOnly) {
-            Poco::JSON::Array   Points_OuterArray;
-            for (const auto &point_list:sp) {
+            auto Points_OuterArray = std::make_unique<Poco::JSON::Array>();
+            for (const auto &point_list:*sp) {
                Poco::JSON::Array Points_InnerArray;
                for (const auto &point: point_list) {
                    Poco::JSON::Object O;
                    point.to_json(O);
                    Points_InnerArray.add(O);
                }
-                Points_OuterArray.add(Points_InnerArray);
+                Points_OuterArray->add(Points_InnerArray);
            }
-            Answer.set("points",Points_OuterArray);
+            Answer->set("points",*Points_OuterArray);
        }

        //  calculate the stats for each time slot
        if(!pointsOnly) {
-            Poco::JSON::Array   Stats_Array;
-            for (const auto &point_list:sp) {
+            auto Stats_Array = std::make_unique<Poco::JSON::Array>();
+            for (const auto &point_list:*sp) {
                AnalyticsObjects::DeviceTimePointAnalysis DTPA;

-                if(point_list.empty())
-                    continue;
-
                DTPA.timestamp = point_list[0].timestamp;
                AverageAPData(&AnalyticsObjects::APTimePoint::tx_bytes_bw, point_list, DTPA.tx_bytes_bw);
                AverageAPData(&AnalyticsObjects::APTimePoint::rx_bytes_bw, point_list, DTPA.rx_bytes_bw);
@@ -205,12 +200,12 @@ namespace OpenWifi {

                Poco::JSON::Object Stats_point;
                DTPA.to_json(Stats_point);
-                Stats_Array.add(Stats_point);
+                Stats_Array->add(Stats_point);
            }
-            Answer.set("stats", Stats_Array);
+            Answer->set("stats", *Stats_Array);
        }

-        return ReturnObject(Answer);
+        return ReturnObject(*Answer);
    }

    void RESTAPI_board_timepoint_handler::DoDelete() {
--- a/src/RESTAPI/RESTAPI_wificlienthistory_handler.cpp
+++ b/src/RESTAPI/RESTAPI_wificlienthistory_handler.cpp
@@ -20,9 +20,10 @@ namespace OpenWifi {
        }

        if(GetBoolParameter("macsOnly")) {
+
            auto macFilter = GetParameter("macFilter","");
            std::vector<uint64_t>    Macs;
-            WifiClientCache()->FindNumbers(venue,macFilter,QB_.Offset, QB_.Limit, Macs);
+            WifiClientCache()->FindNumbers(venue,macFilter,500,Macs);
            Poco::JSON::Array   Arr;
            for(const auto &mac: Macs)
                Arr.add(Utils::IntToSerialNumber(mac));
--- a/src/StateReceiver.cpp
+++ b/src/StateReceiver.cpp
@@ -25,7 +25,6 @@ namespace OpenWifi {

    void StateReceiver::run() {
        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-        Utils::SetThreadName("dev-state");
        while(Note && Running_) {
            auto Msg = dynamic_cast<StateMessage *>(Note.get());
            if(Msg!= nullptr) {
--- a/src/StorageService.cpp
+++ b/src/StorageService.cpp
@@ -66,7 +66,6 @@ namespace OpenWifi {
    }

    void Storage::run() {
-        Utils::SetThreadName("strg-updtr");
 	    Running_ = true ;
 	    bool FirstRun=true;
 	    long Retry = 2000;
--- a/src/VenueCoordinator.cpp
+++ b/src/VenueCoordinator.cpp
@@ -13,27 +13,9 @@ namespace OpenWifi {
    int VenueCoordinator::Start() {
        GetBoardList();
        Worker_.start(*this);
-
-        ReconcileTimerCallback_ = std::make_unique<Poco::TimerCallback<VenueCoordinator>>(*this,&VenueCoordinator::onReconcileTimer);
-        ReconcileTimerTimer_.setStartInterval( 3 * 60 * 1000 );
-        ReconcileTimerTimer_.setPeriodicInterval(3 * 60 * 1000); // 1 hours
-        ReconcileTimerTimer_.start(*ReconcileTimerCallback_, MicroService::instance().TimerPool());
-
        return 0;
    }

-    void VenueCoordinator::onReconcileTimer([[maybe_unused]] Poco::Timer &timer) {
-        std::lock_guard     G(Mutex_);
-        Utils::SetThreadName("brd-refresh");
-
-        Logger().information("Starting to reconcile board information.");
-        for(const auto &[board_id, watcher]:Watchers_) {
-            Logger().information(fmt::format("Updating: {}", board_id));
-            UpdateBoard(board_id);
-        }
-        Logger().information("Finished reconciling board information.");
-    }
-
    void VenueCoordinator::GetBoardList() {
        BoardsToWatch_.clear();
        auto F = [&](const AnalyticsObjects::BoardInfo &B) ->bool {
@@ -52,7 +34,6 @@ namespace OpenWifi {
    }

    void VenueCoordinator::run() {
-        Utils::SetThreadName("venue-coord");
        Running_=true;
        while(Running_) {
            Poco::Thread::trySleep(20000);
@@ -77,11 +58,9 @@ namespace OpenWifi {

    void VenueCoordinator::RetireBoard(const AnalyticsObjects::BoardInfo &B) {
        Logger().error(fmt::format("Venue board '{}' is no longer in the system. Retiring its associated board.", B.venueList[0].name));
-        /*
        StopBoard(B.info.id);
        StorageService()->BoardsDB().DeleteRecord("id",B.info.id);
        StorageService()->TimePointsDB().DeleteRecords(fmt::format(" boardId='{}' ", B.info.id));
-         */
    }

    bool VenueCoordinator::GetDevicesForBoard(const AnalyticsObjects::BoardInfo &B, std::vector<uint64_t> & Devices, bool & VenueExists) {
@@ -139,7 +118,7 @@ namespace OpenWifi {
        }
    }

-    void VenueCoordinator::UpdateBoard(const std::string &id) {
+    void VenueCoordinator::ModifyBoard(const std::string &id) {
        AnalyticsObjects::BoardInfo B;
        if(StorageService()->BoardsDB().GetRecord("id",id,B)) {
            std::vector<uint64_t>   Devices;
@@ -150,15 +129,15 @@ namespace OpenWifi {
                if(it!=ExistingBoards_.end()) {
                    if(it->second!=Devices) {
                        auto it2 = Watchers_.find(id);
-                        if(it2!=Watchers_.end()) {
+                        if(it2!=Watchers_.end())
                            it2->second->ModifySerialNumbers(Devices);
-                        }
                        ExistingBoards_[id] = Devices;
                        Logger().information(fmt::format("Modified board {}",B.info.name));
                    } else {
                        Logger().information(fmt::format("No device changes in board {}",B.info.name));
                    }
                }
+                Logger().information(fmt::format("Modified board {}",B.info.name));
                return;
            }

--- a/src/VenueCoordinator.h
+++ b/src/VenueCoordinator.h
@@ -3,12 +3,9 @@
 //

 #pragma once
-
 #include "framework/MicroService.h"
 #include "VenueWatcher.h"

-#include "Poco/Timer.h"
-
 namespace OpenWifi {

    class VenueCoordinator : public SubSystemServer, Poco::Runnable {
@@ -24,7 +21,7 @@ namespace OpenWifi {
        void run() override;

        void StopBoard(const std::string &id);
-        void UpdateBoard(const std::string &id);
+        void ModifyBoard(const std::string &id);
        void AddBoard(const std::string &id);

        bool GetDevicesForBoard(const AnalyticsObjects::BoardInfo &B, std::vector<uint64_t> & Devices, bool & VenueExists);
@@ -33,17 +30,13 @@ namespace OpenWifi {
        bool Watching(const std::string &id);
        void RetireBoard(const AnalyticsObjects::BoardInfo &B);

-        void onReconcileTimer(Poco::Timer & timer);
-
    private:
-        Poco::Thread                                            Worker_;
-        std::atomic_bool                                        Running_=false;
-        std::set<AnalyticsObjects::BoardInfo>                   BoardsToWatch_;
-        std::map<std::string,std::shared_ptr<VenueWatcher>>     Watchers_;
-        std::unique_ptr<Poco::TimerCallback<VenueCoordinator>>  ReconcileTimerCallback_;
-        Poco::Timer                     		                ReconcileTimerTimer_;
+        Poco::Thread                                        Worker_;
+        std::atomic_bool                                    Running_=false;
+        std::set<AnalyticsObjects::BoardInfo>               BoardsToWatch_;
+        std::map<std::string,std::shared_ptr<VenueWatcher>> Watchers_;

-        std::map<std::string,std::vector<uint64_t>>             ExistingBoards_;
+        std::map<std::string,std::vector<uint64_t>>            ExistingBoards_;

        VenueCoordinator() noexcept:
                SubSystemServer("VenueCoordinator", "VENUE-COORD", "venue.coordinator")
--- a/src/VenueWatcher.cpp
+++ b/src/VenueWatcher.cpp
@@ -34,7 +34,6 @@ namespace OpenWifi {
    }

    void VenueWatcher::run() {
-        Utils::SetThreadName("venue-watch");
        Running_ = true;
        Poco::AutoPtr<Poco::Notification>	Msg(Queue_.waitDequeueNotification());
        while(Msg && Running_) {
--- a/src/VenueWatcher.h
+++ b/src/VenueWatcher.h
@@ -69,11 +69,9 @@ namespace OpenWifi {
        void GetDevices(std::vector<AnalyticsObjects::DeviceInfo> & DI);

        void GetBandwidth(uint64_t start, uint64_t end, uint64_t interval , AnalyticsObjects::BandwidthAnalysis & BW);
-        inline std::string Venue() const {
-            return venue_id_;
-        }
+
    private:
-        std::mutex                                  Mutex_;
+        std::recursive_mutex                        Mutex_;
        std::string                                 boardId_;
        std::string                                 venue_id_;
        Poco::NotificationQueue                     Queue_;
--- a/src/WifiClientCache.cpp
+++ b/src/WifiClientCache.cpp
@@ -124,36 +124,32 @@ namespace OpenWifi {
 		}
 	}

-	void WifiClientCache::FindNumbers(const std::string &venueId, const std::string &SerialNumber, std::uint64_t StartingOffset, std::uint64_t HowMany, std::vector<uint64_t> &A) {
+	void WifiClientCache::FindNumbers(const std::string &venue_id, const std::string &S, uint HowMany, std::vector<uint64_t> &A) {
        std::lock_guard G(Mutex_);

        A.clear();
-        auto VenueIt = Cache_.find(venueId);
+        auto VenueIt = Cache_.find(venue_id);
        if(VenueIt==Cache_.end())
            return;

-		if(SerialNumber.empty()) {
+		if(S.empty()) {
            auto Start = VenueIt->second.SNs_.begin();
-            std::uint64_t Offset=0;
            while(HowMany && Start!=VenueIt->second.SNs_.end()) {
-                if(Offset>=StartingOffset) {
-                    A.push_back(*Start);
-                    HowMany--;
-                }
+                A.push_back(*Start);
                Start++;
-                Offset++;
+                HowMany--;
            }
            return;
        }

-		if (SerialNumber[0] == '*') {
+		if (S[0] == '*') {
 			std::string Reversed;
-			std::copy(rbegin(SerialNumber), rend(SerialNumber)-1, std::back_inserter(Reversed));
+			std::copy(rbegin(S), rend(S)-1, std::back_inserter(Reversed));
 			if(Reversed.empty())
 				return;
 			return ReturnNumbers(Reversed, HowMany, VenueIt->second.Reverse_SNs_, A, true);
 		} else {
-			return ReturnNumbers(SerialNumber, HowMany, VenueIt->second.SNs_, A, false);
+			return ReturnNumbers(S, HowMany, VenueIt->second.SNs_, A, false);
 		}
 	}
 }
--- a/src/WifiClientCache.h
+++ b/src/WifiClientCache.h
@@ -20,7 +20,7 @@ namespace OpenWifi {
 		void Stop() override;
 		void AddSerialNumber(const std::string &venueId, const std::string &SerialNumber);
 		void DeleteSerialNumber(const std::string &venueId, const std::string &SerialNumber);
-		void FindNumbers(const std::string &venueId, const std::string &SerialNumber, std::uint64_t start, std::uint64_t HowMany, std::vector<uint64_t> &A);
+		void FindNumbers(const std::string &venueId, const std::string &SerialNumber, uint HowMany, std::vector<uint64_t> &A);
 		inline bool NumberExists(const std::string &venueId, uint64_t SerialNumber) {
 			std::lock_guard		G(Mutex_);
            auto It = Cache_.find(venueId);
--- a/src/framework/MicroService.h
+++ b/src/framework/MicroService.h
@@ -27,11 +27,6 @@ namespace OpenWifi {
    inline uint64_t Now() { return std::time(nullptr); };
 }

-namespace OpenWifi::Utils {
-    std::vector<unsigned char> base64decode(const std::string& input);
-    std::string base64encode(const unsigned char *input, uint32_t size);
-}
-
 using namespace std::chrono_literals;

 #include "Poco/Util/Application.h"
@@ -243,11 +238,6 @@ namespace OpenWifi::RESTAPI_utils {
        Obj.set(Field,Value);
    }

-    inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Poco::Data::BLOB &Value) {
-        auto Result = Utils::base64encode((const unsigned char *)Value.rawContent(),Value.size());
-        Obj.set(Field,Result);
-    }
-
    inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringPairVec & S) {
        Poco::JSON::Array   Array;
        for(const auto &i:S) {
@@ -344,12 +334,12 @@ namespace OpenWifi::RESTAPI_utils {

    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, double & Value) {
        if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (double)Obj->get(Field);
+            Value = (double) Obj->get(Field);
    }

    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, float & Value) {
        if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (float)Obj->get(Field);
+            Value = (float) Obj->get(Field);
    }

    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, bool &Value) {
@@ -384,14 +374,7 @@ namespace OpenWifi::RESTAPI_utils {

    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, uint64_t &Value) {
        if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (uint64_t)Obj->get(Field);
-    }
-
-    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Poco::Data::BLOB &Value) {
-        if(Obj->has(Field) && !Obj->isNull(Field)) {
-            auto Result = Utils::base64decode(Obj->get(Field).toString());
-            Value.assignRaw((const unsigned char *)&Result[0],Result.size());
-        }
+            Value = (uint64_t ) Obj->get(Field);
    }

    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringPairVec &Vec) {
@@ -660,27 +643,6 @@ namespace OpenWifi::RESTAPI_utils {

 namespace OpenWifi::Utils {

-	inline void SetThreadName(const char *name) {
-#ifdef __linux__
-		Poco::Thread::current()->setName(name);
-		pthread_setname_np(pthread_self(), name);
-#endif
-#ifdef __APPLE__
-	Poco::Thread::current()->setName(name);
-	pthread_setname_np(name);
-#endif
-	}
-
-	inline void SetThreadName(Poco::Thread &thr, const char *name) {
-#ifdef __linux__
-		thr.setName(name);
-		pthread_setname_np(thr.tid(), name);
-#endif
-#ifdef __APPLE__
-		thr.setName(name);
-#endif
-	}
-
    enum MediaTypeEncodings {
        PLAIN,
        BINARY,
@@ -703,19 +665,6 @@ namespace OpenWifi::Utils {
        return (std::all_of(UUID.begin(),UUID.end(),[&](auto i){ if(i=='-') dashes++; return i=='-' || std::isxdigit(i);})) && (dashes>0);
    }

-	template <typename ...Args> std::string ComputeHash(Args&&... args) {
-		Poco::SHA2Engine    E;
-		auto as_string = [](auto p) {
-			if constexpr(std::is_arithmetic_v<decltype(p)>) {
-				return std::to_string(p);
-			} else {
-				return p;
-			}
-		};
-		(E.update(as_string(args)),...);
-		return Poco::SHA2Engine::digestToHex(E.digest());
-	}
-
    [[nodiscard]] inline std::vector<std::string> Split(const std::string &List, char Delimiter=',' ) {
        std::vector<std::string> ReturnList;

@@ -1218,7 +1167,6 @@ namespace OpenWifi {
    static const std::string uSERVICE_SUBCRIBER{ "owsub"};
    static const std::string uSERVICE_INSTALLER{ "owinst"};
    static const std::string uSERVICE_ANALYTICS{ "owanalytics"};
-	static const std::string uSERVICE_OWRRM{ "owrrm"};

 	class ConfigurationEntry {
 	  public:
@@ -1367,7 +1315,7 @@ namespace OpenWifi {
 		inline void Start();
 		inline void Stop();
 	  private:
-		mutable std::atomic_bool 	Running_ = false;
+		std::atomic_bool 	Running_ = false;
 		Poco::Thread		Thread_;
 	};

@@ -1412,14 +1360,13 @@ namespace OpenWifi {

 	    [[nodiscard]] inline const std::string &Address() const { return address_; };
 	    [[nodiscard]] inline uint32_t Port() const { return port_; };
-	    [[nodiscard]] inline auto KeyFile() const { return key_file_; };
-	    [[nodiscard]] inline auto CertFile() const { return cert_file_; };
-	    [[nodiscard]] inline auto RootCA() const { return root_ca_; };
-	    [[nodiscard]] inline auto KeyFilePassword() const { return key_file_password_; };
-	    [[nodiscard]] inline auto IssuerCertFile() const { return issuer_cert_file_; };
-	    [[nodiscard]] inline auto Name() const { return name_; };
+	    [[nodiscard]] inline const std::string &KeyFile() const { return key_file_; };
+	    [[nodiscard]] inline const std::string &CertFile() const { return cert_file_; };
+	    [[nodiscard]] inline const std::string &RootCA() const { return root_ca_; };
+	    [[nodiscard]] inline const std::string &KeyFilePassword() const { return key_file_password_; };
+	    [[nodiscard]] inline const std::string &IssuerCertFile() const { return issuer_cert_file_; };
+	    [[nodiscard]] inline const std::string &Name() const { return name_; };
 	    [[nodiscard]] inline int Backlog() const { return backlog_; }
-		[[nodiscard]] inline auto Cas() const { return cas_; }

 	    [[nodiscard]] inline Poco::Net::SecureServerSocket CreateSecureSocket(Poco::Logger &L) const {
 	        Poco::Net::Context::Params P;
@@ -1899,8 +1846,7 @@ namespace OpenWifi {
 	            Request = &RequestIn;
 	            Response = &ResponseIn;

-//				std::string th_name = "restsvr_" + std::to_string(TransactionId_);
-//				Utils::SetThreadName(th_name.c_str());
+				Poco::Thread::current()->setName("WebServerThread_" + std::to_string(TransactionId_));

                if(Request->getContentLength()>0) {
                    if(Request->getContentType().find("application/json")!=std::string::npos) {
@@ -1949,32 +1895,36 @@ namespace OpenWifi {
 	    [[nodiscard]] inline bool NeedAdditionalInfo() const { return QB_.AdditionalInfo; }
 	    [[nodiscard]] inline const std::vector<std::string> & SelectedRecords() const { return QB_.Select; }

-		inline static bool ParseBindings(const std::string & Request, const std::list<std::string> & EndPoints, BindingMap &bindings) {
-			bindings.clear();
-			auto PathItems = Poco::StringTokenizer(Request, "/");
+/*	    [[nodiscard]] inline const Poco::JSON::Object::Ptr ParseStream() {
+	        return IncomingParser_.parse(Request->stream()).extract<Poco::JSON::Object::Ptr>();
+	    }
+*/

-			for(const auto &EndPoint:EndPoints) {
-				auto ParamItems = Poco::StringTokenizer(EndPoint, "/");
-				if (PathItems.count() != ParamItems.count())
-					continue;
+	    inline static bool ParseBindings(const std::string & Request, const std::list<std::string> & EndPoints, BindingMap &bindings) {
+	        bindings.clear();
+	        std::vector<std::string> PathItems = Utils::Split(Request, '/');

-				bool Matched = true;
-				for (size_t i = 0; i < PathItems.count(); i++) {
-					if (PathItems[i] != ParamItems[i]) {
-						if (ParamItems[i][0] == '{') {
-							auto ParamName = ParamItems[i].substr(1, ParamItems[i].size() - 2);
-							bindings[Poco::toLower(ParamName)] = PathItems[i];
-						} else {
-							Matched = false;
-							break;
-						}
-					}
-				}
-				if(Matched)
-					return true;
-			}
-			return false;
-		}
+	        for(const auto &EndPoint:EndPoints) {
+	            std::vector<std::string> ParamItems = Utils::Split(EndPoint, '/');
+	            if (PathItems.size() != ParamItems.size())
+	                continue;
+
+	            bool Matched = true;
+	            for (size_t i = 0; i != PathItems.size() && Matched; i++) {
+	                if (PathItems[i] != ParamItems[i]) {
+	                    if (ParamItems[i][0] == '{') {
+	                        auto ParamName = ParamItems[i].substr(1, ParamItems[i].size() - 2);
+	                        bindings[Poco::toLower(ParamName)] = PathItems[i];
+	                    } else {
+	                        Matched = false;
+	                    }
+	                }
+	            }
+	            if(Matched)
+	                return true;
+	        }
+	        return false;
+	    }

 	    inline void PrintBindings() {
 	        for (const auto &[key, value] : Bindings_)
@@ -2095,17 +2045,6 @@ namespace OpenWifi {
            return false;
        }

-        static inline bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, Poco::Data::BLOB &Value) {
-            if(O->has(Field)) {
-                std::string Content = O->get(Field).toString();
-                auto DecodedBlob = Utils::base64decode(Content);
-                Value.assignRaw((const unsigned char *)&DecodedBlob[0],DecodedBlob.size());
-                return true;
-            }
-            return false;
-        }
-
-
        template <typename T> bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, const T &value, T & assignee) {
            if(O->has(Field)) {
                assignee = value;
@@ -2446,7 +2385,6 @@ namespace OpenWifi {
            Poco::Net::HTTPServerResponse       *Response= nullptr;
            SecurityObjects::UserInfoAndPolicy 	UserInfo_;
            QueryBlock					QB_;
-			const std::string & Requester() const { return REST_Requester_; }
 	    protected:
 	        BindingMap 					Bindings_;
 	        Poco::URI::QueryParameters 	Parameters_;
@@ -2463,7 +2401,6 @@ namespace OpenWifi {
 	        RateLimit                   MyRates_;
            uint64_t                    TransactionId_;
            Poco::JSON::Object::Ptr     ParsedBody_;
-			std::string					REST_Requester_;
 	    };

 	    class RESTAPI_UnknownRequestHandler : public RESTAPIHandler {
@@ -2645,7 +2582,7 @@ namespace OpenWifi {
    private:
        std::recursive_mutex  	Mutex_;
        Poco::Thread        	Worker_;
-        mutable std::atomic_bool    	Running_=false;
+        std::atomic_bool    	Running_=false;
 		Poco::NotificationQueue	Queue_;
    };

@@ -2671,7 +2608,7 @@ namespace OpenWifi {
 	  private:
 		std::recursive_mutex  	Mutex_;
        Poco::Thread        	Worker_;
-        mutable std::atomic_bool    	Running_=false;
+        std::atomic_bool    	Running_=false;
    };

 	class KafkaDispatcher : public Poco::Runnable {
@@ -2728,7 +2665,6 @@ namespace OpenWifi {

 		inline void run() override {
 			Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-			Utils::SetThreadName("kafka:dispatch");
 			while(Note && Running_) {
 				auto Msg = dynamic_cast<KafkaMessage*>(Note.get());
 				if(Msg!= nullptr) {
@@ -2751,12 +2687,12 @@ namespace OpenWifi {
 		}

 	  private:
-		std::recursive_mutex  		Mutex_;
-		Types::NotifyTable      	Notifiers_;
-		Poco::Thread        		Worker_;
-		mutable std::atomic_bool    Running_=false;
-		uint64_t          			FunctionId_=1;
-		Poco::NotificationQueue		Queue_;
+		std::recursive_mutex  	Mutex_;
+		Types::NotifyTable      Notifiers_;
+		Poco::Thread        	Worker_;
+		std::atomic_bool    	Running_=false;
+		uint64_t          		FunctionId_=1;
+		Poco::NotificationQueue	Queue_;
 	};

 	class KafkaManager : public SubSystemServer {
@@ -2949,7 +2885,6 @@ namespace OpenWifi {

 	            void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) override
 	            {
-					Utils::SetThreadName("alb-request");
 					try {
 						if((id_ % 100) == 0) {
 							Logger_.debug(fmt::format("ALB-REQUEST({}): ALB Request {}.",
@@ -3018,7 +2953,7 @@ namespace OpenWifi {
 	    std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
 	    std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
 	    int                                     	Port_ = 0;
-	    mutable std::atomic_bool                            Running_=false;
+	    std::atomic_bool                            Running_=false;
 	};

 	inline auto ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
@@ -3038,7 +2973,7 @@ namespace OpenWifi {
 	    }
 	    int Start() override;
 	    inline void Stop() override {
-	        Logger().information("Stopping...");
+	        Logger().information("Stopping ");
 	        for( const auto & svr : RESTServers_ )
 	            svr->stop();
 			Pool_.stopAll();
@@ -3046,23 +2981,22 @@ namespace OpenWifi {
 	        RESTServers_.clear();
 	    }

-
 	    inline void reinitialize(Poco::Util::Application &self) override;

 	    inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) {
 	        RESTAPIHandler::BindingMap Bindings;
-			Utils::SetThreadName(fmt::format("x-rest:{}",Id).c_str());
+			Poco::Thread::current()->setName(fmt::format("RESTAPI_ExtServer_{}",Id));
 	        return RESTAPI_ExtRouter(Path, Bindings, Logger(), Server_, Id);
 	    }
-        const Poco::ThreadPool & Pool() { return Pool_; }

 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"x-rest",2,32};
+	    Poco::ThreadPool	    Pool_;
 	    RESTAPI_GenericServer   Server_;

        RESTAPI_ExtServer() noexcept:
-	    SubSystemServer("RESTAPI_ExtServer", "REST-XSRV", "openwifi.restapi")
+	    SubSystemServer("RESTAPI_ExtServer", "RESTAPIServer", "openwifi.restapi"),
+        Pool_("RESTAPI_ExtServer",4,50,120)
            {
            }
 	};
@@ -3075,7 +3009,7 @@ namespace OpenWifi {
 	    inline Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override {
 			try {
 				Poco::URI uri(Request.getURI());
-				Utils::SetThreadName(fmt::format("x-rest:{}",TransactionId_).c_str());
+				Poco::Thread::current()->setName(fmt::format("ExtWebServer_{}",TransactionId_));
 				return RESTAPI_ExtServer()->CallServer(uri.getPath(), TransactionId_++);
 			} catch (...) {

@@ -3173,7 +3107,7 @@ namespace OpenWifi {

 	    inline int Start() override;
 	    inline void Stop() override {
-	        Logger().information("Stopping...");
+	        Logger().information("Stopping ");
 	        for( const auto & svr : RESTServers_ )
 	            svr->stop();
 			Pool_.stopAll();
@@ -3184,18 +3118,17 @@ namespace OpenWifi {

 	    inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) {
 	        RESTAPIHandler::BindingMap Bindings;
-			Utils::SetThreadName(fmt::format("i-rest:{}",Id).c_str());
+			Poco::Thread::current()->setName(fmt::format("RESTAPI_IntServer_{}",Id));
 	        return RESTAPI_IntRouter(Path, Bindings, Logger(), Server_, Id);
 	    }
-
-        const Poco::ThreadPool & Pool() { return Pool_; }
 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"i-rest",2,16};
+	    Poco::ThreadPool	    Pool_;
 	    RESTAPI_GenericServer   Server_;

        RESTAPI_IntServer() noexcept:
-		   SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi")
+		   SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi"),
+            Pool_("RESTAPI_IntServer",4,50,120)
        {
        }
 	};
@@ -3206,7 +3139,6 @@ namespace OpenWifi {
 	public:
        inline IntRequestHandlerFactory() = default;
 	    inline Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override {
-			Utils::SetThreadName(fmt::format("i-rest:{}",TransactionId_).c_str());
 	        Poco::URI uri(Request.getURI());
 	        return RESTAPI_IntServer()->CallServer(uri.getPath(), TransactionId_);
 	    }
@@ -3250,6 +3182,7 @@ namespace OpenWifi {
 		}

 		[[nodiscard]] std::string Version() { return Version_; }
+		// [[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
 		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
 		[[nodiscard]] inline const std::string & WWWAssetsDir() { return WWWAssetsDir_; }
 		[[nodiscard]] bool Debug() const { return DebugMode_; }
@@ -3282,12 +3215,7 @@ namespace OpenWifi {
            return Poco::Logger::get(Name);
        }

-        virtual void GetExtraConfiguration(Poco::JSON::Object & Cfg) {
-            Cfg.set("additionalConfiguration",false);
-        }
-
-
-        static inline void Exit(int Reason);
+		static inline void Exit(int Reason);
 		inline void BusMessageReceived(const std::string &Key, const std::string & Payload);
 		inline MicroServiceMetaVec GetServices(const std::string & Type);
 		inline MicroServiceMetaVec GetServices();
@@ -3323,6 +3251,7 @@ namespace OpenWifi {
 		inline std::string ConfigPath(const std::string &Key);
 		inline std::string Encrypt(const std::string &S);
 		inline std::string Decrypt(const std::string &S);
+		inline std::string CreateHash(const std::string &S);
 		inline std::string MakeSystemEventMessage( const std::string & Type ) const;
 		[[nodiscard]] inline bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
 		inline static void SavePID();
@@ -3352,9 +3281,6 @@ namespace OpenWifi {
                return Signer_.sign(T,Algo);
            }
        }
-
-		inline Poco::ThreadPool & TimerPool() { return TimerPool_; }
-
 	  private:
 	    static MicroService         * instance_;
 		bool                        HelpRequested_ = false;
@@ -3368,6 +3294,7 @@ namespace OpenWifi {
 		std::string                 WWWAssetsDir_;
 		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
 		Poco::Crypto::Cipher        * Cipher_ = nullptr;
+		Poco::SHA2Engine			SHA2_;
 		MicroServiceMetaMap			Services_;
 		std::string 				MyHash_;
 		std::string 				MyPrivateEndPoint_;
@@ -3388,7 +3315,6 @@ namespace OpenWifi {
        bool                        NoBuiltInCrypto_=false;
        Poco::JWT::Signer	        Signer_;
 		Poco::Logger				&Logger_;
-		Poco::ThreadPool			TimerPool_{"timer:pool",2,16};
    };

 	inline void MicroService::Exit(int Reason) {
@@ -3538,7 +3464,7 @@ namespace OpenWifi {
 	    MyPrivateEndPoint_ = ConfigGetString("openwifi.system.uri.private");
 	    MyPublicEndPoint_ = ConfigGetString("openwifi.system.uri.public");
 	    UIURI_ = ConfigGetString("openwifi.system.uri.ui");
-	    MyHash_ = Utils::ComputeHash(MyPublicEndPoint_);
+	    MyHash_ = CreateHash(MyPublicEndPoint_);
 	}

 	void MicroServicePostInitialization();
@@ -3601,7 +3527,7 @@ namespace OpenWifi {
    void DaemonPostInitialization(Poco::Util::Application &self);

 	inline void MicroService::initialize(Poco::Util::Application &self) {
-		// add the default services
+	    // add the default services
        LoadConfigurationFile();
        InitializeLoggingSystem();

@@ -3875,6 +3801,11 @@ namespace OpenWifi {
 	    return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
 	}

+	inline std::string MicroService::CreateHash(const std::string &S) {
+	    SHA2_.update(S);
+	    return Utils::ToHex(SHA2_.digest());
+	}
+
 	inline std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
 	    Poco::JSON::Object	Obj;
 	    Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
@@ -3937,7 +3868,6 @@ namespace OpenWifi {
            Params->setMaxThreads(50);
            Params->setMaxQueued(200);
            Params->setKeepAlive(true);
-			Params->setName("ws:xrest");

            std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
            if(MicroService::instance().NoAPISecurity()) {
@@ -3974,7 +3904,6 @@ namespace OpenWifi {
            Params->setMaxThreads(50);
            Params->setMaxQueued(200);
            Params->setKeepAlive(true);
-			Params->setName("ws:irest");

            std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
            if(MicroService::instance().NoAPISecurity()) {
@@ -3992,6 +3921,7 @@ namespace OpenWifi {
    }

    inline int MicroService::main([[maybe_unused]] const ArgVec &args) {
+
 	    MyErrorHandler	ErrorHandler(*this);
 	    Poco::ErrorHandler::set(&ErrorHandler);

@@ -4098,7 +4028,6 @@ namespace OpenWifi {
 	        Port_ = (int)MicroService::instance().ConfigGetInt("alb.port",15015);
 	        Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
 	        auto Params = new Poco::Net::HTTPServerParams;
-			Params->setName("ws:alb");
 	        Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger()), *Socket_, Params);
 	        Server_->start();
 	    }
@@ -4108,7 +4037,6 @@ namespace OpenWifi {

    inline void BusEventManager::run() {
        Running_ = true;
-		Utils::SetThreadName("fmwk:EventMgr");
        auto Msg = MicroService::instance().MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
        KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,MicroService::instance().PrivateEndPoint(),Msg, false);
        while(Running_) {
@@ -4194,8 +4122,6 @@ namespace OpenWifi {
 	}

 	inline void KafkaProducer::run() {
-
-		Utils::SetThreadName("Kafka:Prod");
 	    cppkafka::Configuration Config({
            { "client.id", MicroService::instance().ConfigGetString("openwifi.kafka.client.id") },
            { "metadata.broker.list", MicroService::instance().ConfigGetString("openwifi.kafka.brokerlist") }
@@ -4234,8 +4160,6 @@ namespace OpenWifi {
 	}

 	inline void KafkaConsumer::run() {
-		Utils::SetThreadName("Kafka:Cons");
-
 	    cppkafka::Configuration Config({
 	        { "client.id", MicroService::instance().ConfigGetString("openwifi.kafka.client.id") },
 	        { "metadata.broker.list", MicroService::instance().ConfigGetString("openwifi.kafka.brokerlist") },
@@ -4374,11 +4298,6 @@ namespace OpenWifi {
 	            Answer.set("certificates", Certificates);
 	            return ReturnObject(Answer);
 	        }
-            if(GetBoolParameter("extraConfiguration")) {
-                Poco::JSON::Object  Answer;
-                MicroService::instance().GetExtraConfiguration(Answer);
-                return ReturnObject(Answer);
-            }
 	        BadRequest(RESTAPI::Errors::InvalidCommand);
 	    }

@@ -4751,7 +4670,6 @@ namespace OpenWifi {
    inline bool RESTAPIHandler::IsAuthorized( bool & Expired , [[maybe_unused]] bool & Contacted , bool Sub ) {
        if(Internal_ && Request->has("X-INTERNAL-NAME")) {
            auto Allowed = MicroService::instance().IsValidAPIKEY(*Request);
-			Contacted = true;
            if(!Allowed) {
                if(Server_.LogBadTokens(false)) {
                    Logger_.debug(fmt::format("I-REQ-DENIED({}): Method={} Path={}",
@@ -4760,7 +4678,6 @@ namespace OpenWifi {
                }
            } else {
                auto Id = Request->get("X-INTERNAL-NAME", "unknown");
-				REST_Requester_ = Id;
                if(Server_.LogIt(Request->getMethod(),true)) {
                    Logger_.debug(fmt::format("I-REQ-ALLOWED({}): User='{}' Method={} Path={}",
                                               Utils::FormatIPv6(Request->clientAddress().toString()), Id,
@@ -4784,7 +4701,6 @@ namespace OpenWifi {
 #else
            if (AuthClient()->IsAuthorized( SessionToken_, UserInfo_, Expired, Contacted, Sub)) {
 #endif
-				REST_Requester_ = UserInfo_.userinfo.email;
                if(Server_.LogIt(Request->getMethod(),true)) {
                    Logger_.debug(fmt::format("X-REQ-ALLOWED({}): User='{}@{}' Method={} Path={}",
                                               UserInfo_.userinfo.email,
@@ -4867,7 +4783,7 @@ namespace OpenWifi {
        void run() override;
        // MyParallelSocketReactor &ReactorPool();
 		Poco::Net::SocketReactor & Reactor() { return Reactor_; }
-        void NewClient(Poco::Net::WebSocket &WS, const std::string &Id, const std::string &UserName);
+        void NewClient(Poco::Net::WebSocket &WS, const std::string &Id);
        bool Register(WebSocketClient *Client, const std::string &Id);
        void SetProcessor(WebSocketClientProcessor *F);
        void UnRegister(const std::string &Id);
@@ -4902,8 +4818,8 @@ namespace OpenWifi {
 		[[nodiscard]] bool SendToUser(const std::string &userName, const std::string &Payload);
 		void SendToAll(const std::string &Payload);
    private:
-        mutable std::atomic_bool Running_ = false;
-        Poco::Thread 								Thr_;
+        std::atomic_bool Running_ = false;
+        Poco::Thread Thr_;
        // std::unique_ptr<MyParallelSocketReactor> ReactorPool_;
 		Poco::Net::SocketReactor					Reactor_;
 		Poco::Thread								ReactorThread_;
@@ -4918,22 +4834,18 @@ namespace OpenWifi {

    class WebSocketClient {
    public:
-        explicit WebSocketClient(Poco::Net::WebSocket &WS,
-							   		const std::string &Id,
-							   		const std::string &UserName,
-							   		Poco::Logger &L,
-                                 	WebSocketClientProcessor *Processor);
+        explicit WebSocketClient(Poco::Net::WebSocket &WS, const std::string &Id, Poco::Logger &L,
+                                 WebSocketClientProcessor *Processor);
        virtual ~WebSocketClient();
        [[nodiscard]] inline const std::string &Id();
        [[nodiscard]] Poco::Logger &Logger();
        inline bool Send(const std::string &Payload);
    private:
        std::unique_ptr<Poco::Net::WebSocket> WS_;
-        Poco::Net::SocketReactor 	&Reactor_;
-        std::string 				Id_;
-		std::string					UserName_;
-        Poco::Logger 				&Logger_;
-        std::atomic_bool 			Authenticated_ = false;
+        Poco::Net::SocketReactor &Reactor_;
+        std::string Id_;
+        Poco::Logger &Logger_;
+        bool Authenticated_ = false;
        SecurityObjects::UserInfoAndPolicy UserInfo_;
        WebSocketClientProcessor *Processor_ = nullptr;
        void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
@@ -4941,9 +4853,33 @@ namespace OpenWifi {
        void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf);
    };

-    inline void WebSocketClientServer::NewClient(Poco::Net::WebSocket & WS, const std::string &Id, const std::string &UserName ) {
+/*    inline MyParallelSocketReactor::MyParallelSocketReactor(uint32_t NumReactors) :
+            NumReactors_(NumReactors)
+    {
+        Reactors_ = new Poco::Net::SocketReactor[NumReactors_];
+        for(uint32_t i=0;i<NumReactors_;i++) {
+            ReactorPool_.start(Reactors_[i]);
+        }
+    }
+
+    inline MyParallelSocketReactor::~MyParallelSocketReactor() {
+        for(uint32_t i=0;i<NumReactors_;i++) {
+            Reactors_[i].stop();
+        }
+        ReactorPool_.stopAll();
+        ReactorPool_.joinAll();
+        delete [] Reactors_;
+    }
+
+    inline Poco::Net::SocketReactor & MyParallelSocketReactor::Reactor() {
+        return Reactors_[ rand() % NumReactors_ ];
+    }
+
+    // inline MyParallelSocketReactor & WebSocketClientServer::ReactorPool() { return *ReactorPool_; }
+*/
+    inline void WebSocketClientServer::NewClient(Poco::Net::WebSocket & WS, const std::string &Id) {
        std::lock_guard G(Mutex_);
-        auto Client = new WebSocketClient(WS,Id,UserName,Logger(), Processor_);
+        auto Client = new WebSocketClient(WS,Id,Logger(), Processor_);
        Clients_[Id] = std::make_pair(Client,"");
    }

@@ -4973,13 +4909,12 @@ namespace OpenWifi {

    [[nodiscard]] inline bool SendToUser(const std::string &userName, const std::string &Payload);
    inline WebSocketClientServer::WebSocketClientServer() noexcept:
-            SubSystemServer("WebSocketClientServer", "UI-WSCLNT-SVR", "websocketclients")
+            SubSystemServer("WebSocketClientServer", "WSCLNT-SVR", "websocketclients")
    {
    }

    inline void WebSocketClientServer::run() {
        Running_ = true ;
-		Utils::SetThreadName("ws:uiclnt-svr");
        while(Running_) {
            Poco::Thread::trySleep(2000);

@@ -5027,12 +4962,8 @@ namespace OpenWifi {

        for(const auto &client:Clients_) {
            if(client.second.second == UserName) {
-				try {
-					if (client.second.first->Send(Payload))
-						Sent++;
-				} catch (...) {
-					return false;
-				}
+                if(client.second.first->Send(Payload))
+                    Sent++;
            }
        }
        return Sent>0;
@@ -5054,73 +4985,70 @@ namespace OpenWifi {
        int flags;
        int n;
        bool Done=false;
-		try {
-			Poco::Buffer<char> IncomingFrame(0);
-			n = WS_->receiveFrame(IncomingFrame, flags);
-			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
+        Poco::Buffer<char>			IncomingFrame(0);
+        n = WS_->receiveFrame(IncomingFrame, flags);
+        auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;

-			if (n == 0) {
-				Logger().warning(Poco::format("CLOSE(%s): %s UI Client is closing WS connection.", Id_, UserName_));
-				return delete this;
-			}
+        if(n==0) {
+            return delete this;
+        }

-			switch (Op) {
-			case Poco::Net::WebSocket::FRAME_OP_PING: {
-				WS_->sendFrame("", 0,
-							   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_PONG: {
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-				Logger().warning(Poco::format("CLOSE(%s): %s UI Client is closing WS connection.", Id_, UserName_));
-				Done = true;
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
-				IncomingFrame.append(0);
-				if (!Authenticated_) {
-					std::string Frame{IncomingFrame.begin()};
-					auto Tokens = Utils::Split(Frame, ':');
-					bool Expired = false, Contacted = false;
-					if (Tokens.size() == 2 &&
-						AuthClient()->IsAuthorized(Tokens[1], UserInfo_, Expired, Contacted)) {
-						Authenticated_ = true;
-						UserName_ = UserInfo_.userinfo.email;
-						Logger().warning(Poco::format("START(%s): %s UI Client is starting WS connection.", Id_, UserName_));
-						std::string S{"Welcome! Bienvenue! Bienvenidos!"};
-						WS_->sendFrame(S.c_str(), S.size());
-						WebSocketClientServer()->SetUser(Id_, UserInfo_.userinfo.email);
-					} else {
-						std::string S{"Invalid token. Closing connection."};
-						WS_->sendFrame(S.c_str(), S.size());
-						Done = true;
-					}
+        switch(Op) {
+            case Poco::Net::WebSocket::FRAME_OP_PING: {
+                WS_->sendFrame("", 0,
+                               (int)Poco::Net::WebSocket::FRAME_OP_PONG |
+                               (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_PONG: {
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
+                Logger().warning(Poco::format("CLOSE(%s): Client is closing its connection.",Id_));
+                Done=true;
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_TEXT: {
+                IncomingFrame.append(0);
+                if(!Authenticated_) {
+                    std::string Frame{IncomingFrame.begin()};
+                    auto Tokens = Utils::Split(Frame,':');
+                    bool Expired = false, Contacted = false;
+                    if(Tokens.size()==2 && AuthClient()->IsAuthorized(Tokens[1], UserInfo_, Expired, Contacted)) {
+                        Authenticated_=true;
+                        std::string S{"Welcome! Bienvenue! Bienvenidos!"};
+                        WS_->sendFrame(S.c_str(),S.size());
+                        WebSocketClientServer()->SetUser(Id_,UserInfo_.userinfo.email);
+                    } else {
+                        std::string S{"Invalid token. Closing connection."};
+                        WS_->sendFrame(S.c_str(),S.size());
+                        Done=true;
+                    }

-				} else {
-					try {
-						Poco::JSON::Parser P;
-						auto Obj =
-							P.parse(IncomingFrame.begin()).extract<Poco::JSON::Object::Ptr>();
-						std::string Answer;
-						if (Processor_ != nullptr)
-							Processor_->Processor(Obj, Answer, Done);
-						if (!Answer.empty())
-							WS_->sendFrame(Answer.c_str(), (int)Answer.size());
-						else {
-							WS_->sendFrame("{}", 2);
-						}
-					} catch (const Poco::JSON::JSONException &E) {
-						Logger().log(E);
-						Done=true;
-					}
-				}
-			} break;
-			default: {
-			}
-			}
-		} catch (...) {
-			Done=true;
-		}
+                } else {
+                    try {
+                        Poco::JSON::Parser P;
+                        auto Obj = P.parse(IncomingFrame.begin())
+                                .extract<Poco::JSON::Object::Ptr>();
+                        std::string Answer;
+                        if(Processor_!= nullptr)
+                            Processor_->Processor(Obj, Answer, Done);
+                        if (!Answer.empty())
+                            WS_->sendFrame(Answer.c_str(), (int) Answer.size());
+                        else {
+                            WS_->sendFrame("{}", 2);
+                        }
+                    } catch (const Poco::JSON::JSONException & E) {
+                        Logger().log(E);
+                    }
+                }
+            }
+                break;
+            default:
+            {
+
+            }
+        }

        if(Done) {
            delete this;
@@ -5132,10 +5060,9 @@ namespace OpenWifi {
    }


-    inline WebSocketClient::WebSocketClient( Poco::Net::WebSocket & WS , const std::string &Id, const std::string &UserName, Poco::Logger & L, WebSocketClientProcessor * Processor) :
+    inline WebSocketClient::WebSocketClient( Poco::Net::WebSocket & WS , const std::string &Id, Poco::Logger & L, WebSocketClientProcessor * Processor) :
            Reactor_(WebSocketClientServer()->Reactor()),
            Id_(Id),
-			UserName_(UserName),
            Logger_(L),
            Processor_(Processor) {
        try {
@@ -5215,8 +5142,9 @@ namespace OpenWifi {
                try
                {
                    Poco::Net::WebSocket WS(*Request, *Response);
+                    Logger().information("WebSocket connection established.");
                    auto Id = MicroService::CreateUUID();
-                    WebSocketClientServer()->NewClient(WS,Id,UserInfo_.userinfo.email);
+                    WebSocketClientServer()->NewClient(WS,Id);
                }
                catch (...) {
                    std::cout << "Cannot create websocket client..." << std::endl;
--- a/src/framework/WebSocketClientNotifications.h
+++ b/src/framework/WebSocketClientNotifications.h
@@ -146,10 +146,6 @@ namespace OpenWifi {
        WebSocketClientServer()->SendUserNotification(User,N);
    }

-    /////
-    /////
-    /////
-
    struct WebSocketNotificationRebootList {
        std::string                 title,
                details,
@@ -193,58 +189,5 @@ namespace OpenWifi {
        WebSocketClientServer()->SendUserNotification(User,N);
    }

-    /////
-    /////
-    /////
-
-    struct WebSocketNotificationUpgradeList {
-        std::string                 title,
-                details,
-                jobId;
-        std::vector<std::string>    success,
-                                    skipped,
-                                    no_firmware,
-                                    not_connected;
-        uint64_t                    timeStamp=OpenWifi::Now();
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef WebSocketNotification<WebSocketNotificationUpgradeList> WebSocketClientNotificationVenueUpgradeList_t;
-
-    inline void WebSocketNotificationUpgradeList::to_json(Poco::JSON::Object &Obj) const {
-        RESTAPI_utils::field_to_json(Obj,"title",title);
-        RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
-        RESTAPI_utils::field_to_json(Obj,"success",success);
-        RESTAPI_utils::field_to_json(Obj,"notConnected",not_connected);
-        RESTAPI_utils::field_to_json(Obj,"noFirmware",no_firmware);
-        RESTAPI_utils::field_to_json(Obj,"skipped",skipped);
-        RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
-        RESTAPI_utils::field_to_json(Obj,"details",details);
-    }
-
-    inline bool WebSocketNotificationUpgradeList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            RESTAPI_utils::field_from_json(Obj,"title",title);
-            RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
-            RESTAPI_utils::field_from_json(Obj,"success",success);
-            RESTAPI_utils::field_from_json(Obj,"notConnected",not_connected);
-            RESTAPI_utils::field_from_json(Obj,"noFirmware",no_firmware);
-            RESTAPI_utils::field_from_json(Obj,"skipped",skipped);
-            RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
-            RESTAPI_utils::field_from_json(Obj,"details",details);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    inline void WebSocketClientNotificationVenueUpgradeCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpgradeList_t &N) {
-        N.type = "venue_upgrader";
-        WebSocketClientServer()->SendUserNotification(User,N);
-    }
-
 } // namespace OpenWifi

--- a/src/framework/orm.h
+++ b/src/framework/orm.h
@@ -133,37 +133,6 @@ namespace ORM {
        return R;
    }

-    inline std::string WHERE_AND_(std::string Result) {
-        return Result;
-    }
-
-    template <typename T, typename... Args> std::string WHERE_AND_(std::string Result, const char *fieldName, const T &Value, Args... args) {
-        if constexpr(std::is_same_v<T,std::string>)
-        {
-            if(!Value.empty()) {
-                if(!Result.empty())
-                    Result += " and ";
-                Result += fieldName;
-                Result += '=';
-                Result += "'";
-                Result += Escape(Value);
-                Result += "'";
-            }
-        } else {
-            if(!Result.empty())
-                Result += " and ";
-            Result += fieldName ;
-            Result += '=';
-            Result += std::to_string(Value);
-        }
-        return WHERE_AND_(Result,args...);
-    }
-
-    template <typename... Args> std::string WHERE_AND(Args... args) {
-        std::string Result;
-        return WHERE_AND_(Result, args...);
-    }
-
    enum SqlComparison { EQ = 0, NEQ, LT, LTE, GT, GTE };
    enum SqlBinaryOp { AND = 0 , OR };

--- a/src/storage/storage_timepoints.cpp
+++ b/src/storage/storage_timepoints.cpp
@@ -71,7 +71,7 @@ namespace OpenWifi {
        } else if (LastDate) {
            WhereClause = fmt::format(" boardId='{}' and (timestamp <= {}) ", boardId, LastDate);
        }
-        GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp, serialNumber ASC ");
+        GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp ASC ");
        return true;
    }

--- a/stats_sample/bridge-stats-show-clients.json
+++ b/stats_sample/bridge-stats-show-clients.json
--- a/stats_sample/last_stats.json
+++ b/stats_sample/last_stats.json
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -144,9 +144,25 @@ logout() {
  rm -rf token.json
 }

+venuecount() {
+    curl ${FLAGS} "https://${OWPROV}/api/v1/venue?countOnly=true" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: Bearer ${token}" \
+        -H "accept: application/json" > ${result_file}
+    jq < ${result_file}
+}
+
+contactcount() {
+    curl ${FLAGS} "https://${OWPROV}/api/v1/contact?countOnly=true" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: Bearer ${token}" \
+        -H "Accept: application/json" > ${result_file}
+    jq < ${result_file}
+}
+
 setloglevel() {
    payload="{ \"command\" : \"setloglevel\" , \"subsystems\" : [ { \"tag\" : \"$1\" , \"value\" : \"$2\" } ] }"
-    curl  ${FLAGS} -X POST "https://${OWANALYTICS}/api/v1/system" \
+    curl  ${FLAGS} -X POST "https://${OWPROV}/api/v1/system" \
        -H "Accept: application/json" \
        -H "Content-Type: application/json" \
        -H "Authorization: Bearer ${token}" \
@@ -155,7 +171,7 @@ setloglevel() {

 getloglevels() {
    payload="{ \"command\" : \"getloglevels\" }"
-    curl  ${FLAGS} -X POST "https://${OWANALYTICS}/api/v1/system" \
+    curl  ${FLAGS} -X POST "https://${OWPROV}/api/v1/system" \
        -H "Accept: application/json" \
        -H "Content-Type: application/json" \
        -H "Authorization: Bearer ${token}" \
@@ -164,7 +180,7 @@ getloglevels() {

 getloglevelnames() {
    payload="{ \"command\" : \"getloglevelnames\" }"
-    curl  ${FLAGS} -X POST "https://${OWANALYTICS}/api/v1/system" \
+    curl  ${FLAGS} -X POST "https://${OWPROV}/api/v1/system" \
        -H "Accept: application/json" \
        -H "Content-Type: application/json" \
        -H "Authorization: Bearer ${token}" \
@@ -173,7 +189,7 @@ getloglevelnames() {

 getsubsystemnames() {
    payload="{ \"command\" : \"getsubsystemnames\" }"
-    curl  ${FLAGS} -X POST "https://${OWANALYTICS}/api/v1/system" \
+    curl  ${FLAGS} -X POST "https://${OWPROV}/api/v1/system" \
        -H "Accept: application/json" \
        -H "Content-Type: application/json" \
        -H "Authorization: Bearer ${token}" \
@@ -181,7 +197,7 @@ getsubsystemnames() {
 }

 systeminfo() {
-    curl  ${FLAGS} -X GET "https://${OWANALYTICS}/api/v1/system?command=info" \
+    curl  ${FLAGS} -X GET "https://${OWPROV}/api/v1/system?command=info" \
    -H "Accept: application/json" \
    -H "Authorization: Bearer ${token}" > ${result_file}
    jq < ${result_file}
@@ -189,7 +205,7 @@ systeminfo() {

 reloadsubsystem() {
    payload="{ \"command\" : \"reload\", \"subsystems\" : [ \"$1\" ] }"
-    curl  ${FLAGS} -X POST "https://${OWANALYTICS}/api/v1/system" \
+    curl  ${FLAGS} -X POST "https://${OWPROV}/api/v1/system" \
        -H "Accept: application/json" \
        -H "Content-Type: application/json" \
        -H "Authorization: Bearer ${token}" \
--- a/test_scripts/curl/result.json
+++ b/test_scripts/curl/result.json
@@ -0,0 +1 @@
+{"children":[{"children":[{"children":[{"children":[],"name":"Ottawa Operations","type":"entity","uuid":"323054d0-3ff0-11ec-82ff-061b87871e04","venues":[{"children":[],"name":"Living Lab","type":"venue","uuid":"4159ea84-3ff0-11ec-9edb-061b87871e04"}]}],"name":"Ontario","type":"entity","uuid":"21dfa464-3ff0-11ec-9a86-061b87871e04","venues":[]},{"children":[{"children":[],"name":"Quebec","type":"entity","uuid":"27b74e1b-52d7-4414-a1b4-47574c799beb","venues":[]},{"children":[],"name":"Ontario","type":"entity","uuid":"3cb15a80-3550-11ec-9a22-061b87871e04","venues":[{"children":[],"name":"CN Tower","type":"venue","uuid":"3cb28f0e-3550-11ec-acfa-061b87871e04"},{"children":[],"name":"Rogers Center","type":"venue","uuid":"3cb3c798-3550-11ec-8c1a-061b87871e04"}]},{"children":[],"name":"BC","type":"entity","uuid":"3cb503c4-3550-11ec-b436-061b87871e04","venues":[{"children":[],"name":"BC Place","type":"venue","uuid":"3cb76452-3550-11ec-a5ab-061b87871e04"},{"children":[],"name":"Stanley Park","type":"venue","uuid":"3cb8b230-3550-11ec-bbe6-061b87871e04"},{"children":[],"name":"MegaLab","type":"venue","uuid":"a73a23c4-6f3d-4031-bc92-d28c205f2d85"},{"children":[],"name":"Bowen Development","type":"venue","uuid":"d656500b-9f00-4c09-9096-e209085c2a3e"}]}],"name":"Provinces","type":"entity","uuid":"3cac92ca-3550-11ec-b360-061b87871e04","venues":[]}],"name":"Canada","type":"entity","uuid":"3cab2c32-3550-11ec-8a03-061b87871e04","venues":[]},{"children":[],"name":"USA","type":"entity","uuid":"6392c6b3-ef48-4b81-8785-1b5b4888bbd2","venues":[]},{"children":[{"children":[],"name":"Hamburg","type":"entity","uuid":"5939f995-e059-439d-ab0c-29a6f7c0a495","venues":[]}],"name":"Germany","type":"entity","uuid":"6fb5662d-dc48-4fbd-b8f9-69d0308bb902","venues":[]},{"children":[],"name":"Test Land","type":"entity","uuid":"70161a6f-98af-45d7-b0ed-e6b15ba5d84e","venues":[{"children":[],"name":"Test","type":"venue","uuid":"1d06b289-449e-4669-abc9-1f2dcdd1fbbc"}]}],"name":"World","type":"entity","uuid":"0000-0000-0000","venues":[]}
Author	SHA1	Message	Date
TIP Automation User	42083cbf34	Chg: update image tag in helm values to v2.6.0-RC2	2022-06-17 13:39:31 +00:00
Stephane Bourque	8665791ddd	Merge pull request #7 from Telecominfraproject/main https://telecominfraproject.atlassian.net/browse/WIFI-9632	2022-06-16 07:51:40 -07:00
Dmitry Dunaev	f0909a6379	Merge pull request #5 from Telecominfraproject/fix/wifi-9174--dep-charts-2.6 [WIFI-9174] Fix: switch from deprecated bitnami charts to mirrored ones	2022-06-03 19:10:15 +03:00
Dmitry Dunaev	929be02401	[WIFI-9174] Fix: switch from deprecated bitnami charts to mirrored ones Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>	2022-06-03 19:09:38 +03:00
TIP Automation User	3e576bf1cc	Chg: update image tag in helm values to v2.6.0-RC1	2022-05-23 13:12:19 +00:00
				`@@ -0,0 +1 @@`
				{"children":[{"children":[{"children":[{"children":[],"name":"Ottawa Operations","type":"entity","uuid":"323054d0-3ff0-11ec-82ff-061b87871e04","venues":[{"children":[],"name":"Living Lab","type":"venue","uuid":"4159ea84-3ff0-11ec-9edb-061b87871e04"}]}],"name":"Ontario","type":"entity","uuid":"21dfa464-3ff0-11ec-9a86-061b87871e04","venues":[]},{"children":[{"children":[],"name":"Quebec","type":"entity","uuid":"27b74e1b-52d7-4414-a1b4-47574c799beb","venues":[]},{"children":[],"name":"Ontario","type":"entity","uuid":"3cb15a80-3550-11ec-9a22-061b87871e04","venues":[{"children":[],"name":"CN Tower","type":"venue","uuid":"3cb28f0e-3550-11ec-acfa-061b87871e04"},{"children":[],"name":"Rogers Center","type":"venue","uuid":"3cb3c798-3550-11ec-8c1a-061b87871e04"}]},{"children":[],"name":"BC","type":"entity","uuid":"3cb503c4-3550-11ec-b436-061b87871e04","venues":[{"children":[],"name":"BC Place","type":"venue","uuid":"3cb76452-3550-11ec-a5ab-061b87871e04"},{"children":[],"name":"Stanley Park","type":"venue","uuid":"3cb8b230-3550-11ec-bbe6-061b87871e04"},{"children":[],"name":"MegaLab","type":"venue","uuid":"a73a23c4-6f3d-4031-bc92-d28c205f2d85"},{"children":[],"name":"Bowen Development","type":"venue","uuid":"d656500b-9f00-4c09-9096-e209085c2a3e"}]}],"name":"Provinces","type":"entity","uuid":"3cac92ca-3550-11ec-b360-061b87871e04","venues":[]}],"name":"Canada","type":"entity","uuid":"3cab2c32-3550-11ec-8a03-061b87871e04","venues":[]},{"children":[],"name":"USA","type":"entity","uuid":"6392c6b3-ef48-4b81-8785-1b5b4888bbd2","venues":[]},{"children":[{"children":[],"name":"Hamburg","type":"entity","uuid":"5939f995-e059-439d-ab0c-29a6f7c0a495","venues":[]}],"name":"Germany","type":"entity","uuid":"6fb5662d-dc48-4fbd-b8f9-69d0308bb902","venues":[]},{"children":[],"name":"Test Land","type":"entity","uuid":"70161a6f-98af-45d7-b0ed-e6b15ba5d84e","venues":[{"children":[],"name":"Test","type":"venue","uuid":"1d06b289-449e-4669-abc9-1f2dcdd1fbbc"}]}],"name":"World","type":"entity","uuid":"0000-0000-0000","venues":[]}