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

Fixing for build error for 2.7.2

.clang-format

@@ -1,178 +1,7 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
-AlignEscapedNewlines: Right
-AlignOperands:   Align
-AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-AttributeMacros:
-  - __capability
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: Never
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  BeforeLambdaBody: false
-  BeforeWhile:     false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DeriveLineEnding: true
-DerivePointerAlignment: false
-DisableFormat:   false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: LogicalBlock
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IfMacros:
-  - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseLabels: false
-IndentCaseBlocks: false
-IndentGotoLabels: true
-IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-InsertTrailingCommas: None
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-LambdaBodyIndentation: Signature
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 2
-ObjCBreakBeforeNestedBlockParam: true
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
-PointerAlignment: Right
-PPIndentWidth:   -1
-ReferenceAlignment: Pointer
-ReflowComments:  true
-ShortNamespaceLines: 1
-SortIncludes:    CaseSensitive
-SortJavaStaticImport: Before
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceAroundPointerQualifiers: Default
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
-SpacesInConditionalStatement: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInLineCommentPrefix:
-  Minimum:         1
-  Maximum:         -1
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        Latest
-StatementAttributeLikeMacros:
-  - Q_EMIT
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        4
-UseCRLF:         false
-UseTab:          Always
-WhitespaceSensitiveMacros:
-  - STRINGIZE
-  - PP_STRINGIZE
-  - BOOST_PP_STRINGIZE
-  - NS_SWIFT_NAME
-  - CF_SWIFT_NAME
-...
 
+BasedOnStyle: LLVM
+TabWidth:     4
+IndentWidth:  4
+UseTab:       Always
+ColumnLimit:  100
+Language:     Cpp

.github/workflows/ci.yml

@@ -21,13 +21,13 @@ defaults:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       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

@@ -11,13 +11,13 @@ defaults:
 
 jobs:
   helm-package:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
       HELM_REPO_USERNAME: ucentral
     steps:
       - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           path: wlan-cloud-ucentralgw
 

.gitignore

@@ -21,12 +21,10 @@ _deps
 /docker-compose/.env
 /docker-compose/.env_*
 /cmake-build/
+/uploads/
 test_scripts/curl/token.json
 .vscode/c_cpp_properties.json
 test_scripts/curl/result.json
 *.swp
 helm/charts/*
 !helm/charts/.gitkeep
-/portal-test/
-/src/ow_version.h
-

.idea/.gitignore

@@ -6,5 +6,3 @@
 /dataSources.local.xml
 # Editor-based HTTP Client requests
 /httpRequests/
-# GitHub Copilot persisted chat sessions
-/copilot/chatSessions

.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.9 (wlan-cloud-ucentralgw)" />
-  </component>
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
   <component name="CidrRootsConfiguration">
     <excludeRoots>

.idea/ucentral.iml

@@ -2,7 +2,7 @@
 <module classpath="CMake" type="CPP_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Python" name="Python facet">
-      <configuration sdkName="Python 3.9 (wlan-cloud-ucentralgw)" />
+      <configuration sdkName="Python 3.9 (venv)" />
     </facet>
   </component>
 </module>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/cmake-build-debug/rapidjson-test" vcs="Git" />
   </component>
 </project>

BUILDING.md

@@ -1,196 +0,0 @@
-# Building from source
-In order to build OWGW, you will need to install its dependencies, which includes the following:
-- cmake
-- boost
-- POCO 1.10.1 or later
-- a C++17 compiler
-- 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/Telecominfraproject/wlan-cloud-lib-poco). Building
-Poco may take several minutes depending on the platform you are building on.
-
-## Ubuntu
-These instructions have proven to work on Ubuntu 20.4.
-```bash
-sudo apt install git cmake g++ libssl-dev libmariadb-dev \
-    libpq-dev libaprutil1-dev apache2-dev libboost-all-dev \
-    librdkafka-dev // default-libmysqlclient-dev \
-    nlohmann-json-dev
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cppkafka
-cd cppkafka
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 valijson
-cd valijson
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib
-cd fmtlib
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-make install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
-cd wlan-cloud-ucentralgw
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make -j 8
-cd ../..
-```
-
-## Fedora
-The following instructions have proven to work on Fedora 33
-```bash
-sudo yum install cmake g++ openssl-devel mysql-devel mysql apr-util-devel boost boost-devel \
-    yaml-cpp-devel lua-devel
-sudo dnf install postgresql.x86_64 librdkafka-devel
-sudo dnf install postgresql-devel json-devel
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cppkafka
-cd cppkafka
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 valijson
-cd valijson
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
-cd wlan-cloud-ucentralgw
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-cd ../..
-```
-
-## 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/).
-```bash
-brew install openssl \
-	cmake \
-	libpq \
-	mysql-client \
-	apr \
-	apr-util \
-	boost \
-	yaml-cpp \
-	postgresql \
-	librdkafka \
-	nlohmann-json \
-	fmt
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco
-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
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cppkafka
-pushd cppkafka
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 valijson
-pushd valijson
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
-pushd wlan-cloud-ucentralgw
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-make -j
-popd
-popd
-```
-
-## Raspberry
-The build on a rPI takes a while. You can shorten that build time and requirements by disabling all the larger database
-support. You can build with only SQLite support by not installing the packages for PostgreSQL, and MySQL by
-adding -DSMALL_BUILD=1 on the cmake build line.
-
-```bash
-sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev \
-    libboost-all-dev libyaml-cpp-dev
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-cd ../..
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
-cd wlan-cloud-ucentralgw
-mkdir cmake-build
-cd cmake-build
-cmake -DSMALL_BUILD=1 ..
-make
-cd ../..
-```

CLI.md

@@ -7,139 +7,139 @@ cli help
 
 ## The commands
 
-### getdevice `serial`                
+### getdevice <serial>                
 Get the device JSON document.
 
-### deletedevice `serial`             
+### deletedevice <serial>             
 Delete the device.
 
-### createdevice `serial` `cfg` `MAC` 
+### createdevice <serial> <cfg> <MAC> 
 Create a device using the default configuration. 
 - `serial`: device serial number
 - `cfg`: JSON config file name
 - `MAC`: string MAC Address
 
-### getdevicestatus `serial`
+### getdevicestatus <serial>
 Get the device status JSON document.
 - `serial`: device serial number
 
-### getstats `serial`
+### getstats <serial>
 Get statistics for the device.
 - `serial`: device serial number
 
-### gethealthchecks `serial`
+### gethealthchecks <serial>
 Get healthchecks for a device.
 - `serial`: device serial number
 
-### newesthealthchecks `serial`
+### newesthealthchecks <serial>
 Get newest healthchecks for a device.
 - `serial`: device serial number
 
-### lasthealthcheck `serial`
+### lasthealthcheck <serial>
 Get the last healthcheck
 - `serial`: device serial number
 
-### getcapababilities `serial`
+### getcapababilities <serial>
 Get the device capabilities JSON document.
 - `serial`: device serial number
 
-### deletecapababilities `serial`
+### deletecapababilities <serial>
 Delete the device capabilities JSON.
 - `serial`: device serial number
 
-### reboot `serial`                   
+### reboot <serial>                   
 Reboot the device.
 - `serial`: device serial number
 
-### upgrade `serial` `URI` 
+### upgrade <serial> <URI> 
 Do firmware upgrade for a device.
 - `serial`: device serial number
 - `URI`: complete URI where the upgrade file exists. No validation is performed.
 
-### leds `serial` `pattern` `duration`       
+### leds <serial> <pattern> <duration>       
 Activate LEDs a device.
 - `serial`: device serial number
 - `pattern`: on/off/blink
 - `duration`: number in seconds
 
-### configure `serial` `cfg`          
+### configure <serial> <cfg>          
 Change configuration for a device.
 - `serial`: device serial number
 - `cfg`: JSON config file name
 
-### factory `serial` `keep_redirector`     
+### factory <serial> <keep_redirector>     
 Do factory reset for device. 
 - `serial`: device serial number
 - `keep_redirector`: true=keep redirector, false=reset redirector
 
-### request `serial` `message`        
+### request <serial> <message>        
 Force a message from the device.
 - `serial`: device serial number
 - `message`: state or healthcheck
                                  
-### wifiscan `serial` `verbose`       
+### wifiscan <serial> <verbose>       
 Do wifiscan for a device.
 - `serial`: device serial number
 - `verbose`: verbose=true/false
 
-### telemetry `serial`
+### telemetry <serial>
 Start `telemetry` stream for a device.
 
-### trace `serial` `duration` `network`            
+### trace <serial> <duration> <network>            
 Launch a remote trace for a device.
 - `serial`: device serial number
 - `duration`: number in seconds
 - `network`: which network to perform trace on: lan or wan  
                                   
-### getcommand `command-uuid`
+### getcommand <command-uuid>
 Get the command JSON document.
 - `command-uuid`: command UUID
 
-### deletecommand `command-uuid`      
+### deletecommand <command-uuid>      
 Delete the command.
 - `command-uuid`: command UUID
 
-### newestcommands `serial`
+### newestcommands <serial>
 Get the newest commands for a device.
 - `serial`: device serial number
 
 ### listdevices
 List devices.
 
-### listcommands `serial`
+### listcommands <serial>
 List commands for a specific device.
 - `serial`: device serial number
 
-### deletecommands `serial`
+### deletecommands <serial>
 Delete commands for a device.
 - `serial`: device serial number
 
-### getlogs `serial`                  
+### getlogs <serial>                  
 Get logs for the device.
 - `serial`: device serial number
 
-### newestlogs `serial`               
+### newestlogs <serial>               
 Get the latest logs for the device.
 - `serial`: device serial number
 
-### deletelogs `serial`               
+### deletelogs <serial>               
 Delete logs for the device.
 - `serial`: device serial number
 
-### eventqueue `serial`
+### eventqueue <serial>
 Request event queue for the device.
 - `serial`: device serial number
 
 ### listdefaultconfigs
 List default configurations.
 
-### createdefaultconfig `name` `ids` `cfg` 
+### createdefaultconfig <name> <ids> <cfg> 
 Create a default configuration
 - `name`: unique name, no spaces
 - `ids`: comma separated list of models
 - `cfg`: JSON config file name
 
-### addblacklistdevice `serial` `reason`   
+### addblacklistdevice <serial> <reason>   
 Add a device to the black list
 - `serial`: serial number of the device to add
 - `reason`: reason for blacklisting
@@ -147,7 +147,7 @@ Add a device to the black list
 ### getblacklist
 List all blacklisted devices
 
-### deleteblacklistdevice  `serial`   
+### deleteblacklistdevice  <serial>   
 Add a device to the black list.
 - `serial`: device serial number
 
@@ -157,7 +157,7 @@ Get the number of devices in the DB.
 ### deviceserialnumbers               
 Get only the serial numbers.
 
-### selectdevices `serial_list`       
+### selectdevices <serial_list>       
 Get a list of devices based on a list.
 - `serial_list`: serial numbers (must be comma separated).
 
@@ -179,30 +179,27 @@ Get the list of subsystems.
 ### systeminfo
 Get basic system information.
 
-### reloadsubsystem `subsystem name`
+### reloadsubsystem <subsystem name>
 Reload the configuration for a subsystem.### getfile <uuid>					  
 Get the file associated with trace command <uuid>.
 - `uuid`: UUID of file to retrieve
 
-### rtty `serial number`					  
+### rtty <serial>					  
 Get the details for an rtty session.
 - `serial`: device serial number
 
-### lifetimestats `serial number`			  
+### lifetimestats <serial>			  
 Get the lifetime stats counters for a device
 - `serial`: device serial number
 
-### laststats `serial number`			      
+### laststats <serial>			      
 Get the last statistics for a device.
 - `serial`: device serial number
 
-### neweststats `serial number`			  
+### neweststats <serial>			  
 Get the newest statistics for a device.
 - `serial`: device serial number
 
-### deviceping `serial number`
-This will return you the end-to-end latency from command-line to return value.
-
 ## Notes
 To pass additional flags to the CURL command, create an environment variable called FLAGS and git ve the values you
 want. For example, for force all call to use IPv6, set FLAGS=\"-6\", for verbose mode and IPv6, set FLAGS=\"-6 -v\"

CMakeLists.txt

@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
-project(owgw VERSION 4.1.0)
+project(owgw VERSION 2.7.1)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 if(UNIX AND APPLE)
     set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
@@ -40,23 +39,23 @@ 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" -DBOOST_NO_CXX98_FUNCTION_BASE=1)
+add_definitions(-DTIP_GATEWAY_SERVICE="1" -DPOCO_LOG_DEBUG="1")
 
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(fmt  REQUIRED)
 find_package(nlohmann_json  REQUIRED)
-# find_package(valijson       REQUIRED)
+find_package(nlohmann_json_schema_validator REQUIRED)
 
 if(SMALL_BUILD)
     find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
@@ -80,6 +79,7 @@ add_executable( owgw
         src/framework/KafkaTopics.h
         src/framework/MicroService.h
         src/framework/OpenWifiTypes.h
+        src/framework/MicroServiceErrorHandler.h
         src/framework/orm.h
         src/framework/StorageClass.h
         src/framework/MicroServiceErrorHandler.h
@@ -116,7 +116,6 @@ add_executable( owgw
         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
@@ -145,15 +144,9 @@ add_executable( owgw
         src/RESTAPI/RESTAPI_RPC.cpp src/RESTAPI/RESTAPI_RPC.h
         src/RESTAPI/RESTAPI_deviceDashboardHandler.cpp src/RESTAPI/RESTAPI_deviceDashboardHandler.h
         src/RESTAPI/RESTAPI_telemetryWebSocket.cpp src/RESTAPI/RESTAPI_telemetryWebSocket.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/RESTAPI/RESTAPI_regulatory.cpp src/RESTAPI/RESTAPI_regulatory.h
-        src/RESTAPI/RESTAPI_radiussessions_handler.cpp src/RESTAPI/RESTAPI_radiussessions_handler.h
-
         src/storage/storage_blacklist.cpp src/storage/storage_tables.cpp src/storage/storage_logs.cpp
         src/storage/storage_command.cpp src/storage/storage_healthcheck.cpp src/storage/storage_statistics.cpp
         src/storage/storage_device.cpp src/storage/storage_capabilities.cpp src/storage/storage_defconfig.cpp
-        src/storage/storage_scripts.cpp src/storage/storage_scripts.h
         src/storage/storage_tables.cpp
         src/RESTAPI/RESTAPI_routers.cpp
         src/Daemon.cpp src/Daemon.h
@@ -172,12 +165,16 @@ add_executable( owgw
         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/AP_WS_Reactor_Pool.h
+        src/AP_WS_ReactorPool.h
         src/AP_WS_Connection.h
         src/AP_WS_Connection.cpp
         src/TelemetryClient.h src/TelemetryClient.cpp
@@ -201,20 +198,8 @@ add_executable( owgw
         src/AP_WS_Process_deviceupdate.cpp
         src/AP_WS_Process_telemetry.cpp
         src/AP_WS_Process_venuebroadcast.cpp
-        src/RADIUS_Destination.h
+        src/RADSEC_server.h
-        src/UI_GW_WebSocketNotifications.cpp src/UI_GW_WebSocketNotifications.h
+        src/UI_GW_WebSocketNotifications.cpp src/UI_GW_WebSocketNotifications.h)
-        src/framework/RESTAPI_SystemConfiguration.h
-        src/ScriptManager.cpp src/ScriptManager.h
-        src/SignatureMgr.h
-        src/AP_WS_Process_event.cpp
-        src/AP_WS_Process_wifiscan.cpp
-        src/AP_WS_Process_alarm.cpp
-        src/GWKafkaEvents.cpp src/GWKafkaEvents.h
-        src/RegulatoryInfo.cpp src/RegulatoryInfo.h
-        src/RADIUSSessionTracker.cpp src/RADIUSSessionTracker.h
-        src/libs/Scheduler.h src/libs/InterruptableSleep.h src/libs/ctpl_stl.h src/libs/Cron.h
-        src/GenericScheduler.cpp src/GenericScheduler.h src/framework/default_device_types.h src/AP_WS_Process_rebootLog.cpp src/AP_WS_ConfigAutoUpgrader.cpp src/AP_WS_ConfigAutoUpgrader.h src/RESTAPI/RESTAPI_default_firmwares.cpp src/RESTAPI/RESTAPI_default_firmwares.h src/RESTAPI/RESTAPI_default_firmware.cpp src/RESTAPI/RESTAPI_default_firmware.h src/storage/storage_def_firmware.cpp src/firmware_revision_cache.h src/sdks/sdk_fms.h
-        src/AP_WS_LookForUpgrade.cpp)
 
 if(NOT SMALL_BUILD)
 
@@ -226,18 +211,16 @@ INSTALL(TARGETS owgw
 
 target_link_libraries(owgw PUBLIC
         ${Poco_LIBRARIES}
-        ${ZLIB_LIBRARIES}
+        ${ZLIB_LIBRARIES})
-)
 
 if(NOT SMALL_BUILD)
     target_link_libraries(owgw PUBLIC
-            ${MySQL_LIBRARIES}
+            ${MySQL_LIBRARIES} ${ZLIB_LIBRARIES}
-            ${ZLIB_LIBRARIES}
+                CppKafka::cppkafka
-            CppKafka::cppkafka
+                nlohmann_json_schema_validator
-            fmt::fmt
+                fmt::fmt
-            resolv
+             )
-    )
     if(UNIX AND NOT APPLE)
         target_link_libraries(owgw PUBLIC PocoJSON)
     endif()
-endif()
+endif()

CODING_STYLE.md

@@ -0,0 +1,32 @@
+# Coding Style
+I just want ot make sure we all follow the same rules when contributing 
+code back into this tree.
+
+## Version of C++
+This project is based on the C++17 standard. If compiles as-is on most platforms 
+using either clang or g++. Do not use C++21 features for now. I would love to do some
+of the new stuff but let's wait for these features to be available on
+all compilers first. `coroutine` has to wait.
+
+## Naming
+Naming of pretty much anything uses Pascal naming. I know... You might not be a big fan or have 
+fallen to the JS gods and use camelNaming. Well, let's all make an effort to keep
+this coherent. Member variable naming adds a `_` at the end of the vars. Try to
+keep this standard going. Sometimes you must override a base class function and then of course
+you need to follow the base class. Let's be real...
+
+## File Sizes
+Do you best to keep your file sizes < 300 lines. It just makes the code more readable
+and shortens compile times. 
+
+## This is a cmake project
+This is a cmake project and you need to adhere to the cmake rules. If you need
+to add a package to the CMakeList, you need to ensure that the package is available
+on all required platforms and compiles. Remember that this project runs on Linux, OS X, 
+and the Raspberry PI.
+
+## Licensed packages
+When adding a package, you must also state the licensing for the package. MIT, BSD, Apache licenses
+are acceptable. No commercial licenses are allowed. 
+
+

CONFIGURATION.md

@@ -1,415 +0,0 @@
-# Controller Configuration Parameters
-
-## OWGW Specific Parameters
-### Websocket parameters
-This is the crucial section. I bet that 97.4% of all your problems will come from here, and it's boring. So put some good music on,
-give the kids the iPad, get a cup of coffee, and pay attention. Every field will be explained.
-
-```properties
-ucentral.websocket.host.0.backlog = 500
-ucentral.websocket.host.0.rootca = $OWGW_ROOT/certs/root.pem
-ucentral.websocket.host.0.issuer = $OWGW_ROOT/certs/issuer.pem
-ucentral.websocket.host.0.cert = $OWGW_ROOT/certs/websocket-cert.pem
-ucentral.websocket.host.0.key = $OWGW_ROOT/certs/websocket-key.pem
-ucentral.websocket.host.0.clientcas = $OWGW_ROOT/certs/clientcas.pem
-ucentral.websocket.host.0.cas = $OWGW_ROOT/certs/cas
-ucentral.websocket.host.0.address = *
-ucentral.websocket.host.0.port = 15002
-ucentral.websocket.host.0.security = strict
-ucentral.websocket.host.0.key.password = mypassword
-ucentral.websocket.maxreactors = 20
-```
-
-#### ucentral.websocket.host.0.backlog
-This is the number of concurrent devices you are expecting to call all at once. Not the current number of devices. This is how many will connect in the same exact second.
-Take the total number of devices you have and divide by 100. That's a good rule of thumb. Never go above 500.
-#### ucentral.websocket.host.0.rootca
-This is the root file as supplied by Digicert. You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/root.pem)
-#### ucentral.websocket.host.0.issuer
-This is the issuer file as supplied by Digicert. You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/issuer.pem)
-#### ucentral.websocket.host.0.cert
-This is a `pem` file that you will receive from Digicert for the gateway itself. This is the certificate for the gateway.
-#### ucentral.websocket.host.0.key
-This is a `pem` file that you will receive from Digicert for the gateway itself. The is the private key for the gateway.
-#### ucentral.websocket.host.0.clientcas
-This is a `pem` file that contains both the issuer and the root CA certificates. You can find it You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/clientcas.pem)
-#### ucentral.websocket.host.0.cas
-This is a directory where you will copy your own `cert.pem`, the `root.pem`, and the `issuer.pem` files.
-#### ucentral.websocket.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### ucentral.websocket.host.0.port
-Leave to 15002 for now.
-#### ucentral.websocket.host.0.security
-Leave this as strict for now for devices.
-#### ucentral.websocket.host.0.key.password
-If you key file uses a password, please enter it here.
-#### ucentral.websocket.maxreactors
-A single reactor can handle between 1000-2000 devices. Never leave this smaller than 5 or larger than 50.
-
-### File uploader parameters
-Certain commands may require the Access Point to upload a file into the Controller. For this reason, there is a special embedded HTTP 
-server to receive these files.
-
-```properties
-openwifi.fileuploader.host.0.backlog = 100
-openwifi.fileuploader.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
-openwifi.fileuploader.host.0.security = relaxed
-openwifi.fileuploader.host.0.address = *
-openwifi.fileuploader.host.0.name = ucentral.dpaas.arilia.com
-openwifi.fileuploader.host.0.port = 16003
-openwifi.fileuploader.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
-openwifi.fileuploader.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.fileuploader.host.0.key.password = mypassword
-openwifi.fileuploader.path = $OWGW_ROOT/uploads
-openwifi.fileuploader.maxsize = 10000
-openwifi.fileuploader.uri = https://ucentral.dpaas.arilia.com:16003
-```
-
-#### openwifi.fileuploader.host.0.backlog
-This is the number of concurrent REST API calls that maybe be kept in the backlog for processing. That's a good rule of thumb. Never go above 500.
-#### openwifi.fileuploader.host.0.rootca
-This is the root file of your own certificate CA in `pem` format.
-#### openwifi.fileuploader.host.0.cert
-This is your own server certificate in `pem` format..
-#### openwifi.fileuploader.host.0.key
-This is the private key associated with your own certificate in `pem` format.
-#### openwifi.intfileuploaderernal.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### openwifi.fileuploader.host.0.port
-The port on which the REST API server is listening. By default, this is 16003.
-#### openwifi.fileuploader.host.0.security
-Leave this as `relaxed` for now for devices.
-#### openwifi.fileuploader.host.0.key.password
-If you key file uses a password, please enter it here.
-#### openwifi.fileuploader.path
-This is the location where the files will be stored temporarily before processing. This `path` must exist.
-#### openwifi.fileuploader.maxsize 
-This is the maximum uploaded file size. The default maximum size if 10MB. This size is in KB.
-#### openwifi.fileuploader.uri
-This is the URI that will be passed to the AP. You must make sure that the AP can resolve this URI.
-
-### OUI Service
-The controller has a built-in OUI resolver for MAC addresses. The GW will periodically load this file to obtain the latest. 
-This is ths URI for this file.
-```properties
-oui.download.uri = https://standards-oui.ieee.org/oui/oui.txt
-```
-
-### Data-model Source
-The gateway can make use of the latest uCentral data-model or use the built-in model. These 2 parameters allow you to 
-choose which method you want. If you select the internal method, the URI is ignored. If for some reason you choose 
-the on-line data-model from the URI and the URI is not reachable, the system will fall back on the internal model.
-```properties
-ucentral.datamodel.internal = true
-ucentral.datamodel.uri = https://raw.githubusercontent.com/Telecominfraproject/wlan-ucentral-schema/main/ucentral.schema.json
-```
-
-### Command Manager
-The command manager is responsible for managing command sent and responses received with the APs. Several parameters allow you
-to fine tune its behaviour. Unless you have some particular reasons to change tem the defaults are usually just fine.
-```properties
-command.timeout = 14400
-command.retry = 120
-command.janitor = 120
-command.queue = 30
-```
-#### command.timeout
-How long will the GW wait in seconds before considering a commands has timed out. 
-
-#### command.retry
-How long between command retries.
-
-#### command.janitor
-How long between outstanding RPC clean-ups.
-
-#### command.queue
-How long should te gateway wait between running its queue.
-
-### IP to Country Parameters
-The controller has the ability to find the location of the IP of each Access Points. This uses an external IP location service. Currently,
-the controller supports 3 services. Please note that these services will require to obtain an API key or token, and these may cause you to incur 
-additional fees. Here is the list of the services supported:
-- ip2location: ip2location.com
-- ipdata: ipdata.co
-- ipinfo: ipinfo.io
-
-```properties
-iptocountry.default = US
-iptocountry.provider = ipinfo
-#iptocountry.provider = ipdata
-#iptocountry.provider = ip2location
-iptocountry.ipinfo.token =
-iptocountry.ipdata.apikey =
-iptocountry.ip2location.apikey =
-```
-
-#### iptocountry.default
-This is the country code to be used if no information can be found at one of the providers or you have not configured any of the providers.
-
-#### iptocountry.provider
-You must select onf of the possible services and the fill the appropriate token or api key parameter.
-
-### Provisioning link
-This parameter tells the controller how to behave when it receives a request from a device for the first time. In this case, we tell
-the controller to look at the provisioning service first, then apply any local configurations.
-```properties
-autoprovisioning.process = prov,default
-```
-
-### Restricted Device Signature Manager
-If are using restricted devices, then you can include different keys for each vendor who provided 
-you with their information. This allows the controller to automatically sign requests to the device. You can have as many vendors
-as it is necessary.
-
-```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
-```
-
-### OWLS Simulator ID
-If you plan on using OWLS (OpenWifi Load Simulator), then you will need to put your Simulator ID right here.
-This ID must be obtained from TIP. 
-```properties
-simulatorid = 53494dFFEEDD
-```
-
-### RTTY Service
-The controller comes with the ability to run an RTTY service. The service can either be internal (the prefered choice) 
-or external. If you decide to use the internal RTTY, the you only need to specify `rtty.internal = true`. If you choose 
-to use an external RTTY, you must specify the remainder of the parameters.
-
-```properties
-rtty.internal = true
-rtty.enabled = true
-rtty.server = rtty-tip.arilia.com
-rtty.port = 5912
-rtty.token = 96181c567b4d0d98c50f127230068fa8
-rtty.timeout = 60
-rtty.viewport = 5913
-rtty.assets = $OWGW_ROOT/rtty_ui
-```
-
-### RADIUS proxy config
-If you are going to use the buil-in RADIUS proxy service, you need to enable this parameter and provide 
-the ports for you PROXY.
-```properties
-radius.proxy.enable = false
-radius.proxy.accounting.port = 1813
-radius.proxy.authentication.port = 1812
-radius.proxy.coa.port = 3799
-radsec.keepalive = 120
-```
-
-### Auto Archiver Parameters
-The auto archiver is responsible for removing all stale data. The default is to remove old data after 7 days.
-```properties
-archiver.enabled = true
-archiver.schedule = 03:00
-archiver.db.0.name = healthchecks
-archiver.db.0.keep = 7
-archiver.db.1.name = statistics
-archiver.db.1.keep = 7
-archiver.db.2.name = devicelogs
-archiver.db.2.keep = 7
-archiver.db.3.name = commandlist
-archiver.db.3.keep = 7
-```
-
-## Generic OpenWiFi SDK parameters
-### REST API External parameters
-These are the parameters required for the configuration of the external facing REST API server
-```properties
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16004
-openwifi.restapi.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
-```
-
-#### openwifi.restapi.host.0.backlog
-This is the number of concurrent REST API calls that maybe be kept in the backlog for processing. That's a good rule of thumb. Never go above 500.
-#### openwifi.restapi.host.0.rootca
-This is the root file of your own certificate CA in `pem` format.
-#### openwifi.restapi.host.0.cert
-This is your own server certificate in `pem` format..
-#### openwifi.restapi.host.0.key
-This is the private key associated with your own certificate in `pem` format.
-#### openwifi.restapi.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### openwifi.restapi.host.0.port
-The port on which the REST API server is listening. By default, this is 16002.
-#### openwifi.restapi.host.0.security
-Leave this as `relaxed` for now for devices.
-#### openwifi.restapi.host.0.key.password
-If you key file uses a password, please enter it here.
-
-### REST API Intra microservice parameters
-The following parameters describe the configuration for the inter-microservice HTTP server. You may use the same certificate/key
-you are using for your extenral server or another certificate.
-```properties
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17004
-openwifi.internal.restapi.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
-```
-
-#### openwifi.internal.host.0.backlog
-This is the number of concurrent REST API calls that maybe be kept in the backlog for processing. That's a good rule of thumb. Never go above 500.
-#### openwifi.internal.host.0.rootca
-This is the root file of your own certificate CA in `pem` format.
-#### openwifi.internal.host.0.cert
-This is your own server certificate in `pem` format..
-#### openwifi.internal.host.0.key
-This is the private key associated with your own certificate in `pem` format.
-#### openwifi.internal.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### openwifi.internal.host.0.port
-The port on which the REST API server is listening. By default, this is 17002.
-#### openwifi.internal.host.0.security
-Leave this as `relaxed` for now for devices.
-#### openwifi.internal.host.0.key.password
-If you key file uses a password, please enter it here.
-
-### Microservice information
-These are different Microservie parameters. Following is a brief explanation.
-```properties
-openwifi.service.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWGW_ROOT/data
-openwifi.system.uri.private = https://localhost:17004
-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.ucentralfms
-openwifi.autoprovisioning = true
-```
-#### openwifi.service.key
-From time to time, the microservice must encrypt information. This is the key it should use. You may use the
-same keey as you RESTAPI or your server.
-#### openwifi.service.key.password
-The password for the `openwifi.service.key`
-#### openwifi.system.data
-The location of system data. This path must exist.
-#### openwifi.system.uri.private
-The URI to reach the controller on the internal port.
-#### openwifi.system.uri.public
-The URI to reach the controller from the outside world.
-#### openwifi.system.uri.ui
-The URI of the UI to manage this service
-#### openwifi.security.restapi.disable
-This allows to disable security for internal and external API calls. This should only be used if the controller
-sits behind an application load balancer that will actually do TLS. Setting this to `true` disables security.
-#### openwifi.system.commandchannel
-The UNIX socket command channel used by this service.
-#### openwifi.autoprovisioning
-Allow unknown devices to be provisioned by the system.
-
-### ALB Support
-In order to support an application load balancer health check verification, your need to provide the following parameters.
-```properties
-alb.enable = true
-alb.port = 16102
-```
-
-### Kafka
-The controller use Kafka, like all the other microservices. You must configure the kafka section in order for the
-system to work.
-```properties
-openwifi.kafka.group.id = gateway
-openwifi.kafka.client.id = gateway1
-openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = my_Kafka.example.com:9092
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-```
-
-### openwifi.kafka.group.id
-The group ID is a single word that should identify the type of service tuning. In the case `gateway`
-### openwifi.kafka.client.id
-The client ID is a single service within that group ID. Each participant must have a unique client ID.
-### openwifi.kafka.enable
-Kafka should always be enabled.
-### openwifi.kafka.brokerlist
-The list of servers where your Kafka server is running. Comma separated.
-### openwifi.kafka.auto.commit
-Auto commit flag in Kafka. Leave as `false`.
-### openwifi.kafka.queue.buffering.max.ms
-Kafka buffering. Leave as `50`.
-### Kafka security
-If you intend to use SSL, you should look into Kafka Connect and specify the certificates below.
-```properties
-penwifi.kafka.ssl.ca.location =
-openwifi.kafka.ssl.certificate.location =
-openwifi.kafka.ssl.key.location =
-openwifi.kafka.ssl.key.password =
-```
-
-### DB Type
-The controller supports 3 types of Database. SQLite should only be used for sites with less than 100 APs or for testing in the lab.
-In order to select which database to use, you must set the `storage.type` value to sqlite, postgresql, or mysql.
-
-```properties
-storage.type = sqlite
-#storage.type = postgresql
-#storage.type = mysql
-```
-
-### Storage SQLite parameters
-Additional parameters to set for SQLite. The only important one is `storage.type.sqlite.db` which is the database name on disk.
-```properties
-storage.type.sqlite.db = gateway.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-```
-
-### Storage Postgres
-Additional parameters to set if you select Postgres for your database. You must specify `host`, `username`, `password`,
-`database`, and `port`.
-```properties
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = localhost
-storage.type.postgresql.username = gateway
-storage.type.postgresql.password = gateway
-storage.type.postgresql.database = gateway
-storage.type.postgresql.port = 5432
-storage.type.postgresql.connectiontimeout = 60
-```
-
-### Storage MySQL/MariaDB
-Additional parameters to set if you select mysql for your database. You must specify `host`, `username`, `password`,
-`database`, and `port`.
-```properties
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = localhost
-storage.type.postgresql.username = gateway
-storage.type.postgresql.password = gateway
-storage.type.postgresql.database = gateway
-storage.type.mysql.port = 3306
-storage.type.mysql.connectiontimeout = 60
-```
-
-### Logging Parameters
-The microservice provides extensive logging. If you would like to keep logging on disk, set the `logging.type = file`. If you only want
-console logging, `set logging.type = console`. When selecting file, `logging.path` must exist. `logging.level` sets the
-basic logging level for the entire controller. `logging.websocket` disables WebSocket logging.
-
-```properties
-logging.type = file
-logging.path = $OWGW_ROOT/logs
-logging.level = information
-logging.asynch = true
-logging.websocket = false
-```

CONTRIBUTING.md

@@ -1,38 +0,0 @@
-# How to Contribute
-
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
-
-## Version of C++
-This project is based on the C++17 standard and compiles as-is on most platforms 
-using either clang or g++. Do not use C++21 or C++23 features for now. Some core 
-libraries used in this project do not support C++21 or C++23 yet.
-
-## Variable Naming
-Naming of pretty much anything uses Pascal naming. Longer explicit names using casing. 
-Member variable naming adds a `_` at the end of the vars. Try to
-keep this standard going. Sometimes you must override a base class function and then of course
-you need to follow the base class.
-
-## This is a cmake project
-This is a cmake project, and you need to adhere to the cmake rules. If you need
-to add a package to the CMakeList, you need to ensure that the package is available
-on all required platforms and compiles. Remember that this project runs on Linux, OS X, 
-and the Raspberry PI.
-
-## Licensed packages
-When adding a package, you must also state the licensing for the package. MIT, BSD, Apache licenses
-are acceptable. No commercial licenses are allowed. 
-
-## clang formatting
-Please format your code using the included `.clang-format` file included in the project.
-
-```bash
-clang-format -i --style=<project root>/.clang-format myfile.cpp
-```
-
-## Pull Requests
-All submissions, including submissions by project members, require review. We
-accept GitHub pull requests. Please create a branch with the Jira name for addressing the issue you are fixing or the 
-feature you are implementing.
-Create a pull-request from the branch into master. 

Dockerfile

@@ -1,9 +1,7 @@
 ARG DEBIAN_VERSION=11.5-slim
-ARG POCO_VERSION=poco-tip-v2
+ARG POCO_VERSION=poco-tip-v1
 ARG CPPKAFKA_VERSION=tip-v1
-ARG VALIJASON_VERSION=tip-v1.0.2
+ARG JSON_VALIDATOR_VERSION=2.1.0
-ARG APP_NAME=owgw
-ARG APP_HOME_DIR=/openwifi
 
 FROM debian:$DEBIAN_VERSION AS build-base
 
@@ -17,8 +15,8 @@ FROM build-base AS poco-build
 
 ARG POCO_VERSION
 
-ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-poco/git/refs/tags/${POCO_VERSION} version.json
+ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch ${POCO_VERSION} /poco
+RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
 
 WORKDIR /poco
 RUN mkdir cmake-build
@@ -31,8 +29,8 @@ FROM build-base AS cppkafka-build
 
 ARG CPPKAFKA_VERSION
 
-ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
+ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
+RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -41,62 +39,51 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
-FROM build-base AS valijson-build
+FROM build-base AS json-schema-validator-build
 
-ARG VALIJASON_VERSION
+ARG JSON_VALIDATOR_VERSION
 
-ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-valijson/git/refs/tags/${VALIJASON_VERSION} version.json
+ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/tags/${JSON_VALIDATOR_VERSION} version.json
-RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch ${VALIJASON_VERSION} /valijson
+RUN git clone https://github.com/pboettch/json-schema-validator --branch ${JSON_VALIDATOR_VERSION} /json-schema-validator
 
-WORKDIR /valijson
+WORKDIR /json-schema-validator
 RUN mkdir cmake-build
 WORKDIR cmake-build
 RUN cmake ..
-RUN cmake --build . --config Release -j8
+RUN make
-RUN cmake --build . --target install
+RUN make install
 
-FROM build-base AS app-build
+FROM build-base AS owgw-build
 
-ARG APP_NAME
+ADD CMakeLists.txt build /owgw/
-
+ADD cmake /owgw/cmake
-ADD CMakeLists.txt build /${APP_NAME}/
+ADD src /owgw/src
-ADD cmake /${APP_NAME}/cmake
+ADD .git /owgw/.git
-ADD src /${APP_NAME}/src
-ADD .git /${APP_NAME}/.git
 
 COPY --from=poco-build /usr/local/include /usr/local/include
 COPY --from=poco-build /usr/local/lib /usr/local/lib
 COPY --from=cppkafka-build /usr/local/include /usr/local/include
 COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
-COPY --from=valijson-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
 
-WORKDIR /${APP_NAME}
+WORKDIR /owgw
 RUN mkdir cmake-build
-WORKDIR /${APP_NAME}/cmake-build
+WORKDIR /owgw/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8
 
 FROM debian:$DEBIAN_VERSION
 
-ARG APP_NAME
+ENV OWGW_USER=owgw \
-ARG APP_HOME_DIR
+    OWGW_ROOT=/owgw-data \
+    OWGW_CONFIG=/owgw-data
 
-ENV APP_NAME=$APP_NAME \
+RUN useradd "$OWGW_USER"
-    APP_USER=$APP_NAME \
-    APP_ROOT=/$APP_NAME-data \
-    APP_CONFIG=/$APP_NAME-data \
-    APP_HOME_DIR=$APP_HOME_DIR
 
-# This is for legacy
+RUN mkdir /openwifi
-ENV OWGW_USER=$APP_USER \
+RUN mkdir -p "$OWGW_ROOT" "$OWGW_CONFIG" && \
-    OWGW_ROOT=$APP_ROOT \
+    chown "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
-    OWGW_CONFIG=$APP_CONFIG
-
-RUN useradd $APP_USER
-
-RUN mkdir $APP_HOME_DIR
-RUN mkdir -p $APP_ROOT $APP_CONFIG && \
-    chown $APP_USER: $APP_ROOT $APP_CONFIG
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
@@ -105,20 +92,20 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli
 
-COPY $APP_NAME.properties.tmpl /
+COPY owgw.properties.tmpl /
 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
 
-COPY --from=app-build /$APP_NAME/cmake-build/$APP_NAME $APP_HOME_DIR/$APP_NAME
+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/
+COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib
 
 RUN ldconfig
 
 EXPOSE 15002 16002 16003 17002 16102
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ${APP_HOME_DIR}/${APP_NAME}
+CMD ["/openwifi/owgw"]

KAFKA.md

@@ -4,16 +4,15 @@ This is a fast moving target, so please visit often or set an alert in GitHub.
 ## Current plans
 Currently, most telemetry and reports created in the gateway will be issues as topics in Kafka. You should configure 
 your Kafka service with the following topics:
-- `healthcheck` : These are the `healthcheck` report sent from the AP.
+
-- `state` : This is emitted for every `state` report coming from the AP. This state report contains all the information of state reports.
 - `connection` : This is emitted whenever a device connects to the gateway. The report contains all ths information about the connection. 
+- `state` : This is emitted for every `state` report coming from the AP. This state report contains all the information of state reports.  
+- `healthcheck` : These are the `healthcheck` report sent from the AP.
 - `wifiscan` : Whenever a `wifiscan` report is generated, it will be submitted here.
-- `alerts` : Alerts originating from devices (future use).
-- `command` : Allow to send commands (future use).
 - `service_events` : Inter-service traffic.
-- `device_event_queue` : device events
+- `security` : This will have application information (future use).
-- `device_telemetry` : device telemetry. Telemetry must be started manually or through the device configuration.
+- `command` : Allow to send commands (future use).
-- `provisioning_change` : venue, configuration, entity changes from provisioning.
+- `alerts` : Alerts originating from devices (future use).
 
 ## Structure of `kafka` messages
 Messages use 2 formats

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

@@ -89,54 +89,6 @@ Device sends a log message whenever necessary. The controller will log this mess
 }
 ```
 
-#### Events Channel
-Device sends unsolicited events to the controller.
-```json
-{   "jsonrpc" : "2.0" , 
-    "method" : "event" , 
-    "params" : {
-        "serial" : "001122334455" ,
-        "data" : { 
-          "event" : [
-            1871263817263,
-            {
-              "type" : "the event type",
-              "payload" : {
-                "field1" : "value1"
-              }
-            }
-          ]
-        }
-    }
-}
-```
-
-The first element of the `event` array is always the `timestamp` of the event. The `payload` is a JSON document contains addition information about the event. This _may not_ be empty.
-
-#### Alarms Channel
-Device sends unsolicited alarms to the controller.
-```json
-{   "jsonrpc" : "2.0" , 
-    "method" : "alarm" , 
-    "params" : {
-        "serial" : <serial number> ,
-        "data" : <Optiona/may be empty: JSON Document providing additional information related to this event message>
-    }
-}
-```
-
-#### Wifiscan Channel
-Device sends unsolicited wifiscans to the controller.
-```json
-{   "jsonrpc" : "2.0" , 
-    "method" : "wifiscan" , 
-    "params" : {
-        "serial" : <serial number> ,
-        "data" : <Optiona/may be empty: JSON Document providing additional information related to this wifiscan message>
-    }
-}
-```
-
 ##### `severity`
 The `severity` matches the `syslog` levels. Here are the details:
 - 0 : LOG_EMERG       0       /* system is unusable */
@@ -149,35 +101,18 @@ The `severity` matches the `syslog` levels. Here are the details:
 - 7 : LOG_DEBUG       7       /* debug-level messages */
 
 #### Crash Log event
-Device may send a `crash log event` during rebooting after a crash. The event cannot be sent until a connection event has been established.
+Device may send a crash log event after rebooting after a crash. The event cannot be sent until a connection event has been sent.
 ```json
 {   "jsonrpc" : "2.0" , 
     "method" : "crashlog" , 
     "params" : {
-        "serial"    : <serial number> ,
+        "serial" : <serial number> ,
-        "uuid"      : <the UUID of the configuration that generated the crash log>,
+        "uuid"   : <the UUID of the configuration that generated the crash log>,
-        "loglines"  : [ an array of strings representing the logs from the log file ]
+        "loglines" : [ an array of strings representing the logs from the log file ]
       }
 }
 ```
 
-#### Reboot Log event
-The device may send a `reboot log event` after a reboot. This maybe a scheduled reboot or caused in some other way.
-```json
-{   "jsonrpc" : "2.0" , 
-    "method" : "rebootLog" , 
-    "params" : {
-        "serial"  : <serial number> ,
-        "uuid"    : <the UUID of the configuration that generated the reboot log>,
-        "date"    : <Unix time when this reboot occurred>,
-        "type"    : <string>,
-        "info"    : [ "info 1", "info 2"]
-      }
-}
-```
-
-Here is a possible list of reboot reasons:
-
 #### Config change pending event
 Device sends this message to tell the controller that the device 
 has received a configuration but is still running an older configuration. The controller will not
@@ -258,7 +193,7 @@ venue where this device belongs and resend the same message to all other devices
     "params" : {
         "serial" : <serial number> ,
         "timestamp" : <the UTC timestamp when the message was sent>,
-        "data" : <JSON document to broadcast>
+        "data" : <an opaque string from the AP. This could be Zipped and so on and most likely base64 encoded>
     }
 }
 ```
@@ -306,54 +241,8 @@ The device should answer:
          },
      "id" : <same number>
 }
-```
-
-#### Controller wants the device to apply a given fixed configuration
-
-Controller sends this command when it requires the device to apply fixed configuration, eg. country code. The device
-should respond with message indicating failure or success.
-
-```json
-{   "jsonrpc" : "2.0",
-    "method" : "fixedconfig",
-    "params" : {
-        "serial" : <serial number>,
-        "when" : Optional - <UTC time when to apply this config, 0 means immediate, this is a suggestion>
-        "country" : "<country-code>"
-     },
-}
-```
-
-If AP supports compressed configuration feature by inidcating `compress_cmd=true` in its capabilities, controller
-will send a compressed configuration message where configuration payload (i.e. contents of `params`) is compressed
-and encoded in base64 format:
-```json
-{   "jsonrpc" : "2.0",
-    "method" : "configure",
-    "params" : {
-        "compress_64" : "<b64 encoded zlib compressed payload>",
-        "compress_sz" : "<size of uncompressed data in bytes>"
-     },
-     "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, eg. "Applied fixed config, rebooting">
-        },
-        "uuid": <UUID>
-    }
-}
 
 ```
-
-
 ##### The Answer
 The device can answer and tell the controller it has rejected certain parts of the config and potentially replaced them with
 appropriate values. This could be used to allow a device to replace frequencies for the regions it is located in. The device 
@@ -401,39 +290,6 @@ The device should answer:
 - 1 : the device is busy but will reboot soon. `text` may indicate why.
 - 2 : the device will not reboot. `text` contains information as to why.
 
-#### Controller wants to power-cycle PoE port(s)
-Controller sends this command to power-cycle 1 or more PoE ports
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "powercycle" , 
-     "params" : {
-	        "serial" : <serial number> ,
-            "ports" : [ { "name" :  "Ethernet1", "cycle" : 5000}, { "name" :  "Ethernet8", "cycle" : 10000 } ],
-	        "when" : Optional - <UTC time when to reboot, 0 mean immediately, this is a suggestion>
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-      "serial" : <serial number> ,
-      "status" : {
-	    "error" : 0 or an error number,
-	    "text" : [ "Error 1" , "Error 2" ],
-	    "when" : <time when this will be performed as UTC seconds>,
-  	},
-  "id" : <same id from request>
-}
-```
-
-###### Error codes
-- 0 : is rebooting at `when` seconds.
-- 1 : the device is busy but will reboot soon. `text` may indicate why.
-- 2 : the device will not reboot. `text` contains information as to why.
-
 #### Controller wants the device to upgrade its firmware
 Controller sends this command when it believes the device should upgrade its firmware.
 ```json
@@ -442,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>,
+		    "uri"   : <URI to download the firmware>
-            "FWsignature" : <string representation of the signature for the FW> (optional)
      },
      "id" : <some number>
 }
@@ -463,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.
@@ -825,11 +673,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">,
+        "type" : <one of "shell", "ucode">,
-        "script" : <text blob containing the script, This must be vase64 encoded>,
+        "script" : <text blob containing the script>,
-        "timeout" : <max timeout in seconds, default is 30, unused if URI is supplied>,
+        "timeout" : <max timeout in seconds, default is 30>,
-        "uri":  "<upload script results using this URI>",
-        "signature" : "<signature for script>: must be supplied to restricted devices",
         "when" : <time when this will be performed as UTC seconds>
      },
      "id" : <some number>
@@ -854,172 +700,6 @@ The device should answer:
 }
 ```
 
-#### Controller wants the device to replace its certificates
-Controller sends this command to run a predefined script. Extreme care must be taken.
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "certupdate" , 
-     "params" : {
-        "serial" : <serial number>,
-        "certificates" : <BASE64 encoded tar file of the cert package from the certificate portal>
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-#### Controller wants the device to perform re-enrollment
-Controller sends this command to trigger re-enrollment, i.e. update of operational certificate. Extreme care must be taken.
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "reenroll" , 
-     "params" : {
-        "serial" : <serial number>,
-        "when" : Optional - <UTC time when to apply this config, 0 mean immediate, this is a suggestion>
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-#### Controller wants the device to switch to another controller
-Controller sends this when the device should change the controller it connects to without looking up a new redirector.
-
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "transfer" , 
-     "params" : {
-        "serial" : <serial number>,
-        "server" : <controller hostname>,
-        "port" : <controller port number (integer)>,
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-### RRM AP device commands
-The following command is used to send RRM commands to an AP. RRM commands are send to an AP, however the 
-controller will not or cannot verify if they have been sent or the action was performed.
-
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "rrm" , 
-     "params" : {
-        "serial" : <serial number>,
-        "actions" : [ array of actions. Each possible action is defined next]
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-#### RRM Roam action
-
-##### Kick
-```json
-{     
-      "action" : "kick" ,
-      "addr" : <mac if the client that shall be kicked> ,
-      "reason": <number>, (default: 5, https://www.cisco.com/assets/sol/sb/WAP371_Emulators/WAP371_Emulator_v1-0-1-5/help/Apx_ReasonCodes2.html)
-      "ban_time": <number> (seconds, optional)
-}
-```
-
-##### Channel Switch Announcement
-```json
-{   
-    "action" : "channel_switch" ,
-    "bssid" : <mac of the SSID> , (all other SSIDs on the same radio will perform the same action)
-    "channel" : <number> (HT/HW mode will be retained upon issuing the CSA)
-}
-```
-
-##### Change TX-Power
-```json
-{   
-    "action" : "tx_power" ,
-    "bssid" : <mac of the SSID> , (all other SSIDs on the same radio will perform the same action)
-    "level" : <number> (DBm inside the positive number space)
-}
-```
-
-##### Beacon Scan
-```json
-{   
-    "action" : "beacon_request" ,
-    "addr" : <mac if the client that shall perform the scan> ,
-    "ssid": <string>, (the SSID the client shall scan for on all frequencies),
-    "channel": <number> (the channel that shall be scanned)
-}
-```
-
-##### BSS Transition
-```json
-{   
-    "action" : "bss_transition" ,
-    "addr" : <mac if the client that shall perform the roam> ,
-    "neighbors": [ <string> ], (an array of BSSIDs the client shall consider as roamin candidates)
-}
-```
-
-##### Update neighbours
-```json
-{   
-    "action" : "neighbors" ,
-    "bssid" : <mac of the SSID> , (the SSID of the specific VAP)
-    "neighbors": [ [ <BSS>, <ssid>, <neighbor report> ] ]
-}
-```
-
 ### `rtty server`
 More information about the [rtty server](https://github.com/zhaojh329/rtty) can be found here.
 

README.md

@@ -1,36 +1,227 @@
-<p align="center">
+# uCentralGW
-    <img src="images/project/logo.svg" width="200" alt="OpenWiFi Project"/>
-</p>
 
-# OpenWiFI Gateway (OWGW)
+## What is this?
-
+The uCentralGW is an added service for the TIP controller that allows integration with the 
-## What is it?
+uCentral protocol. It supports a complete OpenAPI definition and uses the ucentral communication protocol. To use the uCentralGW,
-The OpenWiFi Gateway is a service for the TIP OpenWiFi CloudSDK (OWSDK). 
+you either need to [build it](#building) or use the [Docker version](#docker).
-OWGW manages Access Points that implement the OpenWiFi uCentral protocol. OWGW, like all other OWSDK microservices, is
-defined using an OpenAPI definition and uses the ucentral communication protocol to interact with Access Points. To use 
-the OWGW, you either need to [build it](#building) or use the [Docker version](#docker).
 
 ## Building
-To build the microservice from source, please follow the instructions in [here](./BUILDING.md)
+In order to build the uCentralGW, you will need to install its dependencies, which includes the following:
+- cmake
+- boost
+- POCO 1.10.1 or later
+- a C++17 compiler
+- openssl
+- libpq-dev (PortgreSQL development libraries)
+- mysql-client (MySQL client)
+- librdkafka
+- cppkafka
+- 
 
-## Docker
+The build is done in 2 parts. The first part is to build a local copy of the framework tailored to your environment. This 
-To use the CLoudSDK deployment please follow [here](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy)
+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 
+Poco may take several minutes depending on the platform you are building on.
+
+### Ubuntu
+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
+cd poco
+mkdir cmake-build
+cd cmake-build
+cmake ..
+cmake --build . --config Release
+sudo cmake --build . --target install
+
+cd ~
+git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
+cd cppkafka
+mkdir cmake-build
+cd cmake-build
+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
+
+git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib
+cd fmtlib
+mkdir cmake-build
+cd cmake-build
+cmake ..
+make
+make install
+
+cd ~
+git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
+cd wlan-cloud-ucentralgw
+mkdir cmake-build
+cd cmake-build
+cmake ..
+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 yaml-cpp-devel lua-devel 
+sudo dnf install postgresql.x86_64 librdkafka-devel
+sudo dnf install postgresql-devel json-devel
+
+git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
+cd poco
+mkdir cmake-build
+cd cmake-build
+cmake ..
+cmake --build . --config Release
+sudo cmake --build . --target install
+
+git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
+cd cppkafka
+mkdir cmake-build
+cd cmake-build
+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
+mkdir cmake-build
+cd cmake-build
+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/).
+```
+brew install openssl \
+	cmake \
+	libpq \
+	mysql-client \
+	apr \
+	apr-util \
+	boost \
+	yaml-cpp \
+	postgresql \
+	librdkafka \
+	nlohmann-json \
+	fmt
+
+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
+sudo cmake --build . --target install
+popd
+popd
+
+git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
+pushd cppkafka
+mkdir cmake-build
+pushd 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
+
+git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
+pushd wlan-cloud-ucentralgw
+mkdir cmake-build
+pushd cmake-build
+cmake ..
+make -j
+popd
+popd
+```
+
+### Raspberry
+The build on a rPI takes a while. You can shorten that build time and requirements by disabling all the larger database 
+support. You can build with only SQLite support by not installing the packages for ODBC, PostgreSQL, and MySQL by 
+adding -DSMALL_BUILD=1 on the cmake build line.
+
+```
+sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev libboost-all-dev libyaml-cpp-dev
+git clone https://github.com/stephb9959/poco
+cd poco
+mkdir cmake-build
+cd cmake-build
+cmake ..
+cmake --build . --config Release
+sudo cmake --build . --target install
+
+cd ~
+git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw
+cd wlan-cloud-ucentralgw
+mkdir cmake-build
+cd cmake-build
+cmake -DSMALL_BUILD=1 ..
+make
+```
+
+### After completing the build
+After completing the build, you can remove the Poco source as it is no longer needed. 
 
 #### Expected directory layout
 From the directory where your cloned source is, you will need to create the `certs`, `logs`, and `uploads` directories.
-```bash
+```shell
 mkdir certs
 mkdir certs/cas
 mkdir logs
 mkdir uploads
 ```
+
 You should now have the following:
-```text
+
---+-- certs
+```
+-- cert_scripts
+  |
+  +-- certs
   |   +--- cas
   +-- cmake
   +-- cmake-build
-  +-- logs
+  +-- logs (dir)
   +-- src
   +-- test_scripts
   +-- openapi
@@ -39,16 +230,12 @@ You should now have the following:
 ```
 
 ### Certificates
-The OWGW uses a number of certificates to provide security. There are 2 types of certificates required for 
+Love'em of hate'em, we gotta use'em. So we tried to make this as easy as possible for you. 
-a normal deployment:
-- A Server Certificate to secure the OWGW<->AP channel
-- A REST API Certificate to secure the Northbound API
-- Device Certificates
 
 #### The `certs` directory
 For all deployments, you will need the following certs directory, populated with the proper files.
 
-```text
+```asm
 certs ---+--- root.pem
          +--- issuer.pem
          +--- websocket-cert.pem
@@ -63,69 +250,183 @@ certs ---+--- root.pem
 ```
 
 #### DigiCert files
-These are the files you should install on your OWGW and devices. For your OWGW, you will need to provide tge following files in the directory above
+These are the files you should install on your gateway and devices. For your gateway, you will need to provide tge following files in the directory above
 - `root.pem` is [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/root.pem).
 - `issuer.pem` is [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/issuer.pem).
 - `clientcas.pem` is [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/clientcas.pem).
 
-#### OWGW Server certificate (must be obtained from TIP)
+#### Gateway certificates: TIP portion (* must be obtained from TIP)
 The gateway requires its own DigiCert certificate. Once obtained, you need to identify the `key` and the `certificate` rename
 them `websocket-key.pem` and `websocket-cert.pem`, and copy them in your `certs` directory. These files mus be obtained from TIP.
 
-#### OWGW for certificate: for REST API (from your favourite Certificate Provider)
+#### Gateway certificates: for REST API
-The gateway requires a key/certificate/ca for the REST interface. These files you need to obtain on your own or generate them. This is beyond the scope of this 
+The gateway requires a key/vertificate/ca for the REST interface. These files you need to obtain on your own of generate them. This is beyond the scope of this 
-document. You, may choose to select LestEncrypt or any other Certificate Authority. Once you have these files, you need to renamed them `restapi-key.pem`, `restapi-cert.pem`, and `restapi-ca.pem`. 
+document. Once you have these files, you need to renamed them `restapi-key.pem`, `restapi-cert.pem`, and `restapi-ca.pem`. This will guarantee proper HTTPS
-This will guarantee proper HTTPS in your browser and RESTAPI. 
+in your browner 
 
-### OpenWiFi Device certificates
+#### Configuration
-This may have already done at the factory. If not, you will need to get the following in order to point your devices to use the OWGW:
+The configuration for this service is kept in a properties file. This file is called `owgw.properties` and you can 
-- A DigiCert certificate that you will call `cert.pem`
+see the latest version [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). The file will be loaded from
-- A DigiCert key that goes with that certificate. Please call this `key.pem`
+the directory set by the environment variable `UCENTRALGW_CONFIG`. To use environment variables in the configuration,
-- The Digicert root certificate that you will find [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/root.pem). You must copy `root.pem`
+you must use `$<varname>`. Only `path names` support the use of environment variables. The sample configuration requires very 
-  and rename it `cas.pem` on the device.
+little changes if you keep the suggested directory structure. For the sample configuration to work, you need to define 2 
-- A Device ID file called `dev-id` or something similar
+environment variables. 
-- Copy all the 4 files to the `/certificates` directory of the AP (you must have firmware created Jun 15th or later).
+```
-
-You will need to upgrade your device to the latest firmware. Once updated, you will need to copy the 4 files mentioned above in
-the `/certificates` directory. Please remove all old keys or certificates from the `/etc/ucentral` directory
-(anything ending in `.pem`).
-
-### Environment variables
-The following environment variables should be set from the root directory of the service. They tell the OWGW process where to find 
-the configuration and the root directory.
-```bash
 export OWGW_ROOT=`pwd`
 export OWGW_CONFIG=`pwd`
 ```
-You can run the shell script `set_env.sh` from the microservice root.
+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.
 
-### OWGW Service Configuration
+##### Important config entries
-The configuration is kept in a file called `owgw.properties`. To understand the content of this file, 
+###### This is the logging directory
-please look [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CONFIGURATION.md)
+```
+logging.channels.c2.path = $OWGW_ROOT/logs/sample.log
+```
 
-### Running the OWGW
+###### This is the type of storage in use
-Tu run the OWGW, you must run the executable `owgw`. You can use several command line options to run as a daemon or 
+```asm
-specify the configuration file location.
+storage.type = sqlite
+```
 
-### systemd: owgw.service
+###### Autoprovisioning settings
-`owgw.service` is a skeleton to allow to run the OWGW in a systemd based operating system (i.e. Debian). You will need 
+```asm
-to modify slightly to reflect your environment.
+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
+```
 
-### Default device configuration
+###### This is the RESTAPI endpoint
-By default, the devices will receive a built-in default configuration. This built-in default configuration is probably not what you need. 
-So there are 2 options in order to specify your own default configuration:
-- In the OWGW data directory, you can create a `default_config.json` file that contains your own personal configuration
-- Using the OWGW UI, on the left hand pane, there is a `configurations` choice. There you can do the same but apply it with more granularity ot each device type 
-you may be deploying.
 
-### Command line options
+```asm
+openwifi.restapi.host.0.backlog = 100
+openwifi.restapi.host.0.security = relaxed
+openwifi.restapi.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
+openwifi.restapi.host.0.address = *
+openwifi.restapi.host.0.port = 16002
+openwifi.restapi.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
+openwifi.restapi.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
+openwifi.restapi.host.0.key.password = mypassword
+```
+
+##### This is the end point for the devices to connect with
+This is the crucial section. I bet that 97.4% of all your problems will come from here, and it's boring. So put some good music on, 
+give the kids the iPad, get a cup of coffee, and pay attention. Every field will be explained.
+
+###### ucentral.websocket.host.0.backlog
+This is the number of concurrent devices you are expecting to call all at once. Not the current number of devices. This is how many will connect in the same exact second. 
+Take the total number of devices you have and divide by 100. That's a good rule of thumb. Never go above 500.
+
+###### ucentral.websocket.host.0.rootca
+This is the root file as supplied by Digicert. You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/root.pem) 
+
+###### ucentral.websocket.host.0.issuer
+This is the issuer file as supplied by Digicert. You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/issuer.pem)
+
+###### ucentral.websocket.host.0.cert
+This is a `pem` file that you will receive from Digicert for the gateway itself. This is the certificate for the gateway. 
+
+###### ucentral.websocket.host.0.key
+This is a `pem` file that you will receive from Digicert for the gateway itself. The is the private key for the gateway.
+
+###### ucentral.websocket.host.0.clientcas
+This is a `pem` file that contains both the issuer and the root CA certificates. You can find it You can find it [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/clientcas.pem)
+
+###### ucentral.websocket.host.0.cas
+This is a directory where you will copy your own `cert.pem`, the `root.pem`, and the `issuer.pem` files.
+
+###### ucentral.websocket.host.0.address
+Leve this a `*` in teh case you want to bind to all interfaces on your gateway host or select the address of a single interface.
+
+###### ucentral.websocket.host.0.port
+Leave to 15002 for now. 
+
+###### ucentral.websocket.host.0.security
+Leave this as strict for now for devices.
+
+###### ucentral.websocket.host.0.key.password
+If you key file uses a password, please enter it here.
+
+###### ucentral.websocket.maxreactors
+A single reactor can handle between 1000-2000 devices. Never leave this smaller than 5 or larger than 50.
+
+#### Conclusion 
+You will need to get the `cert.pem` and `key.pem` from Digicert. The rest is here.
+
+```asm
+ucentral.websocket.host.0.backlog = 500
+ucentral.websocket.host.0.rootca = $OWGW_ROOT/certs/root.pem
+ucentral.websocket.host.0.issuer = $OWGW_ROOT/certs/issuer.pem
+ucentral.websocket.host.0.cert = $OWGW_ROOT/certs/websocket-cert.pem
+ucentral.websocket.host.0.key = $OWGW_ROOT/certs/websocket-key.pem
+ucentral.websocket.host.0.clientcas = $OWGW_ROOT/certs/clientcas.pem
+ucentral.websocket.host.0.cas = $OWGW_ROOT/certs/cas
+ucentral.websocket.host.0.address = *
+ucentral.websocket.host.0.port = 15002
+ucentral.websocket.host.0.security = strict
+ucentral.websocket.host.0.key.password = mypassword
+ucentral.websocket.maxreactors = 20
+```
+
+###### This is the end point for the devices when uploading files
+```asm
+openwifi.fileuploader.host.0.backlog = 100
+openwifi.fileuploader.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
+openwifi.fileuploader.host.0.security = relaxed
+openwifi.fileuploader.host.0.address = *
+openwifi.fileuploader.host.0.name = 192.168.1.176
+openwifi.fileuploader.host.0.port = 16003
+openwifi.fileuploader.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
+openwifi.fileuploader.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
+openwifi.fileuploader.host.0.key.password = mypassword
+openwifi.fileuploader.path = $OWGW_ROOT/uploads
+openwifi.fileuploader.maxsize = 10000
+```
+
+###### host.0.address entries
+If you want to limit traffic to a specific interface, you should specify the IP address of that interface instead of 
+the `*`. Using the `*` means all interfaces will be able to accept connections. You can add multiple interfaces 
+by changing the `0` to another index. You need to repeat the whole configuration block for each index. Indexes must be sequential
+start at `0`.
+
+###### openwifi.fileuploader.host.0.name
+This must point to the IP or FQDN of your uCentralGW.
+
+#### Running the gateway
+Tu run the gateway, you must run the executable `ucentralgw`. You can use several command line options to run as a daemon or specify the configuration file location. 
+
+#### Device configuration
+Once you have the gateway configured, you will need to have some devices coming to it. For now, you will need to get
+the following in order to use the gateway:
+- A DigiCert certificate that you will call `cert.pem`
+- A DigiCert key that goes with that certificate. Please call this `key.pem`
+- The Digicert root certificate that you will find [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/certificates/root.pem). You must copy `root.pem`
+and rename it `cas.pem` on the device.
+- A Device ID file called `dev-id` or something similar
+- Copy all the 4 files to the `/certificates` directory of the AP (you must have firmware created Jun 15th or later).
+
+You will need to upgrade your device to the latest firmware. Once updated, you will need to copy the 4 files mentioned above in 
+the `/certificates` directory. Please remove all old keys or certificates from the `/etc/ucentral` directory 
+(anything ending in `.pem`).
+
+#### Server key entry
+The gateway needs to encrypt information from time to time. In order to do so, it must have a crypto key. This key
+can be any of the keys you are already using. You must keep that keep secret and always use it. In the configutation,
+this is the entry
+
+```asm
+openwifi.service.key = $OWGW_ROOT/certs/websocket-key.pem
+```
+ 
+#### Command line options
 The current implementation supports the following. If you use the built-in configuration file, you do not need to use any command-line
 options. However, you may decide to use the `--daemon` or `umask` options. 
 
 ```bash
-./owgw --help
+./ucentralgw --help
-usage: owgw OPTIONS
+usage: ucentralgw OPTIONS
-A owgw gateway implementation for TIP.
+A uCentral gateway implementation for TIP.
 
 --daemon        Run application as a daemon.
 --umask=mask    Set the daemon's umask (octal, e.g. 027).
@@ -136,27 +437,119 @@ A owgw gateway implementation for TIP.
 --logs=dir      specify the log directory and file (i.e. dir/file.log)
 ```
 
-#### file
+##### file
-This allows you to point to another file without specifying the OWGW_CONFIG variable. The file name must end in `.properties`.
+This allows you to point to another file without specifying the UCENTRALGW_CONFIG variable. The file name must end in `.properties`.
-#### daemon
+##### daemon
 Run this as a UNIX service
-#### pidfile
+##### pidfile
 When running as a daemon, the pid of the running service will be set in the speficied file
-#### debug
+##### debug
 Run the service in debug mode.
-#### logs
+##### logs
 Speficy where logs should be kept. You must include an existing directory and a file name. For example `/var/ucentral/logs/log.0`.
-#### umask
+##### umask
 Seet the umask for the running service.
 
-## Docker
+### ALB Support
-If you would rather launch the docker-compose or helm for the controller, please click [here](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy).
+Support for AWS ALB is provided through the following configuration elements
+```asm
+alb.enable = true
+alb.port = 16102
+```
+
+### Docker
+So building this thing from scratch is not your thing? I can't blame you. It takes some patience and 
+in the end, there's still more work. Here comes `docker` to the rescue. You can run a docker version following
+these instructions. The following is the content of the `docker_run.sh` script you can find
+[here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/docker_run.sh):
+
+```bash
+#!/bin/sh
+
+HUBNAME=tip-tip-wlan-cloud-ucentral.jfrog.io
+IMAGE_NAME=ucentralgw
+DOCKER_NAME=$HUBNAME/$IMAGE_NAME
+
+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 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 owgw.properties is missing in the current directory"
+  exit 2
+fi
+
+docker run -d -p 15002:15002 \
+              -p 16002:16002 \
+              -p 16003:16003 \
+              --init \
+              --volume="$PWD:/ucentral-data" \
+              -e UCENTRAL_ROOT="/ucentral-data" \
+              -e UCENTRALGW_CONFIG="/ucentral-data" \
+              --name="ucentralgw" $DOCKER_NAME
+
+```
+
+Create yourself a directory and copy that script which you can also get from [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/docker_run.sh).
+You must have the basic configuration file copied in the directory. This file must be called `owgw.properties`. You can bring your own or
+copy it from [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). Please look at [this](#certificates-with-docker) to have the right 
+certificates. You need to make sure that the names match the content of the `owgw.properties`
+file. Once all this is done, you can simply run `docker_run.sh`.
+
+#### Docker installation directory layout
+Here is the layout expected for your Docker installation
+
+```asm
+Run-time root
+    |
+    ----- certs (same as above)
+    +---- logs  (dir)
+    +---- uploads  (dir)
+    +---- owgw.properties (file)
+```
+
+#### `owgw.properties` for Docker
+If you use the pre-made configuration file, and you follow the directory layout, the only line you must change 
+is the following line:
+
+```asm
+openwifi.fileuploader.host.0.name = 192.168.1.176
+```
+
+This line should reflect the IP of your gateway or its FQDN. You must make sure that this name or IP is accessible
+from your devices. This is used during file uploads from the devices.
+
+#### Certificates with Docker
+Please refer to the `certs` directory from the sections above.
+
+#### Configuration with Docker
+The configuration for this service is kept in a properties file. Currently, this configuration file must be kept in the 
+current directory of uCentral or one level up. This file is called `owgw.properties` and you can see the latest version
+[here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). The file will be loaded from 
+the directory set by the environment variable `UCENTRALGW_CONFIG`. To use environment variables in the configuration,
+you must use `$<varname>`. The path for the logs for the service must exist prior to starting the 
+service. The path is defined under `logging.channels.c2.path`. Only `path names` support the use of 
+environment variables. Here is a sample configuration:
 
 ## uCentral communication protocol
-The communication protocol between the device and the OGWG is detailed in this [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/PROTOCOL.md).
+The communication protocol between the device and the controller is detailed in this [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/PROTOCOL.md).
 
 ## OpenAPI
-The OWGW supports an OpenAPI REST based interface for management. You can find the [definition here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/owgw.yaml).
+The service supports an OpenAPI REST based interface for management. You can find the [definition here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/owgw.yaml).
 And here is [how to use it](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/OPENAPI.md)
 
 ## Using the API
@@ -166,31 +559,58 @@ or [python](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/ma
 More scripts will be added in the future.
 
 ## Firewall Considerations
-| Port | Description | Configurable |
+- The protocol uses TCP port 15002 between the devices and the gateway. This port must be opened.
-| :--- | :--- |:------------:|
+- Devices use the TCP port 16003 to upload files. This port is configurable in the `owgw.properties` file. Look for `openwifi.fileuploader.host.0.port`.
-| 15002 | Default port from the devices to the OWGW |     yes      |
+- The RESTAPI is accessed through TCP port 16002 by default. This port is configurable in the `owgw.properties` file. Look for the entry `openwifi.restapi.host.0.port`.
-| 16002 | Default port for REST API Access to the OWGW |     yes      |
-| 5912 | Default port for RTTY connection |     yes      |
-| 5913 | Defailt port for RTTY connection |     yes      |
 
-## Kafka topics
+## Kafka integration
+So what about Kafka? Well, the gateway has basic integration with Kafka. It is turned off by default, to turn it on, in the configuration:
+
+```asm
+openwifi.kafka.enable = false
+openwifi.kafka.brokerlist = 127.0.0.1:9092
+openwifi.kafka.commit = false
+openwifi.kafka.queue.buffering.max.ms = 50
+```
+
+#### `openwifi.kafka.enable`
+Kind of obvious but hey, set `true` or `false`. Default is `false`
+
+#### `openwifi.kafka.brokerlist`
+This is a comma separator list of the brokers in your `kafka` deployment. 
+
+#### Kafka topics
 Toe read more about Kafka, follow the [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/KAFKA.md)
 
-## Contributions
+#### Securing `kafka`
-We need more contributors. Should you wish to contribute, 
+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.
-please follow the [contributions](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CONTRIBUTING.md) document.
 
-## Pull Requests
+#### `iptocountry` feature
-Please create a branch with the Jira addressing the issue you are fixing or the feature you are implementing. 
+In the UI, you will notice the presence of small flags showing where the device connections are from. This feature is 
-Create a pull-request from the branch into master. 
+available through the `iptocountry` settings in the configuration. This feature is then also available through the `OpenAPI` for the CLI 
+and other applications.
 
-## Additional OWSDK Microservices
+##### Config file entries
-Here is a list of additional OWSDK microservices
+In the configuration file, you must include the following lines:
-| Name | Description | Link | OpenAPI |
+
-| :--- | :--- | :---: | :---: |
+```asm
-| OWSEC | Security Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml) |
+iptocountry.default = US
-| OWGW | Controller Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/openapi/owgw.yaml) |
+iptocountry.provider = ipinfo
-| OWFMS | Firmware Management Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralfms) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralfms/blob/main/openapi/owfms.yaml) |
+#iptocountry.provider = ipdata
-| OWPROV | Provisioning Service | [here](https://github.com/Telecominfraproject/wlan-cloud-owprov) | [here](https://github.com/Telecominfraproject/wlan-cloud-owprov/blob/main/openapi/owprov.yaml) |
+#iptocountry.provider = ipdata
-| OWANALYTICS | Analytics Service | [here](https://github.com/Telecominfraproject/wlan-cloud-analytics) | [here](https://github.com/Telecominfraproject/wlan-cloud-analytics/blob/main/openapi/owanalytics.yaml) |
+iptocountry.ipinfo.token = 
-| OWSUB | Subscriber Service | [here](https://github.com/Telecominfraproject/wlan-cloud-userportal) | [here](https://github.com/Telecominfraproject/wlan-cloud-userportal/blob/main/openapi/userportal.yaml) |
+#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. 
+Feel free to ask questions and post issues. 

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 @@
-3
+42

docker-entrypoint.sh

@@ -6,35 +6,35 @@ if [ "$SELFSIGNED_CERTS" = 'true' ]; then
 fi
 
 if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
-    WEBSOCKET_HOST_ROOTCA=${WEBSOCKET_HOST_ROOTCA:-"\${APP_ROOT}/certs/root.pem"} \
+    WEBSOCKET_HOST_ROOTCA=${WEBSOCKET_HOST_ROOTCA:-"\$OWGW_ROOT/certs/root.pem"} \
-    WEBSOCKET_HOST_ISSUER=${WEBSOCKET_HOST_ISSUER:-"\${APP_ROOT}/certs/issuer.pem"} \
+    WEBSOCKET_HOST_ISSUER=${WEBSOCKET_HOST_ISSUER:-"\$OWGW_ROOT/certs/issuer.pem"} \
-    WEBSOCKET_HOST_CERT=${WEBSOCKET_HOST_CERT:-"\${APP_ROOT}/certs/websocket-cert.pem"} \
+    WEBSOCKET_HOST_CERT=${WEBSOCKET_HOST_CERT:-"\$OWGW_ROOT/certs/websocket-cert.pem"} \
-    WEBSOCKET_HOST_KEY=${WEBSOCKET_HOST_KEY:-"\${APP_ROOT}/certs/websocket-key.pem"} \
+    WEBSOCKET_HOST_KEY=${WEBSOCKET_HOST_KEY:-"\$OWGW_ROOT/certs/websocket-key.pem"} \
-    WEBSOCKET_HOST_CLIENTCAS=${WEBSOCKET_HOST_CLIENTCAS:-"\${APP_ROOT}/certs/clientcas.pem"} \
+    WEBSOCKET_HOST_CLIENTCAS=${WEBSOCKET_HOST_CLIENTCAS:-"\$OWGW_ROOT/certs/clientcas.pem"} \
-    WEBSOCKET_HOST_CAS=${WEBSOCKET_HOST_CAS:-"\${APP_ROOT}/certs/cas"} \
+    WEBSOCKET_HOST_CAS=${WEBSOCKET_HOST_CAS:-"\$OWGW_ROOT/certs/cas"} \
     WEBSOCKET_HOST_PORT=${WEBSOCKET_HOST_PORT:-"15002"} \
     WEBSOCKET_HOST_KEY_PASSWORD=${WEBSOCKET_HOST_KEY_PASSWORD:-"mypassword"} \
-    RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\${APP_ROOT}/certs/restapi-ca.pem"} \
+    RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
     RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16002"} \
-    RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\${APP_ROOT}/certs/restapi-cert.pem"} \
+    RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-    RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\${APP_ROOT}/certs/restapi-key.pem"} \
+    RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
     RESTAPI_HOST_KEY_PASSWORD=${RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-    INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\${APP_ROOT}/certs/restapi-ca.pem"} \
+    INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
     INTERNAL_RESTAPI_HOST_PORT=${INTERNAL_RESTAPI_HOST_PORT:-"17002"} \
-    INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\${APP_ROOT}/certs/restapi-cert.pem"} \
+    INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-    INTERNAL_RESTAPI_HOST_KEY=${INTERNAL_RESTAPI_HOST_KEY:-"\${APP_ROOT}/certs/restapi-key.pem"} \
+    INTERNAL_RESTAPI_HOST_KEY=${INTERNAL_RESTAPI_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
     INTERNAL_RESTAPI_HOST_KEY_PASSWORD=${INTERNAL_RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-    FILEUPLOADER_HOST_ROOTCA=${FILEUPLOADER_HOST_ROOTCA:-"\${APP_ROOT}/certs/restapi-ca.pem"} \
+    FILEUPLOADER_HOST_ROOTCA=${FILEUPLOADER_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
     FILEUPLOADER_HOST_NAME=${FILEUPLOADER_HOST_NAME:-"localhost"} \
     FILEUPLOADER_HOST_PORT=${FILEUPLOADER_HOST_PORT:-"16003"} \
-    FILEUPLOADER_HOST_CERT=${FILEUPLOADER_HOST_CERT:-"\${APP_ROOT}/certs/restapi-cert.pem"} \
+    FILEUPLOADER_HOST_CERT=${FILEUPLOADER_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-    FILEUPLOADER_HOST_KEY=${FILEUPLOADER_HOST_KEY:-"\${APP_ROOT}/certs/restapi-key.pem"} \
+    FILEUPLOADER_HOST_KEY=${FILEUPLOADER_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
     FILEUPLOADER_HOST_KEY_PASSWORD=${FILEUPLOADER_HOST_KEY_PASSWORD:-"mypassword"} \
-    FILEUPLOADER_PATH=${FILEUPLOADER_PATH:-"\${APP_ROOT}/uploads"} \
+    FILEUPLOADER_PATH=${FILEUPLOADER_PATH:-"\$OWGW_ROOT/uploads"} \
     FILEUPLOADER_URI=${FILEUPLOADER_URI:-"https://localhost:16003"} \
-    SERVICE_KEY=${SERVICE_KEY:-"\${APP_ROOT}/certs/restapi-key.pem"} \
+    SERVICE_KEY=${SERVICE_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
     SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
-    SYSTEM_DATA=${SYSTEM_DATA:-"\${APP_ROOT}/data"} \
+    SYSTEM_DATA=${SYSTEM_DATA:-"\$OWGW_ROOT/data"} \
     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"} \
@@ -51,7 +51,7 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     RTTY_TOKEN=${RTTY_TOKEN:-""} \
     RTTY_TIMEOUT=${RTTY_TIMEOUT:-"60"} \
     RTTY_VIEWPORT=${RTTY_VIEWPORT:-"5913"} \
-    RTTY_ASSETS=${RTTY_ASSETS:-"\${APP_ROOT}/rtty_ui"} \
+    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"} \
@@ -64,41 +64,38 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     KAFKA_SSL_KEY_PASSWORD=${KAFKA_SSL_KEY_PASSWORD:-""} \
     STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
     STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
-    STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"${APP_USER}"} \
+    STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owgw"} \
-    STORAGE_TYPE_POSTGRESQL_PASSWORD=${STORAGE_TYPE_POSTGRESQL_PASSWORD:-"${APP_USER}"} \
+    STORAGE_TYPE_POSTGRESQL_PASSWORD=${STORAGE_TYPE_POSTGRESQL_PASSWORD:-"owgw"} \
-    STORAGE_TYPE_POSTGRESQL_DATABASE=${STORAGE_TYPE_POSTGRESQL_DATABASE:-"${APP_NAME}"} \
+    STORAGE_TYPE_POSTGRESQL_DATABASE=${STORAGE_TYPE_POSTGRESQL_DATABASE:-"owgw"} \
     STORAGE_TYPE_POSTGRESQL_PORT=${STORAGE_TYPE_POSTGRESQL_PORT:-"5432"} \
     STORAGE_TYPE_MYSQL_HOST=${STORAGE_TYPE_MYSQL_HOST:-"localhost"} \
-    STORAGE_TYPE_MYSQL_USERNAME=${STORAGE_TYPE_MYSQL_USERNAME:-"${APP_USER}"} \
+    STORAGE_TYPE_MYSQL_USERNAME=${STORAGE_TYPE_MYSQL_USERNAME:-"owgw"} \
-    STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"${APP_USER}"} \
+    STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owgw"} \
-    STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"${APP_NAME}"} \
+    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
-    IPINFO_DEFAULT_COUNTRY=${IPINFO_DEFAULT_COUNTRY:-"US"} \
-    DEVICE_SESSION_TIMEOUT=${DEVICE_SESSION_TIMEOUT:-"600"} \
-    envsubst < /"${APP_NAME}".properties.tmpl > "${APP_CONFIG}"/"${APP_NAME}".properties
 fi
 
 # Check if rtty_ui directory exists
-export RTTY_ASSETS=$(grep 'rtty.assets' "${APP_CONFIG}"/"${APP_NAME}".properties | awk -F '=' '{print $2}' | xargs | envsubst)
+export RTTY_ASSETS=$(grep 'rtty.assets' $OWGW_CONFIG/owgw.properties | awk -F '=' '{print $2}' | xargs | envsubst)
 
 if [ -z "$RTTY_ASSETS" ]; then
-    export RTTY_ASSETS="${APP_ROOT}/rtty_ui"
+    export RTTY_ASSETS="$OWGW_ROOT/rtty_ui"
 fi
 
 if [[ ! -d "$(dirname $RTTY_ASSETS)" ]]; then
-  mkdir -p "$(dirname $RTTY_ASSETS)"
+  mkdir -p $(dirname $RTTY_ASSETS)
 fi
 
 if [[ ! -d "$RTTY_ASSETS" ]]; then
     cp -r /dist/rtty_ui $RTTY_ASSETS
 fi
 
-if [ "$1" = "${APP_HOME_DIR}/${APP_NAME}" -a "$(id -u)" = '0' ]; then
+if [ "$1" = '/openwifi/owgw' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
-        chown -R "$APP_USER": "${APP_ROOT}" "$APP_CONFIG"
+        chown -R "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
     fi
-    exec gosu "$APP_USER" "$@"
+    exec gosu "$OWGW_USER" "$@"
 fi
 
 exec "$@"

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owgw:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: master
+    tag: v2.7.2
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -43,7 +43,6 @@ services:
       rttys:
         servicePort: 5912
         targetPort: 5912
-        protocol: TCP
       rttys-view:
         servicePort: 5913
         targetPort: 5913
@@ -231,7 +230,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

images/project/logo.svg

@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 141.5 185.6" style="enable-background:new 0 0 141.5 185.6;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#414141;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:#FED206;}
-	.st3{fill:#EB6F53;}
-	.st4{fill:#3BA9B6;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M120.7,183.9H21.5c-10.8,0-19.5-8.7-19.5-19.5V20.5c0-10.8,8.7-19.5,19.5-19.5h99.2
-			c10.8,0,19.5,8.7,19.5,19.5v143.9C140.2,175.2,131.5,183.9,120.7,183.9z"/>
-		<g>
-			<g>
-				<g>
-					<path class="st1" d="M46.3,166.2v-3.4h-1.2v-0.6h3.1v0.6H47v3.4H46.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M49,166.2v-4h2.7v0.6h-2v1h2v0.6h-2v1.1h2v0.6H49z"/>
-				</g>
-				<g>
-					<path class="st1" d="M52.6,166.2v-4h0.7v3.4h1.8v0.6H52.6z"/>
-				</g>
-				<g>
-					<path class="st1" d="M55.7,166.2v-4h2.7v0.6h-2v1h2v0.6h-2v1.1h2v0.6H55.7z"/>
-				</g>
-				<g>
-					<path class="st1" d="M59.1,164.2c0-1.2,0.9-2.1,2.1-2.1c0.8,0,1.3,0.4,1.6,0.9l-0.6,0.3c-0.2-0.3-0.6-0.6-1-0.6
-						c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.4,0,0.8-0.3,1-0.6l0.6,0.3c-0.3,0.5-0.8,0.9-1.6,0.9
-						C60,166.3,59.1,165.5,59.1,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M63.2,164.2c0-1.2,0.8-2.1,2-2.1c1.2,0,2,0.9,2,2.1c0,1.2-0.8,2.1-2,2.1C64,166.3,63.2,165.4,63.2,164.2z
-						 M66.5,164.2c0-0.8-0.5-1.4-1.3-1.4c-0.8,0-1.3,0.6-1.3,1.4c0,0.8,0.5,1.4,1.3,1.4C66,165.7,66.5,165,66.5,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M71.3,166.2v-3.1l-1.2,3.1h-0.3l-1.2-3.1v3.1h-0.7v-4h1l1.1,2.7l1.1-2.7h1v4H71.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M75.7,166.2v-4h0.7v4H75.7z"/>
-				</g>
-				<g>
-					<path class="st1" d="M80.4,166.2l-2.1-2.8v2.8h-0.7v-4h0.7l2,2.8v-2.8h0.7v4H80.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M82.3,166.2v-4H85v0.6h-2v1h2v0.6h-2v1.7H82.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M87.9,166.2l-0.9-1.5h-0.7v1.5h-0.7v-4h1.7c0.8,0,1.3,0.5,1.3,1.2c0,0.7-0.5,1.1-0.9,1.2l1,1.6H87.9z
-						 M88,163.5c0-0.4-0.3-0.6-0.7-0.6h-1v1.3h1C87.7,164.1,88,163.9,88,163.5z"/>
-				</g>
-				<g>
-					<path class="st1" d="M92.4,166.2l-0.3-0.8h-1.8l-0.3,0.8h-0.8l1.6-4h0.9l1.6,4H92.4z M91.2,162.9l-0.7,1.9h1.4L91.2,162.9z"/>
-				</g>
-				<g>
-					<path class="st1" d="M95.8,166.2v-4h1.5c0.8,0,1.2,0.5,1.2,1.2c0,0.6-0.4,1.2-1.2,1.2h-1.2v1.7H95.8z M98.2,163.4
-						c0-0.5-0.3-0.9-0.9-0.9h-1.1v1.7h1.1C97.8,164.3,98.2,163.9,98.2,163.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M101.5,166.2l-1.1-1.6h-0.9v1.6h-0.3v-4h1.5c0.7,0,1.2,0.4,1.2,1.2c0,0.7-0.5,1.1-1.1,1.1l1.2,1.7H101.5z
-						 M101.6,163.4c0-0.5-0.4-0.9-0.9-0.9h-1.1v1.7h1.1C101.2,164.3,101.6,163.9,101.6,163.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M102.8,164.2c0-1.2,0.8-2.1,1.9-2.1c1.2,0,1.9,0.9,1.9,2.1c0,1.2-0.8,2.1-1.9,2.1
-						C103.6,166.3,102.8,165.4,102.8,164.2z M106.3,164.2c0-1-0.6-1.7-1.6-1.7c-1,0-1.6,0.7-1.6,1.7c0,1,0.6,1.7,1.6,1.7
-						C105.7,166,106.3,165.2,106.3,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M106.9,165.8l0.2-0.3c0.2,0.2,0.4,0.4,0.8,0.4c0.5,0,0.9-0.4,0.9-0.9v-2.8h0.3v2.8c0,0.8-0.5,1.2-1.2,1.2
-						C107.5,166.3,107.2,166.1,106.9,165.8z"/>
-				</g>
-				<g>
-					<path class="st1" d="M110.4,166.2v-4h2.5v0.3h-2.2v1.5h2.1v0.3h-2.1v1.6h2.2v0.3H110.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M113.5,164.2c0-1.2,0.9-2.1,2-2.1c0.6,0,1.1,0.3,1.5,0.7l-0.3,0.2c-0.3-0.3-0.7-0.6-1.2-0.6
-						c-0.9,0-1.7,0.7-1.7,1.7c0,1,0.7,1.7,1.7,1.7c0.5,0,0.9-0.2,1.2-0.6l0.3,0.2c-0.4,0.4-0.8,0.7-1.5,0.7
-						C114.4,166.3,113.5,165.5,113.5,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M118.7,166.2v-3.7h-1.3v-0.3h2.9v0.3H119v3.7H118.7z"/>
-				</g>
-			</g>
-			<g>
-				<polygon class="st1" points="26.3,163.8 31.6,158.5 36.9,163.8 37.7,163.8 31.6,157.6 25.5,163.8 				"/>
-				<polygon class="st1" points="36.9,164.7 31.6,170 26.3,164.7 25.5,164.7 31.6,170.8 37.7,164.7 				"/>
-				<polygon class="st1" points="31,163.8 36.3,158.5 41.6,163.8 42.5,163.8 36.3,157.6 30.2,163.8 				"/>
-				<polygon class="st1" points="41.6,164.7 36.3,170 31,164.7 30.2,164.7 36.3,170.8 42.5,164.7 				"/>
-			</g>
-		</g>
-		<g>
-			<path class="st1" d="M33.2,100.7c-4.6,0-8.3,3.7-8.3,8.3s3.7,8.3,8.3,8.3s8.3-3.7,8.3-8.3S37.8,100.7,33.2,100.7z"/>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st2" d="M33.2,35.2c40.7,0,73.8,33.1,73.8,73.8c0,0.7,0,1.4,0,2.1c0,1.7,0.6,3.3,1.7,4.6c1.2,1.2,2.8,1.9,4.5,2
-						l0.2,0c3.5,0,6.3-2.7,6.4-6.2c0-0.8,0-1.7,0-2.5c0-47.7-38.8-86.6-86.6-86.6c-0.8,0-1.7,0-2.5,0c-1.7,0-3.3,0.8-4.5,2
-						c-1.2,1.2-1.8,2.9-1.7,4.6c0.1,3.5,3,6.3,6.6,6.2C31.8,35.2,32.5,35.2,33.2,35.2z"/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st3" d="M33.2,60.5c26.7,0,48.5,21.7,48.5,48.5c0,0.6,0,1.3,0,2c-0.1,1.7,0.5,3.3,1.7,4.6c1.2,1.3,2.7,2,4.4,2.1
-						c1.7,0.1,3.3-0.5,4.6-1.7c1.2-1.2,2-2.7,2-4.4c0-0.9,0.1-1.8,0.1-2.6c0-33.8-27.5-61.2-61.2-61.2c-0.8,0-1.6,0-2.6,0.1
-						c-1.7,0.1-3.3,0.8-4.4,2.1c-1.2,1.3-1.8,2.9-1.7,4.6s0.8,3.3,2.1,4.4c1.3,1.2,2.9,1.8,4.6,1.7C31.9,60.5,32.6,60.5,33.2,60.5z"
-						/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st4" d="M33.2,86.7c12.3,0,22.3,10,22.3,22.3c0,0.5,0,1.1-0.1,1.8c-0.3,3.5,2.3,6.6,5.8,6.9
-						c3.5,0.3,6.6-2.3,6.9-5.8c0.1-1,0.1-1.9,0.1-2.8c0-19.3-15.7-35.1-35.1-35.1c-0.9,0-1.8,0-2.8,0.1c-1.7,0.1-3.2,0.9-4.3,2.2
-						c-1.1,1.3-1.6,2.9-1.5,4.6c0.1,1.7,0.9,3.2,2.2,4.3c1.3,1.1,2.9,1.6,4.6,1.5C32.1,86.7,32.7,86.7,33.2,86.7z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-	<g>
-		<path class="st1" d="M35.8,130.4c1.1,0.6,2.1,1.5,2.7,2.6c0.7,1.1,1,2.3,1,3.7s-0.3,2.6-1,3.7c-0.7,1.1-1.6,2-2.7,2.6
-			c-1.1,0.6-2.4,1-3.8,1s-2.7-0.3-3.8-1c-1.1-0.6-2.1-1.5-2.7-2.6c-0.7-1.1-1-2.3-1-3.7c0-1.3,0.3-2.6,1-3.7c0.7-1.1,1.6-2,2.7-2.6
-			c1.1-0.6,2.4-0.9,3.8-0.9C33.4,129.5,34.7,129.8,35.8,130.4z M29.9,132.9c-0.7,0.4-1.2,0.9-1.6,1.6s-0.6,1.4-0.6,2.2
-			c0,0.8,0.2,1.6,0.6,2.3c0.4,0.7,0.9,1.2,1.6,1.6c0.7,0.4,1.4,0.6,2.1,0.6c0.8,0,1.5-0.2,2.1-0.6c0.6-0.4,1.2-0.9,1.5-1.6
-			c0.4-0.7,0.6-1.4,0.6-2.3c0-0.8-0.2-1.6-0.6-2.2s-0.9-1.2-1.5-1.6c-0.6-0.4-1.4-0.6-2.1-0.6C31.3,132.3,30.6,132.5,29.9,132.9z"/>
-		<path class="st1" d="M50.6,133.6c0.8,0.5,1.4,1.1,1.8,2c0.4,0.8,0.6,1.8,0.6,2.9c0,1.1-0.2,2-0.6,2.8c-0.4,0.8-1,1.5-1.8,1.9
-			c-0.8,0.5-1.6,0.7-2.6,0.7c-0.7,0-1.4-0.1-2-0.4s-1.1-0.7-1.5-1.2v5.4h-3.1V133h3.1v1.6c0.4-0.5,0.9-1,1.4-1.2s1.2-0.4,2-0.4
-			C48.9,132.9,49.8,133.1,50.6,133.6z M49.1,140.5c0.5-0.6,0.7-1.3,0.7-2.2c0-0.9-0.2-1.6-0.7-2.1c-0.5-0.6-1.1-0.8-1.9-0.8
-			s-1.4,0.3-1.9,0.8c-0.5,0.6-0.8,1.3-0.8,2.1c0,0.9,0.2,1.6,0.8,2.2s1.1,0.8,1.9,0.8S48.6,141,49.1,140.5z"/>
-		<path class="st1" d="M63.4,134.4c0.9,1,1.4,2.4,1.4,4.2c0,0.3,0,0.6,0,0.7H57c0.2,0.7,0.5,1.2,1,1.6c0.5,0.4,1.1,0.6,1.8,0.6
-			c0.5,0,1-0.1,1.5-0.3s0.9-0.5,1.3-0.9l1.6,1.6c-0.5,0.6-1.2,1.1-2,1.4c-0.8,0.3-1.6,0.5-2.6,0.5c-1.1,0-2.1-0.2-3-0.7
-			s-1.5-1.1-2-1.9c-0.5-0.8-0.7-1.8-0.7-2.9c0-1.1,0.2-2.1,0.7-2.9s1.1-1.5,2-1.9c0.8-0.5,1.8-0.7,2.9-0.7
-			C61.2,132.9,62.5,133.4,63.4,134.4z M61.8,137.5c0-0.7-0.3-1.3-0.7-1.7s-1-0.6-1.7-0.6c-0.7,0-1.2,0.2-1.7,0.6
-			c-0.4,0.4-0.7,1-0.9,1.7H61.8z"/>
-		<path class="st1" d="M76.2,134c0.7,0.7,1.1,1.7,1.1,3v6.8h-3.1v-5.9c0-0.7-0.2-1.2-0.6-1.6s-0.9-0.6-1.5-0.6
-			c-0.8,0-1.4,0.3-1.8,0.8c-0.4,0.5-0.7,1.2-0.7,2v5.3h-3.1V133h3.1v1.9c0.7-1.3,2-2,3.7-2C74.6,132.8,75.5,133.2,76.2,134z"/>
-		<path class="st1" d="M96,129.7h3.3l-4.7,14h-3.3l-2.9-10.1l-3,10.1h-3.2l-4.7-14h3.4l3,10.7l3-10.7H90l3.1,10.7L96,129.7z"/>
-		<path class="st1" d="M103.3,128.7c0.3,0.3,0.5,0.7,0.5,1.2s-0.2,0.9-0.5,1.2c-0.3,0.3-0.7,0.5-1.2,0.5c-0.5,0-0.9-0.2-1.2-0.5
-			c-0.3-0.3-0.5-0.7-0.5-1.2c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.5,1.2-0.5C102.6,128.2,103,128.3,103.3,128.7z M100.6,133h3.1
-			v10.8h-3.1V133z"/>
-		<path class="st1" d="M106.5,129.7h10.1l0,2.6h-6.9v3.4h6.3v2.6h-6.3v5.3h-3.2V129.7z"/>
-		<path class="st1" d="M120.9,128.7c0.3,0.3,0.5,0.7,0.5,1.2s-0.2,0.9-0.5,1.2c-0.3,0.3-0.7,0.5-1.2,0.5c-0.5,0-0.9-0.2-1.2-0.5
-			c-0.3-0.3-0.5-0.7-0.5-1.2c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.5,1.2-0.5C120.1,128.2,120.5,128.3,120.9,128.7z M118.1,133h3.1
-			v10.8h-3.1V133z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

issues/WIFI-11388.txt

@@ -1,18 +0,0 @@
-Issue: https://telecominfraproject.atlassian.net/browse/WIFI-11388
-
-Problem:
-If a configuration was accepted by the GW or Provisioning but is still not valid according to the firmware on teh device,
-the device will reject the configuration, however, that configuration is known as the kast good configuration in the GW.
-This mens that we will lock the device in a loop where it continuously wants to update the configuration to version X,
-and the device will continuously reject it.
-
-Workaround:
-Simply send a valid configuration to the GW and this will allow the device you update and stop the cycle.
-
-Fix:
-When a new configuration is submitted, store is a "pending". If it is accepted, move it to the current configuration. If
-not accepted, simply remove it. One corner case exists. For some configuration updates, the AP will never complete the
-update cycle, even if it has updated the configuration. In that case, we can detect the configuration during a connect
-later. At that moment, when we look for an upgrade, we must compare with the pending UUID and the current UUID. If it matches the pending,
-we know the last update worked. If it does not, we know to revert.
-

ols_samples/sample1.json

@@ -1,85 +0,0 @@
-{
-    "ethernet": [
-        {
-            "select-ports": [
-                "Ethernet0",
-                "Ethernet1",
-                "Ethernet2",
-                "Ethernet3",
-                "Ethernet4",
-                "Ethernet5",
-                "Ethernet6",
-                "Ethernet7"
-            ],
-            "speed": 2500,
-            "duplex": "full",
-            "enabled": true,
-            "poe": {
-                "admin-mode": true,
-                "power-limit": 60000
-            }
-        },
-        {
-            "select-ports": [
-                "Ethernet8",
-                "Ethernet9"
-            ],
-            "speed": 10000,
-            "duplex": "full",
-            "media": "sfp-forced-1000sfp"
-        }
-    ],
-    "interfaces": [
-        {
-            "name": "VLAN1",
-            "vlan": {
-                "id": 1
-            },
-            "ipv4": {
-                "addressing": "dynamic"
-            },
-            "ethernet": [
-                {
-                    "select-ports": [
-                        "Ethernet0",
-                        "Ethernet1",
-                        "Ethernet2",
-                        "Ethernet3",
-                        "Ethernet4",
-                        "Ethernet5",
-                        "Ethernet6",
-                        "Ethernet7",
-                        "Ethernet8",
-                        "Ethernet9"
-                    ],
-                    "vlan-tag": "un-tagged"
-                }
-            ]
-        }
-    ],
-    "metrics": {
-        "dhcp-snooping": {
-            "filters": [
-                "ack",
-                "discover",
-                "offer",
-                "request",
-                "solicit",
-                "reply",
-                "renew"
-            ]
-        },
-        "health": {
-            "interval": 60
-        },
-        "statistics": {
-            "interval": 120,
-            "types": []
-        }
-    },
-    "unit": {
-        "leds-active": true,
-        "usage-threshold": 95
-    },
-    "uuid": 1678263900
-}

owgw.properties.tmpl

@@ -75,7 +75,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
@@ -85,7 +84,6 @@ iptocountry.ipdata.apikey = ${IPTOCOUNTRY_IPDATA_APIKEY}
 
 autoprovisioning.process = ${AUTOPROVISIONING_PROCESS}
 
-openwifi.session.timeout = ${DEVICE_SESSION_TIMEOUT}
 #
 # rtty
 #
@@ -104,12 +102,6 @@ radius.proxy.accounting.port = ${RADIUS_PROXY_ACCOUNTING_PORT}
 radius.proxy.authentication.port = ${RADIUS_PROXY_AUTHENTICATION_PORT}
 radius.proxy.coa.port = ${RADIUS_PROXY_COA_PORT}
 
-iptocountry.default = ${IPINFO_DEFAULT_COUNTRY}
-#iptocountry.provider = ipinfo
-#iptocountry.provider = ipdata
-#iptocountry.ipinfo.token =
-#iptocountry.ipdata.apikey =
-
 #############################
 # Generic information for all micro services
 #############################
@@ -145,7 +137,7 @@ storage.type.sqlite.db = devices.db
 storage.type.sqlite.idletime = 120
 storage.type.sqlite.maxsessions = 128
 
-storage.type.postgresql.maxsessions = 250
+storage.type.postgresql.maxsessions = 64
 storage.type.postgresql.idletime = 60
 storage.type.postgresql.host = ${STORAGE_TYPE_POSTGRESQL_HOST}
 storage.type.postgresql.username = ${STORAGE_TYPE_POSTGRESQL_USERNAME}

radsec-config-sample.json

@@ -16,7 +16,6 @@
                         "weight" : 10,
                         "radsec" : true,
                         "radsecPort" : 2083,
-                        "allowSelfSigned" : false,
                         "radsecSecret" : "radsec",
                         "radsecKey" : "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUR6RnpXeTZlYXg0QVoxTySG9VUURRZ0FFS3BnWVBHMktPTVd2S0w1Z3NMRXpUc09rREg1M3NHaEQyS3RsRXBDTXVnNDNIZlFnTFVpUgpTR1R2S1l0bDFmbmJaU1lnY0RJdncxdjNYRy9hVDhOY2JBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=",
                         "radsecCert" : "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNRVENDQWVpZ0F3SUJBZ0lVY3BKS3pVM0Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBb1RDa0oxZEhSdmJuZHZiMlF4SFRBYkJnTlZCQU1URkVKMQpkSFJ2Ym5kdmIyUWdVbUZrYzJWaklFTkJNQjRYRFRJeU1EY3dNekExTWpVeE5Gb1hEVEkzTURVeE9UQTFNalV4Ck5Gb3dkVEVMTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFvVENrSjFkSFJ2Ym5kdmIyUXhOakEwQmdOVkJBTVQKTFdGeWFXeHBZUzVqWWpFd2FtTnVjemgxYlhCbk9HWnBjRFowTUM1dmNtbHZiaTVoY21WaE1USXdMbU52YlRFWgpNQmNHQ2dtU0pvbVQ4aXhrQVFFVENVZHZiMmRzWlRwVlV6QlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VICkEwSUFCQ3FZR0R4dGlqakZyeWkrWUxDeE0wN0RwQXgrZDdCb1E5aXJaUktRakxvT054MzBJQzFJa1Voazd5bUwKWmRYNTIyVW1JSEF5TDhOYjkxeHYyay9EWEd5amdZa3dnWVl3RGdZRFZSMFBBUUgvQkFRREFnZUFNQk1HQTFVZApKUVFNTUFvR0NDc0dBUVVGQndNQ01Bd0dBMVVkRXdFQi93UUNNQUF3T0FZRFZSMFJCREV3TDRJdFlYSnBiR2xoCkxtTmlNVEJxWTI1ek9IVnRjR2M0Wm1sd05uUXdMbTl5YVc5dUxtRnlaV0V4TWpBdVkyOXRNQmNHQTFVZElBUVEKTUE0d0RBWUtLd1lCQkFIdUtnRUJCVEFLQmdncWhrak9QUVFEQWdOSEFEQkVBaUFwTmM1dUNBSkp6KzVyakdqdwpCWGtOdHE3UU83bWU5dUg5bkNsTDZnSVE5Z0lnUHM2VkVKVW5CcEZ0RktXbFF4eWJ1YlBxYnpJNjBPSERHQ0ExCmhXUk1PS1U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",

src/AP_WS_ConfigAutoUpgrader.cpp

@@ -1,59 +0,0 @@
-//
-// Created by stephane bourque on 2023-05-23.
-//
-
-#include "AP_WS_ConfigAutoUpgrader.h"
-#include <framework/utils.h>
-#include <RESTObjects/RESTAPI_GWobjects.h>
-#include <StorageService.h>
-
-namespace OpenWifi {
-
-	int AP_WS_ConfigAutoUpgradeAgent::Start() {
-		poco_notice(Logger(), "Starting...");
-		QueueManager_.start(*this);
-
-		return 0;
-	}
-
-	void AP_WS_ConfigAutoUpgradeAgent::Stop() {
-		poco_notice(Logger(), "Stopping...");
-		Running_ = false;
-		Queue_.wakeUpAll();
-		QueueManager_.join();
-		poco_notice(Logger(), "Stopped...");
-	}
-
-	void AP_WS_ConfigAutoUpgradeAgent::run() {
-		Utils::SetThreadName("auto:cfgmgr");
-		Running_ = true;
-
-		while (Running_) {
-			Poco::AutoPtr<Poco::Notification> NextMsg(Queue_.waitDequeueNotification());
-			try {
-				auto Entry = dynamic_cast<CheckConfiguration *>(NextMsg.get());
-				if (Entry != nullptr) {
-					GWObjects::Device DeviceInfo;
-					std::string SerialNumber = Utils::IntToSerialNumber(Entry->serial_);
-					if (StorageService()->GetDevice(SerialNumber, DeviceInfo)) {
-						if(DeviceInfo.pendingUUID!=0 && Entry->uuid_==DeviceInfo.pendingUUID) {
-							StorageService()->CompleteDeviceConfigurationChange(SerialNumber);
-							SetDeviceCacheEntry(Entry->serial_, Utils::Now(), Entry->uuid_, 0);
-							continue;
-						}
-						if(DeviceInfo.UUID==Entry->uuid_) {
-							SetDeviceCacheEntry(Entry->serial_, Utils::Now(), Entry->uuid_, 0);
-							continue;
-						}
-					}
-				}
-				return;
-			} catch (const Poco::Exception &E) {
-				Logger().log(E);
-			} catch (...) {
-				poco_warning(Logger(), "Exception occurred during run.");
-			}
-		}
-	}
-
-} // namespace OpenWifi

src/AP_WS_ConfigAutoUpgrader.h

@@ -1,137 +0,0 @@
-//
-// Created by stephane bourque on 2023-05-23.
-//
-
-#pragma once
-
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
-#include "Poco/Timer.h"
-
-#include <framework/SubSystemServer.h>
-#include <framework/utils.h>
-
-namespace OpenWifi {
-
-	class CheckConfiguration : public Poco::Notification {
-	  public:
-		explicit CheckConfiguration(std::uint64_t s, std::uint64_t c) :
- 			serial_(s), uuid_(c) {
-		}
-		std::uint64_t serial_;
-		std::uint64_t uuid_;
-	};
-
-	struct ConfigurationCacheEntry {
-		std::uint64_t last_check_=0;
-		std::uint64_t current_config_=0;
-		std::uint64_t pending_config_=0;
-	};
-
-	class AP_WS_ConfigAutoUpgradeAgent : public SubSystemServer, Poco::Runnable {
-	  public:
-		int Start() final;
-		void Stop() final;
-		void run() final;
-
-		static auto instance() {
-			static auto instance = new AP_WS_ConfigAutoUpgradeAgent;
-			return instance;
-		}
-
-		inline void AddConfiguration(std::uint64_t serial, std::uint64_t config_uuid) {
-			std::lock_guard			Guard(CacheMutex_);
-			auto hint = Cache_.find(serial);
-			if(hint==end(Cache_)) {
-				Cache_[serial] = { Utils::Now(),config_uuid , 0 };
-				return;
-			}
-			if(hint->second.pending_config_==0) {
-				hint->second.last_check_ = Utils::Now();
-				hint->second.current_config_ = config_uuid;
-				return;
-			}
-		}
-
-		inline void AddConfiguration(std::uint64_t serial, std::uint64_t config_uuid, std::uint64_t pending_config_uuid) {
-			std::lock_guard			Guard(CacheMutex_);
-			auto hint = Cache_.find(serial);
-			if(hint==end(Cache_)) {
-				Cache_[serial] = { Utils::Now(), config_uuid , pending_config_uuid };
-				return;
-			}
-			if(hint->second.pending_config_==0) {
-				hint->second.last_check_ = Utils::Now();
-				hint->second.current_config_ = config_uuid;
-				hint->second.pending_config_ = pending_config_uuid;
-				return;
-			}
-		}
-
-		[[nodiscard]] inline ConfigurationCacheEntry GetSerialInfo(std::uint64_t serial) const {
-			std::lock_guard			Guard(CacheMutex_);
-			auto hint = Cache_.find(serial);
-			if(hint==end(Cache_)) {
-				return {0,0,0};
-			}
-			return hint->second;
-		}
-
-		inline bool UpdateConfiguration(std::uint64_t serial, std::uint64_t config) {
-
-			if(serial==0)
-				return false;
-
-			std::lock_guard			Guard(CacheMutex_);
-			auto hint = Cache_.find(serial);
-			if(hint!=end(Cache_)) {
-
-				if(hint->second.current_config_==config) {
-					return false;
-				}
-
-				if(config==hint->second.pending_config_) {
-					Queue_.enqueueNotification(new CheckConfiguration(serial,config));
-					return true;
-				}
-
-				if(config!=hint->second.current_config_ && hint->second.pending_config_==0) {
-					Queue_.enqueueNotification(new CheckConfiguration(serial,config));
-					return true;
-				}
-
-				if((Utils::Now()-hint->second.last_check_)<60*5) {
-					return false;
-				}
-
-				if(hint->second.pending_config_!=0) {
-					return false;
-				}
-
-			}
-			return true;
-		}
-
-		inline void SetDeviceCacheEntry(std::uint64_t serial, std::uint64_t t, std::uint64_t uuid, std::uint64_t pending_uuid) {
-			std::lock_guard			Guard(CacheMutex_);
-			Cache_[serial] = { t, uuid, pending_uuid };
-		}
-
-
-	  private:
-		Poco::NotificationQueue		Queue_;
-		Poco::Thread				QueueManager_;
-		std::atomic_bool 			Running_=false;
-
-		mutable std::mutex			CacheMutex_;
-		std::map<std::uint64_t, ConfigurationCacheEntry> Cache_;
-
-		AP_WS_ConfigAutoUpgradeAgent() noexcept
-			: SubSystemServer("AutoConfigUpgrade", "AUTO-CFG-MGR", "auto.config.updater") {
-		}
-	};
-
-	inline auto AP_WS_ConfigAutoUpgradeAgent() { return AP_WS_ConfigAutoUpgradeAgent::instance(); }
-
-} // namespace OpenWifi
-

src/AP_WS_Connection.h

@@ -4,155 +4,55 @@
 
 #pragma once
 
-#include <mutex>
 #include <string>
+#include <shared_mutex>
 
-#include "Poco/JSON/Object.h"
-#include <Poco/JSON/Parser.h>
-#include "Poco/Logger.h"
-#include "Poco/Net/SocketNotification.h"
 #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 <Poco/Data/Session.h>
 
 #include "RESTObjects/RESTAPI_GWobjects.h"
-#include <AP_WS_Reactor_Pool.h>
+
 
 namespace OpenWifi {
 
 	class AP_WS_Connection {
 		static constexpr int BufSize = 256000;
-
 	  public:
-		explicit AP_WS_Connection(Poco::Net::HTTPServerRequest &request,
+		explicit AP_WS_Connection(	Poco::Net::HTTPServerRequest &request,
-								  Poco::Net::HTTPServerResponse &response, uint64_t connection_id,
+									Poco::Net::HTTPServerResponse &response,
-								  Poco::Logger &L, std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> R);
+									uint64_t connection_id,
+									Poco::Logger &L,
+									Poco::Net::SocketReactor &R);
 		~AP_WS_Connection();
 
 		void EndConnection();
-		void ProcessJSONRPCEvent(Poco::JSON::Object::Ptr &Doc);
+		void ProcessJSONRPCEvent(Poco::JSON::Object::Ptr & Doc);
 		void ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc);
 		void ProcessIncomingFrame();
 		void ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc);
 
-		[[nodiscard]] bool Send(const std::string &Payload);
+		bool Send(const std::string &Payload);
-		[[nodiscard]] inline bool MustBeSecureRTTY() const { return RTTYMustBeSecure_; }
 
-		bool SendRadiusAuthenticationData(const unsigned char *buffer, std::size_t size);
+		bool SendRadiusAuthenticationData(const unsigned char * buffer, std::size_t size);
-		bool SendRadiusAccountingData(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);
+		bool SendRadiusCoAData(const unsigned char * buffer, std::size_t size);
 
-		void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
+		void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf);
-		void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf);
+		void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification>& pNf);
-		void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf);
+		void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification>& pNf);
-		bool LookForUpgrade(Poco::Data::Session &Session, uint64_t UUID, uint64_t &UpgradedUUID);
+		bool LookForUpgrade(const 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_; }
+		inline Poco::Logger & Logger() { return Logger_; }
-		bool SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t interval,
+		bool SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t interval, uint64_t TelemetryWebSocketTimer);
-											uint64_t TelemetryWebSocketTimer,
+		bool SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t interval, uint64_t TelemetryKafkaTimer);
-											const std::vector<std::string> &TelemetryTypes);
-		bool SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t interval,
-										uint64_t TelemetryKafkaTimer,
-										const std::vector<std::string> &TelemetryTypes);
 		bool StopWebSocketTelemetry(uint64_t RPCID);
 		bool StopKafkaTelemetry(uint64_t RPCID);
 
-		inline void GetLastStats(std::string &LastStats) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				LastStats = RawLastStats_;
-			}
-		}
-
-		inline void GetLastHealthCheck(GWObjects::HealthCheck &H) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				H = RawLastHealthcheck_;
-			}
-		}
-
-		inline void GetState(GWObjects::ConnectionState &State) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				State = State_;
-			}
-		}
-
-		inline GWObjects::DeviceRestrictions GetRestrictions() {
-			std::lock_guard G(ConnectionMutex_);
-			return Restrictions_;
-		}
-
-		[[nodiscard]] inline bool HasGPS() const { return hasGPS_; }
-		[[nodiscard]] 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;
-
-		void Start();
-
-	  private:
-		mutable std::recursive_mutex ConnectionMutex_;
-		std::mutex TelemetryMutex_;
-		Poco::Logger &Logger_;
-		std::shared_ptr<Poco::Net::SocketReactor> 	Reactor_;
-		std::shared_ptr<LockedDbSession> 	DbSession_;
-		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;
-		std::atomic_uint64_t TelemetryWebSocketRefCount_ = 0;
-		std::atomic_uint64_t TelemetryKafkaRefCount_ = 0;
-		std::atomic_uint64_t TelemetryWebSocketTimer_ = 0;
-		std::atomic_uint64_t TelemetryKafkaTimer_ = 0;
-		std::atomic_uint64_t TelemetryInterval_ = 0;
-		std::atomic_uint64_t TelemetryWebSocketPackets_ = 0;
-		std::atomic_uint64_t TelemetryKafkaPackets_ = 0;
-		GWObjects::ConnectionState State_;
-		Utils::CompressedString 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<bool> 	Dead_ = false;
-		std::atomic_bool DeviceValidated_ = false;
-		OpenWifi::GWObjects::DeviceRestrictions Restrictions_;
-		bool 			RTTYMustBeSecure_ = false;
-		bool hasGPS_=false;
-		std::double_t 	memory_used_=0.0, cpu_load_ = 0.0, temperature_ = 0.0;
-		std::uint64_t 	uuid_=0;
-		bool	Simulated_=false;
-		std::atomic_uint64_t 	LastContact_=0;
-
-		static inline std::atomic_uint64_t ConcurrentStartingDevices_ = 0;
-
-		bool StartTelemetry(uint64_t RPCID, const std::vector<std::string> &TelemetryTypes);
-		bool StopTelemetry(uint64_t RPCID);
-		void UpdateCounts();
-		static void DeviceDisconnectionCleanup(const std::string &SerialNumber, std::uint64_t uuid);
-		void SetLastStats(const std::string &LastStats);
 		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);
@@ -164,15 +64,65 @@ namespace OpenWifi {
 		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);
-		void Process_event(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_wifiscan(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_alarm(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_rebootLog(Poco::JSON::Object::Ptr ParamsObj);
 
-		inline void SetLastHealthCheck(const GWObjects::HealthCheck &H) {
+		bool ValidatedDevice();
-			RawLastHealthcheck_ = H;
+
+		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 DeviceRegistry;
+		friend class AP_WS_Server;
+
+	  private:
+		// std::recursive_mutex 				LocalMutex_;
+		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        					LastStats_;
+		GWObjects::HealthCheck				LastHealthcheck_;
+		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};
+		bool 								Threaded_=false;
+		std::atomic_flag 					Dead_=false;
+		std::atomic_bool 					DeviceValidated_=false;
+		std::atomic_bool 					Valid_=false;
+
+		static inline std::atomic_uint64_t 	ConcurrentStartingDevices_=0;
+
+		bool StartTelemetry(uint64_t RPCID);
+		bool StopTelemetry(uint64_t RPCID);
+		void UpdateCounts();
 	};
 
-} // namespace OpenWifi
+}

src/AP_WS_LookForUpgrade.cpp

@@ -1,111 +0,0 @@
-
-#include <AP_WS_Connection.h>
-#include "ConfigurationCache.h"
-#include "UI_GW_WebSocketNotifications.h"
-#include "CommandManager.h"
-
-namespace OpenWifi {
-	bool AP_WS_Connection::LookForUpgrade(Poco::Data::Session &Session, 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 = GetCurrentConfigurationID(SerialNumberInt_);
-		if (GoodConfig && (GoodConfig == UUID || GoodConfig == State_.PendingUUID)) {
-			UpgradedUUID = UUID;
-			State_.PendingUUID = 0;
-			return false;
-		}
-
-		GWObjects::Device D;
-		if (!StorageService()->GetDevice(Session,SerialNumber_, D)) {
-			return false;
-		}
-
-		if(State_.PendingUUID!=0 && UUID==State_.PendingUUID) {
-			//	so we sent an upgrade to a device, and now it is completing now...
-			UpgradedUUID = UUID;
-			StorageService()->CompleteDeviceConfigurationChange(Session, SerialNumber_);
-			State_.PendingUUID = 0;
-			return true;
-		}
-
-		// dont upgrade a switch if it does not have a real config. Config will always be more than 20 characters
-		if (D.DeviceType==Platforms::SWITCH && D.Configuration.size()<20) {
-			return false;
-		}
-
-		Config::Config Cfg(D.Configuration);
-		//	if this is a broken device (UUID==0) just fix it
-		auto StoredConfigurationUUID = Cfg.UUID();
-		if(D.UUID==0) {
-			D.UUID = StoredConfigurationUUID;
-		}
-
-
-		if (D.UUID == UUID) {
-			D.UUID = UpgradedUUID = UUID;
-			State_.PendingUUID = D.pendingUUID = 0;
-			D.pendingConfiguration.clear();
-			D.pendingConfigurationCmd.clear();
-			StorageService()->UpdateDevice(Session, D);
-			SetCurrentConfigurationID(SerialNumberInt_, UUID);
-//			std::cout << __LINE__ << ": " << SerialNumber_ << "  GoodConfig: " << GoodConfig << "   UUID:" << UUID << "  Pending:" << State_.PendingUUID << std::endl;
-			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.
-			D.UUID = UUID + 2;
-			UpgradedUUID = D.UUID;
-//			std::cout << __LINE__ << ": " << SerialNumber_  << "  GoodConfig: " << GoodConfig << "   UUID:" << UUID << "  Pending:" << State_.PendingUUID << std::endl;
-		}
-
-		Cfg.SetUUID(D.UUID);
-		D.Configuration = Cfg.get();
-		D.pendingUUID = State_.PendingUUID = UpgradedUUID = D.UUID;
-		StorageService()->UpdateDevice(Session, D);
-
-		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, false, false);
-
-		GWWebSocketNotifications::SingleDeviceConfigurationChange_t Notification;
-		Notification.content.serialNumber = D.SerialNumber;
-		Notification.content.oldUUID = UUID;
-		Notification.content.newUUID = UpgradedUUID;
-		GWWebSocketNotifications::DeviceConfigurationChange(Notification);
-
-//		std::cout << __LINE__ << ": " << SerialNumber_ << "  GoodConfig: " << GoodConfig << "   UUID:" << UUID <<
-//			"  Pending:" << State_.PendingUUID << "  Upgraded:" << UpgradedUUID << std::endl;
-
-		return true;
-	}
-
-}

src/AP_WS_Process_alarm.cpp

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2023-01-22.
-//
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "fmt/format.h"
-#include "framework/KafkaManager.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_alarm(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("Alarm data received for {}", SerialNumber_));
-
-		if (ParamsObj->has(uCentralProtocol::SERIAL) && ParamsObj->has(uCentralProtocol::DATA)) {
-			if (KafkaManager()->Enabled()) {
-				KafkaManager()->PostMessage(KafkaTopics::ALERTS, SerialNumber_, *ParamsObj);
-			}
-		}
-	}
-} // namespace OpenWifi

src/AP_WS_Process_cfgpending.cpp

@@ -9,9 +9,8 @@
 namespace OpenWifi {
 	void AP_WS_Connection::Process_cfgpending(Poco::JSON::Object::Ptr ParamsObj) {
 		if (!State_.Connected) {
-			poco_warning(Logger_,
+			poco_warning(Logger_, fmt::format(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-									 CId_, CN_));
 			Errors_++;
 			return;
 		}
@@ -19,10 +18,9 @@ namespace OpenWifi {
 
 			[[maybe_unused]] uint64_t UUID = ParamsObj->get(uCentralProtocol::UUID);
 			[[maybe_unused]] uint64_t Active = ParamsObj->get(uCentralProtocol::ACTIVE);
-			poco_trace(Logger_,
+			poco_trace(Logger_, fmt::format("CFG-PENDING({}): Active: {} Target: {}", CId_, Active, UUID));
-					   fmt::format("CFG-PENDING({}): Active: {} Target: {}", CId_, Active, UUID));
 		} else {
 			poco_warning(Logger_, fmt::format("CFG-PENDING({}): Missing some parameters", CId_));
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_connect.cpp

@@ -4,304 +4,141 @@
 
 #include "AP_WS_Connection.h"
 #include "AP_WS_Server.h"
-#include "CentralConfig.h"
-#include "Daemon.h"
-#include "FindCountry.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 "firmware_revision_cache.h"
-
 #include "UI_GW_WebSocketNotifications.h"
-#include <GWKafkaEvents.h>
 
 namespace OpenWifi {
 
-	[[maybe_unused]] static void SendKafkaFirmwareUpdate(const std::string &SerialNumber,
+	void AP_WS_Connection::Process_connect(Poco::JSON::Object::Ptr ParamsObj, const std::string &Serial) {
-														 const std::string &OldFirmware,
+		if (ParamsObj->has(uCentralProtocol::UUID) &&
-														 const std::string &NewFirmware) {
+			ParamsObj->has(uCentralProtocol::FIRMWARE) &&
-		if (KafkaManager()->Enabled()) {
-			Poco::JSON::Object EventDetails;
-			EventDetails.set("oldFirmware", OldFirmware);
-			EventDetails.set("newFirmware", NewFirmware);
-			Poco::JSON::Object Event;
-			Event.set("type", "device.firmware_change");
-			Event.set("timestamp", Utils::Now());
-			Event.set("payload", EventDetails);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, Event);
-		}
-	}
-
-	[[maybe_unused]] static void SendKafkaDeviceNotProvisioned(	const std::string &SerialNumber,
-														 		const std::string &Firmware,
-															   	const std::string &DeviceType,
-															   	const std::string &IP) {
-		if (KafkaManager()->Enabled()) {
-			Poco::JSON::Object EventDetails;
-			EventDetails.set("firmware", Firmware);
-			EventDetails.set("deviceType", DeviceType);
-			EventDetails.set("IP", IP);
-			Poco::JSON::Object Event;
-			Event.set("type", "device.not_provisioned");
-			Event.set("timestamp", Utils::Now());
-			Event.set("payload", EventDetails);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, Event);
-		}
-	}
-
-	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);
+			auto CapabilitiesString = ParamsObj->get(uCentralProtocol::CAPABILITIES).toString();
 
-			std::string DevicePassword;
+			Config::Capabilities Caps(CapabilitiesString);
-			if(ParamsObj->has("password")) {
+			Compatible_ = Caps.Compatible();
-				DevicePassword = ParamsObj->get("password").toString();
-			}
 
 			SerialNumber_ = Serial;
 			SerialNumberInt_ = Utils::SerialNumberToInt(SerialNumber_);
 
 			CommandManager()->ClearQueue(SerialNumberInt_);
 
-			AP_WS_Server()->StartSession(State_.sessionId, SerialNumberInt_);
+			AP_WS_Server()->SetSessionDetails(State_.sessionId,SerialNumberInt_);
-
-			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 Platform = Poco::toLower(Caps.Platform());
-
-			if(ParamsObj->has("reason")) {
-				State_.connectReason = ParamsObj->get("reason").toString();
-			}
-
 			auto IP = PeerAddress_.toString();
-			if (IP.substr(0, 7) == "::ffff:") {
+			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);
-			}
-
-			if (Capabilities->has("developer") && !Capabilities->isNull("developer")) {
-				Restrictions_.developer = Capabilities->getValue<bool>("developer");
-			}
-
-			if(Capabilities->has("secure-rtty")) {
-				RTTYMustBeSecure_ = Capabilities->getValue<bool>("secure-rtty");
-			}
-
 			State_.locale = FindCountryFromIP()->Get(IP);
-			GWObjects::Device DeviceInfo;
+			GWObjects::Device	DeviceInfo;
-			std::lock_guard DbSessionLock(DbSession_->Mutex());
+			auto DeviceExists = StorageService()->GetDevice(SerialNumber_,DeviceInfo);
-
-			auto DeviceExists = StorageService()->GetDevice(DbSession_->Session(), SerialNumber_, DeviceInfo);
 			if (Daemon()->AutoProvisioning() && !DeviceExists) {
-				//	check the firmware version. if this is too old, we cannot let that device connect yet, we must
+				StorageService()->CreateDefaultDevice(SerialNumber_, CapabilitiesString, Firmware,
-				//	force a firmware upgrade
+													  Compatible_, PeerAddress_);
-				GWObjects::DefaultFirmware	MinimumFirmware;
-				if(FirmwareRevisionCache()->DeviceMustUpgrade(Compatible_, Firmware, MinimumFirmware)) {
-					Poco::JSON::Object	UpgradeCommand, Params;
-					UpgradeCommand.set(uCentralProtocol::JSONRPC,uCentralProtocol::JSONRPC_VERSION);
-					UpgradeCommand.set(uCentralProtocol::METHOD,uCentralProtocol::UPGRADE);
-					Params.set(uCentralProtocol::SERIALNUMBER, SerialNumber_);
-					Params.set(uCentralProtocol::WHEN, 0);
-					Params.set(uCentralProtocol::URI, MinimumFirmware.uri);
-					Params.set(uCentralProtocol::KEEP_REDIRECTOR,1);
-					UpgradeCommand.set(uCentralProtocol::PARAMS, Params);
-					UpgradeCommand.set(uCentralProtocol::ID, 1);
-
-					std::ostringstream Command;
-					UpgradeCommand.stringify(Command);
-					if(Send(Command.str())) {
-						poco_information(
-							Logger(),
-							fmt::format(
-								"Forcing device {} to upgrade to {} before connection is allowed.",
-								SerialNumber_, MinimumFirmware.revision));
-					} else {
-						poco_error(
-							Logger(),
-							fmt::format(
-								"Could not force device {} to upgrade to {} before connection is allowed.",
-								SerialNumber_, MinimumFirmware.revision));
-					}
-					return;
-				} else {
-					StorageService()->CreateDefaultDevice( DbSession_->Session(),
-						SerialNumber_, Caps, Firmware, PeerAddress_,
-						State_.VerifiedCertificate == GWObjects::SIMULATED);
-				}
-			} else if (!Daemon()->AutoProvisioning() && !DeviceExists) {
-				SendKafkaDeviceNotProvisioned(SerialNumber_, Firmware, Compatible_, CId_);
-				poco_warning(Logger(),fmt::format("Device {} is a {} from {} and cannot be provisioned.",SerialNumber_,Compatible_, CId_));
-				return EndConnection();
 			} else if (DeviceExists) {
-				StorageService()->UpdateDeviceCapabilities(DbSession_->Session(), SerialNumber_, Caps);
+				StorageService()->UpdateDeviceCapabilities(SerialNumber_, CapabilitiesString,
-				int Updated{0};
+														   Compatible_);
-				if (!Firmware.empty()) {
+				bool Updated = false;
-					if (Firmware != DeviceInfo.Firmware) {
+				if(!Firmware.empty()) {
-						DeviceFirmwareChangeKafkaEvent KEvent(SerialNumberInt_, Utils::Now(),
+					if(Firmware!=DeviceInfo.Firmware) {
-															  DeviceInfo.Firmware, Firmware);
 						DeviceInfo.Firmware = Firmware;
 						DeviceInfo.LastFWUpdate = Utils::Now();
-						++Updated;
+						Updated = true;
 
-						GWWebSocketNotifications::SingleDeviceFirmwareChange_t Notification;
+						WebNotificationSingleDeviceFirmwareChange_t	Notification;
 						Notification.content.serialNumber = SerialNumber_;
 						Notification.content.newFirmware = Firmware;
-						GWWebSocketNotifications::DeviceFirmwareUpdated(Notification);
+						WebSocketClientNotificationDeviceFirmwareUpdated(Notification);
-					} else if (DeviceInfo.LastFWUpdate == 0) {
+					} else if(DeviceInfo.LastFWUpdate==0) {
 						DeviceInfo.LastFWUpdate = Utils::Now();
-						++Updated;
+						Updated = true;
 					}
 				}
 
-				if(ParamsObj->has("reason")) {
+				if(DeviceInfo.locale != State_.locale) {
-					State_.connectReason = ParamsObj->get("reason").toString();
-					DeviceInfo.connectReason = State_.connectReason;
-					++Updated;
-				}
-
-				if(DeviceInfo.DevicePassword!=DevicePassword) {
-					DeviceInfo.DevicePassword = DevicePassword.empty() ? "openwifi" : DevicePassword ;
-					++Updated;
-				}
-
-				if (DeviceInfo.lastRecordedContact==0) {
-					DeviceInfo.lastRecordedContact = Utils::Now();
-					++Updated;
-				}
-
-				if (DeviceInfo.simulated && (State_.VerifiedCertificate!=GWObjects::SIMULATED)) {
-					DeviceInfo.simulated = false;
-					++Updated;
-				}
-
-				if (!DeviceInfo.simulated && (State_.VerifiedCertificate==GWObjects::SIMULATED)) {
-					DeviceInfo.simulated = true;
-					++Updated;
-				}
-
-				if (DeviceInfo.locale != State_.locale) {
 					DeviceInfo.locale = State_.locale;
-					++Updated;
+					Updated = true;
 				}
 
-				if (Compatible_ != DeviceInfo.Compatible) {
+				if(Compatible_ != DeviceInfo.DeviceType) {
-					DeviceInfo.Compatible = Compatible_;
+					DeviceInfo.DeviceType = Compatible_;
-					++Updated;
+					Updated = true;
 				}
 
-				if (Platform != DeviceInfo.DeviceType) {
+				if(Updated) {
-					DeviceInfo.DeviceType = Platform;
+					StorageService()->UpdateDevice(DeviceInfo);
-					++Updated;
-				}
-
-				if (RestrictedDevice != DeviceInfo.restrictedDevice) {
-					DeviceInfo.restrictedDevice = RestrictedDevice;
-					++Updated;
-				}
-
-				if (Restrictions_ != DeviceInfo.restrictionDetails) {
-					DeviceInfo.restrictionDetails = Restrictions_;
-					++Updated;
-				}
-
-				if(DeviceInfo.certificateExpiryDate!=State_.certificateExpiryDate) {
-					DeviceInfo.certificateExpiryDate = State_.certificateExpiryDate;
-					++Updated;
-				}
-
-				if (Updated) {
-					StorageService()->UpdateDevice(DbSession_->Session(), DeviceInfo);
-				}
-			}
-
-			if(!Simulated_) {
-				uint64_t UpgradedUUID = 0;
-				if (LookForUpgrade(DbSession_->Session(), UUID, UpgradedUUID)) {
-					State_.UUID = UpgradedUUID;
 				}
+				uint64_t UpgradedUUID=0;
+				LookForUpgrade(UUID,UpgradedUUID);
+				State_.UUID = UpgradedUUID;
 			}
 
 			State_.Compatible = Compatible_;
 			State_.Connected = true;
-			ConnectionCompletionTime_ =
+			ConnectionCompletionTime_ = std::chrono::high_resolution_clock::now() - ConnectionStart_;
-				std::chrono::high_resolution_clock::now() - ConnectionStart_;
 			State_.connectionCompletionTime = ConnectionCompletionTime_.count();
 
-			if (State_.VerifiedCertificate == GWObjects::VALID_CERTIFICATE) {
+			if(State_.VerifiedCertificate == GWObjects::VALID_CERTIFICATE) {
-				if ((Utils::SerialNumberMatch(CN_, SerialNumber_,
+				if ((	Utils::SerialNumberMatch(CN_, SerialNumber_, AP_WS_Server()->MismatchDepth())) ||
-											  (int)AP_WS_Server()->MismatchDepth())) ||
+						AP_WS_Server()->IsSimSerialNumber(CN_)) {
-					AP_WS_Server()->IsSimSerialNumber(CN_)) {
 					State_.VerifiedCertificate = GWObjects::VERIFIED;
-					poco_information(Logger_,
+					poco_information(Logger_, fmt::format("CONNECT({}): Fully validated and authenticated device. Session={} ConnectionCompletion Time={}",
-									 fmt::format("CONNECT({}): Fully validated and authenticated "
+														   CId_,
-												 "device. Session={} ConnectionCompletion Time={}",
+														   State_.sessionId,
-												 CId_, State_.sessionId,
+														   State_.connectionCompletionTime ));
-												 State_.connectionCompletionTime));
 				} else {
 					State_.VerifiedCertificate = GWObjects::MISMATCH_SERIAL;
-					if (AP_WS_Server()->AllowSerialNumberMismatch()) {
+					if(AP_WS_Server()->AllowSerialNumberMismatch()) {
 						poco_information(
-							Logger_,
+							Logger_, fmt::format("CONNECT({}): Serial number mismatch allowed. CN={} Serial={} Session={} ConnectionCompletion Time={}",
-							fmt::format("CONNECT({}): Serial number mismatch allowed. CN={} "
+												 CId_, CN_, SerialNumber_, State_.sessionId,
-										"Serial={} Session={} ConnectionCompletion Time={}",
+												 State_.connectionCompletionTime));
-										CId_, CN_, SerialNumber_, State_.sessionId,
-										State_.connectionCompletionTime));
 					} else {
 						poco_information(
-							Logger_, fmt::format("CONNECT({}): Serial number mismatch disallowed. "
+							Logger_, fmt::format("CONNECT({}): Serial number mismatch disallowed. Device rejected. CN={} Serial={} Session={} ConnectionCompletion Time={}",
-												 "Device rejected. CN={} Serial={} Session={}",
+												 CId_, CN_, SerialNumber_, State_.sessionId,
-												 CId_, CN_, SerialNumber_, State_.sessionId));
+												 State_.connectionCompletionTime));
 						return EndConnection();
 					}
 				}
-			} else {
-				poco_information(Logger_,
-								 fmt::format("CONNECT({}): Simulator device. "
-											 "Session={} ConnectionCompletion Time={}",
-											 CId_, State_.sessionId,
-											 State_.connectionCompletionTime));
 			}
 
-			GWWebSocketNotifications::SingleDevice_t Notification;
+			WebNotificationSingleDevice_t	Notification;
 			Notification.content.serialNumber = SerialNumber_;
-			GWWebSocketNotifications::DeviceConnected(Notification);
+			WebSocketClientNotificationDeviceConnected(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("locale", State_.locale );
 				ParamsObj->set(uCentralProtocol::TIMESTAMP, Utils::Now());
-				ParamsObj->set(uCentralProtocol::UUID, uuid_);
+				std::ostringstream OS;
-				KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, *ParamsObj);
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, OS.str());
 			}
 		} else {
-			poco_warning(
+			poco_warning(Logger_,fmt::format("INVALID-PROTOCOL({}): Missing one of uuid, firmware, or capabilities", CId_));
-				Logger_,
-				fmt::format("INVALID-PROTOCOL({}): Missing one of uuid, firmware, or capabilities",
-							CId_));
 			Errors_++;
 		}
 	}
 
-} // namespace OpenWifi
+}

src/AP_WS_Process_crashlog.cpp

@@ -5,14 +5,13 @@
 #include "AP_WS_Connection.h"
 #include "StorageService.h"
 
-#include "fmt/format.h"
+#include "framework/utils.h"
 #include "framework/ow_constants.h"
-#include <GWKafkaEvents.h>
+#include "fmt/format.h"
 
 namespace OpenWifi {
 	void AP_WS_Connection::Process_crashlog(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has(uCentralProtocol::UUID)
+		if (ParamsObj->has(uCentralProtocol::UUID) && ParamsObj->has(uCentralProtocol::LOGLINES)) {
-			&& ParamsObj->has(uCentralProtocol::LOGLINES)) {
 			poco_trace(Logger_, fmt::format("CRASH-LOG({}): new entry.", CId_));
 			auto LogLines = ParamsObj->get(uCentralProtocol::LOGLINES);
 			std::string LogText;
@@ -26,14 +25,14 @@ namespace OpenWifi {
 										   .Log = LogText,
 										   .Data = "",
 										   .Severity = GWObjects::DeviceLog::LOG_EMERG,
-										   .Recorded = Utils::Now(),
+										   .Recorded = (uint64_t)time(nullptr),
 										   .LogType = 1,
-										   .UUID = ParamsObj->get(uCentralProtocol::UUID)};
+										   .UUID = 0};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
-			DeviceLogKafkaEvent	E(DeviceLog);
+
 		} else {
 			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
 			return;
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_deviceupdate.cpp

@@ -9,23 +9,19 @@
 
 namespace OpenWifi {
 
-	void AP_WS_Connection::Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj,
+	void AP_WS_Connection::Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj, std::string &Serial) {
-												std::string &Serial) {
 		if (!State_.Connected) {
-			poco_warning(Logger_,
+			poco_warning(Logger_, fmt::format(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-									 CId_, CN_));
 			Errors_++;
 			return;
 		}
 		if (ParamsObj->has("currentPassword")) {
 			auto Password = ParamsObj->get("currentPassword").toString();
 
-			StorageService()->SetDevicePassword(*DbSession_,Serial, Password);
+			StorageService()->SetDevicePassword(Serial, Password);
-			poco_trace(
+			poco_trace(Logger_, fmt::format("DEVICEUPDATE({}): Device is updating its login password.", Serial));
-				Logger_,
-				fmt::format("DEVICE-UPDATE({}): Device is updating its login password.", Serial));
 		}
 	}
 
-} // namespace OpenWifi
+}

src/AP_WS_Process_event.cpp

@@ -1,51 +0,0 @@
-//
-// Created by stephane bourque on 2023-01-22.
-//
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "fmt/format.h"
-#include "framework/KafkaManager.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_event(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("Event data received for {}", SerialNumber_));
-
-		try {
-			if (ParamsObj->has(uCentralProtocol::SERIAL) &&
-				ParamsObj->has(uCentralProtocol::DATA)) {
-				if (KafkaManager()->Enabled()) {
-					auto Data = ParamsObj->getObject(uCentralProtocol::DATA);
-					auto Event = Data->getArray("event");
-					auto EventTimeStamp = Event->getElement<std::uint64_t>(0);
-					auto EventDetails = Event->getObject(1);
-					auto EventType = EventDetails->get("type").extract<std::string>();
-					auto EventPayload = EventDetails->getObject("payload");
-
-					Poco::JSON::Object FullEvent;
-					FullEvent.set("type", EventType);
-					FullEvent.set("timestamp", EventTimeStamp);
-					FullEvent.set("payload", EventPayload);
-					if(strncmp(EventType.c_str(),"rrm.",4) == 0 ) {
-						KafkaManager()->PostMessage(KafkaTopics::RRM, SerialNumber_,
-													FullEvent);
-					} else {
-						KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber_,
-													FullEvent);
-					}
-				}
-			}
-		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
-		} catch (...) {
-		}
-	}
-} // namespace OpenWifi

src/AP_WS_Process_healthcheck.cpp

@@ -3,67 +3,73 @@
 //
 
 #include "AP_WS_Connection.h"
-#include "AP_WS_Server.h"
 #include "StorageService.h"
 
-#include "fmt/format.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) {
+void AP_WS_Connection::Process_healthcheck(Poco::JSON::Object::Ptr ParamsObj) {
-		if (!State_.Connected) {
+	if (!State_.Connected) {
-			poco_warning(Logger_,
+		poco_warning(Logger_, fmt::format(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+								   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-									 CId_, CN_));
+		Errors_++;
-			Errors_++;
+		return;
-			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);
-			State_.sanity = 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));
-			}
-
-			GWObjects::HealthCheck Check;
-
-			Check.SerialNumber = SerialNumber_;
-			Check.Recorded = Utils::Now();
-			Check.UUID = UUID;
-			Check.Data = CheckData;
-			Check.Sanity = Sanity;
-
-			StorageService()->AddHealthCheckData(*DbSession_, Check);
-
-			if (!request_uuid.empty()) {
-				StorageService()->SetCommandResult(request_uuid, CheckData);
-			}
-
-			SetLastHealthCheck(Check);
-			if (KafkaManager()->Enabled() && !AP_WS_Server()->KafkaDisableHealthChecks()) {
-				KafkaManager()->PostMessage(KafkaTopics::HEALTHCHECK, SerialNumber_, *ParamsObj);
-			}
-		} else {
-			poco_warning(Logger_, fmt::format("HEALTHCHECK({}): Missing parameter", CId_));
-			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;
 
-} // namespace OpenWifi
+		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);
+		}
+
+		LastHealthcheck_ = 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

@@ -5,16 +5,15 @@
 #include "AP_WS_Connection.h"
 #include "StorageService.h"
 
-#include "fmt/format.h"
 #include "framework/ow_constants.h"
-#include <GWKafkaEvents.h>
+#include "fmt/format.h"
 
 namespace OpenWifi {
 	void AP_WS_Connection::Process_log(Poco::JSON::Object::Ptr ParamsObj) {
 		if (!State_.Connected) {
-			poco_warning(Logger_,
+			poco_warning(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+				Logger_,
-									 CId_, CN_));
+				fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
 			Errors_++;
 			return;
 		}
@@ -36,11 +35,10 @@ namespace OpenWifi {
 										   .Recorded = (uint64_t)time(nullptr),
 										   .LogType = 0,
 										   .UUID = State_.UUID};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
-			DeviceLogKafkaEvent	E(DeviceLog);
 		} else {
 			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
 			return;
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_ping.cpp

@@ -15,4 +15,4 @@ namespace OpenWifi {
 			poco_warning(Logger_, fmt::format("PING({}): Missing parameter.", CId_));
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_rebootLog.cpp

@@ -1,44 +0,0 @@
-//
-// Created by stephane bourque on 2023-05-16.
-//
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "fmt/format.h"
-#include "framework/ow_constants.h"
-#include <GWKafkaEvents.h>
-
-namespace OpenWifi {
-
-	void StripNulls(std::string &S) {
-		for(std::size_t i=0;i<S.size();++i) {
-			if(S[i]==0)
-				S[i]=' ';
-		}
-	}
-
-	void AP_WS_Connection::Process_rebootLog(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has(uCentralProtocol::UUID)
-			&& ParamsObj->isArray(uCentralProtocol::INFO)
-			&& ParamsObj->has(uCentralProtocol::TYPE)
-			&& ParamsObj->has(uCentralProtocol::DATE) ) {
-			poco_warning(Logger_, fmt::format("REBOOT-LOG({}): new entry.", CId_));
-
-			auto InfoLines = ParamsObj->getArray(uCentralProtocol::INFO);
-			std::ostringstream os;
-			InfoLines->stringify(os);
-
-			GWObjects::DeviceLog DeviceLog{.SerialNumber = SerialNumber_,
-										   .Log = ParamsObj->get(uCentralProtocol::TYPE).toString(),
-										   .Data = "{ \"info\" : " + os.str() + "}",
-										   .Severity = GWObjects::DeviceLog::LOG_INFO,
-										   .Recorded = ParamsObj->get(uCentralProtocol::DATE),
-										   .LogType = 2,
-										   .UUID = ParamsObj->get(uCentralProtocol::UUID)};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
-			DeviceLogKafkaEvent	E(DeviceLog);
-		} else {
-			poco_warning(Logger_, fmt::format("REBOOT-LOG({}): Missing parameters.", CId_));
-		}
-	}
-} // namespace OpenWifi

src/AP_WS_Process_recovery.cpp

@@ -3,12 +3,12 @@
 //
 
 #include "AP_WS_Connection.h"
-#include "CommandManager.h"
 #include "StorageService.h"
+#include "CommandManager.h"
 
-#include "fmt/format.h"
-#include "framework/MicroServiceFuncs.h"
 #include "framework/ow_constants.h"
+#include "framework/MicroServiceFuncs.h"
+#include "fmt/format.h"
 
 namespace OpenWifi {
 	void AP_WS_Connection::Process_recovery(Poco::JSON::Object::Ptr ParamsObj) {
@@ -35,7 +35,7 @@ namespace OpenWifi {
 										   .LogType = 1,
 										   .UUID = 0};
 
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
 
 			if (ParamsObj->get(uCentralProtocol::REBOOT).toString() == "true") {
 				GWObjects::CommandDetails Cmd;
@@ -51,24 +51,16 @@ namespace OpenWifi {
 				Poco::JSON::Stringifier::stringify(Params, O);
 				Cmd.Details = O.str();
 				bool Sent;
-				CommandManager()->PostCommand(CommandManager()->Next_RPC_ID(),
+				CommandManager()->PostCommand(CommandManager()->NextRPCId(),SerialNumber_, Cmd.Command, Params, Cmd.UUID, Sent);
-											  APCommands::Commands::reboot, SerialNumber_,
+				StorageService()->AddCommand(SerialNumber_, Cmd, Storage::CommandExecutionType::COMMAND_EXECUTED);
-											  Cmd.Command, Params, Cmd.UUID, Sent, false, false);
+				poco_information(Logger_, fmt::format("RECOVERY({}): Recovery mode received, need for a reboot.", CId_));
-				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(
+				poco_information(Logger_, fmt::format(
-					Logger_,
+											   "RECOVERY({}): Recovery mode received, no need for a reboot.", CId_));
-					fmt::format("RECOVERY({}): Recovery mode received, no need for a reboot.",
-								CId_));
 			}
 		} else {
-			poco_warning(Logger_, fmt::format("RECOVERY({}): Recovery missing one of serialnumber, "
+			poco_warning(Logger_, fmt::format("RECOVERY({}): Recovery missing one of serialnumber, firmware, uuid, loglines, reboot",
-											  "firmware, uuid, loglines, reboot",
+											   CId_));
-											  CId_));
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_state.cpp

@@ -3,9 +3,8 @@
 //
 
 #include "AP_WS_Connection.h"
-#include "AP_WS_Server.h"
-#include "StateUtils.h"
 #include "StorageService.h"
+#include "StateUtils.h"
 
 #include "UI_GW_WebSocketNotifications.h"
 
@@ -17,9 +16,8 @@
 namespace OpenWifi {
 	void AP_WS_Connection::Process_state(Poco::JSON::Object::Ptr ParamsObj) {
 		if (!State_.Connected) {
-			poco_warning(Logger_,
+			poco_warning(Logger_, fmt::format(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-									 CId_, CN_));
 			Errors_++;
 			return;
 		}
@@ -36,42 +34,39 @@ namespace OpenWifi {
 			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_,
+				poco_trace(Logger_, fmt::format("STATE({}): UUID={} Updating for CMD={}.",
-												UUID, request_uuid));
+												 CId_, UUID, request_uuid));
 			}
 
-			std::lock_guard	Guard(DbSession_->Mutex());
+			uint64_t UpgradedUUID;
-			if(!Simulated_) {
+			LookForUpgrade(UUID,UpgradedUUID);
-				uint64_t UpgradedUUID;
+			State_.UUID = UpgradedUUID;
-				LookForUpgrade(DbSession_->Session(), UUID, UpgradedUUID);
+			LastStats_ = StateStr;
-				State_.UUID = UpgradedUUID;
-			}
-
-			SetLastStats(StateStr);
 
 			GWObjects::Statistics Stats{
 				.SerialNumber = SerialNumber_, .UUID = UUID, .Data = StateStr};
 			Stats.Recorded = Utils::Now();
-			StorageService()->AddStatisticsData(DbSession_->Session(),Stats);
+			StorageService()->AddStatisticsData(Stats);
 			if (!request_uuid.empty()) {
 				StorageService()->SetCommandResult(request_uuid, StateStr);
 			}
 
-			StateUtils::ComputeAssociations(StateObj, State_.Associations_2G,
+			StateUtils::ComputeAssociations(StateObj, 	State_.Associations_2G,
-											State_.Associations_5G, State_.Associations_6G, State_.uptime);
+														State_.Associations_5G);
 
-			if (KafkaManager()->Enabled() && !AP_WS_Server()->KafkaDisableState()) {
+			if (KafkaManager()->Enabled()) {
-				KafkaManager()->PostMessage(KafkaTopics::STATE, SerialNumber_, *ParamsObj);
+				Poco::JSON::Stringifier Stringify;
+				std::ostringstream OS;
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::STATE, SerialNumber_, OS.str());
 			}
 
-			GWWebSocketNotifications::SingleDevice_t N;
+			WebNotificationSingleDevice_t	N;
 			N.content.serialNumber = SerialNumber_;
-			GWWebSocketNotifications::DeviceStatistics(N);
+			WebSocketClientNotificationDeviceStatistics(N);
 
 		} else {
-			poco_warning(
+			poco_warning(Logger_, fmt::format("STATE({}): Invalid request. Missing serial, uuid, or state", CId_));
-				Logger_,
-				fmt::format("STATE({}): Invalid request. Missing serial, uuid, or state", CId_));
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_telemetry.cpp

@@ -3,65 +3,57 @@
 //
 
 #include "AP_WS_Connection.h"
-#include "CommandManager.h"
 #include "TelemetryStream.h"
+#include "CommandManager.h"
 
-#include "fmt/format.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_,
+			poco_warning(Logger_, fmt::format(
-						 fmt::format("INVALID-PROTOCOL({}): Device '{}' is not following protocol",
+									   "INVALID-PROTOCOL({}): Device '{}' is not following protocol", CId_, CN_));
-									 CId_, CN_));
 			Errors_++;
 			return;
 		}
-		poco_trace(Logger_, fmt::format("Telemetry data received for {}", SerialNumber_));
+		poco_trace(Logger_,fmt::format("Telemetry data received for {}", SerialNumber_));
-		if (TelemetryReporting_ || ParamsObj->has("adhoc")) {
+		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();
+				auto now=Utils::Now();
-				auto KafkaPayload = SS.str();
-				if (ParamsObj->has("adhoc")) {
-					KafkaManager()->PostMessage(KafkaTopics::DEVICE_TELEMETRY, SerialNumber_,
-												KafkaPayload);
-					return;
-				}
 				if (TelemetryWebSocketRefCount_) {
-					if (now < TelemetryWebSocketTimer_) {
+					if(now<TelemetryWebSocketTimer_) {
-
+						// std::cout << SerialNumber_ << ": Updating WebSocket telemetry" << std::endl;
 						TelemetryWebSocketPackets_++;
 						State_.websocketPackets = TelemetryWebSocketPackets_;
-						TelemetryStream()->NotifyEndPoint(SerialNumberInt_, KafkaPayload);
+						TelemetryStream()->NotifyEndPoint(SerialNumberInt_, SS.str());
 					} else {
-						StopWebSocketTelemetry(CommandManager()->Next_RPC_ID());
+						StopWebSocketTelemetry(CommandManager()->NextRPCId());
 					}
 				}
 				if (TelemetryKafkaRefCount_) {
-					if (KafkaManager()->Enabled() && now < TelemetryKafkaTimer_) {
+					if(KafkaManager()->Enabled() && now<TelemetryKafkaTimer_) {
+						// std::cout << SerialNumber_ << ": Updating Kafka telemetry" << std::endl;
 						TelemetryKafkaPackets_++;
 						State_.kafkaPackets = TelemetryKafkaPackets_;
 						KafkaManager()->PostMessage(KafkaTopics::DEVICE_TELEMETRY, SerialNumber_,
-													KafkaPayload);
+													SS.str());
 					} else {
-						StopKafkaTelemetry(CommandManager()->Next_RPC_ID());
+						StopKafkaTelemetry(CommandManager()->NextRPCId());
 					}
 				}
 			} else {
-				poco_debug(Logger_,
+				poco_debug(Logger_,fmt::format("TELEMETRY({}): Invalid telemetry packet.",SerialNumber_));
-						   fmt::format("TELEMETRY({}): Invalid telemetry packet.", SerialNumber_));
 			}
 		} else {
 			// if we are ignoring telemetry, then close it down on the device.
-			poco_debug(Logger_,
+			poco_debug(Logger_,fmt::format("TELEMETRY({}): Stopping runaway telemetry.",SerialNumber_));
-					   fmt::format("TELEMETRY({}): Stopping runaway telemetry.", SerialNumber_));
+			StopTelemetry(CommandManager()->NextRPCId());
-			StopTelemetry(CommandManager()->Next_RPC_ID());
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_venuebroadcast.cpp

@@ -7,10 +7,11 @@
 
 namespace OpenWifi {
 	void AP_WS_Connection::Process_venuebroadcast(Poco::JSON::Object::Ptr ParamsObj) {
-		if (ParamsObj->has("data") && ParamsObj->has("serial") && ParamsObj->has("timestamp")) {
+		if(ParamsObj->has("data") && ParamsObj->has("serial") && ParamsObj->has("timestamp")) {
-			VenueBroadcaster()->Broadcast(ParamsObj->get("serial").toString(),
+			VenueBroadcaster()->Broadcast(
-										  ParamsObj->getObject("data"),
+				ParamsObj->get("serial").toString(),
-										  ParamsObj->get("timestamp"));
+				ParamsObj->get("data").toString(),
+				ParamsObj->get("timestamp"));
 		}
 	}
-} // namespace OpenWifi
+}

src/AP_WS_Process_wifiscan.cpp

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2023-01-22.
-//
-#include "AP_WS_Connection.h"
-#include "StorageService.h"
-
-#include "fmt/format.h"
-#include "framework/KafkaManager.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-	void AP_WS_Connection::Process_wifiscan(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("Wifiscan data received for {}", SerialNumber_));
-
-		if (ParamsObj->has(uCentralProtocol::SERIAL) && ParamsObj->has(uCentralProtocol::DATA)) {
-			if (KafkaManager()->Enabled()) {
-				KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, *ParamsObj);
-			}
-		}
-	}
-} // namespace OpenWifi

src/AP_WS_ReactorPool.h

@@ -0,0 +1,64 @@
+//
+// Created by stephane bourque on 2022-02-03.
+//
+
+#pragma once
+
+#include <string>
+#include <shared_mutex>
+
+#include "Poco/Net/SocketAcceptor.h"
+#include "Poco/Environment.h"
+
+#include "framework/utils.h"
+
+namespace OpenWifi {
+	class AP_WS_ReactorThreadPool {
+	  public:
+		explicit AP_WS_ReactorThreadPool() {
+			NumberOfThreads_ = Poco::Environment::processorCount()*2;
+			if(NumberOfThreads_==0)
+				NumberOfThreads_=4;
+		}
+
+		~ AP_WS_ReactorThreadPool() {
+			Stop();
+		}
+
+		void Start() {
+			for (uint64_t i = 0; i < NumberOfThreads_; ++i) {
+				auto NewReactor = std::make_unique<Poco::Net::SocketReactor>();
+				auto NewThread = std::make_unique<Poco::Thread>();
+				NewThread->start(*NewReactor);
+				std::string ThreadName{"ap:react:" + std::to_string(i)};
+				Utils::SetThreadName(*NewThread,ThreadName.c_str());
+				Reactors_.emplace_back(std::move(NewReactor));
+				Threads_.emplace_back(std::move(NewThread));
+			}
+		}
+
+		void Stop() {
+			for (auto &i : Reactors_)
+				i->stop();
+			for (auto &i : Threads_) {
+				i->join();
+			}
+			Reactors_.clear();
+			Threads_.clear();
+		}
+
+		Poco::Net::SocketReactor &NextReactor() {
+			std::shared_lock		Lock(Mutex_);
+			NextReactor_++;
+			NextReactor_ %= NumberOfThreads_;
+			return *Reactors_[NextReactor_];
+		}
+
+	  private:
+		std::shared_mutex	Mutex_;
+		uint64_t 			NumberOfThreads_;
+		uint64_t 			NextReactor_ = 0;
+		std::vector<std::unique_ptr<Poco::Net::SocketReactor>> Reactors_;
+		std::vector<std::unique_ptr<Poco::Thread>> Threads_;
+	};
+}

src/AP_WS_Reactor_Pool.h

@@ -1,77 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-03.
-//
-
-#pragma once
-
-#include <mutex>
-#include <string>
-
-#include <framework/utils.h>
-
-#include <Poco/Environment.h>
-#include <Poco/Net/SocketAcceptor.h>
-#include <Poco/Data/SessionPool.h>
-
-#include <StorageService.h>
-
-namespace OpenWifi {
-
-	class AP_WS_ReactorThreadPool {
-	  public:
-		explicit AP_WS_ReactorThreadPool(Poco::Logger &Logger) : Logger_(Logger) {
-			NumberOfThreads_ = Poco::Environment::processorCount() * 4;
-			if (NumberOfThreads_ == 0)
-				NumberOfThreads_ = 8;
-			NumberOfThreads_ = std::min(NumberOfThreads_, (std::uint64_t) 128);
-		}
-
-		~AP_WS_ReactorThreadPool() { Stop(); }
-
-		void Start() {
-			Reactors_.reserve(NumberOfThreads_);
-			DbSessions_.reserve(NumberOfThreads_);
-			Threads_.reserve(NumberOfThreads_);
-			Logger_.information(fmt::format("WebSocket Processor: starting {} threads.", NumberOfThreads_));
-			for (uint64_t i = 0; i < NumberOfThreads_; ++i) {
-				auto NewReactor = std::make_shared<Poco::Net::SocketReactor>();
-				auto NewThread = std::make_unique<Poco::Thread>();
-				NewThread->start(*NewReactor);
-				std::string ThreadName{"ap:react:" + std::to_string(i)};
-				Utils::SetThreadName(*NewThread, ThreadName.c_str());
-				Reactors_.emplace_back(std::move(NewReactor));
-				Threads_.emplace_back(std::move(NewThread));
-				DbSessions_.emplace_back(std::make_shared<LockedDbSession>());
-			}
-			Logger_.information(fmt::format("WebSocket Processor: {} threads started.", NumberOfThreads_));
-		}
-
-		void Stop() {
-			for (auto &i : Reactors_)
-				i->stop();
-			for (auto &i : Threads_) {
-				i->join();
-			}
-			Reactors_.clear();
-			Threads_.clear();
-			DbSessions_.clear();
-		}
-
-		auto NextReactor() {
-			std::lock_guard Lock(Mutex_);
-			NextReactor_++;
-			NextReactor_ %= NumberOfThreads_;
-			return std::make_pair(Reactors_[NextReactor_], DbSessions_[NextReactor_]);
-		}
-
-	  private:
-		std::mutex Mutex_;
-		uint64_t NumberOfThreads_;
-		uint64_t NextReactor_ = 0;
-		std::vector<std::shared_ptr<Poco::Net::SocketReactor>> 	Reactors_;
-		std::vector<std::unique_ptr<Poco::Thread>> 				Threads_;
-		std::vector<std::shared_ptr<LockedDbSession>>			DbSessions_;
-		Poco::Logger &Logger_;
-
-	};
-} // namespace OpenWifi

src/AP_WS_Server.cpp

@@ -6,103 +6,54 @@
 //	Arilia Wireless Inc.
 //
 
-#include <Poco/Net/Context.h>
+#include "Poco/Net/HTTPHeaderStream.h"
-#include <Poco/Net/HTTPHeaderStream.h>
+#include "Poco/Net/Context.h"
-#include <Poco/Net/HTTPServerRequest.h>
+#include "Poco/Net/HTTPServerRequest.h"
 
-#include <AP_WS_Connection.h>
+#include "AP_WS_Server.h"
-#include <AP_WS_Server.h>
+#include "AP_WS_Connection.h"
-#include <ConfigurationCache.h>
+#include "ConfigurationCache.h"
-#include <TelemetryStream.h>
+#include "TelemetryStream.h"
 
-#include <fmt/format.h>
+#include "framework/MicroServiceFuncs.h"
-
+#include "framework/utils.h"
-#include <framework/MicroServiceFuncs.h>
+#include "UI_GW_WebSocketNotifications.h"
-#include <framework/utils.h>
+#include "fmt/format.h"
-#include <framework/KafkaManager.h>
-
-#include <UI_GW_WebSocketNotifications.h>
 
 namespace OpenWifi {
 
-	class AP_WS_RequestHandler : public Poco::Net::HTTPRequestHandler {
+	void AP_WS_RequestHandler::handleRequest(Poco::Net::HTTPServerRequest &request,
-	  public:
+											 Poco::Net::HTTPServerResponse &response)  {
-		explicit AP_WS_RequestHandler(Poco::Logger &L, std::uint64_t session_id) : Logger_(L),
+		try {
-								   		session_id_(session_id) {
+			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");
-		void handleRequest(	Poco::Net::HTTPServerRequest &request,
-						 	Poco::Net::HTTPServerResponse &response) override {
-			try {
-				auto NewConnection = std::make_shared<AP_WS_Connection>(request, response, session_id_, Logger_,
-																		AP_WS_Server()->NextReactor());
-				AP_WS_Server()->AddConnection(NewConnection);
-				NewConnection->Start();
-			} catch (...) {
-				poco_warning(Logger_, "Exception during WS creation");
-			}
-		};
-
-	  private:
-		Poco::Logger &Logger_;
-		std::uint64_t session_id_;
-	};
-
-	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");
-				session_id_++;
-				return new AP_WS_RequestHandler(Logger_, session_id_);
-			} else {
-				return nullptr;
-			}
 		}
-	  private:
-		Poco::Logger &Logger_;
-		inline static std::atomic_uint64_t session_id_ = 0;
 	};
 
-	bool AP_WS_Server::ValidateCertificate(const std::string &ConnectionId,
+	bool AP_WS_Server::ValidateCertificate(const std::string & ConnectionId, const Poco::Crypto::X509Certificate & Certificate) {
-										   const Poco::Crypto::X509Certificate &Certificate) {
+		if(IsCertOk()) {
-		if (IsCertOk()) {
+			if(!Certificate.issuedBy(*IssuerCert_)) {
-			// validate certificate agains trusted chain
+				poco_warning(Logger(),fmt::format("CERTIFICATE({}): issuer mismatch. Local='{}' Incoming='{}'", ConnectionId, IssuerCert_->issuerName(), Certificate.issuerName()));
-			for (const auto &cert : ClientCasCerts_) {
+				return false;
-				if (Certificate.issuedBy(cert)) {
-					return true;
-				}
 			}
-			poco_warning(
+			return true;
-					Logger(),
-					fmt::format(
-						"CERTIFICATE({}): issuer mismatch. Certificate not issued by any trusted CA",
-						ConnectionId)
-					);
 		}
 		return false;
 	}
 
 	int AP_WS_Server::Start() {
 
-		AllowSerialNumberMismatch_ =
+		AllowSerialNumberMismatch_ = MicroServiceConfigGetBool("openwifi.certificates.allowmismatch",true);
-			MicroServiceConfigGetBool("openwifi.certificates.allowmismatch", true);
+		MismatchDepth_ = MicroServiceConfigGetInt("openwifi.certificates.mismatchdepth",2);
-		MismatchDepth_ = MicroServiceConfigGetInt("openwifi.certificates.mismatchdepth", 2);
 
-		SessionTimeOut_ = MicroServiceConfigGetInt("openwifi.session.timeout", 10*60);
+		Reactor_pool_ = std::make_unique<AP_WS_ReactorThreadPool>();
-
-		Reactor_pool_ = std::make_unique<AP_WS_ReactorThreadPool>(Logger());
 		Reactor_pool_->Start();
 
-		for (const auto &Svr : ConfigServersList_) {
+		for(const auto & Svr : ConfigServersList_ ) {
 
-			poco_notice(Logger(),
+			poco_notice(Logger(),fmt::format("Starting: {}:{} Keyfile:{} CertFile: {}", Svr.Address(),
-						fmt::format("Starting: {}:{} Keyfile:{} CertFile: {}", Svr.Address(),
+										Svr.Port(), Svr.KeyFile(), Svr.CertFile()));
-									Svr.Port(), Svr.KeyFile(), Svr.CertFile()));
 
 			Svr.LogCert(Logger());
 			if (!Svr.RootCA().empty())
@@ -110,8 +61,8 @@ namespace OpenWifi {
 
 			if (!IsCertOk()) {
 				IssuerCert_ = std::make_unique<Poco::Crypto::X509Certificate>(Svr.IssuerCertFile());
-				poco_information(
+				poco_information(Logger(),
-					Logger(), fmt::format("Certificate Issuer Name:{}", IssuerCert_->issuerName()));
+					fmt::format("Certificate Issuer Name:{}", IssuerCert_->issuerName()));
 			}
 
 			Poco::Net::Context::Params P;
@@ -123,9 +74,13 @@ namespace OpenWifi {
 			P.dhUse2048Bits = true;
 			P.caLocation = Svr.Cas();
 
-			auto Context = Poco::AutoPtr<Poco::Net::Context>(
+			auto Context = Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
-				new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
 
+/*			if(!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());
 
@@ -137,13 +92,6 @@ namespace OpenWifi {
 			Context->addChainCertificate(Issuing);
 			Context->addCertificateAuthority(Issuing);
 
-			// add certificates from clientcas to trust chain
-			ClientCasCerts_ = Poco::Net::X509Certificate::readPEM(Svr.ClientCas());
-			for (const auto &cert : ClientCasCerts_) {
-				Context->addChainCertificate(cert);
-				Context->addCertificateAuthority(cert);
-			}
-
 			Poco::Crypto::RSAKey Key("", Svr.KeyFile(), Svr.KeyFilePassword());
 			Context->usePrivateKey(Key);
 
@@ -152,8 +100,8 @@ namespace OpenWifi {
 			Context->flushSessionCache();
 			Context->enableSessionCache(true);
 			Context->enableExtendedCertificateVerification(false);
-			Context->disableProtocols(Poco::Net::Context::PROTO_TLSV1 |
+			// Context->disableStatelessSessionResumption();
-									  Poco::Net::Context::PROTO_TLSV1_1);
+			Context->disableProtocols(Poco::Net::Context::PROTO_TLSV1 | Poco::Net::Context::PROTO_TLSV1_1);
 
 			auto WebServerHttpParams = new Poco::Net::HTTPServerParams;
 			WebServerHttpParams->setMaxThreads(50);
@@ -167,32 +115,25 @@ namespace OpenWifi {
 													  : 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_,
+					new AP_WS_RequestHandlerFactory(Logger()), DeviceConnectionPool_, Poco::Net::SecureServerSocket(SockAddr, Svr.Backlog(), Context), WebServerHttpParams);
-					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_,
+					new AP_WS_RequestHandlerFactory(Logger()), DeviceConnectionPool_, Poco::Net::SecureServerSocket(SockAddr, Svr.Backlog(), Context), WebServerHttpParams);
-					Poco::Net::SecureServerSocket(SockAddr, Svr.Backlog(), Context),
-					WebServerHttpParams);
 				WebServers_.push_back(std::move(NewWebServer));
 			}
-
-			KafkaDisableState_ = MicroServiceConfigGetBool("openwifi.kafka.disablestate", false);
-			KafkaDisableHealthChecks_ = MicroServiceConfigGetBool("openwifi.kafka.disablehealthchecks", false);
 		}
 
-		for (auto &server : WebServers_) {
+		for(auto &server:WebServers_) {
 			server->start();
 		}
 
 		ReactorThread_.start(Reactor_);
 
-		auto ProvString = MicroServiceConfigGetString("autoprovisioning.process", "default");
+		auto ProvString = MicroServiceConfigGetString("autoprovisioning.process","default");
-		if (ProvString != "default") {
+		if(ProvString!="default") {
 			auto Tokens = Poco::StringTokenizer(ProvString, ",");
 			for (const auto &i : Tokens) {
 				if (i == "prov")
@@ -204,595 +145,273 @@ namespace OpenWifi {
 			UseDefaultConfig_ = true;
 		}
 
-		SimulatorId_ = Poco::toLower(MicroServiceConfigGetString("simulatorid", ""));
+		SimulatorId_ = MicroServiceConfigGetString("simulatorid","");
 		SimulatorEnabled_ = !SimulatorId_.empty();
-		Utils::SetThreadName(ReactorThread_, "dev:react:head");
+		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;
-		GarbageCollector_.setName("ws:garbage");
-		GarbageCollector_.start(*this);
-
-		std::thread CleanupThread([this](){ CleanupSessions(); });
-		CleanupThread.detach();
-
 		return 0;
 	}
 
-	bool AP_WS_Server::Disconnect(uint64_t SerialNumber) {
+	void AP_WS_Server::onGarbageCollecting([[maybe_unused]] Poco::Timer &timer) {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+		if(Garbage_.size()>0) {
-			auto hashIndex = MACHash::Hash(SerialNumber);
+			std::cout << "Removing " << Garbage_.size() << " old connections." << std::endl;
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+			Garbage_.clear();
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == SerialNumbers_[hashIndex].end() || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-			SerialNumbers_[hashIndex].erase(DeviceHint);
 		}
 
-		{
+		static uint64_t last_log = Utils::Now();
-			auto H = SessionHash::Hash(Connection->State_.sessionId);
-			std::lock_guard SessionLock(SessionMutex_[H]);
-			Sessions_[H].erase(Connection->State_.sessionId);
-		}
 
-		return true;
+		NumberOfConnectedDevices_ = 0;
-	}
+		NumberOfConnectingDevices_ = 0;
+		AverageDeviceConnectionTime_ = 0;
+		uint64_t	total_connected_time=0;
 
-	void AP_WS_Server::CleanupSessions() {
+		auto now = Utils::Now();
+		for (auto connection=SerialNumbers_.begin(); connection!=SerialNumbers_.end();) {
 
-		while(Running_) {
+			if(connection->second.second== nullptr) {
-			std::this_thread::sleep_for(std::chrono::seconds(10));
+				connection++;
+				continue;
+			}
 
-			while(Running_ && !CleanupSessions_.empty()) {
+			if (connection->second.second->State_.Connected) {
-				std::pair<uint64_t, uint64_t> Session;
+				NumberOfConnectedDevices_++;
-				{
+				total_connected_time += (now - connection->second.second->State_.started);
-					std::lock_guard G(CleanupMutex_);
+				connection++;
-					Session = CleanupSessions_.front();
+			} else {
-					CleanupSessions_.pop_front();
+				NumberOfConnectingDevices_++;
-				}
+				connection++;
-				poco_trace(this->Logger(),fmt::format("Cleaning up session: {} for device: {}", Session.first, Utils::IntToSerialNumber(Session.second)));
-				EndSession(Session.first, Session.second);
 			}
 		}
-	}
 
-	void AP_WS_Server::run() {
+		AverageDeviceConnectionTime_ = (NumberOfConnectedDevices_!=0) ? total_connected_time/NumberOfConnectedDevices_ : 0;
-		uint64_t last_log = Utils::Now(),
+		if((now-last_log)>120) {
-				 last_zombie_run = 0,
+			last_log = now;
-				 last_garbage_run = 0;
+			poco_information(Logger(),
-
+							 fmt::format("Active AP connections: {} Connecting: {} Average connection time: {} seconds",
-		Poco::Logger &LocalLogger = Poco::Logger::create(
+										 NumberOfConnectedDevices_, NumberOfConnectingDevices_, AverageDeviceConnectionTime_));
-			"WS-Session-Janitor", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel());
-
-		while(Running_) {
-
-			if(!Poco::Thread::trySleep(30000)) {
-				break;
-			}
-
-			LocalLogger.information(fmt::format("Garbage collecting starting run."	));
-
-			uint64_t total_connected_time = 0, now = Utils::Now();
-
-			if(now-last_zombie_run > 60) {
-				try {
-					poco_information(LocalLogger,
-									 fmt::format("Garbage collecting zombies... (step 1)"));
-					NumberOfConnectingDevices_ = 0;
-					AverageDeviceConnectionTime_ = 0;
-					int waits = 0;
-					for (int hashIndex = 0; hashIndex < MACHash::HashMax(); hashIndex++) {
-						last_zombie_run = now;
-						waits = 0;
-						while (true) {
-							if (SerialNumbersMutex_[hashIndex].try_lock()) {
-								waits = 0;
-								auto hint = SerialNumbers_[hashIndex].begin();
-								while (hint != end(SerialNumbers_[hashIndex])) {
-									if (hint->second == nullptr) {
-										poco_information(
-											LocalLogger,
-											fmt::format("Dead device found in hash index {}", hashIndex));
-										hint = SerialNumbers_[hashIndex].erase(hint);
-									} else {
-										auto Device = hint->second;
-										auto RightNow = Utils::Now();
-										if (Device->Dead_) {
-											AddCleanupSession(Device->State_.sessionId, Device->SerialNumberInt_);
-											++hint;
-											// hint = SerialNumbers_[hashIndex].erase(hint);
-										} else if (RightNow > Device->LastContact_ &&
-												   (RightNow - Device->LastContact_) > SessionTimeOut_) {
-											poco_information(
-												LocalLogger,
-												fmt::format(
-													"{}: Session seems idle. Controller disconnecting device.",
-													Device->SerialNumber_));
-											// hint = SerialNumbers_[hashIndex].erase(hint);
-											AddCleanupSession(Device->State_.sessionId, Device->SerialNumberInt_);
-											++hint;
-										} else {
-											if (Device->State_.Connected) {
-												total_connected_time +=
-													(RightNow - Device->State_.started);
-											}
-											++hint;
-										}
-									}
-								}
-								SerialNumbersMutex_[hashIndex].unlock();
-								break;
-							} else if (waits < 5) {
-								waits++;
-								Poco::Thread::trySleep(10);
-							} else {
-								break;
-							}
-						}
-					}
-
-					poco_information(LocalLogger, fmt::format("Garbage collecting zombies... (step 2)"));
-					LeftOverSessions_ = 0;
-					for (int i = 0; i < SessionHash::HashMax(); i++) {
-						waits = 0;
-						while (true) {
-							if (SessionMutex_[i].try_lock()) {
-								waits = 0;
-								auto hint = Sessions_[i].begin();
-								auto RightNow = Utils::Now();
-								while (hint != end(Sessions_[i])) {
-									if (hint->second == nullptr) {
-										hint = Sessions_[i].erase(hint);
-									} else if (hint->second->Dead_) {
-										// hint = Sessions_[i].erase(hint);
-										AddCleanupSession(hint->second->State_.sessionId, hint->second->SerialNumberInt_);
-										++hint;
-									} else if (RightNow > hint->second->LastContact_ &&
-											   (RightNow - hint->second->LastContact_) >
-												   SessionTimeOut_) {
-										poco_information(
-											LocalLogger,
-											fmt::format("{}: Session seems idle. Controller disconnecting device.",
-														hint->second->SerialNumber_));
-										AddCleanupSession(hint->second->State_.sessionId, hint->second->SerialNumberInt_);
-										++hint;
-										// hint = Sessions_[i].erase(hint);
-									} else {
-										++LeftOverSessions_;
-										++hint;
-									}
-								}
-								SessionMutex_[i].unlock();
-								break;
-							} else if (waits < 5) {
-								Poco::Thread::trySleep(10);
-								waits++;
-							} else {
-								break;
-							}
-						}
-					}
-
-					AverageDeviceConnectionTime_ = NumberOfConnectedDevices_ > 0
-													   ? total_connected_time / NumberOfConnectedDevices_
-													   : 0;
-					poco_information(LocalLogger, fmt::format("Garbage collecting zombies done..."));
-				} catch (const Poco::Exception &E) {
-					poco_error(LocalLogger, fmt::format("Poco::Exception: Garbage collecting zombies failed: {}", E.displayText()));
-				} catch (const std::exception &E) {
-					poco_error(LocalLogger, fmt::format("std::exception: Garbage collecting zombies failed: {}", E.what()));
-				} catch (...) {
-					poco_error(LocalLogger, fmt::format("exception:Garbage collecting zombies failed: {}", "unknown"));
-				}
-
-			}
-
-			if(NumberOfConnectedDevices_) {
-				if (last_garbage_run > 0) {
-					AverageDeviceConnectionTime_ += (now - last_garbage_run);
-				}
-			}
-
-			try {
-				if ((now - last_log) > 60) {
-					last_log = now;
-					poco_information(
-						LocalLogger,
-						fmt::format("Active AP connections: {} Connecting: {} Average connection time: {} seconds. Left Over Sessions: {}",
-									NumberOfConnectedDevices_, NumberOfConnectingDevices_,
-									AverageDeviceConnectionTime_, LeftOverSessions_));
-				}
-
-				GWWebSocketNotifications::NumberOfConnection_t Notification;
-				Notification.content.numberOfConnectingDevices = NumberOfConnectingDevices_;
-				Notification.content.numberOfDevices = NumberOfConnectedDevices_;
-				Notification.content.averageConnectedTime = AverageDeviceConnectionTime_;
-				GetTotalDataStatistics(Notification.content.tx, Notification.content.rx);
-				GWWebSocketNotifications::NumberOfConnections(Notification);
-
-				Poco::JSON::Object KafkaNotification;
-				Notification.to_json(KafkaNotification);
-
-				Poco::JSON::Object FullEvent;
-				FullEvent.set("type", "load-update");
-				FullEvent.set("timestamp", now);
-				FullEvent.set("payload", KafkaNotification);
-
-				KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, "system", FullEvent);
-				LocalLogger.information(fmt::format("Garbage collection finished run."));
-				last_garbage_run = now;
-			} catch (const Poco::Exception &E) {
-				LocalLogger.error(fmt::format("Poco::Exception: Garbage collecting failed: {}", E.displayText()));
-			} catch (const std::exception &E) {
-				LocalLogger.error(fmt::format("std::exception: Garbage collecting failed: {}", E.what()));
-			} catch (...) {
-				LocalLogger.error(fmt::format("exception:Garbage collecting failed: {}", "unknown"));
-			}
 		}
-		LocalLogger.information(fmt::format("Garbage collector done for the day."	));
+
+		WebSocketClientNotificationNumberOfConnection_t	Notification;
+		Notification.content.numberOfConnectingDevices = NumberOfConnectingDevices_;
+		Notification.content.numberOfDevices = NumberOfConnectedDevices_;
+		Notification.content.averageConnectedTime = AverageDeviceConnectionTime_;
+		WebSocketClientNotificationNumberOfConnections(Notification);
 	}
 
 	void AP_WS_Server::Stop() {
-		poco_information(Logger(), "Stopping...");
+		poco_information(Logger(),"Stopping...");
 		Running_ = false;
 
-		GarbageCollector_.wakeUp();
+		Timer_.stop();
-		GarbageCollector_.join();
 
-		for (auto &server : WebServers_) {
+		for(auto &server:WebServers_) {
 			server->stopAll();
 		}
-
 		Reactor_pool_->Stop();
 		Reactor_.stop();
 		ReactorThread_.join();
-		poco_information(Logger(), "Stopped...");
+		poco_information(Logger(),"Stopped...");
-	}
-
-	bool AP_WS_Server::GetHealthDevices(std::uint64_t lowLimit, std::uint64_t  highLimit, std::vector<std::string> & SerialNumbers) {
-		SerialNumbers.clear();
-		for(int i=0;i<SessionHash::HashMax();i++) {
-			std::lock_guard Lock(SessionMutex_[i]);
-			for (const auto &connection : Sessions_[i]) {
-				if (connection.second->RawLastHealthcheck_.Sanity >= lowLimit &&
-					connection.second->RawLastHealthcheck_.Sanity <= highLimit) {
-					SerialNumbers.push_back(connection.second->SerialNumber_);
-				}
-			}
-		}
-		return true;
 	}
 
 	bool AP_WS_Server::GetStatistics(uint64_t SerialNumber, std::string &Statistics) const {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+		auto Device = SerialNumbers_.find(SerialNumber);
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		if(Device == SerialNumbers_.end() || Device->second.second==nullptr)
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+			return false;
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
+		Statistics = Device->second.second->LastStats_;
-			if (DeviceHint == SerialNumbers_[hashIndex].end() || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-		Connection->GetLastStats(Statistics);
 		return true;
 	}
 
-	bool AP_WS_Server::GetState(uint64_t SerialNumber, GWObjects::ConnectionState &State) const {
+	bool AP_WS_Server::GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State) const {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+		auto Device = SerialNumbers_.find(SerialNumber);
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		if(Device == SerialNumbers_.end() || Device->second.second==nullptr)
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+			return false;
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
+		State = Device->second.second->State_;
-			if (DeviceHint == SerialNumbers_[hashIndex].end() ||
-				DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-		Connection->GetState(State);
 		return true;
 	}
 
-	bool AP_WS_Server::GetHealthcheck(uint64_t SerialNumber,
+	bool AP_WS_Server::GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData) const {
-									  GWObjects::HealthCheck &CheckData) const {
+		std::lock_guard			Lock(LocalMutex_);
-		std::shared_ptr<AP_WS_Connection> Connection;
-		{
-			auto hashIndex = MACHash::Hash(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto Device = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (Device == SerialNumbers_[hashIndex].end() || Device->second == nullptr) {
-				return false;
-			}
-			Connection = Device->second;
-		}
-		Connection->GetLastHealthCheck(CheckData);
-		return true;
 
-	}
+		auto Device = SerialNumbers_.find(SerialNumber);
+		if(Device == SerialNumbers_.end() || Device->second.second==nullptr)
+			return false;
 
-	void AP_WS_Server::StartSession(uint64_t session_id, uint64_t SerialNumber) {
+		CheckData = Device->second.second->LastHealthcheck_;
-		auto sessionHash = SessionHash::Hash(session_id);
-		std::shared_ptr<AP_WS_Connection> Connection;
-		{
-			std::lock_guard SessionLock(SessionMutex_[sessionHash]);
-			auto SessionHint = Sessions_[sessionHash].find(session_id);
-			if (SessionHint == end(Sessions_[sessionHash])) {
-				return;
-			}
-			Connection = SessionHint->second;
-			Sessions_[sessionHash].erase(SessionHint);
-		}
-
-		auto deviceHash = MACHash::Hash(SerialNumber);
-		std::lock_guard DeviceLock(SerialNumbersMutex_[deviceHash]);
-		SerialNumbers_[deviceHash][SerialNumber] = Connection;
-	}
-
-	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t SerialNumber) {
-		{
-			poco_trace(Logger(), fmt::format("Ending session 1: {} for device: {}", session_id, Utils::IntToSerialNumber(SerialNumber)));
-			auto sessionHash = SessionHash::Hash(session_id);
-			std::lock_guard SessionLock(SessionMutex_[sessionHash]);
-			Sessions_[sessionHash].erase(session_id);
-			poco_trace(Logger(), fmt::format("Ended session 1: {} for device: {}", session_id, Utils::IntToSerialNumber(SerialNumber)));
-		}
-
-		{
-			auto hashIndex = MACHash::Hash(SerialNumber);
-			poco_trace(Logger(), fmt::format("Ending session 2.0: {} for device: {} hi:{}", session_id, Utils::IntToSerialNumber(SerialNumber), hashIndex));
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			poco_trace(Logger(), fmt::format("Ending session 2.1: {} for device: {} hi:{}", session_id, Utils::IntToSerialNumber(SerialNumber), hashIndex));
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			poco_trace(Logger(), fmt::format("Ending session 2.2: {} for device: {} hi:{}", session_id, Utils::IntToSerialNumber(SerialNumber), hashIndex));
-			if (DeviceHint == SerialNumbers_[hashIndex].end()
-				|| DeviceHint->second == nullptr
-				|| DeviceHint->second->State_.sessionId != session_id) {
-				poco_trace(Logger(), fmt::format("Did not end session 2: {} for device: {}", session_id, Utils::IntToSerialNumber(SerialNumber)));
-				return false;
-			}
-			SerialNumbers_[hashIndex].erase(DeviceHint);
-			poco_trace(Logger(), fmt::format("Ended session 2: {} for device: {}", session_id, Utils::IntToSerialNumber(SerialNumber)));
-		}
 		return true;
 	}
 
+	void AP_WS_Server::SetSessionDetails(uint64_t connection_id, uint64_t SerialNumber) {
+		std::lock_guard			Lock(LocalMutex_);
 
-	bool AP_WS_Server::Connected(uint64_t SerialNumber,
+		auto Conn = Sessions_.find(connection_id);
-								 GWObjects::DeviceRestrictions &Restrictions) const {
+		if(Conn == end(Sessions_))
-		std::shared_ptr<AP_WS_Connection> Connection;
+			return;
-		{
+
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		auto CurrentSerialNumber = SerialNumbers_.find(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+		if(	(CurrentSerialNumber==SerialNumbers_.end())	||
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
+			(CurrentSerialNumber->second.first<connection_id)) {
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
+			SerialNumbers_[SerialNumber] = std::make_pair(connection_id, Conn->second.first);
-				return false;
+			return;
-			}
-			Connection = DeviceHint->second;
 		}
+	}
 
-		if(Connection->Dead_) {
+	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t serial_number) {
+		std::unique_lock G(LocalMutex_);
+
+		auto Session = Sessions_.find(session_id);
+		if(Session==end(Sessions_))
+			return false;
+
+		Garbage_.push_back(Session->second.first);
+
+		auto Device = SerialNumbers_.find(serial_number);
+		if (Device == end(SerialNumbers_)) {
+			Sessions_.erase(Session);
 			return false;
 		}
-		Restrictions = Connection->GetRestrictions();
-		return Connection->State_.Connected;
-	}
 
+		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) const {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+		auto Device = SerialNumbers_.find(SerialNumber);
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		if(Device==end(SerialNumbers_) || Device->second.second== nullptr)
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-
-		if(Connection->Dead_) {
 			return false;
-		}
+
-		return Connection->State_.Connected;
+		return  Device->second.second->State_.Connected;
 	}
 
-	bool AP_WS_Server::SendFrame(uint64_t SerialNumber, const std::string &Payload) const {
+	bool AP_WS_Server::SendFrame(uint64_t SerialNumber, const std::string & Payload) const {
-		auto hashIndex = MACHash::Hash(SerialNumber);
+		std::lock_guard			Lock(LocalMutex_);
-
+		auto Device = SerialNumbers_.find(SerialNumber);
-		std::shared_ptr<AP_WS_Connection> Connection;
+		if(Device==SerialNumbers_.end() || Device->second.second== nullptr)
-		{
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-
-		if(Connection->Dead_) {
 			return false;
-		}
 
 		try {
-			return Connection->Send(Payload);
+			// std::cout << "Device connection pointer: " << (uint64_t) Device->second.second << std::endl;
+			return Device->second.second->Send(Payload);
 		} catch (...) {
-			poco_debug(Logger(), fmt::format(": SendFrame: Could not send data to device '{}'",
+			poco_debug(Logger(),fmt::format(": SendFrame: Could not send data to device '{}'", Utils::IntToSerialNumber(SerialNumber)));
-											 Utils::IntToSerialNumber(SerialNumber)));
 		}
 		return false;
 	}
 
 	void AP_WS_Server::StopWebSocketTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		auto Device = SerialNumbers_.find(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+		if(Device==end(SerialNumbers_) || Device->second.second==nullptr)
-			auto Device = SerialNumbers_[hashIndex].find(SerialNumber);
+			return;
-			if (Device == end(SerialNumbers_[hashIndex]) || Device->second == nullptr) {
+		Device->second.second->StopWebSocketTelemetry(RPCID);
-				return;
-			}
-			Connection = Device->second;
-		}
-		Connection->StopWebSocketTelemetry(RPCID);
 	}
 
-	void
+	void AP_WS_Server::SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime) {
-	AP_WS_Server::SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
+		std::lock_guard			Lock(LocalMutex_);
-												 uint64_t Interval, uint64_t Lifetime,
+
-												 const std::vector<std::string> &TelemetryTypes) {
+		auto Device = SerialNumbers_.find(SerialNumber);
-		std::shared_ptr<AP_WS_Connection> Connection;
+		if(Device==end(SerialNumbers_) || Device->second.second==nullptr)
-		{
+			return;
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		Device->second.second->SetWebSocketTelemetryReporting(RPCID, Interval, Lifetime);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return;
-			}
-			Connection = DeviceHint->second;
-		}
-		Connection->SetWebSocketTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
 	}
 
-	void AP_WS_Server::SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
+	void AP_WS_Server::SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime) {
-												  uint64_t Interval, uint64_t Lifetime,
+		std::lock_guard			Lock(LocalMutex_);
-												  const std::vector<std::string> &TelemetryTypes) {
+
-		std::shared_ptr<AP_WS_Connection> Connection;
+		auto Device = SerialNumbers_.find(SerialNumber);
-		{
+		if(Device==end(SerialNumbers_) || Device->second.second== nullptr)
-			auto hashIndex = MACHash::Hash(SerialNumber);
+			return;
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
+		Device->second.second->SetKafkaTelemetryReporting(RPCID, Interval, Lifetime);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return;
-			}
-			Connection = DeviceHint->second;
-		}
-		Connection->SetKafkaTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
 	}
 
 	void AP_WS_Server::StopKafkaTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::lock_guard			Lock(LocalMutex_);
-		{
+
-			auto hashIndex = MACHash::Hash(SerialNumber);
+		auto Device = SerialNumbers_.find(SerialNumber);
-			std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
+		if(Device==end(SerialNumbers_) || Device->second.second== nullptr)
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
+			return;
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
+		Device->second.second->StopKafkaTelemetry(RPCID);
-				return;
-			}
-			Connection = DeviceHint->second;
-		}
-		Connection->StopKafkaTelemetry(RPCID);
 	}
 
-	void AP_WS_Server::GetTelemetryParameters(
+	void AP_WS_Server::GetTelemetryParameters(uint64_t SerialNumber , bool & TelemetryRunning,
-		uint64_t SerialNumber, bool &TelemetryRunning, uint64_t &TelemetryInterval,
+												uint64_t & TelemetryInterval,
-		uint64_t &TelemetryWebSocketTimer, uint64_t &TelemetryKafkaTimer,
+												uint64_t & TelemetryWebSocketTimer,
-		uint64_t &TelemetryWebSocketCount, uint64_t &TelemetryKafkaCount,
+												uint64_t & TelemetryKafkaTimer,
-		uint64_t &TelemetryWebSocketPackets, uint64_t &TelemetryKafkaPackets) {
+												uint64_t & TelemetryWebSocketCount,
+												uint64_t & TelemetryKafkaCount,
+												uint64_t & TelemetryWebSocketPackets,
+												uint64_t & TelemetryKafkaPackets) {
+		std::lock_guard			Lock(LocalMutex_);
 
-		std::shared_ptr<AP_WS_Connection> Connection;
+		auto Device = SerialNumbers_.find(SerialNumber);
-		{
+		if(Device==end(SerialNumbers_)|| Device->second.second== nullptr)
-			auto hashIndex = MACHash::Hash(SerialNumber);
+			return;
-			std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
+		Device->second.second->GetTelemetryParameters(TelemetryRunning,
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
+													  TelemetryInterval,
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
+													  TelemetryWebSocketTimer,
-				return;
+													  TelemetryKafkaTimer,
-			}
+													  TelemetryWebSocketCount,
-			Connection = DeviceHint->second;
+													  TelemetryKafkaCount,
-		}
+													  TelemetryWebSocketPackets,
-
+													  TelemetryKafkaPackets);
-		Connection->GetTelemetryParameters(TelemetryRunning, TelemetryInterval,
-										  TelemetryWebSocketTimer, TelemetryKafkaTimer,
-										  TelemetryWebSocketCount, TelemetryKafkaCount,
-										  TelemetryWebSocketPackets, TelemetryKafkaPackets);
 	}
 
-	bool AP_WS_Server::SendRadiusAccountingData(const std::string &SerialNumber,
+	bool AP_WS_Server::SendRadiusAccountingData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-												const unsigned char *buffer, std::size_t size) {
+		std::lock_guard			Lock(LocalMutex_);
-
+		auto Device = 		SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-		std::shared_ptr<AP_WS_Connection> Connection;
+		if(Device==SerialNumbers_.end() || Device->second.second== nullptr)
-		{
-			auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-			auto hashIndex = MACHash::Hash(IntSerialNumber);
-			std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-
-		if(Connection->Dead_) {
 			return false;
-		}
 
 		try {
-			return Connection->SendRadiusAccountingData(buffer, size);
+			return Device->second.second->SendRadiusAccountingData(buffer,size);
 		} catch (...) {
-			poco_debug(
+			poco_debug(Logger(),fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'", SerialNumber));
-				Logger(),
-				fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'",
-							SerialNumber));
 		}
 		return false;
 	}
 
-	bool AP_WS_Server::SendRadiusAuthenticationData(const std::string &SerialNumber,
+	bool AP_WS_Server::SendRadiusAuthenticationData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-													const unsigned char *buffer, std::size_t size) {
+		std::lock_guard			Lock(LocalMutex_);
-		std::shared_ptr<AP_WS_Connection> Connection;
+		auto Device = 		SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-		{
+		if(Device==SerialNumbers_.end() || Device->second.second== nullptr)
-			auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-			auto hashIndex = MACHash::Hash(IntSerialNumber);
-			std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-
-		if(Connection->Dead_) {
 			return false;
-		}
 
 		try {
-			return Connection->SendRadiusAuthenticationData(buffer, size);
+			return Device->second.second->SendRadiusAuthenticationData(buffer,size);
 		} catch (...) {
-			poco_debug(
+			poco_debug(Logger(),fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'", SerialNumber));
-				Logger(),
-				fmt::format(": SendRadiusAuthenticationData: Could not send data to device '{}'",
-							SerialNumber));
 		}
 		return false;
 	}
 
-	bool AP_WS_Server::SendRadiusCoAData(const std::string &SerialNumber,
+	bool AP_WS_Server::SendRadiusCoAData(const std::string & SerialNumber, const unsigned char * buffer, std::size_t size) {
-										 const unsigned char *buffer, std::size_t size) {
+		std::lock_guard			Lock(LocalMutex_);
-		std::shared_ptr<AP_WS_Connection> Connection;
+		auto Device = 		SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
-		{
+		if(Device==SerialNumbers_.end() || Device->second.second== nullptr)
-			auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-			auto hashIndex = MACHash::Hash(IntSerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-			if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-				return false;
-			}
-			Connection = DeviceHint->second;
-		}
-
-		if(Connection->Dead_) {
 			return false;
-		}
+
 		try {
-			return Connection->SendRadiusCoAData(buffer, size);
+			return Device->second.second->SendRadiusCoAData(buffer,size);
 		} catch (...) {
-			poco_debug(Logger(),
+			poco_debug(Logger(),fmt::format(": SendRadiusCoAData: Could not send data to device '{}'", SerialNumber));
-					   fmt::format(": SendRadiusCoAData: Could not send data to device '{}'",
-								   SerialNumber));
 		}
 		return false;
 	}
 
-} // namespace OpenWifi
+}      //namespace

src/AP_WS_Server.h

@@ -8,67 +8,65 @@
 
 #pragma once
 
-#include <array>
-#include <ctime>
 #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 "Poco/Net/ParallelSocketAcceptor.h"
-#include "Poco/Net/SocketAcceptor.h"
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/Timer.h"
 
 #include "AP_WS_Connection.h"
-#include "AP_WS_Reactor_Pool.h"
+#include "AP_WS_ReactorPool.h"
 
-#include "framework/SubSystemServer.h"
 #include "framework/utils.h"
+#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
-	constexpr uint MACHashMax = 256;
+	class AP_WS_RequestHandler : public Poco::Net::HTTPRequestHandler {
-	constexpr uint MACHashMask = MACHashMax-1;
-	class MACHash {
 	  public:
-		[[nodiscard]] static inline uint16_t Hash(std::uint64_t value) {
+		explicit AP_WS_RequestHandler(Poco::Logger &L, uint64_t id)
-			uint8_t hash = 0, i=6;
+			: Logger_(L),
-			while(i) {
+			  id_(id){
-				hash ^= (value & MACHashMask) + 1;
+		};
-				value >>= 8;
+
-				--i;
+		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;
 			}
-			return hash;
-		}
-
-		[[nodiscard]] static inline uint16_t Hash(const std::string & value) {
-			return Hash(Utils::MACToInt(value));
-		}
-
-		[[nodiscard]] static inline uint16_t HashMax() {
-			return MACHashMax;
 		}
+	  private:
+		Poco::Logger 				&Logger_;
+		inline static uint64_t 		id_=1;
 	};
 
-	constexpr uint SessionHashMax = 256;
+	class AP_WS_Server : public SubSystemServer {
-	constexpr uint SessionHashMask = SessionHashMax-1;
-	class SessionHash {
-	  public:
-		[[nodiscard]] static inline uint16_t Hash(std::uint64_t value) {
-			return (value & SessionHashMask);
-		}
-
-		[[nodiscard]] static inline uint16_t HashMax() {
-			return SessionHashMax;
-		}
-	};
-
-
-	class AP_WS_Server : public SubSystemServer, public Poco::Runnable {
 	  public:
 		static auto instance() {
 			static auto instance_ = new AP_WS_Server;
@@ -77,188 +75,134 @@ namespace OpenWifi {
 
 		int Start() override;
 		void Stop() override;
-		bool IsCertOk() { return IssuerCert_ != nullptr; }
+		bool IsCertOk() { return IssuerCert_!= nullptr; }
-		bool ValidateCertificate(const std::string &ConnectionId,
+		bool ValidateCertificate(const std::string & ConnectionId, const Poco::Crypto::X509Certificate & Certificate);
-								 const Poco::Crypto::X509Certificate &Certificate);
+		// Poco::Net::SocketReactor & GetNextReactor() { return ReactorPool_.NextReactor(); }
 
-		inline bool IsSimSerialNumber(const std::string &SerialNumber) const {
+		inline bool IsSimSerialNumber(const std::string & SerialNumber) const {
-			return IsSim(SerialNumber) &&
+			return IsSim(Poco::toLower(SerialNumber)) && Poco::toLower(SerialNumber) == Poco::toLower(SimulatorId_);
-				   SerialNumber == SimulatorId_;
 		}
 
-		inline static bool IsSim(const std::string &SerialNumber) {
+		inline static bool IsSim(const std::string & SerialNumber) {
-			return SerialNumber.substr(0, 6) == "53494d";
+			return SerialNumber.substr(0,6) == "53494d";
 		}
 
-		void run() override;		//	Garbage collector thread.
+		inline bool IsSimEnabled() const {
-		[[nodiscard]] inline bool IsSimEnabled() const { return SimulatorEnabled_; }
+			return SimulatorEnabled_;
-		[[nodiscard]] inline bool AllowSerialNumberMismatch() const { return AllowSerialNumberMismatch_; }
+		}
-		[[nodiscard]] inline uint64_t MismatchDepth() const { return MismatchDepth_; }
+
-		[[nodiscard]] inline bool UseProvisioning() const { return LookAtProvisioning_; }
+		inline bool AllowSerialNumberMismatch() const {
-		[[nodiscard]] inline bool UseDefaults() const { return UseDefaultConfig_; }
+			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_; }
-		[[nodiscard]] inline std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> NextReactor() {
+
-			return Reactor_pool_->NextReactor();
+		inline void AddConnection(uint64_t session_id, std::shared_ptr<AP_WS_Connection> Connection ) {
+			std::lock_guard			Lock(LocalMutex_);
+			Sessions_[session_id] = std::make_pair(std::move(Connection),false);
 		}
 
-		inline void AddConnection(std::shared_ptr<AP_WS_Connection> Connection) {
+		inline std::shared_ptr<AP_WS_Connection> FindConnection(uint64_t session_id) const {
-			std::uint64_t sessionHash = SessionHash::Hash(Connection->State_.sessionId);
+			std::lock_guard			Lock(LocalMutex_);
-			std::lock_guard SessionLock(SessionMutex_[sessionHash]);
+
-			if(Sessions_[sessionHash].find(Connection->State_.sessionId)==end(Sessions_[sessionHash])) {
+			auto Connection = Sessions_.find(session_id);
-				Sessions_[sessionHash][Connection->State_.sessionId] = std::move(Connection);
+			if(Connection!=end(Sessions_))
-			}
+				return Connection->second.first;
+			return nullptr;
 		}
 
-		[[nodiscard]] inline bool DeviceRequiresSecureRTTY(uint64_t serialNumber) const {
+		inline bool GetStatistics(const std::string &SerialNumber, std::string & Statistics) const {
-			std::shared_ptr<AP_WS_Connection> Connection;
+			return GetStatistics(Utils::SerialNumberToInt(SerialNumber),Statistics);
-			{
-				auto hashIndex = MACHash::Hash(serialNumber);
-				std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-				auto DeviceHint = SerialNumbers_[hashIndex].find(serialNumber);
-				if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr)
-					return false;
-				Connection = DeviceHint->second;
-			}
-			return Connection->RTTYMustBeSecure_;
 		}
+		bool GetStatistics(uint64_t SerialNumber, std::string & Statistics) const ;
 
-		inline bool GetStatistics(const std::string &SerialNumber, std::string &Statistics) const {
+		inline bool GetState(const std::string & SerialNumber, GWObjects::ConnectionState & State) const {
-			return GetStatistics(Utils::SerialNumberToInt(SerialNumber), Statistics);
-		}
-		[[nodiscard]] 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;
+		bool GetState(uint64_t SerialNumber, GWObjects::ConnectionState & State) const;
 
-		inline bool GetHealthcheck(const std::string &SerialNumber,
+		inline bool GetHealthcheck(const std::string &SerialNumber, GWObjects::HealthCheck & CheckData) const {
-								   GWObjects::HealthCheck &CheckData) const {
 			return GetHealthcheck(Utils::SerialNumberToInt(SerialNumber), CheckData);
 		}
-		bool GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck &CheckData) const;
+		bool GetHealthcheck(uint64_t SerialNumber, GWObjects::HealthCheck & CheckData) const ;
 
-		bool Connected(uint64_t SerialNumber, GWObjects::DeviceRestrictions &Restrictions) const;
+		bool Connected(uint64_t SerialNumber) const ;
-		bool Connected(uint64_t SerialNumber) const;
-		bool Disconnect(uint64_t SerialNumber);
-		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 StartSession(uint64_t session_id, uint64_t SerialNumber);
+		inline bool SendFrame(const std::string & SerialNumber, const std::string & Payload) const {
-		bool EndSession(uint64_t session_id, uint64_t SerialNumber);
+			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
-		void SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
+		}
-											uint64_t Interval, uint64_t Lifetime,
+
-											const std::vector<std::string> &TelemetryTypes);
+		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,
+		void SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber, uint64_t Interval, uint64_t Lifetime);
-										uint64_t Lifetime,
-										const std::vector<std::string> &TelemetryTypes);
 		void StopKafkaTelemetry(uint64_t RPCID, uint64_t SerialNumber);
-		void GetTelemetryParameters(uint64_t SerialNumber, bool &TelemetryRunning,
+		void GetTelemetryParameters(uint64_t SerialNumber , bool & TelemetryRunning,
-									uint64_t &TelemetryInterval, uint64_t &TelemetryWebSocketTimer,
+									uint64_t & TelemetryInterval,
-									uint64_t &TelemetryKafkaTimer,
+									uint64_t & TelemetryWebSocketTimer,
-									uint64_t &TelemetryWebSocketCount,
+									uint64_t & TelemetryKafkaTimer,
-									uint64_t &TelemetryKafkaCount,
+									uint64_t & TelemetryWebSocketCount,
-									uint64_t &TelemetryWebSocketPackets,
+									uint64_t & TelemetryKafkaCount,
-									uint64_t &TelemetryKafkaPackets);
+									uint64_t & TelemetryWebSocketPackets,
+									uint64_t & TelemetryKafkaPackets);
 
-		bool GetHealthDevices(std::uint64_t lowLimit, std::uint64_t  highLimit, std::vector<std::string> & SerialNumbers);
+		void onGarbageCollecting(Poco::Timer & timer);
-//		bool ExtendedAttributes(const std::string &serialNumber, bool & hasGPS, std::uint64_t &Sanity,
-//								std::double_t &MemoryUsed, std::double_t &Load, std::double_t &Temperature);
 
-		inline void AverageDeviceStatistics(uint64_t &Connections, uint64_t &AverageConnectionTime,
+		inline void AverageDeviceStatistics( uint64_t & Connections, uint64_t & AverageConnectionTime, uint64_t & NumberOfConnectingDevices) const {
-											uint64_t &NumberOfConnectingDevices) const {
 			Connections = NumberOfConnectedDevices_;
 			AverageConnectionTime = AverageDeviceConnectionTime_;
 			NumberOfConnectingDevices = NumberOfConnectingDevices_;
 		}
 
-		inline bool SendFrame(const std::string &SerialNumber, const std::string &Payload) const {
+	private:
-			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
+		mutable std::recursive_mutex								LocalMutex_;
+		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<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 void AddRX(std::uint64_t bytes) {
-			RX_ += bytes;
-		}
-
-		inline void AddTX(std::uint64_t bytes) {
-			TX_ += bytes;
-		}
-
-		inline void GetTotalDataStatistics(std::uint64_t &TX, std::uint64_t &RX) const {
-			TX = TX_;
-			RX = RX_;
-		}
-
-		bool KafkaDisableState() const { return KafkaDisableState_; }
-		bool KafkaDisableHealthChecks() const { return KafkaDisableHealthChecks_; }
-
-		inline void IncrementConnectionCount() {
-			++NumberOfConnectedDevices_;
-		}
-
-		inline void DecrementConnectionCount() {
-			--NumberOfConnectedDevices_;
-		}
-
-		inline void AddCleanupSession(uint64_t session_id, uint64_t SerialNumber) {
-			std::lock_guard G(CleanupMutex_);
-			CleanupSessions_.emplace_back(session_id, SerialNumber);
-		}
-
-		void CleanupSessions();
-
-	  private:
-		std::array<std::mutex,SessionHashMax> 			SessionMutex_;
-		std::array<std::map<std::uint64_t, std::shared_ptr<AP_WS_Connection>>,SessionHashMax> Sessions_;
-		using SerialNumberMap = std::map<uint64_t /* serial number */,
-										 std::shared_ptr<AP_WS_Connection>>;
-		std::array<SerialNumberMap,MACHashMax>			SerialNumbers_;
-		mutable std::array<std::mutex,MACHashMax>		SerialNumbersMutex_;
-
-		std::unique_ptr<Poco::Crypto::X509Certificate> IssuerCert_;
-		std::vector<Poco::Crypto::X509Certificate> ClientCasCerts_;
-		std::list<std::unique_ptr<Poco::Net::HTTPServer>> WebServers_;
-		Poco::ThreadPool DeviceConnectionPool_{"ws:dev-pool", 4, 256};
-		Poco::Net::SocketReactor Reactor_;
-		Poco::Thread ReactorThread_;
-		std::string SimulatorId_;
-		bool LookAtProvisioning_ = false;
-		bool UseDefaultConfig_ = true;
-		bool SimulatorEnabled_ = false;
-		bool AllowSerialNumberMismatch_ = true;
-
-		Poco::Thread            CleanupThread_;
-		std::mutex              CleanupMutex_;
-		std::deque<std::pair<uint64_t, uint64_t>> CleanupSessions_;
-
-		std::unique_ptr<AP_WS_ReactorThreadPool> Reactor_pool_;
-		std::atomic_bool Running_ = false;
-
-		std::uint64_t 			MismatchDepth_ = 2;
-
-		std::atomic_uint64_t 	NumberOfConnectedDevices_ = 0;
-		std::atomic_uint64_t 	AverageDeviceConnectionTime_ = 0;
-		std::uint64_t 			NumberOfConnectingDevices_ = 0;
-		std::uint64_t 			SessionTimeOut_ = 10*60;
-		std::uint64_t 			LeftOverSessions_ = 0;
-		std::atomic_uint64_t 	TX_=0,RX_=0;
-
-		std::atomic_bool 		KafkaDisableState_=false,
-						 		KafkaDisableHealthChecks_=false;
-
-		Poco::Thread 			GarbageCollector_;
-
-		AP_WS_Server() noexcept
-			: SubSystemServer("WebSocketServer", "WS-SVR", "ucentral.websocket") {}
 	};
 
 	inline auto AP_WS_Server() { return AP_WS_Server::instance(); }
 
-} // namespace OpenWifi
+} //namespace

src/CapabilitiesCache.h

@@ -4,105 +4,101 @@
 
 #pragma once
 
-#include <fstream>
+#include <string>
 #include <map>
 #include <mutex>
-#include <string>
+#include <fstream>
 
 #include "framework/MicroServiceFuncs.h"
-#include "framework/ow_constants.h"
 
-#include "CentralConfig.h"
 #include "nlohmann/json.hpp"
 
 namespace OpenWifi {
 	const std::string PlatformCacheFileName{"/plat_cache.json"};
 	const std::string CapabilitiesCacheFileName{"/caps_cache.json"};
 
-	typedef std::map<std::string, nlohmann::json> CapabilitiesCache_t;
+	typedef std::map<std::string,nlohmann::json>	CapabilitiesCache_t;
 
 	class CapabilitiesCache {
 	  public:
+
 		static auto instance() {
 			static auto instance = new CapabilitiesCache;
 			return instance;
 		}
 
-		inline void Add(const Config::Capabilities &Caps) {
+		inline void Add(const std::string & DeviceType, const std::string & Platform, const std::string & FullCapabilities) {
-			if (Caps.Compatible().empty() || Caps.Platform().empty())
+			if(DeviceType.empty() || Platform.empty())
 				return;
 
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
-			if (!PlatformsLoaded_)
+			if(!PlatformsLoaded_)
 				LoadPlatforms();
-			auto P = Poco::toLower(Caps.Platform());
+			auto P = Poco::toUpper(Platform);
-			auto Hint = Platforms_.find(Caps.Compatible());
+			auto Hint = Platforms_.find(DeviceType);
-			if (Hint == Platforms_.end()) {
+			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) {
+			} else if(Hint->second != P) {
 				Hint->second = P;
 				SavePlatforms();
 			}
 
-			if (!CapabilitiesLoaded_)
+			if(!CapabilitiesLoaded_)
 				LoadCapabilities();
 
-			auto CapHint = Capabilities_.find(Caps.Compatible());
+			auto CapHint = Capabilities_.find(DeviceType);
-			if (CapHint == Capabilities_.end()) {
+			if(CapHint==Capabilities_.end()) {
-				auto C = nlohmann::json::parse(Caps.AsString());
+				Capabilities_[DeviceType] = nlohmann::json::parse(FullCapabilities);
-				C.erase("restrictions");
-				Capabilities_[Caps.Compatible()] = nlohmann::json::parse(Caps.AsString());
 				SaveCapabilities();
 			} else {
-				CapHint->second = nlohmann::json::parse(Caps.AsString());
+				CapHint->second = nlohmann::json::parse(FullCapabilities);
 				SaveCapabilities();
 			}
 		}
 
-		inline std::string GetPlatform(const std::string &DeviceType) {
+		inline std::string GetPlatform(const std::string & DeviceType) {
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
 
-			if (!PlatformsLoaded_) {
+			if(!PlatformsLoaded_) {
 				LoadPlatforms();
 			}
 
 			auto Hint = Platforms_.find(DeviceType);
-			if (Hint == Platforms_.end())
+			if(Hint==Platforms_.end())
-				return Platforms::AP;
+				return "AP";
 			return Hint->second;
 		}
 
-		inline nlohmann::json GetCapabilities(const std::string &DeviceType) {
+		inline nlohmann::json GetCapabilities(const std::string & DeviceType) {
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
 
-			if (!CapabilitiesLoaded_) {
+			if(!CapabilitiesLoaded_) {
 				LoadCapabilities();
 			}
 
 			auto Hint = Capabilities_.find(DeviceType);
-			if (Hint == Capabilities_.end())
+			if(Hint==Capabilities_.end())
 				return nlohmann::json{};
 			return Hint->second;
 		}
 
-		inline const CapabilitiesCache_t &AllCapabilities() {
+		inline const CapabilitiesCache_t & AllCapabilities() {
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
-			if (!CapabilitiesLoaded_) {
+			if(!CapabilitiesLoaded_) {
 				LoadCapabilities();
 			}
 			return Capabilities_;
 		}
 
 	  private:
-		std::recursive_mutex Mutex_;
+		std::recursive_mutex					Mutex_;
-		std::atomic_bool PlatformsLoaded_ = false;
+		std::atomic_bool 						PlatformsLoaded_=false;
-		std::atomic_bool CapabilitiesLoaded_ = false;
+		std::atomic_bool 						CapabilitiesLoaded_=false;
-		std::map<std::string, std::string> Platforms_;
+		std::map<std::string,std::string>		Platforms_;
-		CapabilitiesCache_t Capabilities_;
+		CapabilitiesCache_t						Capabilities_;
-		std::string PlatformCacheFileName_{MicroServiceDataDirectory() + PlatformCacheFileName};
+		std::string 							PlatformCacheFileName_{ MicroServiceDataDirectory()+PlatformCacheFileName };
-		std::string CapabilitiesCacheFileName_{MicroServiceDataDirectory() +
+		std::string 							CapabilitiesCacheFileName_{ MicroServiceDataDirectory()+CapabilitiesCacheFileName };
-											   CapabilitiesCacheFileName};
 
 		inline void LoadPlatforms() {
 			try {
@@ -110,10 +106,11 @@ namespace OpenWifi {
 				nlohmann::json cache;
 				i >> cache;
 
-				for (const auto &[Type, Platform] : cache.items()) {
+				for(const auto &[Type,Platform]:cache.items()) {
-					Platforms_[Type] = Poco::toLower(Platform.get<std::string>());
+					Platforms_[Type] = Platform;
 				}
-			} catch (...) {
+			} catch(...) {
+
 			}
 			PlatformsLoaded_ = true;
 		}
@@ -124,35 +121,33 @@ namespace OpenWifi {
 				nlohmann::json cache(Platforms_);
 				i << cache;
 			} catch (...) {
+
 			}
 		}
 
 		inline void LoadCapabilities() {
 			try {
-				std::ifstream i(CapabilitiesCacheFileName_,
+				std::ifstream i(CapabilitiesCacheFileName_, std::ios_base::binary|std::ios_base::in);
-								std::ios_base::binary | std::ios_base::in);
 				nlohmann::json cache;
 				i >> cache;
 
-				for (const auto &[Type, Caps] : cache.items()) {
+				for(const auto &[Type,Caps]:cache.items()) {
 					Capabilities_[Type] = Caps;
 				}
-			} catch (...) {
+			} catch(...) {
+
 			}
 			CapabilitiesLoaded_ = true;
 		}
 
 		inline void SaveCapabilities() {
 			try {
-				std::ofstream i(CapabilitiesCacheFileName_,
+				std::ofstream i(CapabilitiesCacheFileName_, std::ios_base::trunc | std::ios_base::out | std::ios_base::binary );
-								std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
 				nlohmann::json cache(Capabilities_);
 				i << cache;
 			} catch (...) {
+
 			}
 		}
 	};
-
+}
-	inline auto CapabilitiesCache() { return CapabilitiesCache::instance(); };
-
-} // namespace OpenWifi

src/CentralConfig.cpp

@@ -7,17 +7,17 @@
 //
 #include <fstream>
 
-#include "Poco/File.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
+#include "Poco/File.h"
 
 #include "CentralConfig.h"
 #include "Daemon.h"
 
 namespace OpenWifi::Config {
 
-	const static std::string BasicConfig{
+	const static std::string BasicConfig {
-		R"lit(
+R"lit(
 {
   "interfaces": [
     {
@@ -67,11 +67,11 @@ namespace OpenWifi::Config {
       "ipv4": {
         "addressing": "static",
         "dhcp": {
-          "lease-count": 100,
+          "lease-count": 10000,
           "lease-first": 10,
           "lease-time": "6h"
         },
-        "subnet": "192.168.1.1/24"
+        "subnet": "192.168.1.1/16"
       },
       "name": "LAN",
       "role": "downstream",
@@ -150,11 +150,10 @@ namespace OpenWifi::Config {
 
 	void Config::SetBasicConfigFile() {
 		try {
-			Poco::File DefaultConfigFileName{MicroService::instance().DataDir() +
+			Poco::File DefaultConfigFileName{MicroService::instance().DataDir() + "/default_config.json"};
-											 "/default_config.json"};
 			DefaultConfiguration_ = BasicConfig;
-			std::ofstream OS(DefaultConfigFileName.path(), std::ios::binary | std::ios::trunc);
+			std::ofstream OS(DefaultConfigFileName.path(), std::ios::binary | std::ios::trunc );
-			std::istringstream IS(DefaultConfiguration_);
+			std::istringstream	IS(DefaultConfiguration_);
 			Poco::StreamCopier::copyStream(IS, OS);
 		} catch (...) {
 			DefaultConfiguration_ = BasicConfig;
@@ -162,23 +161,22 @@ namespace OpenWifi::Config {
 	}
 
 	Config::Config() {
-		if (DefaultConfiguration_.empty())
+		if(DefaultConfiguration_.empty())
 			Init();
 		Config_ = DefaultConfiguration_;
 	}
 
 	void Config::Init() {
-		if (DefaultConfiguration_.empty()) {
+		if(DefaultConfiguration_.empty()) {
 			//	open the file
 			try {
-				Poco::File DefaultConfigFileName{MicroService::instance().DataDir() +
+				Poco::File DefaultConfigFileName{MicroService::instance().DataDir()+"/default_config.json"};
-												 "/default_config.json"};
 				if (!DefaultConfigFileName.exists()) {
 					SetBasicConfigFile();
 				} else {
-					std::ifstream F(DefaultConfigFileName.path(), std::ios::binary | std::ios::in);
+					std::ifstream F(DefaultConfigFileName.path(),std::ios::binary | std::ios::in);
 					std::ostringstream C;
-					Poco::StreamCopier::copyStream(F, C);
+					Poco::StreamCopier::copyStream(F,C);
 					DefaultConfiguration_ = C.str();
 				}
 			} catch (...) {
@@ -187,104 +185,107 @@ namespace OpenWifi::Config {
 		}
 	}
 
-	bool Config::SetUUID(uint64_t UUID) {
+    bool Config::SetUUID(uint64_t UUID) {
-		try {
+        try {
-			Poco::JSON::Parser Parser;
+            Poco::JSON::Parser Parser;
-			auto Object = Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
+            auto Object = Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
 			Object->set("uuid", UUID);
 			std::ostringstream NewConfig;
-			Poco::JSON::Stringifier Stringifier;
+            Poco::JSON::Stringifier Stringifier;
 			Stringifier.condense(Object, NewConfig);
 			Config_ = NewConfig.str();
 			return true;
-		} catch (const Poco::Exception &E) {
+        }
-			std::cout << __func__ << ": new Configuration failed with " << E.displayText()
+        catch(const Poco::Exception &E)
-					  << std::endl;
+        {
-		}
+            std::cout << __func__ << ": new Configuration failed with " << E.displayText() << std::endl;
-		return false;
+        }
-	}
+        return false;
+    }
 
-	std::uint64_t Config::UUID() {
+    bool Config::Valid() {
-		try {
+        try {
-			Poco::JSON::Parser Parser;
+            Poco::JSON::Parser Parser;
-			auto object = Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
+            auto object = Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
-			if (object->has("uuid"))
+            if(object->has("uuid"))
-				return object->get("uuid");
+                return true;
-		} catch (...) {
+            return false;
-		}
+        }
-		return 0;
+        catch (...)
-	}
+        {
-
-	bool Config::Valid() {
-		try {
-			Poco::JSON::Parser Parser;
-			auto object = Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
-			if (object->has("uuid"))
-				return true;
 			return false;
-		} catch (...) {
+        }
-			return false;
+    }
-		}
-	}
 
 	Poco::JSON::Object::Ptr Config::to_json() {
-		Poco::JSON::Parser Parser;
+        Poco::JSON::Parser Parser;
-		return Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
+        return Parser.parse(Config_).extract<Poco::JSON::Object::Ptr>();
-	}
+    }
 
 	std::string Config::Default() {
-		if (DefaultConfiguration_.empty())
+		if(DefaultConfiguration_.empty())
 			Init();
 		return DefaultConfiguration_;
 	}
 
-	/*    std::string Capabilities::Default() {
+    std::string Capabilities::Default() {
-			return std::string(R"lit({"model":{"id":"linksys,ea8300","name":"Linksys EA8300
+        return std::string(R"lit({"model":{"id":"linksys,ea8300","name":"Linksys EA8300 (Dallas)"},
-	   (Dallas)"},
+                        "network":{"lan":{"ifname":"eth0","protocol":"static"},"wan":{"ifname":"eth1","protocol":"dhcp"}},
-							"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,
-							"switch":{"switch0":{"enable":true,"reset":true,"ports":[{"num":0,"device":"eth0","need_tag":false,
+                        "want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],
-							"want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],
+                        "roles":[{"role":"lan","ports":"1 2 3 4 0","device":"eth0"}]}},
-							"roles":[{"role":"lan","ports":"1 2 3 4 0","device":"eth0"}]}},
+                        "wifi":{"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5u"],"ht_capa":6639,
-							"wifi":{"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5u"],"ht_capa":6639,
+                        "vht_capa":865696178,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"tx_ant":3,"rx_ant":3,
-							"vht_capa":865696178,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"tx_ant":3,"rx_ant":3,
+                        "channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165]},
-							"channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165]},
+                        "platform/soc/a000000.wifi":{"band":["2"],"ht_capa":6639,"vht_capa":865687986,
-							"platform/soc/a000000.wifi":{"band":["2"],"ht_capa":6639,"vht_capa":865687986,
+                        "htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"tx_ant":3,"rx_ant":3,"channels":[1,2,3,4,5,6,7,8,9,10,11]},
-							"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"tx_ant":3,"rx_ant":3,"channels":[1,2,3,4,5,6,7,8,9,10,11]},
+                        "platform/soc/a800000.wifi":{"band":["5l"],"ht_capa":6639,"vht_capa":865687986,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],
-							"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");
-							"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() {
-		try {
+        if(Capabilities_.empty())
+            Capabilities_=Default();
 
-			if (Caps->has("compatible"))
+        try {
-				Compatible_ = Caps->get("compatible").toString();
+            Poco::JSON::Parser parser;
 
-			if (Caps->has("model"))
+            auto Result = parser.parse(Capabilities_);
-				Model_ = Caps->get("model").toString();
+            auto Objects = Result.extract<Poco::JSON::Object::Ptr>();
 
-			if (Caps->has("platform"))
+			if(Objects->has("compatible"))
-				Platform_ = Poco::toLower(Caps->get("platform").toString());
+				Compatible_ = Objects->get("compatible").toString();
 
-			if(Compatible_.empty()) {
+			if(Objects->has("model"))
-				Compatible_ = Model_;
+				Model_ = Objects->get("model").toString();
-			}
 
-			std::ostringstream OS;
+			if(Objects->has("platform"))
-			Caps->stringify(OS);
+				Platform_ = Objects->get("platform").toString();
-			AsString_ = OS.str();
+
-		} catch (const Poco::Exception &E) {
+            Parsed_ = true ;
-			Daemon()->logger().log(E);
+        }
-		}
+        catch ( const Poco::Exception & E )
+        {
+            Daemon()->logger().log(E);
+        }
+    }
+
+	const std::string & Capabilities::Compatible() {
+		if(!Parsed_)
+			Parse();
+		return Compatible_;
 	}
 
-	const std::string &Capabilities::Compatible() const { return Compatible_; }
+	const std::string & Capabilities::Model() {
+		if(!Parsed_)
+			Parse();
+		return Model_;
+	}
 
-	const std::string &Capabilities::Model() const { return Model_; }
+	const std::string & Capabilities::Platform() {
+		if(!Parsed_)
+			Parse();
+		return Platform_;
+	}
 
-	const std::string &Capabilities::Platform() const { return Platform_; }
+} // namespace
-
-	const std::string &Capabilities::AsString() const { return AsString_; }
-
-} // namespace OpenWifi::Config

src/CentralConfig.h

@@ -8,56 +8,59 @@
 
 #pragma once
 
-#include "Poco/JSON/Object.h"
 #include <string>
+#include "Poco/JSON/Object.h"
 
 namespace OpenWifi::Config {
 
 	class Config {
-	  public:
+    public:
-		explicit Config(const std::string &Config) : Config_(Config) {}
+        explicit Config(const std::string &Config)
+        	:Config_(Config) {
+		}
 
-		Config();
+        Config();
-		bool SetUUID(uint64_t UUID);
+        bool SetUUID(uint64_t UUID);
-		[[nodiscard]] bool Valid();
+        [[nodiscard]] bool Valid();
 		[[nodiscard]] std::string get() { return Config_; };
 		[[nodiscard]] std::string Default();
 		[[nodiscard]] Poco::JSON::Object::Ptr to_json();
-		[[nodiscard]] std::uint64_t UUID();
 
-	  private:
+    private:
-		void Init();
+	  	void Init();
-		void SetBasicConfigFile();
+	  	void SetBasicConfigFile();
-		inline static std::string DefaultConfiguration_ = "";
+	  	inline static std::string DefaultConfiguration_ = "";
-		std::string Config_;
+	  	std::string Config_;
-	};
+    };
 
-	class Capabilities {
+    class Capabilities {
-	  public:
+    public:
-		explicit Capabilities(const Poco::JSON::Object::Ptr &Caps);
+        explicit Capabilities(std::string Caps)
+        :   Capabilities_(std::move(Caps))
+        {
 
-		/*        Capabilities()
+        }
-				{
-					Capabilities_ = Default();
-				}
 
-				static std::string Default();
+        Capabilities()
+        {
+            Capabilities_ = Default();
+        }
 
-				[[nodiscard]] const std::string & Get() const { return Capabilities_; };
+        static std::string Default();
-		*/
+        [[nodiscard]] const std::string & Get() const { return Capabilities_; };
+        [[nodiscard]] const std::string & Compatible();
+        [[nodiscard]] const std::string & Model();
+		[[nodiscard]] const std::string & Platform();
 
-		[[nodiscard]] const std::string &Compatible() const;
+    private:
-		[[nodiscard]] const std::string &Model() const;
+        std::string Capabilities_;
-		[[nodiscard]] const std::string &Platform() const;
+        bool        Parsed_=false;
-		[[nodiscard]] const std::string &AsString() const;
+        std::string Compatible_;
-
+        std::string Model_;
-	  private:
-		std::string Compatible_;
-		std::string Model_;
 		std::string Platform_;
-		std::string AsString_;
 
 		void Parse();
-	};
+    };
+
+} // namespace
 
-} // namespace OpenWifi::Config

src/CommandManager.cpp

@@ -10,11 +10,11 @@
 
 #include "Poco/JSON/Parser.h"
 
-#include "AP_WS_Server.h"
 #include "CommandManager.h"
+#include "AP_WS_Server.h"
 #include "StorageService.h"
-#include "framework/MicroServiceFuncs.h"
 #include "framework/ow_constants.h"
+#include "framework/MicroServiceFuncs.h"
 #include "framework/utils.h"
 
 using namespace std::chrono_literals;
@@ -31,56 +31,38 @@ namespace OpenWifi {
 
 			try {
 				if (Resp != nullptr) {
-					Poco::JSON::Object::Ptr Payload = Resp->Payload_;
+					const Poco::JSON::Object &Payload = Resp->Payload_;
-					std::string SerialNumberStr = Utils::IntToSerialNumber(Resp->SerialNumber_);
+					const std::string &SerialNumber = Resp->SerialNumber_;
 
-					if (!Payload->has(uCentralProtocol::ID)) {
+					std::ostringstream SS;
-						poco_error(Logger(),
+					Payload.stringify(SS);
-								   fmt::format("({}): Invalid RPC response.", SerialNumberStr));
+
+					if (!Payload.has(uCentralProtocol::ID)) {
+						poco_error(Logger(), fmt::format("({}): Invalid RPC response.", SerialNumber));
 					} else {
-						uint64_t ID = Payload->get(uCentralProtocol::ID);
+						uint64_t ID = Payload.get(uCentralProtocol::ID);
+						poco_debug(Logger(),fmt::format("({}): Processing {} response.", SerialNumber, ID));
 						if (ID > 1) {
-							poco_debug(Logger(), fmt::format("({}): Processing {} response.",
+							std::lock_guard	Lock(LocalMutex_);
-															 SerialNumberStr, ID));
-							std::lock_guard Lock(LocalMutex_);
 							auto RPC = OutStandingRequests_.find(ID);
-							if (RPC == OutStandingRequests_.end()) {
+							if (RPC == OutStandingRequests_.end() ||
-								poco_debug(Logger(), fmt::format("({}): RPC {} cannot be found.",
+								RPC->second.SerialNumber !=
-																 SerialNumberStr, ID));
+									Utils::SerialNumberToInt(Resp->SerialNumber_)) {
-							} else if (RPC->second.SerialNumber != Resp->SerialNumber_) {
+								poco_debug(Logger(),
-								poco_debug(
+									fmt::format("({}): RPC {} completed.", SerialNumber, ID));
-									Logger(),
-									fmt::format("({}): RPC {} serial number mismatch {}!={}.",
-												SerialNumberStr, ID, RPC->second.SerialNumber,
-												Resp->SerialNumber_));
 							} else {
-								std::shared_ptr<promise_type_t> TmpRpcEntry;
 								std::chrono::duration<double, std::milli> rpc_execution_time =
 									std::chrono::high_resolution_clock::now() -
 									RPC->second.submitted;
-								poco_debug(Logger(),
+								StorageService()->CommandCompleted(RPC->second.UUID, Payload,
-										   fmt::format("({}): Received RPC answer {}. Command={}",
+																   rpc_execution_time, true);
-													   SerialNumberStr, ID,
+								if (RPC->second.rpc_entry) {
-													   APCommands::to_string(RPC->second.Command)));
+									RPC->second.rpc_entry->set_value(Payload);
-								if (RPC->second.Command == APCommands::Commands::script) {
-									CompleteScriptCommand(RPC->second, Payload, rpc_execution_time);
-								} else if (RPC->second.Command == APCommands::Commands::telemetry) {
-									CompleteTelemetryCommand(RPC->second, Payload,
-															 rpc_execution_time);
-								} else if (RPC->second.Command == APCommands::Commands::configure && RPC->second.rpc_entry==nullptr) {
-									CompleteConfigureCommand(RPC->second, Payload,
-															 rpc_execution_time);
-								} else {
-									StorageService()->CommandCompleted(RPC->second.UUID, Payload,
-																	   rpc_execution_time, true);
-									if (RPC->second.rpc_entry) {
-										TmpRpcEntry = RPC->second.rpc_entry;
-									}
-									RPC->second.State = 0;
-									OutStandingRequests_.erase(ID);
-									if (TmpRpcEntry != nullptr)
-										TmpRpcEntry->set_value(Payload);
 								}
+								poco_debug(Logger(),
+									fmt::format("({}): Received RPC answer {}. Command={}",
+												SerialNumber, ID, RPC->second.Command));
+								OutStandingRequests_.erase(ID);
 							}
 						}
 					}
@@ -88,380 +70,217 @@ namespace OpenWifi {
 			} catch (const Poco::Exception &E) {
 				Logger().log(E);
 			} catch (...) {
-				poco_warning(Logger(), "Exception occurred during run.");
+				poco_warning(Logger(),"Exception occurred during run.");
 			}
 			NextMsg = ResponseQueue_.waitDequeueNotification();
 		}
-		poco_information(Logger(), "RPC Command processor stopping.");
+		poco_information(Logger(),"RPC Command processor stopping.");
-	}
+   	}
 
-	bool CommandManager::CompleteTelemetryCommand(
+    int CommandManager::Start() {
-		CommandInfo &Command, [[maybe_unused]] const Poco::JSON::Object::Ptr &Payload,
+        poco_notice(Logger(),"Starting...");
-		std::chrono::duration<double, std::milli> rpc_execution_time) {
-		std::shared_ptr<promise_type_t> TmpRpcEntry;
-
-		StorageService()->CommandCompleted(Command.UUID, Payload, rpc_execution_time, true);
-
-		if (Command.rpc_entry) {
-			TmpRpcEntry = Command.rpc_entry;
-		}
-		Command.State = 0;
-
-		OutStandingRequests_.erase(Command.Id);
-		if (TmpRpcEntry != nullptr)
-			TmpRpcEntry->set_value(Payload);
-		return true;
-	}
-
-	bool CommandManager::CompleteConfigureCommand(
-		CommandInfo &Command, [[maybe_unused]] const Poco::JSON::Object::Ptr &Payload,
-		std::chrono::duration<double, std::milli> rpc_execution_time) {
-		std::shared_ptr<promise_type_t> TmpRpcEntry;
-
-		if (Command.rpc_entry) {
-			TmpRpcEntry = Command.rpc_entry;
-		}
-
-		StorageService()->CommandCompleted(Command.UUID, Payload, rpc_execution_time, true);
-
-		if (Payload->has("result")) {
-			auto Result = Payload->getObject("result");
-			if (Result->has("status") && Result->has("serial")) {
-				auto Status = Result->getObject("status");
-				auto SerialNumber = Result->get("serial").toString();
-				std::uint64_t Error = Status->get("error");
-				if (Error == 2) {
-					StorageService()->RollbackDeviceConfigurationChange(SerialNumber);
-				} else {
-					StorageService()->CompleteDeviceConfigurationChange(SerialNumber);
-				}
-			}
-		} else {
-		}
-		Command.State = 0;
-
-		if (Command.rpc_entry) {
-			TmpRpcEntry = Command.rpc_entry;
-		}
-
-		OutStandingRequests_.erase(Command.Id);
-		if (TmpRpcEntry != nullptr)
-			TmpRpcEntry->set_value(Payload);
-		return true;
-	}
-
-	bool CommandManager::CompleteScriptCommand(
-		CommandInfo &Command, const Poco::JSON::Object::Ptr &Payload,
-		std::chrono::duration<double, std::milli> rpc_execution_time) {
-		bool Reply = true;
-		std::shared_ptr<promise_type_t> TmpRpcEntry;
-
-		if (Command.rpc_entry) {
-			TmpRpcEntry = Command.rpc_entry;
-		}
-		if (Command.State == 2) {
-			//	 look at the payload to see if we should continue or not...
-			if (Payload->has("result")) {
-				auto Result = Payload->getObject("result");
-				if (Result->has("status")) {
-					auto Status = Result->getObject("status");
-
-					std::uint64_t Error = Status->get("error");
-					if (Error == 0) {
-						StorageService()->CommandCompleted(Command.UUID, Payload,
-														   rpc_execution_time, true);
-						Command.State = 1;
-					} else {
-						StorageService()->CommandCompleted(Command.UUID, Payload,
-														   rpc_execution_time, true);
-						std::string ErrorTxt = Status->get("result");
-						StorageService()->CancelWaitFile(Command.UUID, ErrorTxt);
-						Command.State = 0;
-					}
-				} else {
-				}
-			} else {
-				Command.State = 0;
-			}
-		} else if (Command.State == 1) {
-			StorageService()->CommandCompleted(Command.UUID, Payload, rpc_execution_time, true);
-			if (Command.Deferred) {
-				Reply = false;
-			}
-			Command.State = 0;
-		}
-
-		if (Command.State == 0) {
-			OutStandingRequests_.erase(Command.Id);
-		}
-		if (Reply && TmpRpcEntry != nullptr)
-			TmpRpcEntry->set_value(Payload);
-
-		return true;
-	}
-
-	int CommandManager::Start() {
-		poco_notice(Logger(), "Starting...");
-
-		commandTimeOut_ = MicroServiceConfigGetInt("command.timeout", 4 * 60 * 60);
-		commandRetry_ = MicroServiceConfigGetInt("command.retry", 120);
-		janitorInterval_ = MicroServiceConfigGetInt("command.janitor", 2 * 60); //	1 hour
-		queueInterval_ = MicroServiceConfigGetInt("command.queue", 30);
 
 		ManagerThread.start(*this);
 
-		JanitorCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(
+		JanitorCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(*this,&CommandManager::onJanitorTimer);
-			*this, &CommandManager::onJanitorTimer);
+		JanitorTimer_.setStartInterval( 10000 );
-		JanitorTimer_.setStartInterval(10000);
+		JanitorTimer_.setPeriodicInterval(10 * 60 * 1000); // 1 hours
-		JanitorTimer_.setPeriodicInterval(janitorInterval_ * 1000); // 1 hours
 		JanitorTimer_.start(*JanitorCallback_, MicroServiceTimerPool());
 
-		CommandRunnerCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(
+		CommandRunnerCallback_ = std::make_unique<Poco::TimerCallback<CommandManager>>(*this,&CommandManager::onCommandRunnerTimer);
-			*this, &CommandManager::onCommandRunnerTimer);
+		CommandRunnerTimer_.setStartInterval( 10000 );
-		CommandRunnerTimer_.setStartInterval(10000);
+		CommandRunnerTimer_.setPeriodicInterval(30 * 1000); // 1 hours
-		CommandRunnerTimer_.setPeriodicInterval(queueInterval_ * 1000); // 1 hours
 		CommandRunnerTimer_.start(*CommandRunnerCallback_, MicroServiceTimerPool());
 
-		return 0;
+        return 0;
-	}
+    }
 
-	void CommandManager::Stop() {
+    void CommandManager::Stop() {
-		poco_notice(Logger(), "Stopping...");
+        poco_notice(Logger(),"Stopping...");
 		Running_ = false;
 		JanitorTimer_.stop();
 		CommandRunnerTimer_.stop();
 		ResponseQueue_.wakeUpAll();
 		ManagerThread.wakeUp();
-		ManagerThread.join();
+        ManagerThread.join();
-		poco_notice(Logger(), "Stopped...");
+		poco_notice(Logger(),"Stopped...");
-	}
+    }
 
-	void CommandManager::WakeUp() {
+    void CommandManager::WakeUp() {
-		poco_notice(Logger(), "Waking up...");
+		poco_notice(Logger(),"Waking up...");
-		ManagerThread.wakeUp();
+        ManagerThread.wakeUp();
-	}
+    }
 
-	void CommandManager::onJanitorTimer([[maybe_unused]] Poco::Timer &timer) {
+	void CommandManager::onJanitorTimer([[maybe_unused]] Poco::Timer & timer) {
-		std::lock_guard Lock(LocalMutex_);
+		std::lock_guard	Lock(LocalMutex_);
 		Utils::SetThreadName("cmd:janitor");
-		Poco::Logger &MyLogger = Poco::Logger::get("CMD-MGR-JANITOR");
+		Poco::Logger	& MyLogger = Poco::Logger::get("CMD-MGR-JANITOR");
-		std::string TimeOutError("No response.");
-
 		auto now = std::chrono::high_resolution_clock::now();
-		for (auto request = OutStandingRequests_.begin(); request != OutStandingRequests_.end();) {
+		for(auto request=OutStandingRequests_.begin();request!=OutStandingRequests_.end();) {
 			std::chrono::duration<double, std::milli> delta = now - request->second.submitted;
-			if (delta > 10min) {
+			if(delta > 10min) {
-				MyLogger.debug(fmt::format("{}: Command={} for {} Timed out.", request->second.UUID,
+				MyLogger.debug(fmt::format("{}: Command={} for {} Timed out.",
-										   APCommands::to_string(request->second.Command),
+										   request->second.UUID,
+										   request->second.Command,
 										   Utils::IntToSerialNumber(request->second.SerialNumber)));
-				if ((request->second.Command == APCommands::Commands::script &&
-					 request->second.Deferred) ||
-					(request->second.Command == APCommands::Commands::trace)) {
-					StorageService()->CancelWaitFile(request->second.UUID, TimeOutError);
-				}
-				StorageService()->SetCommandTimedOut(request->second.UUID);
 				request = OutStandingRequests_.erase(request);
 			} else {
 				++request;
 			}
 		}
 		poco_information(MyLogger,
-						 fmt::format("Outstanding-requests {}", OutStandingRequests_.size()));
+			fmt::format("Outstanding-requests {}", OutStandingRequests_.size()));
 	}
 
 	bool CommandManager::IsCommandRunning(const std::string &C) {
-		std::lock_guard Lock(LocalMutex_);
+		std::lock_guard	Lock(LocalMutex_);
-		return std::any_of(
+		for (const auto &request : OutStandingRequests_) {
-			OutStandingRequests_.begin(), OutStandingRequests_.end(),
+			if (request.second.UUID == C) {
-			[C](const std::pair<std::uint64_t, CommandInfo> &r) { return r.second.UUID == C; });
+				return true;
+			}
+		}
+		return false;
 	}
 
 	void CommandManager::onCommandRunnerTimer([[maybe_unused]] Poco::Timer &timer) {
 		Utils::SetThreadName("cmd:schdlr");
 		Poco::Logger &MyLogger = Poco::Logger::get("CMD-MGR-SCHEDULER");
 
-		poco_trace(MyLogger, "Scheduler starting.");
+		poco_trace(MyLogger,"Scheduler starting.");
 
 		try {
 
 			StorageService()->RemovedExpiredCommands();
 			StorageService()->RemoveTimedOutCommands();
 
-			std::uint64_t offset = 0;
+			std::vector<GWObjects::CommandDetails> Commands;
-			bool Done = false;
+			if (StorageService()->GetReadyToExecuteCommands(0, 200, Commands)) {
-			while (!Done) {
+				poco_trace(MyLogger,fmt::format("Scheduler about to process {} commands.", Commands.size()));
-				std::vector<GWObjects::CommandDetails> Commands;
+				for (auto &Cmd : Commands) {
-				if (StorageService()->GetReadyToExecuteCommands(offset, 200, Commands)) {
+					if (!Running_) {
-					if(Commands.empty()) {
+						poco_warning(MyLogger,"Scheduler quitting because service is stopping.");
-						Done=true;
+						break;
-						continue;
 					}
-					poco_trace(MyLogger, fmt::format("Scheduler about to process {} commands.",
+					poco_trace(
-													 Commands.size()));
+						MyLogger, fmt::format("{}: Serial={} Command={} Starting processing.",
-					for (auto &Cmd : Commands) {
+											  Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						if (!Running_) {
+					try {
-							poco_warning(MyLogger,
-										 "Scheduler quitting because service is stopping.");
-							break;
-						}
-						poco_trace(MyLogger,
-								   fmt::format("{}: Serial={} Command={} Starting processing.",
-											   Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-						try {
 
-							//	Skip an already running command
+						//	Skip an already running command
-							if (IsCommandRunning(Cmd.UUID)) {
+						if(IsCommandRunning(Cmd.UUID))
-								continue;
+							continue;
-							}
 
-							auto now = Utils::Now();
+						auto now = Utils::Now();
-							// 2 hour timeout for commands
+						// 2 hour timeout for commands
-							if ((now - Cmd.Submitted) > commandTimeOut_) {
+						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;
-							}
-
-							auto SerialNumberInt = Utils::SerialNumberToInt(Cmd.SerialNumber);
-							if (!AP_WS_Server()->Connected(SerialNumberInt)) {
-								poco_trace(
-									MyLogger,
-									fmt::format("{}: Serial={} Command={} Device is not connected.",
-												Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-								StorageService()->SetCommandLastTry(Cmd.UUID);
-								continue;
-							}
-
-							std::string ExecutingUUID;
-							APCommands::Commands ExecutingCommand = APCommands::Commands::unknown;
-							if (CommandRunningForDevice(SerialNumberInt, 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,
+								MyLogger, fmt::format("{}: Serial={} Command={} has expired.",
-								fmt::format("{}: Serial={} Command={} Preparing execution.",
+													  Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-											Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
+							StorageService()->SetCommandTimedOut(Cmd.UUID);
-							auto Params = P.parse(Cmd.Details).extract<Poco::JSON::Object::Ptr>();
+							continue;
-							auto Result = PostCommandDisk(
+						}
-								Next_RPC_ID(), APCommands::to_apcommand(Cmd.Command.c_str()),
+
-								Cmd.SerialNumber, Cmd.Command, *Params, Cmd.UUID, Sent);
+						if (!AP_WS_Server()->Connected(
-							if (Sent) {
+								Utils::SerialNumberToInt(Cmd.SerialNumber))) {
-								StorageService()->SetCommandExecuted(Cmd.UUID);
+							poco_trace(
-								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));
-								StorageService()->SetCommandLastTry(Cmd.UUID);
-							}
-						} catch (const Poco::Exception &E) {
-							poco_debug(
 								MyLogger,
 								fmt::format(
-									"{}: Serial={} Command={} Failed. Command marked as completed.",
+									"{}: Serial={} Command={} Device is not connected.",
 									Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-							MyLogger.log(E);
+							continue;
-							StorageService()->SetCommandExecuted(Cmd.UUID);
-						} catch (...) {
-							poco_debug(MyLogger,
-									   fmt::format("{}: Serial={} Command={} Hard failure. "
-												   "Command marked as completed.",
-												   Cmd.UUID, Cmd.SerialNumber, Cmd.Command));
-							StorageService()->SetCommandExecuted(Cmd.UUID);
 						}
+
+						std::string ExecutingCommand, ExecutingUUID;
+						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, 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(NextRPCId(), 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));
+						StorageService()->SetCommandExecuted(Cmd.UUID);
 					}
-					offset += Commands.size();
-				} else {
-					Done=true;
-					continue;
 				}
 			}
-		}
+		} catch (Poco::Exception &E) {
-		catch (Poco::Exception &E) {
 			MyLogger.log(E);
+		} catch (...) {
+			poco_warning(MyLogger,"Exception during command processing.");
 		}
-		catch (...) {
+		poco_trace(MyLogger,"Scheduler done.");
-			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,
+		uint64_t RPCID,
-		const std::string &CommandStr, const Poco::JSON::Object &Params, const std::string &UUID,
+		const std::string &SerialNumber,
-		bool oneway_rpc, [[maybe_unused]] bool disk_only, bool &Sent, bool rpc, bool Deferred) {
+		const std::string &Command,
+		const Poco::JSON::Object &Params,
+		const std::string &UUID,
+		bool oneway_rpc,
+		bool disk_only,
+		bool & Sent) {
 
 		auto SerialNumberInt = Utils::SerialNumberToInt(SerialNumber);
-		Sent = false;
+		Sent=false;
 
-		std::stringstream ToSend;
+		std::stringstream 	ToSend;
 
-		CommandInfo CInfo;
+		CommandInfo		Idx;
-		CInfo.Id = oneway_rpc ? 1 : RPC_ID;
+		Idx.Id = oneway_rpc ? 1 : RPCID;
-		CInfo.SerialNumber = SerialNumberInt;
+		Idx.SerialNumber = SerialNumberInt;
-		CInfo.Command = Command;
+		Idx.Command = Command;
-		CInfo.Deferred = Deferred;
+		Idx.UUID = UUID;
-		CInfo.UUID = UUID;
-		if (Command == APCommands::Commands::script && Deferred) {
-			CInfo.State = 2;
-		} else {
-			CInfo.State = 1;
-		}
 
 		Poco::JSON::Object CompleteRPC;
 		CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
-		CompleteRPC.set(uCentralProtocol::ID, RPC_ID);
+		CompleteRPC.set(uCentralProtocol::ID, RPCID);
-		CompleteRPC.set(uCentralProtocol::METHOD, CommandStr);
+		CompleteRPC.set(uCentralProtocol::METHOD, Command);
 		CompleteRPC.set(uCentralProtocol::PARAMS, Params);
 		Poco::JSON::Stringifier::stringify(CompleteRPC, ToSend);
-		CInfo.rpc_entry = rpc ? std::make_shared<CommandManager::promise_type_t>() : nullptr;
+		Idx.rpc_entry = disk_only ? nullptr : std::make_shared<CommandManager::promise_type_t>();
 
-		poco_debug(Logger(), fmt::format("{}: Sending command {} to {}. ID: {}", UUID, CommandStr,
+		poco_debug(Logger(), fmt::format("{}: Sending command. ID: {}", UUID, RPCID));
-										 SerialNumber, RPC_ID));
+		if(AP_WS_Server()->SendFrame(SerialNumber, ToSend.str())) {
-		//	Do not change the order. It is possible that an RPC completes before it is entered in
+			if(!oneway_rpc) {
-		// the map. So we insert it 	first, even if we may need to remove it later upon failure.
+				std::lock_guard M(Mutex_);
-		if (!oneway_rpc) {
+				OutStandingRequests_[RPCID] = Idx;
-			std::lock_guard M(Mutex_);
+			}
-			OutStandingRequests_[RPC_ID] = CInfo;
+			poco_debug(Logger(), fmt::format("{}: Sent command. ID: {}", UUID, RPCID));
-		}
+			Sent=true;
-		if (AP_WS_Server()->SendFrame(SerialNumber, ToSend.str())) {
+			return Idx.rpc_entry;
-			poco_debug(Logger(), fmt::format("{}: Sent command. ID: {}", UUID, RPC_ID));
-			Sent = true;
-			return CInfo.rpc_entry;
-		} else if (!oneway_rpc) {
-			std::lock_guard M(Mutex_);
-			OutStandingRequests_.erase(RPC_ID);
 		}
 
-		poco_warning(Logger(), fmt::format("{}: Failed to send command. ID: {}", UUID, RPC_ID));
+		poco_warning(Logger(), fmt::format("{}: Failed to send command. ID: {}", UUID, RPCID));
 		return nullptr;
 	}
-
+}  // namespace
-	bool CommandManager::FireAndForget(const std::string &SerialNumber, const std::string &Method, const Poco::JSON::Object &Params) {
-		Poco::JSON::Object CompleteRPC;
-		CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
-		CompleteRPC.set(uCentralProtocol::ID, 0);
-		CompleteRPC.set(uCentralProtocol::METHOD, Method);
-		CompleteRPC.set(uCentralProtocol::PARAMS, Params);
-		std::stringstream ToSend;
-		CompleteRPC.stringify(ToSend);
-		poco_debug(Logger(), fmt::format("{}: Fire and forget command {}.", SerialNumber, Method));
-		return AP_WS_Server()->SendFrame(SerialNumber, ToSend.str())>0;
-	}
-} // namespace OpenWifi

src/CommandManager.h

@@ -9,194 +9,203 @@
 #pragma once
 
 #include <chrono>
-#include <functional>
 #include <future>
 #include <map>
-#include <mutex>
 #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 "Poco/Timer.h"
 
-#include "fmt/format.h"
 #include "framework/SubSystemServer.h"
+#include "fmt/format.h"
 
 #include "RESTObjects/RESTAPI_GWobjects.h"
 
 namespace OpenWifi {
 
-	class RPCResponseNotification : public Poco::Notification {
+	class RPCResponseNotification: public Poco::Notification {
 	  public:
-		RPCResponseNotification(std::uint64_t ser, Poco::JSON::Object::Ptr pl)
+		RPCResponseNotification(const std::string &ser,
-			: SerialNumber_(ser), Payload_(std::move(pl)) {}
+								const Poco::JSON::Object &pl) :
-		std::uint64_t SerialNumber_;
+ 			SerialNumber_(ser),
-		Poco::JSON::Object::Ptr Payload_;
+			Payload_(pl)
+		{
+
+		}
+		std::string			SerialNumber_;
+		Poco::JSON::Object	Payload_;
 	};
 
+
 	class CommandManager : public SubSystemServer, Poco::Runnable {
-	  public:
+	    public:
-		using objtype_t = Poco::JSON::Object::Ptr;
+		  	typedef Poco::JSON::Object 		objtype_t;
-		using promise_type_t = std::promise<objtype_t>;
+		  	typedef std::promise<objtype_t> promise_type_t;
 
-		struct CommandInfo {
+			struct CommandInfo {
-			std::uint64_t Id = 0;
+				std::uint64_t 	Id=0;
-			std::uint64_t SerialNumber = 0;
+				std::uint64_t 	SerialNumber=0;
-			APCommands::Commands Command;
+				std::string 	Command;
-			std::string UUID;
+				std::string 	UUID;
-			std::uint64_t State = 1;
+				std::chrono::time_point<std::chrono::high_resolution_clock> submitted = std::chrono::high_resolution_clock::now();
-			std::chrono::time_point<std::chrono::high_resolution_clock> submitted =
+				std::shared_ptr<promise_type_t> rpc_entry;
-				std::chrono::high_resolution_clock::now();
+			};
-			std::shared_ptr<promise_type_t> rpc_entry;
-			bool Deferred = false;
-		};
 
-		struct RPCResponse {
+			struct RPCResponse {
-			std::uint64_t serialNumber;
+				std::string 			serialNumber;
-			Poco::JSON::Object::Ptr payload;
+				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)) {}
+					:
-		};
+						serialNumber(ser),
+						payload(pl) {
+				}
+			};
 
-		int Start() override;
+			int Start() override;
-		void Stop() override;
+			void Stop() override;
-		void WakeUp();
+			void WakeUp();
-		inline void PostCommandResult(const std::string &SerialNumber,
+			inline void PostCommandResult(const std::string &SerialNumber, const Poco::JSON::Object &Obj) {
-									  Poco::JSON::Object::Ptr Obj) {
+				// RPCResponseQueue_->Write(RPCResponse{.serialNumber=SerialNumber, .payload = Obj});
-			ResponseQueue_.enqueueNotification(new RPCResponseNotification(
+				ResponseQueue_.enqueueNotification(new RPCResponseNotification(SerialNumber,Obj));
-				Utils::SerialNumberToInt(SerialNumber), std::move(Obj)));
+			}
-		}
 
-		std::shared_ptr<promise_type_t> PostCommandOneWayDisk(uint64_t RPC_ID,
+			std::shared_ptr<promise_type_t> PostCommandOneWayDisk(uint64_t RPCID,
-															  APCommands::Commands Command,
+				const std::string &SerialNumber,
-															  const std::string &SerialNumber,
+				const std::string &Method,
-															  const std::string &Method,
+				const Poco::JSON::Object &Params,
-															  const Poco::JSON::Object &Params,
+				const std::string &UUID,
-															  const std::string &UUID, bool &Sent) {
+				bool & Sent) {
-			return PostCommand(RPC_ID, Command, SerialNumber, Method, Params, UUID, true, true,
+					return 	PostCommand(RPCID, SerialNumber,
-							   Sent, false);
+									Method,
-		}
+									Params,
+									UUID,
+								   	true, true, Sent );
+			}
 
-		std::shared_ptr<promise_type_t>
+			std::shared_ptr<promise_type_t> PostCommandDisk(
-		PostCommandDisk(uint64_t RPC_ID, APCommands::Commands Command,
+				uint64_t RPCID,
-						const std::string &SerialNumber, const std::string &Method,
+				const std::string &SerialNumber,
-						const Poco::JSON::Object &Params, const std::string &UUID, bool &Sent) {
+				const std::string &Method,
-			return PostCommand(RPC_ID, Command, SerialNumber, Method, Params, UUID, false, true,
+				const Poco::JSON::Object &Params,
-							   Sent, false);
+				const std::string &UUID,
-		}
+				bool & Sent) {
+					return 	PostCommand(RPCID,
+								   SerialNumber,
+								   Method,
+								   Params,
+								   UUID,
+								   false, true, Sent  );
+			}
 
-		std::shared_ptr<promise_type_t>
+			std::shared_ptr<promise_type_t> PostCommand(
-		PostCommand(uint64_t RPC_ID, APCommands::Commands Command, const std::string &SerialNumber,
+				uint64_t RPCID,
-					const std::string &Method, const Poco::JSON::Object &Params,
+				const std::string &SerialNumber,
-					const std::string &UUID, bool &Sent, bool rpc, bool Deferred) {
+				const std::string &Method,
-			return PostCommand(RPC_ID, Command, SerialNumber, Method, Params, UUID, false, false,
+				const Poco::JSON::Object &Params,
-							   Sent, rpc, Deferred);
+				const std::string &UUID,
-		}
+				bool & Sent) {
+					return 	PostCommand(RPCID, SerialNumber,
+								   Method,
+								   Params,
+								   UUID,
+								   false,
+								   false, Sent );
+			}
 
-		std::shared_ptr<promise_type_t>
+			std::shared_ptr<promise_type_t> PostCommandOneWay(
-		PostCommandOneWay(uint64_t RPC_ID, APCommands::Commands Command,
+				uint64_t RPCID,
-						  const std::string &SerialNumber, const std::string &Method,
+				const std::string &SerialNumber,
-						  const Poco::JSON::Object &Params, const std::string &UUID, bool &Sent) {
+				const std::string &Method,
-			return PostCommand(RPC_ID, Command, SerialNumber, Method, Params, UUID, true, false,
+				const Poco::JSON::Object &Params,
-							   Sent, false);
+				const std::string &UUID,
-		}
+				bool & Sent) {
+					return 	PostCommand(RPCID,
+								   SerialNumber,
+								   Method,
+								   Params,
+								   UUID,
+								   true,
+								   false, Sent  );
+			}
 
-		bool IsCommandRunning(const std::string &C);
+			bool IsCommandRunning(const std::string &C);
 
-		void run() override;
+			void run() override;
 
-		static auto instance() {
+			static auto instance() {
-			static auto instance_ = new CommandManager;
+			    static auto instance_ = new CommandManager;
-			return instance_;
+				return instance_;
-		}
+			}
 
-		inline bool Running() const { return Running_; }
+			inline bool Running() const { return Running_; }
-		void onJanitorTimer(Poco::Timer &timer);
+			void onJanitorTimer(Poco::Timer & timer);
-		void onCommandRunnerTimer(Poco::Timer &timer);
+			void onCommandRunnerTimer(Poco::Timer & timer);
-		inline uint64_t Next_RPC_ID() { return ++Id_; }
+			void onRPCAnswer(bool& b);
+			inline uint64_t NextRPCId() { return ++Id_; }
 
-		void RemovePendingCommand(std::uint64_t Id) {
+			void RemovePendingCommand(std::uint64_t Id) {
-			std::unique_lock Lock(LocalMutex_);
+				std::unique_lock	Lock(LocalMutex_);
-			OutStandingRequests_.erase(Id);
+				OutStandingRequests_.erase(Id);
-		}
+			}
 
-		inline bool CommandRunningForDevice(std::uint64_t SerialNumber, std::string &uuid,
+			inline bool CommandRunningForDevice(std::uint64_t SerialNumber, std::string & uuid, std::string &command) {
-											APCommands::Commands &command) {
+				std::lock_guard	Lock(LocalMutex_);
-			std::lock_guard Lock(LocalMutex_);
 
-			for (const auto &[Request, Command] : OutStandingRequests_) {
+				for(const auto &[Request,Command]:OutStandingRequests_) {
-				if (Command.SerialNumber == SerialNumber) {
+					if(Command.SerialNumber==SerialNumber) {
-					uuid = Command.UUID;
+						uuid = Command.UUID;
-					command = Command.Command;
+						command = Command.Command;
-					return true;
+						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;
 				}
 			}
-			return false;
-		}
 
-		inline void ClearQueue(std::uint64_t SerialNumber) {
+	    private:
-			std::lock_guard Lock(LocalMutex_);
+		  	mutable std::recursive_mutex			LocalMutex_;
-			for (auto Request = OutStandingRequests_.begin();
+			std::atomic_bool 						Running_ = false;
-				 Request != OutStandingRequests_.end();) {
+			Poco::Thread    						ManagerThread;
-				if (Request->second.SerialNumber == SerialNumber)
+			std::atomic_uint64_t 					Id_=3;	//	do not start @1. We ignore ID=1 & 0 is illegal..
-					Request = OutStandingRequests_.erase(Request);
+			std::map<std::uint64_t , CommandInfo>	OutStandingRequests_;
-				else
+			Poco::Timer                     		JanitorTimer_;
-					++Request;
+			std::unique_ptr<Poco::TimerCallback<CommandManager>>   JanitorCallback_;
+			Poco::Timer                     		CommandRunnerTimer_;
+			std::unique_ptr<Poco::TimerCallback<CommandManager>>   CommandRunnerCallback_;
+			Poco::NotificationQueue					ResponseQueue_;
+
+			std::shared_ptr<promise_type_t> PostCommand(
+				uint64_t RPCID,
+				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);
+
+			CommandManager() noexcept:
+				SubSystemServer("CommandManager", "CMD-MGR", "command.manager") {
 			}
-		}
-
-		inline void RemoveCommand(const std::string &UUID) {
-			std::lock_guard Lock(LocalMutex_);
-			for (const auto &[Id, Cmd] : OutStandingRequests_) {
-				if (Cmd.UUID == UUID) {
-					OutStandingRequests_.erase(Id);
-					return;
-				}
-			}
-		}
-
-		inline auto CommandTimeout() const { return commandTimeOut_; }
-		inline auto CommandRetry() const { return commandRetry_; }
-
-		bool FireAndForget(const std::string &SerialNumber, const std::string &Method,
-						   const Poco::JSON::Object &Params);
-	  private:
-		mutable std::mutex LocalMutex_;
-		std::atomic_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_;
-		Poco::Timer JanitorTimer_;
-		std::unique_ptr<Poco::TimerCallback<CommandManager>> JanitorCallback_;
-		Poco::Timer CommandRunnerTimer_;
-		std::unique_ptr<Poco::TimerCallback<CommandManager>> CommandRunnerCallback_;
-		Poco::NotificationQueue ResponseQueue_;
-		std::uint64_t commandTimeOut_ = 0;
-		std::uint64_t commandRetry_ = 0;
-		std::uint64_t janitorInterval_ = 0;
-		std::uint64_t queueInterval_ = 0;
-
-		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,
-					const std::string &UUID, bool oneway_rpc, bool disk_only, bool &Sent,
-					bool rpc_call, bool Deferred = false);
-
-		bool CompleteScriptCommand(CommandInfo &Command, const Poco::JSON::Object::Ptr &Payload,
-								   std::chrono::duration<double, std::milli> rpc_execution_time);
-		bool CompleteTelemetryCommand(CommandInfo &Command, const Poco::JSON::Object::Ptr &Payload,
-									  std::chrono::duration<double, std::milli> rpc_execution_time);
-		bool CompleteConfigureCommand(CommandInfo &Command, const Poco::JSON::Object::Ptr &Payload,
-									  std::chrono::duration<double, std::milli> rpc_execution_time);
-
-		CommandManager() noexcept
-			: SubSystemServer("CommandManager", "CMD-MGR", "command.manager") {}
 	};
 
 	inline auto CommandManager() { return CommandManager::instance(); }
 
-} // namespace OpenWifi
+}  // namespace
+

src/ConfigurationCache.h

@@ -5,44 +5,45 @@
 #pragma once
 
 #include <map>
-#include <mutex>
 #include <string>
+#include <mutex>
 
 namespace OpenWifi {
 	class ConfigurationCache {
 	  public:
-		static auto instance() {
+
-			static auto instance = new ConfigurationCache;
+		static ConfigurationCache & instance() {
+			static ConfigurationCache instance;
 			return instance;
 		}
 
-		inline uint64_t GetCurrentConfig(std::uint64_t SerialNumber) {
+		inline uint64_t CurrentConfig(uint64_t SerialNumber) {
 			std::lock_guard G(Mutex_);
 			const auto Hint = Cache_.find(SerialNumber);
-			if (Hint == end(Cache_))
+			if(Hint==end(Cache_))
 				return 0;
 			return Hint->second;
 		}
 
-		inline void SetCurrentConfig(std::uint64_t SerialNumber, uint64_t Id) {
+		inline void Add(uint64_t SerialNumber, uint64_t Id) {
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
-			Cache_[SerialNumber] = Id;
+			Cache_[SerialNumber]=Id;
 		}
 
 	  private:
-		std::mutex Mutex_;
+		std::recursive_mutex					Mutex_;
-		std::map<uint64_t, uint64_t> Cache_;
+		std::map<uint64_t,uint64_t>	Cache_;
 	};
 
-	inline auto GetCurrentConfigurationID(std::uint64_t SerialNumber) {
+	inline uint64_t GetCurrentConfigurationID(uint64_t SerialNumber) {
-		return ConfigurationCache::instance()->GetCurrentConfig(SerialNumber);
+		return ConfigurationCache::instance().CurrentConfig(SerialNumber);
 	}
 
-	inline void SetCurrentConfigurationID(const std::string &SerialNumber, std::uint64_t ID) {
+	inline void SetCurrentConfigurationID(const std::string & SerialNumber, uint64_t ID) {
-		return ConfigurationCache::instance()->SetCurrentConfig(Utils::SerialNumberToInt(SerialNumber), ID);
+		return ConfigurationCache::instance().Add(Utils::SerialNumberToInt(SerialNumber), ID);
 	}
 
-	inline void SetCurrentConfigurationID(uint64_t SerialNumber, std::uint64_t ID) {
+	inline void SetCurrentConfigurationID(uint64_t SerialNumber, uint64_t ID) {
-		return ConfigurationCache::instance()->SetCurrentConfig(SerialNumber, ID);
+		return ConfigurationCache::instance().Add(SerialNumber, ID);
 	}
-} // namespace OpenWifi
+}

src/Daemon.cpp

@@ -6,14 +6,11 @@
 //	Arilia Wireless Inc.
 //
 
-#include "Poco/Environment.h"
-#include "Poco/Net/SSLManager.h"
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
+#include "Poco/Environment.h"
+#include "Poco/Net/SSLManager.h"
 
-#include <framework/ConfigurationValidator.h>
-#include <framework/UI_WebSocketClientServer.h>
-#include <framework/default_device_types.h>
 
 #include "AP_WS_Server.h"
 #include "CommandManager.h"
@@ -21,78 +18,102 @@
 #include "FileUploader.h"
 #include "FindCountry.h"
 #include "OUIServer.h"
-#include "RADIUSSessionTracker.h"
 #include "RADIUS_proxy_server.h"
-#include "RegulatoryInfo.h"
-#include "ScriptManager.h"
 #include "SerialNumberCache.h"
-#include "SignatureMgr.h"
 #include "StorageArchiver.h"
 #include "StorageService.h"
 #include "TelemetryStream.h"
-#include "GenericScheduler.h"
-#include "UI_GW_WebSocketNotifications.h"
 #include "VenueBroadcaster.h"
-#include "AP_WS_ConfigAutoUpgrader.h"
+#include "framework/ConfigurationValidator.h"
 #include "rttys/RTTYS_server.h"
-#include "firmware_revision_cache.h"
+#include "framework/UI_WebSocketClientServer.h"
 
 namespace OpenWifi {
 	class Daemon *Daemon::instance() {
-		static Daemon instance(
+	    static Daemon instance(vDAEMON_PROPERTIES_FILENAME,
-			vDAEMON_PROPERTIES_FILENAME, vDAEMON_ROOT_ENV_VAR, vDAEMON_CONFIG_ENV_VAR,
+								   vDAEMON_ROOT_ENV_VAR,
-			vDAEMON_APP_NAME, vDAEMON_BUS_TIMER,
+								   vDAEMON_CONFIG_ENV_VAR,
-			SubSystemVec{GenericScheduler(), StorageService(), SerialNumberCache(), ConfigurationValidator(),
+								   vDAEMON_APP_NAME,
-				UI_WebSocketClientServer(), OUIServer(), FindCountryFromIP(),
+								   vDAEMON_BUS_TIMER,
-				CommandManager(), FileUploader(), StorageArchiver(), TelemetryStream(),
+								   SubSystemVec{
-				RTTYS_server(), RADIUS_proxy_server(), VenueBroadcaster(), ScriptManager(),
+										StorageService(),
-				SignatureManager(), AP_WS_Server(),
+										SerialNumberCache(),
-				RegulatoryInfo(),
+										ConfigurationValidator(),
-				RADIUSSessionTracker(),
+								   		UI_WebSocketClientServer(),
-			 	AP_WS_ConfigAutoUpgradeAgent(),
+										OUIServer(),
-				FirmwareRevisionCache()
+										FindCountryFromIP(),
-			});
+										CommandManager(),
-		return &instance;
+										FileUploader(),
-	}
+										StorageArchiver(),
-
+										TelemetryStream(),
-	static std::string ALBHealthCallback() {
+										RTTYS_server(),
-		uint64_t Connections, AverageConnectionTime, NumberOfConnectingDevices;
+								   		RADIUS_proxy_server(),
-		AP_WS_Server()->AverageDeviceStatistics(Connections, AverageConnectionTime,
+								   		VenueBroadcaster(),
-								NumberOfConnectingDevices);
+									   	AP_WS_Server()
-		std::ostringstream os;
+							   });
-		os << 	"Connections: " << Connections << std::endl <<
+        return &instance;
-				"ConnectingDevices: " << NumberOfConnectingDevices << std::endl <<
-				"ConnectionTime: " << AverageConnectionTime << std::endl;
-		return os.str();
 	}
 
+	static const std::vector<std::pair<std::string,std::string>>		DefaultDeviceTypes{
+		{"cig_wf160d","AP"},
+		{"cig_wf188","AP"},
+		{"cig_wf188n","AP"},
+		{"cig_wf194c","AP"},
+		{"cig_wf194c4","AP"},
+		{"edgecore_eap101","AP"},
+		{"edgecore_eap102","AP"},
+		{"edgecore_ecs4100-12ph","AP"},
+		{"edgecore_ecw5211","AP"},
+		{"edgecore_ecw5410","AP"},
+		{"edgecore_oap100","AP"},
+		{"edgecore_spw2ac1200","SWITCH"},
+		{"edgecore_spw2ac1200-lan-poe","SWITCH"},
+		{"edgecore_ssw2ac2600","SWITCH"},
+		{"hfcl_ion4","AP"},
+		{"indio_um-305ac","AP"},
+		{"linksys_e8450-ubi","AP"},
+		{"linksys_ea6350","AP"},
+		{"linksys_ea6350-v4","AP"},
+		{"linksys_ea8300","AP"},
+		{"mikrotik_nand","AP"},
+		{"tp-link_ec420-g1","AP"},
+		{"tplink_cpe210_v3","AP"},
+		{"tplink_cpe510_v3","AP"},
+		{"tplink_eap225_outdoor_v1","AP"},
+		{"tplink_ec420","AP"},
+		{"tplink_ex227","AP"},
+		{"tplink_ex228","AP"},
+		{"tplink_ex447","AP"},
+		{"wallys_dr40x9","AP"}
+	};
+	
 	void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
-		AutoProvisioning_ = config().getBool("openwifi.autoprovisioning", false);
+        AutoProvisioning_ = config().getBool("openwifi.autoprovisioning",false);
-		DeviceTypes_ = DefaultDeviceTypeList;
+        DeviceTypes_ = DefaultDeviceTypes;
-		WebSocketProcessor_ = std::make_unique<GwWebSocketClient>(logger());
-		MicroServiceALBCallback(ALBHealthCallback);
-	}
 
-	[[nodiscard]] std::string Daemon::IdentifyDevice(const std::string &Id) const {
+		WebSocketProcessor_ = std::make_unique<GwWebSocketClient>(logger());
-		for (const auto &[DeviceType, Type] : DeviceTypes_) {
+    }
-			if (Id == DeviceType)
+
-				return Type;
+    [[nodiscard]] std::string Daemon::IdentifyDevice(const std::string & Id ) const {
-		}
+	    for(const auto &[DeviceType,Type]:DeviceTypes_)
-		return Platforms::AP;
+        {
-	}
+        	if(Id == DeviceType)
+        		return Type;
+        }
+        return "AP";
+    }
 
 	void DaemonPostInitialization(Poco::Util::Application &self) {
 		Daemon()->PostInitialization(self);
-		GWWebSocketNotifications::Register();
 	}
-} // namespace OpenWifi
+}
 
 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);
+		ExitCode =  App->run(argc, argv);
 		Poco::Net::SSLManager::instance().shutdown();
 	} catch (Poco::Exception &exc) {
 		ExitCode = Poco::Util::Application::EXIT_SOFTWARE;

src/Daemon.h

@@ -9,47 +9,50 @@
 #pragma once
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
-#include <set>
+#include <cstdlib>
 #include <vector>
+#include <set>
 
-#include "framework/MicroService.h"
 #include "framework/MicroServiceNames.h"
+#include "framework/MicroService.h"
 
 #include "Dashboard.h"
-#include "GwWebSocketClient.h"
 #include "framework/OpenWifiTypes.h"
+#include "GwWebSocketClient.h"
 
 namespace OpenWifi {
 
-	[[maybe_unused]] static const char *vDAEMON_PROPERTIES_FILENAME = "owgw.properties";
+	[[maybe_unused]] static const char * vDAEMON_PROPERTIES_FILENAME = "owgw.properties";
-	[[maybe_unused]] static const char *vDAEMON_ROOT_ENV_VAR = "OWGW_ROOT";
+	[[maybe_unused]] static const char * vDAEMON_ROOT_ENV_VAR = "OWGW_ROOT";
-	[[maybe_unused]] static const char *vDAEMON_CONFIG_ENV_VAR = "OWGW_CONFIG";
+	[[maybe_unused]] static const char * vDAEMON_CONFIG_ENV_VAR = "OWGW_CONFIG";
-	[[maybe_unused]] static const char *vDAEMON_APP_NAME = uSERVICE_GATEWAY.c_str();
+	[[maybe_unused]] static const char * vDAEMON_APP_NAME = uSERVICE_GATEWAY.c_str();
 	[[maybe_unused]] static const uint64_t vDAEMON_BUS_TIMER = 10000;
 
-	class Daemon : public MicroService {
+    class Daemon : public MicroService {
-	  public:
+		public:
-		explicit Daemon(const std::string &PropFile, const std::string &RootEnv,
+			explicit Daemon(const std::string & PropFile,
-						const std::string &ConfigEnv, const std::string &AppName, uint64_t BusTimer,
+							const std::string & RootEnv,
-						const SubSystemVec &SubSystems)
+							const std::string & ConfigEnv,
-			: MicroService(PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems){};
+							const std::string & AppName,
+						  	uint64_t 	BusTimer,
+							const SubSystemVec & SubSystems) :
+				MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-		bool AutoProvisioning() const { return AutoProvisioning_; }
+			bool AutoProvisioning() const { return AutoProvisioning_ ; }
-		[[nodiscard]] std::string IdentifyDevice(const std::string &Compatible) const;
+			[[nodiscard]] std::string IdentifyDevice(const std::string & Compatible) const;
-		static Daemon *instance();
+			static Daemon *instance();
-		inline DeviceDashboard &GetDashboard() { return DB_; }
+			inline DeviceDashboard	& GetDashboard() { return DB_; }
-		Poco::Logger &Log() { return Poco::Logger::get(AppName()); }
+			Poco::Logger & Log() { return Poco::Logger::get(AppName()); }
-		void PostInitialization(Poco::Util::Application &self);
+			void PostInitialization(Poco::Util::Application &self);
+	  	private:
+			bool                        AutoProvisioning_ = false;
+			std::vector<std::pair<std::string,std::string>> DeviceTypes_;
+			DeviceDashboard				DB_;
+			std::unique_ptr<GwWebSocketClient>    WebSocketProcessor_;
+    };
 
-	  private:
+	inline Daemon * Daemon() { return Daemon::instance(); }
-		bool AutoProvisioning_ = false;
-		std::vector<std::pair<std::string, std::string>> DeviceTypes_;
-		DeviceDashboard DB_;
-		std::unique_ptr<GwWebSocketClient> WebSocketProcessor_;
-	};
-
-	inline Daemon *Daemon() { return Daemon::instance(); }
 	void DaemonPostInitialization(Poco::Util::Application &self);
-} // namespace OpenWifi
+}
+

src/Dashboard.cpp

@@ -7,42 +7,14 @@
 #include "framework/utils.h"
 
 namespace OpenWifi {
-
+	void DeviceDashboard::Create() {
-	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(LastRun_==0 || (Now-LastRun_)>120) {
-		if (GeneratingDashboard_.load()) {
+			DB_.reset();
-			while (GeneratingDashboard_.load()) {
+			StorageService()->AnalyzeCommands(DB_.commands);
-				Poco::Thread::trySleep(100);
+			StorageService()->AnalyzeDevices(DB_);
-			}
+			LastRun_ = Now;
-			std::lock_guard G(DataMutex_);
-			D = DB_;
-		} else {
-			GeneratingDashboard_ = true;
-			ValidDashboard_ = false;
-			try {
-				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;
 		}
 	}
-} // namespace OpenWifi
+}

src/Dashboard.h

@@ -4,24 +4,19 @@
 
 #pragma once
 
-#include <mutex>
-
-#include "Poco/Logger.h"
 #include "RESTObjects//RESTAPI_GWobjects.h"
 #include "framework/OpenWifiTypes.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_;
+			GWObjects::Dashboard 	DB_;
-		volatile std::atomic_bool GeneratingDashboard_ = false;
+			uint64_t 				LastRun_=0;
-		volatile bool ValidDashboard_ = false;
+			inline void Reset() { DB_.reset(); }
-		GWObjects::Dashboard DB_;
-		uint64_t LastRun_ = 0;
-
-		void Generate(GWObjects::Dashboard &D, Poco::Logger &Logger);
 	};
-} // namespace OpenWifi
+}
+

src/FileUploader.cpp

@@ -8,16 +8,16 @@
 
 #include <iostream>
 
-#include "Poco/CountingStream.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/Exception.h"
-#include "Poco/File.h"
 #include "Poco/Net/HTTPServerParams.h"
 #include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/DynamicAny.h"
+#include "Poco/Net/PartHandler.h"
 #include "Poco/Net/MessageHeader.h"
 #include "Poco/Net/MultipartReader.h"
-#include "Poco/Net/PartHandler.h"
+#include "Poco/CountingStream.h"
 #include "Poco/StreamCopier.h"
+#include "Poco/Exception.h"
+#include "Poco/File.h"
 #include "Poco/StringTokenizer.h"
 
 #include "framework/MicroServiceFuncs.h"
@@ -30,25 +30,25 @@
 
 namespace OpenWifi {
 
-	static const std::string URI_BASE{"/v1/upload/"};
+    static const std::string URI_BASE{"/v1/upload/"};
 
-	int FileUploader::Start() {
+    int FileUploader::Start() {
-		poco_notice(Logger(), "Starting.");
+		poco_notice(Logger(),"Starting.");
 
-		Poco::File UploadsDir(MicroServiceConfigPath("openwifi.fileuploader.path", "/tmp"));
+        Poco::File UploadsDir(MicroServiceConfigPath("openwifi.fileuploader.path","/tmp"));
-		Path_ = UploadsDir.path();
+        Path_ = UploadsDir.path();
-		if (!UploadsDir.exists()) {
+        if(!UploadsDir.exists()) {
-			try {
+        	try {
-				UploadsDir.createDirectory();
+        		UploadsDir.createDirectory();
-			} catch (const Poco::Exception &E) {
+        	} catch (const Poco::Exception &E) {
-				Logger().log(E);
+        		Logger().log(E);
-				Path_ = "/tmp";
+        		Path_ = "/tmp";
-			}
+        	}
-		}
+        }
 
-		for (const auto &Svr : ConfigServersList_) {
+        for(const auto & Svr: ConfigServersList_) {
-			if (MicroServiceNoAPISecurity()) {
+			if(MicroServiceNoAPISecurity()) {
-				poco_notice(Logger(), fmt::format("Starting: {}:{}", Svr.Address(), Svr.Port()));
+				poco_notice(Logger(), fmt::format("Starting: {}:{}",Svr.Address(),Svr.Port()));
 
 				auto Sock{Svr.CreateSocket(Logger())};
 
@@ -66,7 +66,7 @@ namespace OpenWifi {
 					} else {
 						FullName_ = TmpName + URI_BASE;
 					}
-					poco_information(Logger(), fmt::format("Uploader URI base is '{}'", FullName_));
+					poco_information(Logger(),fmt::format("Uploader URI base is '{}'", FullName_));
 				}
 
 				auto NewServer = std::make_unique<Poco::Net::HTTPServer>(
@@ -77,7 +77,7 @@ namespace OpenWifi {
 			} else {
 				std::string l{"Starting: " + Svr.Address() + ":" + std::to_string(Svr.Port()) +
 							  " key:" + Svr.KeyFile() + " cert:" + Svr.CertFile()};
-				poco_information(Logger(), l);
+				poco_information(Logger(),l);
 
 				auto Sock{Svr.CreateSecureSocket(Logger())};
 
@@ -107,62 +107,68 @@ namespace OpenWifi {
 				NewServer->start();
 				Servers_.push_back(std::move(NewServer));
 			}
-		}
+        }
 
-		MaxSize_ = 1000 * MicroServiceConfigGetInt("openwifi.fileuploader.maxsize", 10000);
+        MaxSize_ = 1000 * MicroServiceConfigGetInt("openwifi.fileuploader.maxsize", 10000);
 
-		return 0;
+        return 0;
-	}
+    }
 
 	void FileUploader::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
 		MicroServiceLoadConfigurationFile();
-		poco_information(Logger(), "Reinitializing.");
+		poco_information(Logger(),"Reinitializing.");
 		Stop();
 		Start();
 	}
 
-	const std::string &FileUploader::FullName() { return FullName_; }
+    const std::string & FileUploader::FullName() {
+        return FullName_;
+    }
 
-	//  if you pass in an empty UUID, it will just clean the list and not add it.
+    //  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,
+    bool FileUploader::AddUUID( const std::string & UUID) {
-							   const std::string &Type) {
+		std::lock_guard		Guard(Mutex_);
-		std::lock_guard Guard(Mutex_);
 
-		uint64_t now = Utils::Now();
+        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});
-		return true;
-	}
 
-	bool FileUploader::ValidRequest(const std::string &UUID) {
+        // remove old stuff...
-		std::lock_guard Guard(Mutex_);
+        for(auto i=OutStandingUploads_.begin();i!=OutStandingUploads_.end();) {
-		auto Func = [UUID](const UploadId &P) -> bool { return (P.UUID == UUID); };
+            if ((now-i->second) > (60 * 30))
-		return std::find_if(OutStandingUploads_.begin(), OutStandingUploads_.end(), Func) !=
+                i = OutStandingUploads_.erase(i);
-			   end(OutStandingUploads_);
+            else
-	}
+                ++i;
+        }
 
-	void FileUploader::RemoveRequest(const std::string &UUID) {
+        if(!UUID.empty())
-		std::lock_guard Guard(Mutex_);
+            OutStandingUploads_[UUID] = now;
-		auto Func = [UUID](const UploadId &P) -> bool { return (P.UUID == UUID); };
+
-		OutStandingUploads_.erase(
+        return true;
-			std::remove_if(OutStandingUploads_.begin(), OutStandingUploads_.end(), Func),
+    }
-			OutStandingUploads_.end());
+
-	}
+    bool FileUploader::ValidRequest(const std::string &UUID) {
+		std::lock_guard		Guard(Mutex_);
+
+        return OutStandingUploads_.find(UUID)!=OutStandingUploads_.end();
+    }
+
+    void FileUploader::RemoveRequest(const std::string &UUID) {
+		std::lock_guard		Guard(Mutex_);
+        OutStandingUploads_.erase(UUID);
+    }
 
 	class FileUploaderPartHandler2 : public Poco::Net::PartHandler {
 	  public:
-		FileUploaderPartHandler2(std::string Id, Poco::Logger &Logger, std::stringstream &ofs)
+		FileUploaderPartHandler2(std::string Id, Poco::Logger &Logger, std::stringstream & ofs) :
-			: Id_(std::move(Id)), Logger_(Logger), OutputStream_(ofs) {}
+																						  Id_(std::move(Id)),
+																						  Logger_(Logger),
+																						  OutputStream_(ofs){
+		}
 		void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
 			FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
 			if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
 				std::string Disposition;
 				Poco::Net::NameValueCollection Parameters;
-				Poco::Net::MessageHeader::splitParameters(
+				Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
-					Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
 				Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
 			}
 			Poco::CountingInputStream InputStream(Stream);
@@ -174,30 +180,32 @@ namespace OpenWifi {
 		[[nodiscard]] std::string &ContentType() { return FileType_; }
 
 	  private:
-		uint64_t Length_ = 0;
+		uint64_t        Length_ = 0;
-		std::string FileType_;
+		std::string     FileType_;
-		std::string Name_;
+		std::string     Name_;
-		std::string Id_;
+		std::string     Id_;
-		Poco::Logger &Logger_;
+		Poco::Logger    &Logger_;
 		std::stringstream &OutputStream_;
 
-		inline Poco::Logger &Logger() { return Logger_; };
+		inline Poco::Logger & Logger() { return Logger_; };
 	};
 
-	class FormRequestHandler : public Poco::Net::HTTPRequestHandler {
+    class FormRequestHandler: public Poco::Net::HTTPRequestHandler
-	  public:
+    {
-		explicit FormRequestHandler(std::string UUID, Poco::Logger &L, const std::string &Type)
+    public:
-			: UUID_(std::move(UUID)), Logger_(L), Type_(Type) {}
+        explicit FormRequestHandler(std::string UUID, Poco::Logger & L):
+            UUID_(std::move(UUID)),
+            Logger_(L)
+        {
+        }
 
-		void handleRequest(Poco::Net::HTTPServerRequest &Request,
+        void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) final {
-						   Poco::Net::HTTPServerResponse &Response) final {
 
 			Utils::SetThreadName("FileUploader");
 			const auto ContentType = Request.getContentType();
-			const auto Tokens =
+			const auto Tokens = Poco::StringTokenizer(ContentType,";",Poco::StringTokenizer::TOK_TRIM);
-				Poco::StringTokenizer(ContentType, ";", Poco::StringTokenizer::TOK_TRIM);
 
-			poco_debug(Logger(), fmt::format("{}: Preparing to upload a file.", UUID_));
+			poco_debug(Logger(),fmt::format("{}: Preparing to upload trace file.",UUID_));
 			Poco::JSON::Object Answer;
 
 			try {
@@ -222,9 +230,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_));
+								poco_debug(Logger(),fmt::format("{}: Trace file uploaded.", UUID_));
-								StorageService()->AttachFileDataToCommand(UUID_, FileContent,
+								StorageService()->AttachFileDataToCommand(UUID_, FileContent);
-																		  Type_);
 								std::ostream &ResponseStream = Response.send();
 								Poco::JSON::Stringifier::stringify(Answer, ResponseStream);
 								return;
@@ -241,11 +248,11 @@ namespace OpenWifi {
 			} catch (const Poco::Exception &E) {
 				Logger().log(E);
 			} catch (...) {
-				poco_debug(Logger(), "Exception while receiving uploaded file.");
+				poco_debug(Logger(),"Exception while receiving trace file.");
 			}
 
-			poco_debug(Logger(), fmt::format("{}: Failed to upload a file.", UUID_));
+			poco_debug(Logger(),fmt::format("{}: Failed to upload trace file.",UUID_));
-			std::string Error{"File rejected"};
+			std::string Error{"Trace file rejected"};
 			StorageService()->CancelWaitFile(UUID_, Error);
 			Answer.set("filename", UUID_);
 			Answer.set("error", 13);
@@ -255,64 +262,49 @@ namespace OpenWifi {
 			Poco::JSON::Stringifier::stringify(Answer, ResponseStream);
 		}
 
-		inline Poco::Logger &Logger() { return Logger_; }
+		inline Poco::Logger & Logger() { return Logger_; }
 
-	  private:
+    private:
-		std::string UUID_;
+        std::string     UUID_;
-		Poco::Logger &Logger_;
+        Poco::Logger    & Logger_;
-		std::string Type_;
+    };
-	};
 
-	Poco::Net::HTTPRequestHandler *FileUpLoaderRequestHandlerFactory::createRequestHandler(
+    Poco::Net::HTTPRequestHandler *FileUpLoaderRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
-		const Poco::Net::HTTPServerRequest &Request) {
 
-		poco_debug(Logger(), fmt::format("REQUEST({}): {} {}",
+		poco_debug(Logger(),fmt::format("REQUEST({}): {} {}", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
-										 Utils::FormatIPv6(Request.clientAddress().toString()),
-										 Request.getMethod(), Request.getURI()));
 
-		if (Request.getMethod() != Poco::Net::HTTPRequest::HTTP_POST ||
+		if(Request.getMethod()!=Poco::Net::HTTPRequest::HTTP_POST ||
-			Request.getURI().size() < (URI_BASE.size() + 36)) {
+			Request.getURI().size()<(URI_BASE.size()+36)) {
-			poco_warning(Logger(),
+			poco_warning(Logger(),fmt::format("ILLEGAL-REQUEST({}): {} {}. Dropped.", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
-						 fmt::format("ILLEGAL-REQUEST({}): {} {}. Dropped.",
-									 Utils::FormatIPv6(Request.clientAddress().toString()),
-									 Request.getMethod(), Request.getURI()));
 			return nullptr;
 		}
 
-		//  The UUID should be after the /v1/upload/ part...
+        //  The UUID should be after the /v1/upload/ part...
-		auto UUIDLocation = Request.getURI().find_first_of(URI_BASE);
+        auto UUIDLocation = Request.getURI().find_first_of(URI_BASE);
 
-		if (UUIDLocation != std::string::npos) {
+        if( UUIDLocation != std::string::npos )
-			auto UUID = Request.getURI().substr(UUIDLocation + URI_BASE.size());
+        {
-
+            auto UUID = Request.getURI().substr(UUIDLocation+URI_BASE.size());
-			FileUploader::UploadId E;
+            if(FileUploader()->ValidRequest(UUID))
-			if (FileUploader()->Find(UUID, E)) {
+            {
+                //  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));
+            else
-			}
+            {
-		}
+				poco_warning(Logger(),fmt::format("Unknown UUID={}",UUID));
-		return nullptr;
+            }
-	}
+        }
+        return nullptr;
+    }
 
-	bool FileUploader::Find(const std::string &UUID, UploadId &V) {
+    void FileUploader::Stop() {
-		std::lock_guard G(Mutex_);
+		poco_notice(Logger(),"Stopping...");
-		for (const auto &E : OutStandingUploads_) {
+        for( const auto & svr : Servers_ )
-			if (E.UUID == UUID) {
+            svr->stopAll(true);
-				V = E;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	void FileUploader::Stop() {
-		poco_notice(Logger(), "Stopping...");
-		for (const auto &svr : Servers_)
-			svr->stopAll(true);
 		Servers_.clear();
-		poco_notice(Logger(), "Stopped...");
+		poco_notice(Logger(),"Stopped...");
-	}
+    }
 
-} // namespace OpenWifi
+}  //  Namespace

src/FileUploader.h

@@ -8,64 +8,57 @@
 
 #pragma once
 
-#include <Poco/Net/HTTPRequestHandler.h>
+#include "Poco/Net/HTTPRequestHandler.h"
-#include <Poco/Net/HTTPRequestHandlerFactory.h>
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
-#include <Poco/Net/HTTPServer.h>
+#include "Poco/Net/HTTPServer.h"
-#include <Poco/Net/HTTPServerRequest.h>
+#include "Poco/Net/HTTPServerRequest.h"
 
-#include <framework/SubSystemServer.h>
+#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
-	class FileUploader : public SubSystemServer {
+    class FileUploader : public SubSystemServer {
-	  public:
+    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();
+		const std::string & FullName();
-		bool AddUUID(const std::string &UUID, std::chrono::seconds WaitTimeInSecond,
+		bool AddUUID( const std::string & UUID);
-					 const std::string &Type);
+		bool ValidRequest(const std::string & UUID);
-		bool ValidRequest(const std::string &UUID);
 		void RemoveRequest(const std::string &UUID);
-		const std::string &Path() { return Path_; };
+		const std::string & Path() { return Path_; };
 
-		static auto instance() {
+        static auto instance() {
-			static auto instance_ = new FileUploader;
+            static auto instance_ = new FileUploader;
 			return instance_;
-		}
+        }
 
 		[[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::map<std::string,uint64_t>  OutStandingUploads_;
+        std::string                     Path_;
+		uint64_t 						MaxSize_=10000000;
 
-	  private:
+		explicit FileUploader() noexcept:
-		std::vector<std::unique_ptr<Poco::Net::HTTPServer>> Servers_;
+			SubSystemServer("FileUploader", "FILE-UPLOAD", "openwifi.fileuploader")
-		std::string FullName_;
+		{
-		std::list<UploadId> OutStandingUploads_;
+		}
-		std::string Path_;
+    };
-		uint64_t MaxSize_ = 10000000;
 
-		explicit FileUploader() noexcept
+    class FileUpLoaderRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
-			: SubSystemServer("FileUploader", "FILE-UPLOAD", "openwifi.fileuploader") {}
+    public:
-	};
+        explicit FileUpLoaderRequestHandlerFactory(Poco::Logger &L) :
+                Logger_(L){}
 
-	class FileUpLoaderRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+        Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
-	  public:
+		inline Poco::Logger & Logger() { return Logger_; }
-		explicit FileUpLoaderRequestHandlerFactory(Poco::Logger &L) : Logger_(L) {}
+    private:
-
+        Poco::Logger    & Logger_;
-		Poco::Net::HTTPRequestHandler *
+    };
-		createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
-		inline Poco::Logger &Logger() { return Logger_; }
-
-	  private:
-		Poco::Logger &Logger_;
-	};
 
 	inline auto FileUploader() { return FileUploader::instance(); }
-} // namespace OpenWifi
+} //   namespace
+

src/FindCountry.h

@@ -6,8 +6,8 @@
 
 #include "Poco/Net/IPAddress.h"
 
-#include "framework/MicroServiceFuncs.h"
 #include "framework/SubSystemServer.h"
+#include "framework/MicroServiceFuncs.h"
 
 #include "nlohmann/json.hpp"
 
@@ -15,10 +15,11 @@ namespace OpenWifi {
 
 	class IPToCountryProvider {
 	  public:
-		virtual bool Init() = 0;
+		virtual bool Init() = 0 ;
-		virtual Poco::URI URI(const std::string &IPAddress) = 0;
+		virtual Poco::URI URI(const std::string & IPAddress) = 0;
-		virtual std::string Country(const std::string &Response) = 0;
+		virtual std::string Country( const std::string & Response ) = 0 ;
-		virtual ~IPToCountryProvider(){};
+		virtual ~IPToCountryProvider() {
+		};
 	};
 
 	class IPInfo : public IPToCountryProvider {
@@ -29,26 +30,28 @@ namespace OpenWifi {
 			return !Key_.empty();
 		}
 
-		[[nodiscard]] inline Poco::URI URI(const std::string &IPAddress) override {
+		[[nodiscard]] inline Poco::URI URI(const std::string & IPAddress) override {
-			Poco::URI U("https://ipinfo.io");
+			Poco::URI	U("https://ipinfo.io");
 			U.setPath("/" + IPAddress);
-			U.addQueryParameter("token", Key_);
+			U.addQueryParameter("token",Key_);
 			return U;
 		}
 
-		inline std::string Country(const std::string &Response) override {
+		inline std::string Country( const std::string & Response ) override {
 			try {
 				nlohmann::json IPInfo = nlohmann::json::parse(Response);
 				if (IPInfo.contains("country") && IPInfo["country"].is_string()) {
 					return IPInfo["country"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
 
 	  private:
 		std::string Key_;
+
 	};
 
 	class IPData : public IPToCountryProvider {
@@ -59,24 +62,24 @@ namespace OpenWifi {
 			return !Key_.empty();
 		}
 
-		[[nodiscard]] inline Poco::URI URI(const std::string &IPAddress) override {
+		[[nodiscard]] inline Poco::URI URI(const std::string & IPAddress) override {
-			Poco::URI U("https://api.ipdata.co");
+			Poco::URI	U("https://api.ipdata.co");
 			U.setPath("/" + IPAddress);
-			U.addQueryParameter("api-key", Key_);
+			U.addQueryParameter("api-key",Key_);
 			return U;
 		}
 
-		inline std::string Country(const std::string &Response) override {
+		inline std::string Country( const std::string & Response ) override {
 			try {
 				nlohmann::json IPInfo = nlohmann::json::parse(Response);
 				if (IPInfo.contains("country_code") && IPInfo["country_code"].is_string()) {
 					return IPInfo["country_code"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
-
 	  private:
 		std::string Key_;
 	};
@@ -89,33 +92,33 @@ namespace OpenWifi {
 			return !Key_.empty();
 		}
 
-		[[nodiscard]] inline Poco::URI URI(const std::string &IPAddress) override {
+		[[nodiscard]] inline Poco::URI URI(const std::string & IPAddress) override {
-			Poco::URI U("https://api.ip2location.com/v2");
+			Poco::URI	U("https://api.ip2location.com/v2");
 			U.setPath("/");
 			U.addQueryParameter("ip", IPAddress);
 			U.addQueryParameter("package", "WS1");
-			U.addQueryParameter("key", Key_);
+			U.addQueryParameter("key",Key_);
 			return U;
 		}
 
-		inline std::string Country(const std::string &Response) override {
+		inline std::string Country( const std::string & Response ) override {
 			try {
 				nlohmann::json IPInfo = nlohmann::json::parse(Response);
 				if (IPInfo.contains("country_code") && IPInfo["country_code"].is_string()) {
 					return IPInfo["country_code"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
-
 	  private:
 		std::string Key_;
 	};
 
-	template <typename BaseClass, typename T, typename... Args>
+	template<typename BaseClass, typename T, typename... Args>
-	std::unique_ptr<BaseClass> IPLocationProvider(const std::string &RequestProvider) {
+	std::unique_ptr<BaseClass> IPLocationProvider(const std::string & RequestProvider ) {
-		if (T::Name() == RequestProvider) {
+		if(T::Name()==RequestProvider) {
 			return std::make_unique<T>();
 		}
 		if constexpr (sizeof...(Args) == 0) {
@@ -133,12 +136,11 @@ namespace OpenWifi {
 		}
 
 		inline int Start() final {
-			poco_notice(Logger(), "Starting...");
+			poco_notice(Logger(),"Starting...");
-			ProviderName_ = MicroServiceConfigGetString("iptocountry.provider", "");
+			ProviderName_ = MicroServiceConfigGetString("iptocountry.provider","");
-			if (!ProviderName_.empty()) {
+			if(!ProviderName_.empty()) {
-				Provider_ = IPLocationProvider<IPToCountryProvider, IPInfo, IPData, IP2Location>(
+				Provider_ = IPLocationProvider<IPToCountryProvider, IPInfo, IPData, IP2Location>(ProviderName_);
-					ProviderName_);
+				if(Provider_!= nullptr) {
-				if (Provider_ != nullptr) {
 					Enabled_ = Provider_->Init();
 				}
 			}
@@ -147,26 +149,28 @@ namespace OpenWifi {
 		}
 
 		inline void Stop() final {
-			poco_notice(Logger(), "Stopping...");
+			poco_notice(Logger(),"Stopping...");
 			//	Nothing to do - just to provide the same look at the others.
-			poco_notice(Logger(), "Stopped...");
+			poco_notice(Logger(),"Stopped...");
 		}
 
-		[[nodiscard]] static inline std::string ReformatAddress(const std::string &I) {
+		[[nodiscard]] static inline std::string ReformatAddress(const std::string & I )
-			if (I.substr(0, 7) == "::ffff:") {
+		{
-				std::string ip = I.substr(7);
+			if(I.substr(0,7) == "::ffff:")
+			{
+				std::string ip = I.substr(7 );
 				return ip;
 			}
 			return I;
 		}
 
-		inline std::string Get(const Poco::Net::IPAddress &IP) {
+		inline std::string Get(const Poco::Net::IPAddress & IP) {
 			if (!Enabled_)
 				return Default_;
 			return Get(ReformatAddress(IP.toString()));
 		}
 
-		inline std::string Get(const std::string &IP) {
+		inline std::string Get(const std::string & IP) {
 			if (!Enabled_)
 				return Default_;
 			try {
@@ -174,10 +178,10 @@ namespace OpenWifi {
 				std::string Response;
 				if (Utils::wgets(URL, Response)) {
 					auto Answer = Provider_->Country(Response);
-					if (!Answer.empty())
+					if(!Answer.empty())
 						return Answer;
 				}
-			} catch (...) {
+			} catch(...) {
 			}
 			return Default_;
 		}
@@ -185,14 +189,17 @@ namespace OpenWifi {
 		inline auto Enabled() const { return Enabled_; }
 
 	  private:
-		bool Enabled_ = false;
+		bool 									Enabled_=false;
-		std::string Default_;
+		std::string 							Default_;
-		std::unique_ptr<IPToCountryProvider> Provider_;
+		std::unique_ptr<IPToCountryProvider>	Provider_;
-		std::string ProviderName_;
+		std::string 							ProviderName_;
 
-		FindCountryFromIP() noexcept : SubSystemServer("IpToCountry", "IPTOC-SVR", "iptocountry") {}
+		FindCountryFromIP() noexcept:
+			SubSystemServer("IpToCountry", "IPTOC-SVR", "iptocountry")
+		{
+		}
 	};
 
 	inline auto FindCountryFromIP() { return FindCountryFromIP::instance(); }
 
-} // namespace OpenWifi
+}

src/GWKafkaEvents.cpp

@@ -1,19 +0,0 @@
-//
-// Created by stephane bourque on 2023-02-03.
-//
-
-#include "GWKafkaEvents.h"
-
-namespace OpenWifi {
-
-	void GWKafkaEvents::Send() {
-		if (KafkaManager()->Enabled()) {
-			Poco::JSON::Object Event;
-			Event.set("type", type_);
-			Event.set("timestamp", timestamp_);
-			Event.set("payload", payload_);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, Utils::IntToSerialNumber(serialNumber_), Event);
-		}
-	}
-
-} // namespace OpenWifi

src/GWKafkaEvents.h

@@ -1,116 +0,0 @@
-//
-// Created by stephane bourque on 2023-02-03.
-//
-
-#pragma once
-
-#include <string>
-
-#include <Poco/JSON/Object.h>
-#include <RESTObjects/RESTAPI_GWobjects.h>
-#include <framework/KafkaManager.h>
-
-namespace OpenWifi {
-
-	class GWKafkaEvents {
-	  public:
-		GWKafkaEvents(std::uint64_t serialNumber, const std::string &type,
-					  std::uint64_t timestamp)
-			: serialNumber_(serialNumber), type_(type), timestamp_(timestamp) {
-			payload_ = Poco::SharedPtr<Poco::JSON::Object>(new Poco::JSON::Object);
-		}
-		void Send();
-		[[nodiscard]] inline std::uint64_t Serial() const { return serialNumber_;};
-
-	  protected:
-		std::uint64_t serialNumber_;
-		std::string type_;
-		std::uint64_t timestamp_ = 0;
-		Poco::JSON::Object::Ptr payload_;
-	};
-
-	class DeviceFirmwareChangeKafkaEvent : public GWKafkaEvents {
-	  public:
-		DeviceFirmwareChangeKafkaEvent(std::uint64_t serialNumber, std::uint64_t timestamp,
-									   const std::string &oldFirmware,
-									   const std::string &newFirmware)
-			: GWKafkaEvents(serialNumber, "unit.firmware_change", timestamp),
-			  oldFirmware_(oldFirmware), newFirmware_(newFirmware) {}
-
-		~DeviceFirmwareChangeKafkaEvent() {
-			payload_->set("oldFirmware", oldFirmware_);
-			payload_->set("newFirmware", newFirmware_);
-			Send();
-		}
-
-	  private:
-		std::string oldFirmware_, newFirmware_;
-	};
-
-	class DeviceConfigurationChangeKafkaEvent : public GWKafkaEvents {
-	  public:
-		DeviceConfigurationChangeKafkaEvent(std::uint64_t serialNumber,
-											std::uint64_t timestamp,
-											const Poco::JSON::Object::Ptr config)
-			: GWKafkaEvents(serialNumber, "unit.configuration_change", timestamp), config_(config) {
-		}
-
-		~DeviceConfigurationChangeKafkaEvent() {
-			if(config_!= nullptr) {
-				std::ostringstream os;
-				config_->stringify(os);
-				if(os.str().size()> KafkaManager()->KafkaManagerMaximumPayloadSize()) {
-					payload_->set("configuration", "{}");
-					payload_->set("configurationTooBig", true);
-				} else {
-					payload_->set("configuration", *config_);
-				}
-			}
-			Send();
-		}
-
-	  private:
-		Poco::JSON::Object::Ptr config_;
-	};
-
-	class DeviceBlacklistedKafkaEvent : public GWKafkaEvents {
-	  public:
-		explicit DeviceBlacklistedKafkaEvent(std::uint64_t serialNumber,
-											 std::uint64_t timestamp, const std::string &reason,
-											 const std::string &author, std::uint64_t created,
-											 std::string &IP)
-			: GWKafkaEvents(serialNumber, "blacklisted_device", timestamp), reason_(reason),
-			  author_(author), created_(created), IP_(IP) {}
-
-		~DeviceBlacklistedKafkaEvent() {
-			payload_->set("reason", reason_);
-			payload_->set("author", author_);
-			payload_->set("created", created_);
-			payload_->set("ipaddress", IP_);
-			Send();
-		}
-
-	  private:
-		std::string reason_, author_;
-		std::uint64_t created_;
-		std::string IP_;
-	};
-
-	class DeviceLogKafkaEvent : public GWKafkaEvents {
-	  public:
-		explicit DeviceLogKafkaEvent( const GWObjects::DeviceLog &L)
-			: GWKafkaEvents(Utils::MACToInt(L.SerialNumber), "device_log", L.Recorded),
-			  DL_(L)
-		{
-		}
-
-		~DeviceLogKafkaEvent() {
-			DL_.to_json(*payload_);
-			Send();
-		}
-
-	  private:
-		GWObjects::DeviceLog	DL_;
-	};
-
-} // namespace OpenWifi

src/GenericScheduler.cpp

@@ -1,19 +0,0 @@
-//
-// Created by stephane bourque on 2023-04-19.
-//
-
-#include "GenericScheduler.h"
-
-namespace OpenWifi {
-
-	int GenericScheduler::Start() {
-		poco_information(Logger(),"Starting...");
-		return 0;
-	}
-
-	void GenericScheduler::Stop() {
-		poco_information(Logger(),"Stopping...");
-		poco_information(Logger(),"Stopped...");
-	}
-
-} // namespace OpenWifi

src/GenericScheduler.h

@@ -1,37 +0,0 @@
-//
-// Created by stephane bourque on 2023-04-19.
-//
-
-#pragma once
-
-#include <framework/SubSystemServer.h>
-#include <libs/Scheduler.h>
-#include <Poco/Environment.h>
-
-namespace OpenWifi {
-
-	class GenericScheduler : public SubSystemServer {
-	  public:
-
-		static auto instance() {
-			static auto instance_ = new GenericScheduler;
-			return instance_;
-		}
-
-		int Start() override;
-		void Stop() override;
-
-		auto & Scheduler() { return Scheduler_; }
-
-	  private:
-		GenericScheduler() noexcept
-			: SubSystemServer("Scheduler", "SCHEDULER", "scheduler"),
-			  Scheduler_(Poco::Environment::processorCount()*2) {
-
-		}
-		Bosma::Scheduler	Scheduler_;
-	};
-
-	inline auto GenericScheduler() { return GenericScheduler::instance(); }
-
-} // namespace OpenWifi

src/GwWebSocketClient.cpp

@@ -7,22 +7,23 @@
 
 namespace OpenWifi {
 
-	GwWebSocketClient::GwWebSocketClient(Poco::Logger &Logger) : Logger_(Logger) {
+	GwWebSocketClient::GwWebSocketClient(Poco::Logger &Logger):
+		 Logger_(Logger){
 		UI_WebSocketClientServer()->SetProcessor(this);
 	}
 
-	GwWebSocketClient::~GwWebSocketClient() { UI_WebSocketClientServer()->SetProcessor(nullptr); }
+	GwWebSocketClient::~GwWebSocketClient() {
+		UI_WebSocketClientServer()->SetProcessor(nullptr);
+	}
 
-	void GwWebSocketClient::Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer,
+	void GwWebSocketClient::Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done ) {
-									  bool &Done,
-									  [[maybe_unused]] const SecurityObjects::UserInfo &UserInfo) {
 		try {
 			if (O->has("command")) {
 				auto Command = O->get("command").toString();
 				if (Command == "serial_number_search" && O->has("serial_prefix")) {
-					ws_command_serial_number_search(O, Done, Answer);
+					ws_command_serial_number_search(O,Done,Answer);
-				} else if (Command == "exit") {
+				} else if (Command=="exit") {
-					ws_command_exit(O, Done, Answer);
+					ws_command_exit(O,Done,Answer);
 				} else {
 					ws_command_invalid(O, Done, Answer);
 				}
@@ -33,7 +34,7 @@ namespace OpenWifi {
 	}
 
 	void GwWebSocketClient::ws_command_serial_number_search(const Poco::JSON::Object::Ptr &O,
-															bool &Done, std::string &Answer) {
+															  bool &Done, std::string &Answer) {
 		Done = false;
 		auto Prefix = O->get("serial_prefix").toString();
 		if (!Prefix.empty() && Prefix.length() < 13) {
@@ -50,15 +51,13 @@ namespace OpenWifi {
 		}
 	}
 
-	void GwWebSocketClient::ws_command_exit([[maybe_unused]] const Poco::JSON::Object::Ptr &O,
+	void GwWebSocketClient::ws_command_exit([[maybe_unused]] const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-											bool &Done, std::string &Answer) {
 		Done = true;
 		Answer = R"lit({ "closing" : "Goodbye! Aurevoir! Hasta la vista!" })lit";
 	}
 
-	void GwWebSocketClient::ws_command_invalid([[maybe_unused]] const Poco::JSON::Object::Ptr &O,
+	void GwWebSocketClient::ws_command_invalid([[maybe_unused]] const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-											   bool &Done, std::string &Answer) {
 		Done = false;
 		Answer = std::string{R"lit({ "error" : "invalid command" })lit"};
 	}
-} // namespace OpenWifi
+}

src/GwWebSocketClient.h

@@ -11,15 +11,13 @@ namespace OpenWifi {
 	  public:
 		explicit GwWebSocketClient(Poco::Logger &Logger);
 		virtual ~GwWebSocketClient();
-		virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done,
+		virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done );
-							   const SecurityObjects::UserInfo &UserInfo);
+		void ws_command_serial_number_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_serial_number_search(const Poco::JSON::Object::Ptr &O, bool &Done,
+		void ws_command_exit( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-											 std::string &Answer);
+		void ws_command_invalid( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_exit(const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_invalid(const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
 
 	  private:
-		Poco::Logger &Logger_;
+		Poco::Logger & Logger_;
-		inline Poco::Logger &Logger() { return Logger_; }
+		inline Poco::Logger & Logger() { return Logger_; }
 	};
-} // namespace OpenWifi
+}

src/OUIServer.cpp

@@ -1,15 +1,15 @@
 //
 // Created by stephane bourque on 2021-06-17.
 //
-#include <fstream>
 #include <thread>
+#include <fstream>
 #include <vector>
 
-#include "Poco/File.h"
-#include "Poco/StreamCopier.h"
 #include "Poco/String.h"
 #include "Poco/StringTokenizer.h"
 #include "Poco/URIStreamOpener.h"
+#include "Poco/StreamCopier.h"
+#include "Poco/File.h"
 
 #include "framework/MicroServiceFuncs.h"
 #include "framework/utils.h"
@@ -22,25 +22,25 @@ namespace OpenWifi {
 
 	int OUIServer::Start() {
 		Running_ = true;
-		LatestOUIFileName_ = MicroServiceDataDirectory() + "/newOUIFile.txt";
+		LatestOUIFileName_ =  MicroServiceDataDirectory() + "/newOUIFile.txt";
 		CurrentOUIFileName_ = MicroServiceDataDirectory() + "/current_oui.txt";
 
 		bool Recovered = false;
-		Poco::File OuiFile(CurrentOUIFileName_);
+		Poco::File	OuiFile(CurrentOUIFileName_);
-		if (OuiFile.exists()) {
+		if(OuiFile.exists()) {
-			std::lock_guard Lock(LocalMutex_);
+			std::unique_lock	Lock(LocalMutex_);
-			Recovered = ProcessFile(CurrentOUIFileName_, OUIs_);
+			Recovered = ProcessFile(CurrentOUIFileName_,OUIs_);
-			if (Recovered) {
+			if(Recovered) {
 				poco_notice(Logger(),
-							fmt::format("Recovered last OUI file - {}", CurrentOUIFileName_));
+								 fmt::format("Recovered last OUI file - {}", CurrentOUIFileName_));
 			}
 		} else {
-			poco_notice(Logger(), fmt::format("No existing OUIFile.", CurrentOUIFileName_));
+			poco_notice(Logger(),
+							 fmt::format("No existing OUIFile.", CurrentOUIFileName_));
 		}
 
-		UpdaterCallBack_ =
+		UpdaterCallBack_ = std::make_unique<Poco::TimerCallback<OUIServer>>(*this, &OUIServer::onTimer);
-			std::make_unique<Poco::TimerCallback<OUIServer>>(*this, &OUIServer::onTimer);
+		if(Recovered) {
-		if (Recovered) {
 			Timer_.setStartInterval(60 * 60 * 1000); // first run in 1 hour
 		} else {
 			Timer_.setStartInterval(30 * 1000); // first run in 5 minutes
@@ -51,15 +51,15 @@ namespace OpenWifi {
 	}
 
 	void OUIServer::Stop() {
-		poco_notice(Logger(), "Stopping...");
+		poco_notice(Logger(),"Stopping...");
-		Running_ = false;
+		Running_=false;
 		Timer_.stop();
-		poco_notice(Logger(), "Stopped...");
+		poco_notice(Logger(),"Stopped...");
 	}
 
 	void OUIServer::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
 		MicroServiceLoadConfigurationFile();
-		poco_information(Logger(), "Reinitializing.");
+		poco_information(Logger(),"Reinitializing.");
 		Stop();
 		Start();
 	}
@@ -67,18 +67,14 @@ namespace OpenWifi {
 	bool OUIServer::GetFile(const std::string &FileName) {
 		try {
 			LastUpdate_ = Utils::Now();
-			poco_information(Logger(),
+			poco_information(Logger(), fmt::format("Start: Retrieving OUI file: {}",MicroServiceConfigGetString("oui.download.uri","")));
-							 fmt::format("Start: Retrieving OUI file: {}",
+			std::unique_ptr<std::istream> pStr(
-										 MicroServiceConfigGetString("oui.download.uri", "")));
+				Poco::URIStreamOpener::defaultOpener().open(MicroServiceConfigGetString("oui.download.uri","")));
-			std::unique_ptr<std::istream> pStr(Poco::URIStreamOpener::defaultOpener().open(
-				MicroServiceConfigGetString("oui.download.uri", "")));
 			std::ofstream OS;
 			OS.open(FileName);
 			Poco::StreamCopier::copyStream(*pStr, OS);
 			OS.close();
-			poco_information(Logger(),
+			poco_information(Logger(), fmt::format("Done: Retrieving OUI file: {}",MicroServiceConfigGetString("oui.download.uri","")));
-							 fmt::format("Done: Retrieving OUI file: {}",
-										 MicroServiceConfigGetString("oui.download.uri", "")));
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -86,13 +82,13 @@ namespace OpenWifi {
 		return false;
 	}
 
-	bool OUIServer::ProcessFile(const std::string &FileName, OUIMap &Map) {
+	bool OUIServer::ProcessFile( const std::string &FileName, OUIMap &Map) {
 		try {
 			std::ifstream Input;
 			Input.open(FileName, std::ios::binary);
 
 			while (!Input.eof()) {
-				if (!Running_)
+				if(!Running_)
 					return false;
 				char buf[1024];
 				Input.getline(buf, sizeof(buf));
@@ -116,68 +112,67 @@ namespace OpenWifi {
 				}
 			}
 			return true;
-		} catch (const Poco::Exception &E) {
+		} catch ( const Poco::Exception &E) {
 			Logger().log(E);
 		}
 		return false;
 	}
 
-	void OUIServer::onTimer([[maybe_unused]] Poco::Timer &timer) {
+	void OUIServer::onTimer([[maybe_unused]] Poco::Timer & timer) {
 		Utils::SetThreadName("ouisvr-timer");
-		if (Updating_)
+		if(Updating_)
 			return;
 		Updating_ = true;
 
-		poco_information(Logger(), "Starting to process OUI file...");
+		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_);
+		Poco::File	Current(CurrentOUIFileName_);
-		if (Current.exists()) {
+		if(Current.exists()) {
-			if ((Utils::Now() - Current.getLastModified().epochTime()) < (7 * 24 * 60 * 60)) {
+			if((Utils::Now()-Current.getLastModified().epochTime()) < (7*24*60*60)) {
-				if (!Initialized_) {
+				if(!Initialized_) {
-					if (ProcessFile(CurrentOUIFileName_, OUIs_)) {
+					if(ProcessFile(CurrentOUIFileName_, OUIs_)) {
 						Initialized_ = true;
-						Updating_ = false;
+						Updating_=false;
 						poco_information(Logger(), "Using cached file.");
 						return;
 					}
 				} else {
-					Updating_ = false;
+					Updating_=false;
 					return;
 				}
 			}
 		}
 
 		OUIMap TmpOUIs;
-		if (GetFile(LatestOUIFileName_) && ProcessFile(LatestOUIFileName_, TmpOUIs)) {
+		if(GetFile(LatestOUIFileName_) && ProcessFile(LatestOUIFileName_, TmpOUIs)) {
-			std::lock_guard G(LocalMutex_);
+			std::unique_lock G(LocalMutex_);
 			OUIs_ = std::move(TmpOUIs);
 			LastUpdate_ = Utils::Now();
 			Poco::File F1(CurrentOUIFileName_);
-			if (F1.exists())
+			if(F1.exists())
 				F1.remove();
 			Poco::File F2(LatestOUIFileName_);
 			F2.renameTo(CurrentOUIFileName_);
-			poco_information(Logger(),
+			poco_information(Logger(), fmt::format("New OUI file {} downloaded.",LatestOUIFileName_));
-							 fmt::format("New OUI file {} downloaded.", LatestOUIFileName_));
+		} else if(OUIs_.empty()) {
-		} else if (OUIs_.empty()) {
+			if(ProcessFile(CurrentOUIFileName_, TmpOUIs)) {
-			if (ProcessFile(CurrentOUIFileName_, TmpOUIs)) {
 				LastUpdate_ = Utils::Now();
-				std::lock_guard G(LocalMutex_);
+				std::unique_lock G(LocalMutex_);
 				OUIs_ = std::move(TmpOUIs);
 			}
 		}
-		Initialized_ = true;
+		Initialized_=true;
 		Updating_ = false;
-		poco_information(Logger(), "Done processing OUI file...");
+		poco_information(Logger(),"Done processing OUI file...");
 	}
 
 	std::string OUIServer::GetManufacturer(const std::string &MAC) {
-		std::lock_guard Lock(LocalMutex_);
+		std::shared_lock 	Lock(LocalMutex_);
 
 		auto Manufacturer = OUIs_.find(Utils::SerialNumberToOUI(MAC));
-		if (Manufacturer != OUIs_.end())
+		if(Manufacturer != OUIs_.end())
 			return Manufacturer->second;
 		return "";
 	}
-}; // namespace OpenWifi
+};

src/OUIServer.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <mutex>
+#include <shared_mutex>
 
 #include "framework/SubSystemServer.h"
 
@@ -14,17 +14,18 @@ namespace OpenWifi {
 
 	class OUIServer : public SubSystemServer {
 	  public:
-		typedef std::map<uint64_t, std::string> OUIMap;
+
+		typedef std::map<uint64_t,std::string>	OUIMap;
 
 		static auto instance() {
-			static auto instance_ = new OUIServer;
+		    static auto instance_ = new OUIServer;
 			return instance_;
 		}
 
 		int Start() override;
 		void Stop() override;
 
-		void onTimer(Poco::Timer &timer);
+		void onTimer(Poco::Timer & timer);
 
 		void reinitialize(Poco::Util::Application &self) override;
 		[[nodiscard]] std::string GetManufacturer(const std::string &MAC);
@@ -32,19 +33,23 @@ namespace OpenWifi {
 		[[nodiscard]] bool ProcessFile(const std::string &FileName, OUIMap &Map);
 
 	  private:
-		std::mutex LocalMutex_;
+		std::shared_mutex	LocalMutex_;
-		uint64_t LastUpdate_ = 0;
+		uint64_t 			LastUpdate_ = 0 ;
-		bool Initialized_ = false;
+		bool 				Initialized_ = false;
-		OUIMap OUIs_;
+		OUIMap 				OUIs_;
-		volatile std::atomic_bool Updating_ = false;
+		volatile std::atomic_bool 	Updating_=false;
-		volatile std::atomic_bool Running_ = false;
+		volatile std::atomic_bool 	Running_=false;
-		Poco::Timer Timer_;
+		Poco::Timer         Timer_;
-		std::unique_ptr<Poco::TimerCallback<OUIServer>> UpdaterCallBack_;
+		std::unique_ptr<Poco::TimerCallback<OUIServer>>   UpdaterCallBack_;
-		std::string LatestOUIFileName_, CurrentOUIFileName_;
+		std::string 		LatestOUIFileName_,CurrentOUIFileName_;
 
-		OUIServer() noexcept : SubSystemServer("OUIServer", "OUI-SVR", "ouiserver") {}
+		OUIServer() noexcept:
+			SubSystemServer("OUIServer", "OUI-SVR", "ouiserver")
+		{
+		}
 	};
 
 	inline auto OUIServer() { return OUIServer::instance(); }
 
-} // namespace OpenWifi
+}
+

src/RADIUSSessionTracker.cpp

@@ -1,443 +0,0 @@
-//
-// Created by stephane bourque on 2023-03-19.
-//
-
-#include "RADIUSSessionTracker.h"
-#include <fmt/format.h>
-#include <framework/utils.h>
-
-#include "RADIUS_proxy_server.h"
-#include "framework/RESTAPI_utils.h"
-
-using OpenWifi::RESTAPI_utils::field_from_json;
-using OpenWifi::RESTAPI_utils::field_to_json;
-
-namespace OpenWifi {
-
-	int RADIUSSessionTracker::Start() {
-		poco_information(Logger(),"Starting...");
-		QueueManager_.start(*this);
-		GarbageCollectionCallback_ = std::make_unique<Poco::TimerCallback<RADIUSSessionTracker>>(
-			*this, &RADIUSSessionTracker::GarbageCollection);
-		GarbageCollectionTimer_.setStartInterval(10000);
-		GarbageCollectionTimer_.setPeriodicInterval(2*60*1000); // every 2 minutes
-		GarbageCollectionTimer_.start(*GarbageCollectionCallback_, MicroServiceTimerPool());
-		return 0;
-	}
-
-	void RADIUSSessionTracker::Stop() {
-		poco_information(Logger(),"Stopping...");
-		Running_ = false;
-		GarbageCollectionTimer_.stop();
-		SessionMessageQueue_.wakeUpAll();
-		QueueManager_.join();
-		poco_information(Logger(),"Stopped...");
-	}
-
-	void RADIUSSessionTracker::GarbageCollection([[maybe_unused]] Poco::Timer &timer) {
-		std::lock_guard		G(Mutex_);
-
-		auto Now = Utils::Now();
-		std::uint64_t active_sessions=0, active_devices=0;
-		for(auto device_it = AccountingSessions_.begin(); device_it != end(AccountingSessions_); ) {
-			auto & serialNumber = device_it->first;
-			auto & session_list = device_it->second;
-			for(auto session_it=session_list.begin();session_it!=end(session_list);) {
-				auto & session_name = session_it->first;
-				auto & session = session_it->second;
-				if((Now-session->lastTransaction)>SessionTimeout_) {
-					poco_debug(Logger(),fmt::format("{}: Session {} timeout for {}", serialNumber, session_name, session->userName));
-					session_it = session_list.erase(session_it);
-				} else {
-					++active_sessions;
-					++session_it;
-				}
-			}
-			if(session_list.empty()) {
-				device_it = AccountingSessions_.erase(device_it);
-			} else {
-				++active_devices;
-				++device_it;
-			}
-		}
-		poco_information(Logger(),fmt::format("{} active sessions on {} devices",active_sessions, active_devices));
-	}
-
-	void RADIUSSessionTracker::run() {
-		Utils::SetThreadName("rad:sessmgr");
-		Running_ = true;
-
-		Poco::AutoPtr<Poco::Notification> NextSession(SessionMessageQueue_.waitDequeueNotification());
-		while (NextSession && Running_) {
-			auto Session = dynamic_cast<SessionNotification *>(NextSession.get());
-
-			try {
-				if (Session != nullptr) {
-					switch(Session->Type_) {
-						case SessionNotification::NotificationType::accounting_session_message: {
-							ProcessAccountingSession(*Session);
-						} break;
-						case SessionNotification::NotificationType::authentication_session_message: {
-							ProcessAuthenticationSession(*Session);
-						} break;
-						case SessionNotification::NotificationType::ap_disconnect: {
-							DisconnectSession(Session->SerialNumber_);
-						} break;
-					}
-				}
-			} catch (const Poco::Exception &E) {
-				Logger().log(E);
-			} catch (...) {
-				poco_warning(Logger(), "Exception occurred during run.");
-			}
-			NextSession = SessionMessageQueue_.waitDequeueNotification();
-		}
-		poco_information(Logger(), "RADIUS session manager stopping.");
-	}
-
-	void RADIUSSessionTracker::ProcessAuthenticationSession([[maybe_unused]] OpenWifi::SessionNotification &Notification) {
-		std::lock_guard Guard(Mutex_);
-
-		std::string CallingStationId, CalledStationId, AccountingSessionId, AccountingMultiSessionId, UserName, ChargeableUserIdentity, Interface, nasId;
-		for (const auto &attribute : Notification.Packet_.Attrs_) {
-			switch (attribute.type) {
-			case RADIUS::Attributes::AUTH_USERNAME: {
-				UserName.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CALLING_STATION_ID: {
-				CallingStationId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CALLED_STATION_ID: {
-				CalledStationId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::ACCT_SESSION_ID: {
-				AccountingSessionId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::ACCT_MULTI_SESSION_ID: {
-				AccountingMultiSessionId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CHARGEABLE_USER_IDENTITY:{
-				ChargeableUserIdentity.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::NAS_IDENTIFIER:{
-				nasId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::PROXY_STATE: {
-				std::string Tmp;
-				Tmp.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-				auto ProxyParts = Poco::StringTokenizer(Tmp,":");
-				if(ProxyParts.count()==4)
-					Interface=ProxyParts[3];
-
-			} break;
-			default: {
-			} break;
-			}
-		}
-
-		auto ap_hint = AccountingSessions_.find(Notification.SerialNumber_);
-		if(ap_hint==end(AccountingSessions_)) {
-			SessionMap M;
-			AccountingSessions_[Notification.SerialNumber_ ] = M;
-			ap_hint = AccountingSessions_.find(Notification.SerialNumber_);
-		}
-
-		auto Index = AccountingSessionId +AccountingMultiSessionId;
-		auto session_hint = ap_hint->second.find(Index);
-		if(session_hint==end(ap_hint->second)) {
-			auto NewSession = std::make_shared<GWObjects::RADIUSSession>();
-			NewSession->serialNumber = Notification.SerialNumber_;
-			NewSession->started = NewSession->lastTransaction = Utils::Now();
-			NewSession->userName = UserName;
-			NewSession->callingStationId = CallingStationId;
-			NewSession->calledStationId = CalledStationId;
-			NewSession->accountingSessionId = AccountingSessionId;
-			NewSession->accountingMultiSessionId = AccountingMultiSessionId;
-			NewSession->chargeableUserIdentity = ChargeableUserIdentity;
-			NewSession->interface = Interface;
-			NewSession->nasId = nasId;
-			NewSession->secret = Notification.Secret_;
-			ap_hint->second[Index] = NewSession;
-		} else {
-			session_hint->second->lastTransaction = Utils::Now();
-		}
-	}
-
-	std::uint32_t GetUiInt32(const std::uint8_t *buf) {
-		return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + (buf[3] << 0);
-	}
-
-/*
-	std::string RADIUSSessionTracker::ComputeSessionIndex(OpenWifi::RADIUSSessionPtr S) {
-		return "";
-	}
-*/
-
-	void
-	RADIUSSessionTracker::ProcessAccountingSession(OpenWifi::SessionNotification &Notification) {
-		std::lock_guard     Guard(Mutex_);
-
-		std::string CallingStationId, CalledStationId, AccountingSessionId, AccountingMultiSessionId, UserName, ChargeableUserIdentity, Interface;
-		std::uint8_t AccountingPacketType = 0;
-		std::uint32_t InputOctets=0, OutputOctets=0, InputPackets=0, OutputPackets=0, InputGigaWords=0, OutputGigaWords=0,
-					  SessionTime = 0;
-		for (const auto &attribute : Notification.Packet_.Attrs_) {
-			switch (attribute.type) {
-			case RADIUS::Attributes::AUTH_USERNAME: {
-				UserName.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CALLING_STATION_ID: {
-				CallingStationId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CALLED_STATION_ID: {
-				CalledStationId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::ACCT_SESSION_ID: {
-				AccountingSessionId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::ACCT_MULTI_SESSION_ID: {
-				AccountingMultiSessionId.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::CHARGEABLE_USER_IDENTITY:{
-				ChargeableUserIdentity.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-			} break;
-			case RADIUS::Attributes::ACCT_STATUS_TYPE: {
-				AccountingPacketType = Notification.Packet_.P_.attributes[attribute.pos + 3];
-			} break;
-			case RADIUS::Attributes::ACCT_INPUT_OCTETS: {
-				InputOctets = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_INPUT_PACKETS: {
-				InputPackets = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_INPUT_GIGAWORDS: {
-				InputGigaWords = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_OUTPUT_OCTETS: {
-				OutputOctets = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_OUTPUT_PACKETS: {
-				OutputPackets= GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_OUTPUT_GIGAWORDS: {
-				OutputGigaWords = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::ACCT_SESSION_TIME: {
-				SessionTime = GetUiInt32(&Notification.Packet_.P_.attributes[attribute.pos]);
-			} break;
-			case RADIUS::Attributes::PROXY_STATE: {
-				std::string Tmp;
-				Tmp.assign(
-					&Notification.Packet_.P_.attributes[attribute.pos],
-					&Notification.Packet_.P_.attributes[attribute.pos + attribute.len]);
-				auto ProxyParts = Poco::StringTokenizer(Tmp,":");
-				if(ProxyParts.count()==4)
-					Interface=ProxyParts[3];
-
-			} break;
-			default: {
-			} break;
-			}
-		}
-
-		auto ap_hint = AccountingSessions_.find(Notification.SerialNumber_);
-		if(ap_hint==end(AccountingSessions_)) {
-			SessionMap M;
-			AccountingSessions_[Notification.SerialNumber_ ] = M;
-			ap_hint = AccountingSessions_.find(Notification.SerialNumber_);
-		}
-
-		auto Index = AccountingSessionId + AccountingMultiSessionId;
-		auto session_hint = ap_hint->second.find(Index);
-		if(session_hint==end(ap_hint->second)) {
-			//  find the calling_station_id
-			//  if we are getting a stop for something we do not know, nothing to do...
-			if( AccountingPacketType!=OpenWifi::RADIUS::AccountingPacketTypes::ACCT_STATUS_TYPE_START &&
-				AccountingPacketType!=OpenWifi::RADIUS::AccountingPacketTypes::ACCT_STATUS_TYPE_INTERIM_UPDATE) {
-				return;
-			}
-
-//			std::cout << "ACT -> " << Notification.SerialNumber_ << ":  AccountingSessionId: " << AccountingSessionId << "  AccountingMultiSessionId: " << AccountingMultiSessionId << std::endl;
-
-			auto NewSession = std::make_shared<GWObjects::RADIUSSession>();
-			NewSession->serialNumber = Notification.SerialNumber_;
-			NewSession->destination = Notification.Destination_;
-			NewSession->started = NewSession->lastTransaction = Utils::Now();
-			NewSession->userName = UserName;
-			NewSession->callingStationId = CallingStationId;
-			NewSession->calledStationId = CalledStationId;
-			NewSession->accountingSessionId = AccountingSessionId;
-			NewSession->accountingMultiSessionId = AccountingMultiSessionId;
-			NewSession->accountingPacket = Notification.Packet_;
-			NewSession->destination = Notification.Destination_;
-			NewSession->inputOctets = InputOctets;
-			NewSession->inputPackets = InputPackets;
-			NewSession->inputGigaWords = InputGigaWords;
-			NewSession->outputOctets = OutputOctets;
-			NewSession->outputOctets = OutputPackets;
-			NewSession->outputGigaWords = OutputGigaWords;
-			NewSession->sessionTime = SessionTime;
-			NewSession->chargeableUserIdentity = ChargeableUserIdentity;
-			NewSession->interface = Interface;
-			NewSession->secret = Notification.Secret_;
-
-			poco_debug(Logger(),fmt::format("{}: Creating session", CallingStationId));
-			ap_hint->second[Index] = NewSession;
-
-		} else {
-
-			//  If we receive a stop, just remove that session
-			if(AccountingPacketType==OpenWifi::RADIUS::AccountingPacketTypes::ACCT_STATUS_TYPE_STOP) {
-				poco_debug(Logger(),fmt::format("{}: Deleting session", CallingStationId));
-				ap_hint->second.erase(Index);
-			} else {
-				poco_debug(Logger(),fmt::format("{}: Updating session", CallingStationId));
-				session_hint->second->accountingPacket = Notification.Packet_;
-				session_hint->second->destination = Notification.Destination_;
-				session_hint->second->lastTransaction = Utils::Now();
-				session_hint->second->inputOctets = InputOctets;
-				session_hint->second->inputPackets = InputPackets;
-				session_hint->second->inputGigaWords = InputGigaWords;
-				session_hint->second->outputOctets = OutputOctets;
-				session_hint->second->outputOctets = OutputPackets;
-				session_hint->second->outputGigaWords = OutputGigaWords;
-				session_hint->second->sessionTime = SessionTime;
-			}
-		}
-
-/*		if(ap_hint!=AccountingSessions_.end()) {
-			std::cout << "Acct table:" << std::endl;
-			for(const auto &session:ap_hint->second) {
-				std::cout << Notification.SerialNumber_ << ":  Index: " << session.first << ": ID: " << session.second->accountingSessionId << "  MID:" << session.second->accountingMultiSessionId << std::endl;
-  			}
-		}
-*/
-	}
-
-	[[maybe_unused]] static void store_packet(const std::string &serialNumber, const char *buffer, std::size_t size, int i) {
-		static std::uint64_t pkt=0;
-
-		std::string filename = MicroServiceDataDirectory() + "/radius." + serialNumber + ".stop." +
-							   std::to_string(pkt++) + "." + std::to_string(i) + ".bin";
-
-		std::ofstream ofs(filename,std::ios_base::binary | std::ios_base::trunc | std::ios_base::out);
-		ofs.write(buffer,size);
-		ofs.close();
-	}
-
-	bool RADIUSSessionTracker::SendCoADM(const RADIUSSessionPtr &session) {
-
-		RADIUS::RadiusPacket	P;
-
-		P.PacketType(RADIUS::Disconnect_Request);
-		P.Identifier(std::rand() & 0x00ff);
-		P.AppendAttribute(RADIUS::Attributes::AUTH_USERNAME, session->userName);
-		P.AppendAttribute(RADIUS::Attributes::NAS_IP, (std::uint32_t)(0x7f000001));
-		if(!session->calledStationId.empty())
-			P.AppendAttribute(RADIUS::Attributes::CALLED_STATION_ID, session->calledStationId);
-		if(!session->callingStationId.empty())
-			P.AppendAttribute(RADIUS::Attributes::CALLING_STATION_ID, session->callingStationId);
-		if(!session->nasId.empty())
-			P.AppendAttribute(RADIUS::Attributes::NAS_IDENTIFIER, session->nasId);
-		if(!session->accountingSessionId.empty())
-			P.AppendAttribute(RADIUS::Attributes::ACCT_SESSION_ID, session->accountingSessionId);
-		if(!session->accountingMultiSessionId.empty())
-			P.AppendAttribute(RADIUS::Attributes::ACCT_MULTI_SESSION_ID, session->accountingMultiSessionId);
-		auto ProxyState = session->serialNumber + ":" + "0.0.0.0" + ":" + "3799" + ":" + session->interface;
-		// std::cout << "Proxy state: " << ProxyState << "   Secret: " << session->secret << std::endl;
-		P.AppendAttribute(RADIUS::Attributes::PROXY_STATE, ProxyState);
-		P.RecomputeAuthenticator(session->secret);
-		P.Log(std::cout);
-		AP_WS_Server()->SendRadiusCoAData(session->serialNumber, P.Buffer(), P.Size_);
-
-		return true;
-	}
-
-	bool RADIUSSessionTracker::SendCoADM(const std::string &serialNumber, const std::string &sessionId) {
-		poco_information(Logger(),fmt::format("{}: SendCoADM for {}.", serialNumber, sessionId));
-		std::lock_guard		Guard(Mutex_);
-
-		auto ap_hint = AccountingSessions_.find(serialNumber);
-		if(ap_hint==end(AccountingSessions_)) {
-			return false;
-		}
-
-		auto session_hint = ap_hint->second.find(sessionId);
-		if(session_hint!=ap_hint->second.end()) {
-			SendCoADM(session_hint->second);
-		}
-
-		return true;
-	}
-
-	bool RADIUSSessionTracker::DisconnectUser(const std::string &UserName) {
-		poco_information(Logger(),fmt::format("Disconnect user {}.", UserName));
-		std::lock_guard		Guard(Mutex_);
-
-		for(const auto &AP:AccountingSessions_) {
-			for(const auto &Session:AP.second) {
-				if(Session.second->userName==UserName) {
-					SendCoADM(Session.second);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	void RADIUSSessionTracker::DisconnectSession(const std::string &SerialNumber) {
-
-		std::lock_guard		Guard(Mutex_);
-		auto hint = AccountingSessions_.find(SerialNumber);
-		if(hint==end(AccountingSessions_)) {
-			return;
-		}
-
-		poco_information(Logger(),fmt::format("{}: Disconnecting.", SerialNumber));
-
-		//	we need to go through all sessions and send an accounting stop
-		for(const auto &session:hint->second) {
-			poco_debug(Logger(), fmt::format("Stopping accounting for {}:{}", SerialNumber, session.first ));
-
-			RADIUS::RadiusPacket	P(session.second->accountingPacket);
-
-			P.P_.identifier++;
-			P.ReplaceAttribute(RADIUS::Attributes::ACCT_STATUS_TYPE, (std::uint32_t) RADIUS::AccountingPacketTypes::ACCT_STATUS_TYPE_STOP);
-			P.ReplaceOrAdd(RADIUS::Attributes::EVENT_TIMESTAMP, (std::uint32_t) std::time(nullptr));
-			P.AppendAttribute(RADIUS::Attributes::ACCT_TERMINATE_CAUSE, (std::uint32_t) RADIUS::AccountingTerminationReasons::ACCT_TERMINATE_LOST_CARRIER);
-			RADIUS_proxy_server()->RouteAndSendAccountingPacket(session.second->destination, SerialNumber, P, true, session.second->secret);
-		}
-
-		AccountingSessions_.erase(hint);
-	}
-
-
-} // namespace OpenWifi

src/RADIUSSessionTracker.h

@@ -1,208 +0,0 @@
-//
-// Created by stephane bourque on 2023-03-19.
-//
-
-#pragma once
-
-#include <framework/SubSystemServer.h>
-#include <Poco/Runnable.h>
-#include <Poco/Notification.h>
-#include <Poco/NotificationQueue.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/Timer.h>
-
-#include "RADIUS_helpers.h"
-
-#include <RESTObjects/RESTAPI_GWobjects.h>
-
-namespace OpenWifi {
-
-	class SessionNotification : public Poco::Notification {
-	  public:
-
-		enum class NotificationType {
-			accounting_session_message,
-			authentication_session_message,
-			ap_disconnect
-		};
-
-		explicit SessionNotification(NotificationType T, const std::string &Destination, const std::string &SerialNumber, const RADIUS::RadiusPacket &P, const std::string &secret)
-			: Type_(T), Destination_(Destination), SerialNumber_(SerialNumber), Packet_(P), Secret_(secret) {
-		}
-
-		explicit SessionNotification(const std::string &SerialNumber)
-			: Type_(NotificationType::ap_disconnect), SerialNumber_(SerialNumber) {
-
-		}
-
-		NotificationType			Type_;
-		std::string 				Destination_;
-		std::string 				SerialNumber_;
-		RADIUS::RadiusPacket		Packet_;
-		std::string					Secret_;
-	};
-
-	class TrackerFutureCompletion {
-	  public:
-		virtual bool Completed(const RADIUS::RadiusPacket &P) = 0;
-		virtual bool StillValid() = 0;
-	  private:
-	};
-
-	class CoADisconnectResponse : public TrackerFutureCompletion {
-	  public:
-		CoADisconnectResponse(const std::string &serialNumber, std::uint8_t id, const std::vector<std::uint8_t> &types, const std::string &callingStationId):
- 			SerialNumber_(serialNumber),
-			Id_(id),
-			PacketTypes_(types),
-			CallingStationId_(callingStationId) {
-			Created_ = Utils::Now();
-		}
-
-		bool Completed(const RADIUS::RadiusPacket &P) final {
-			if(P.Identifier()==Id_) {
-				if(P.P_.code == RADIUS::Disconnect_ACK) {
-
-				} else if (P.P_.code == RADIUS::Disconnect_NAK) {
-
-				}
-			}
-			return true;
-		}
-
-		bool StillValid() final {
-			return (Utils::Now()-Created_) < 20;
-		}
-
-	  private:
-		std::string 	SerialNumber_;
-		std::uint8_t 	Id_;
-		std::vector<std::uint8_t>	PacketTypes_;
-		std::uint64_t 	Created_;
-		std::string 	CallingStationId_;
-	};
-
-	using RADIUSSessionPtr = std::shared_ptr<GWObjects::RADIUSSession>;
-
-	class RADIUSSessionTracker : public SubSystemServer, Poco::Runnable {
-	  public:
-
-		static auto instance() {
-			static auto instance_ = new RADIUSSessionTracker;
-			return instance_;
-		}
-
-		int Start() override;
-		void Stop() override;
-		void run() final;
-
-		inline void AddAccountingSession(const std::string &Destination, const std::string &SerialNumber,
-										 const RADIUS::RadiusPacket &P, const std::string &secret) {
-			SessionMessageQueue_.enqueueNotification(new SessionNotification(SessionNotification::NotificationType::accounting_session_message, Destination, SerialNumber, P, secret));
-		}
-
-		inline void AddAuthenticationSession(const std::string &Destination, const std::string &SerialNumber,
-											 const RADIUS::RadiusPacket &P, const std::string &secret) {
-			std::lock_guard	G(Mutex_);
-			auto ap_hint = AccountingSessions_.find(SerialNumber);
-			if(AccountingSessions_.find(SerialNumber)!=end(AccountingSessions_)) {
-				//	if we have already added the info, do not need to add it again
-				auto CallingStationId = P.ExtractCallingStationID();
-				auto AccountingSessionId = P.ExtractAccountingSessionID();
-				if(ap_hint->second.find(CallingStationId+AccountingSessionId)!=end(ap_hint->second)) {
-					return;
-				}
-			}
-			SessionMessageQueue_.enqueueNotification(new SessionNotification(SessionNotification::NotificationType::authentication_session_message, Destination, SerialNumber, P, secret));
-		}
-
-		inline void DeviceDisconnect(const std::string &serialNumber) {
-			SessionMessageQueue_.enqueueNotification(new SessionNotification(serialNumber));
-		}
-
-		inline void GetAPList(std::vector<std::string> &SerialNumbers) {
-			std::lock_guard	G(Mutex_);
-
-			for(const auto &[serialNumber,_]:AccountingSessions_) {
-				SerialNumbers.emplace_back(serialNumber);
-			}
-		}
-
-		inline void GetAPSessions(const std::string &SerialNumber, GWObjects::RADIUSSessionList & list) {
-			std::lock_guard	G(Mutex_);
-
-			auto ap_hint = AccountingSessions_.find(SerialNumber);
-			if(ap_hint!=end(AccountingSessions_)) {
-				for(const auto &[index,session]:ap_hint->second) {
-					list.sessions.emplace_back(*session);
-				}
-			}
-		}
-
-		inline void GetUserNameAPSessions(const std::string &userName, GWObjects::RADIUSSessionList & list) {
-			std::lock_guard	G(Mutex_);
-
-			for(const auto &[_,sessions]:AccountingSessions_) {
-				for(const auto &[_,session]:sessions) {
-					if(Utils::match(userName.c_str(),session->userName.c_str())) {
-						list.sessions.emplace_back(*session);
-					}
-				}
-			}
-		}
-
-		inline void GetMACAPSessions(const std::string &mac, GWObjects::RADIUSSessionList & list) {
-			std::lock_guard	G(Mutex_);
-
-			for(const auto &[_,sessions]:AccountingSessions_) {
-				for(const auto &[_,session]:sessions) {
-					if(Utils::match(mac.c_str(),session->callingStationId.c_str())) {
-						list.sessions.emplace_back(*session);
-					}
-				}
-			}
-		}
-
-		bool SendCoADM(const std::string &serialNumber, const std::string &sessionId);
-		bool SendCoADM(const RADIUSSessionPtr &session);
-		bool DisconnectUser(const std::string &UserName);
-
-		inline std::uint32_t HasSessions(const std::string & serialNumber) {
-			std::lock_guard	G(Mutex_);
-			auto ap_hint = AccountingSessions_.find(serialNumber);
-			if(ap_hint==end(AccountingSessions_)) {
-				return 0;
-			}
-			return ap_hint->second.size();
-		}
-
-		void GarbageCollection(Poco::Timer &timer);
-
-	  private:
-		std::atomic_bool 			Running_=false;
-		Poco::NotificationQueue 	SessionMessageQueue_;
-		Poco::Thread				QueueManager_;
-
-		using SessionMap = std::map<std::string,RADIUSSessionPtr>;	//	calling-station-id + accounting-session-id
-		std::map<std::string,SessionMap>		AccountingSessions_;				//	serial-number -> session< accounting-session -> session>
-
-		Poco::Timer 												GarbageCollectionTimer_;
-		std::unique_ptr<Poco::TimerCallback<RADIUSSessionTracker>> 	GarbageCollectionCallback_;
-
-		std::uint64_t 				SessionTimeout_=10*60;
-
-
-		void ProcessAccountingSession(SessionNotification &Notification);
-		void ProcessAuthenticationSession(SessionNotification &Notification);
-		void DisconnectSession(const std::string &SerialNumber);
-
-		RADIUSSessionTracker() noexcept
-			: SubSystemServer("RADIUSSessionTracker", "RADIUS-SESSION", "radius.session") {}
-
-		std::string ComputeSessionIndex(RADIUSSessionPtr S);
-	};
-
-	inline auto RADIUSSessionTracker() { return RADIUSSessionTracker::instance(); }
-
-} // namespace OpenWifi
-

src/RADIUS_Destination.h

@@ -1,747 +0,0 @@
-//
-// Created by stephane bourque on 2022-08-15.
-//
-
-#pragma once
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTObjects/RESTAPI_GWobjects.h"
-
-#include "Poco/Crypto/X509Certificate.h"
-#include "Poco/Crypto/RSAKey.h"
-#include "Poco/Net/Context.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/Net/SecureStreamSocket.h"
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/TemporaryFile.h"
-
-#include "framework/MicroServiceFuncs.h"
-
-#include "fmt/format.h"
-
-#include "AP_WS_Server.h"
-#include "RADIUS_helpers.h"
-#include <RESTObjects/RESTAPI_GWobjects.h>
-
-namespace OpenWifi {
-
-	class RADIUS_Destination : public Poco::Runnable {
-	  public:
-		RADIUS_Destination(Poco::Net::SocketReactor &R, const GWObjects::RadiusProxyPool &P)
-			: Reactor_(R),
-			  Logger_(Poco::Logger::get(
-				  fmt::format("RADSEC: {}", P.name))),
-			  Pool_(P)
-		{
-			Type_ = GWObjects::RadiusEndpointType(P.radsecPoolType);
-			Start();
-		}
-
-		~RADIUS_Destination() override { Stop(); }
-
-		const int SMALLEST_RADIUS_PACKET = 20 + 19 + 4;
-		const int DEFAULT_RADIUS_AUTHENTICATION_PORT = 1812;
-		const int DEFAULT_RADIUS_ACCOUNTING_PORT = 1813;
-		const int DEFAULT_RADIUS_CoA_PORT = 3799;
-		
-		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(5000);
-			std::uint64_t CurrentDelay = 10, maxDelay=300, LastTry=0, LastKeepAlive=0;
-			while (TryAgain_) {
-				if (!Connected_) {
-					if(!LastTry || (Utils::Now()-LastTry)>CurrentDelay) {
-						LastTry = Utils::Now();
-						if (!Connect()) {
-							CurrentDelay *= 2;
-							if(CurrentDelay>maxDelay) CurrentDelay=10;
-						} else {
-							CurrentDelay = 10;
-						}
-					}
-				} else if ((Utils::Now() - LastKeepAlive) > Pool_.radsecKeepAlive) {
-					RADIUS::RadiusOutputPacket P(Pool_.authConfig.servers[ServerIndex_].radsecSecret);
-					P.MakeStatusMessage(Pool_.authConfig.servers[ServerIndex_].name);
-					if(Type_!=GWObjects::RadiusEndpointType::generic) {
-						poco_trace(Logger_, fmt::format("{}: Keep-Alive message.", Pool_.authConfig.servers[ServerIndex_].name));
-						Socket_->sendBytes(P.Data(), P.Len());
-					}
-					LastKeepAlive = Utils::Now();
-				}
-				Poco::Thread::trySleep(2000);
-			}
-		}
-
-		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(Pool_.authConfig.servers[ServerIndex_].radsecSecret)) {
-						poco_trace(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						sent_bytes = Socket_->sendBytes(buffer, length);
-					} else {
-						poco_trace(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						P.ComputeMessageAuthenticator(Pool_.authConfig.servers[ServerIndex_].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));
-				std::string ReplySource;
-				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(),
-												   P.PacketTypeToString(),
-												   NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, Buffer,
-																		 NumberOfReceivedBytes);
-						} else if(P.IsStatusMessageReply(ReplySource)) {
-							poco_debug(Logger_,
-									   fmt::format("{}: Keepalive message received.", ReplySource));
-						} 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(),
-												   P.PacketTypeToString(), 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(),
-												   P.PacketTypeToString(), 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()));
-					}
-					return;
-				} else {
-					poco_warning(Logger_, "Invalid packet received. Resetting the connection.");
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			} catch (...) {
-				poco_warning(Logger_, "Exception occurred. Resetting the connection.");
-			}
-			Disconnect();
-		}
-
-		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 void 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.");
-				return;
-			}
-			P.Evaluate(ReceiveSize);
-			auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "Accounting: missing serial number. Dropping request.");
-				return;
-			}
-			poco_debug(
-				Logger_,
-				fmt::format(
-					"Accounting Packet Response received for {}", SerialNumber ));
-			AP_WS_Server()->SendRadiusAccountingData(SerialNumber, P.Buffer(), P.Size());
-		}
-
-		inline void OnAuthenticationSocketReadable(
-			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_, "Authentication: bad packet received.");
-				return;
-			}
-			P.Evaluate(ReceiveSize);
-
-			if(Logger_.trace()) {
-				P.Log(std::cout);
-			}
-			auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "Authentication: missing serial number. Dropping request.");
-				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());
-		}
-
-		inline void OnCoASocketReadable(
-			const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-			Poco::Net::SocketAddress Sender;
-			RADIUS::RadiusPacket P;
-
-			auto ReceiveSize = pNf.get()->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
-			if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
-				poco_warning(Logger_, "CoA/DM: bad packet received.");
-				return;
-			}
-
-			P.Evaluate(ReceiveSize);
-			auto SerialNumber = P.ExtractSerialNumberTIP();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "CoA/DM: missing serial number. Dropping request.");
-				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());
-		}
-		
-		static inline bool IsExpired(const Poco::Crypto::X509Certificate &C) {
-			return C.expiresOn().timestamp().epochTime() < (std::time_t)Utils::Now();
-		}
-
-		static inline void Cat(const std::string &F1, const std::string & F2, const std::string &F) {
-			std::ofstream of(F.c_str(),std::ios_base::trunc|std::ios_base::out|std::ios_base::binary);
-			std::ifstream if1(F1.c_str(),std::ios_base::binary|std::ios_base::in);
-			Poco::StreamCopier::copyStream(if1,of);
-			of << std::endl;
-			std::ifstream if2(F2.c_str(),std::ios_base::binary|std::ios_base::in);
-			Poco::StreamCopier::copyStream(if2,of);
-			of << std::endl;
-			of.close();
-		}
-
-		inline bool Connect_GlobalReach() {
-
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-
-				Poco::TemporaryFile CertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile KeyFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile OpenRoamingRootCertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile Intermediate0(MicroServiceDataDirectory());
-				Poco::TemporaryFile Intermediate1(MicroServiceDataDirectory());
-
-				DecodeFile(KeyFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecKey);
-				DecodeFile(CertFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCert);
-				DecodeFile(Intermediate0.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCacerts[0]);
-				DecodeFile(Intermediate1.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCacerts[1]);
-
-				const static std::string OpenRoamingRootCert{
-					"-----BEGIN CERTIFICATE-----\n"
-					"MIIClDCCAhugAwIBAgIUF1f+h+uJNHyr+ZqTpwew8LYRAW0wCgYIKoZIzj0EAwMw\n"
-					"gYkxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRv\n"
-					"bjEsMCoGA1UEChMjR2xvYmFsUmVhY2ggVGVjaG5vbG9neSBFTUVBIExpbWl0ZWQx\n"
-					"KjAoBgNVBAMTIUdsb2JhbFJlYWNoIENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0y\n"
-					"MzA3MTQwOTMyMDBaFw00MzA3MDkwOTMyMDBaMIGJMQswCQYDVQQGEwJHQjEPMA0G\n"
-					"A1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xLDAqBgNVBAoTI0dsb2JhbFJl\n"
-					"YWNoIFRlY2hub2xvZ3kgRU1FQSBMaW1pdGVkMSowKAYDVQQDEyFHbG9iYWxSZWFj\n"
-					"aCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARy\n"
-					"f02umFNy5W/TtM5nfMaLhRF61vLxhT8iNQHR1mXiRmNdME3ArForBcAm2eolHPcJ\n"
-					"RH9DcXs59d2zzoPEaBjXADTCjUts3F7G6fjqvfki2e/txx/xfUopQO8G54XcFWqj\n"
-					"QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRS\n"
-					"tNe7MgAFwTaMZKUtS1/8pVoBqjAKBggqhkjOPQQDAwNnADBkAjA7VKHTybtSMBcN\n"
-					"717jGYvkWlcj4c9/LzPtkHO053wGsPigaq+1SjY7tDhS/g9oUQACMA6UqH2e8cfn\n"
-					"cZqmBNVNN3DBjIb4anug7F+FnYOQF36ua6MLBeGn3aKxvu1aO+hjPg==\n"
-					"-----END CERTIFICATE-----\n"};
-
-				std::ofstream ofs{OpenRoamingRootCertFile_.path().c_str(),
-								  std::ios_base::trunc | std::ios_base::out |
-									  std::ios_base::binary};
-				ofs << OpenRoamingRootCert;
-				ofs.close();
-
-				auto SecureContext = Poco::AutoPtr<Poco::Net::Context>(
-					new Poco::Net::Context(Poco::Net::Context::TLS_CLIENT_USE, ""));
-
-				if (Pool_.acctConfig.servers[ServerIndex_].allowSelfSigned) {
-					SecureContext->setSecurityLevel(Poco::Net::Context::SECURITY_LEVEL_NONE);
-					SecureContext->enableExtendedCertificateVerification(false);
-				}
-
-				SecureContext->usePrivateKey(Poco::Crypto::RSAKey("", KeyFile_.path(), ""));
-				Poco::Crypto::X509Certificate Cert(CertFile_.path());
-				if (!IsExpired(Cert)) {
-					SecureContext->useCertificate(Poco::Crypto::X509Certificate(CertFile_.path()));
-				} else {
-					poco_error(
-						Logger_,
-						fmt::format(
-							"Certificate for {} has expired. We cannot connect to this server.",
-							Pool_.acctConfig.servers[ServerIndex_].name));
-					return false;
-				}
-
-				SecureContext->addCertificateAuthority(
-					Poco::Crypto::X509Certificate(OpenRoamingRootCertFile_.path()));
-				SecureContext->addChainCertificate(
-					Poco::Crypto::X509Certificate(Intermediate0.path()));
-				SecureContext->addChainCertificate(
-					Poco::Crypto::X509Certificate(Intermediate1.path()));
-				SecureContext->enableExtendedCertificateVerification(false);
-
-				Socket_ = std::make_unique<Poco::Net::SecureStreamSocket>(SecureContext);
-				ServerIndex_ = 0 ;
-				for (const auto &PoolEntryServer : Pool_.acctConfig.servers) {
-					Poco::Net::SocketAddress Destination(PoolEntryServer.ip, PoolEntryServer.port);
-					try {
-						poco_information(Logger_, fmt::format("Attempting to connect to {}", CommonName()));
-						Socket_->connect(Destination, Poco::Timespan(20, 0));
-						Socket_->completeHandshake();
-
-						if (!Pool_.authConfig.servers[ServerIndex_].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<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::onData));
-						Reactor_.addEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::onShutdown));
-
-						Connected_ = true;
-						poco_information(Logger_, fmt::format("Connected. CN={}", CommonName()));
-						return true;
-					} catch (const Poco::Net::NetException &E) {
-						poco_warning(Logger_, "NetException: Could not connect.");
-						Logger_.log(E);
-					} catch (const Poco::Exception &E) {
-						poco_warning(Logger_, "Exception: Could not connect.");
-						Logger_.log(E);
-					} catch (...) {
-						poco_warning(Logger_, "Could not connect.");
-					}
-					ServerIndex_++;
-				}
-			}
-			ServerIndex_=0;
-			return false;
-		}
-
-		inline bool Connect_Orion() {
-			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(), Pool_.acctConfig.servers[ServerIndex_].radsecCert);
-				DecodeFile(KeyFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecKey);
-
-				Poco::Crypto::X509Certificate	Cert(CertFile_.path());
-				if(IsExpired(Cert)) {
-					poco_error(Logger_, fmt::format("Certificate for {} has expired. We cannot connect to this server.", Pool_.acctConfig.servers[ServerIndex_].name));
-					return false;
-				}
-
-				for (auto &cert : Pool_.acctConfig.servers[ServerIndex_].radsecCacerts) {
-					CaCertFiles_.emplace_back(
-						std::make_unique<Poco::TemporaryFile>(MicroServiceDataDirectory()));
-					DecodeFile(CaCertFiles_[CaCertFiles_.size() - 1]->path(), cert);
-				}
-
-				auto SecureContext =
-					Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(
-						Poco::Net::Context::TLS_CLIENT_USE, KeyFile_.path(), CertFile_.path(), ""));
-				if (Pool_.acctConfig.servers[ServerIndex_].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);
-				ServerIndex_ = 0 ;
-				for (const auto &PoolEntryServer : Pool_.acctConfig.servers) {
-					Poco::Net::SocketAddress Destination(PoolEntryServer.ip, PoolEntryServer.port);
-					try {
-						poco_information(Logger_, "Attempting to connect");
-						Socket_->connect(Destination, Poco::Timespan(100, 0));
-						Socket_->completeHandshake();
-
-						if (!Pool_.authConfig.servers[ServerIndex_].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<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::onData));
-						Reactor_.addEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::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.");
-					}
-					ServerIndex_++;
-				}
-			}
-			ServerIndex_=0;
-			return false;
-		}
-
-		inline bool Connect_Generic() {
-			poco_information(Logger_, fmt::format("Connecting {}", Pool_.name));
-			if (TryAgain_ && !Connected_) {
-
-				std::lock_guard G(LocalMutex_);
-
-				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);
-
-				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);
-
-				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);
-
-				Reactor_.addEventHandler(
-					*AuthenticationSocketV4_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-				Reactor_.addEventHandler(
-					*AccountingSocketV4_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAccountingSocketReadable));
-				Reactor_.addEventHandler(
-					*CoASocketV4_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-									   *this, &RADIUS_Destination::OnCoASocketReadable));
-
-/*
-				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);
-
-				Poco::Net::SocketAddress AcctSockAddrV6(
-					Poco::Net::AddressFamily::IPv6,
-					MicroServiceConfigGetInt("radius.proxy.accounting.port",
-											 DEFAULT_RADIUS_AUTHENTICATION_PORT));
-				AccountingSocketV6_ =
-					std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV6, true, 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);
-
-				Reactor_.addEventHandler(
-					*AuthenticationSocketV6_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-				Reactor_.addEventHandler(
-					*AccountingSocketV6_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAccountingSocketReadable));
-
-				Reactor_.addEventHandler(
-					*CoASocketV6_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-									   *this, &RADIUS_Destination::OnCoASocketReadable));
-*/
-				Connected_ = true;
-			}
-			return true;
-		}
-
-		inline bool Connect_Radsec() {
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-			}
-			return true;
-		}
-
-		inline bool Connect() {
-			switch(Type_) {
-			case GWObjects::RadiusEndpointType::orion: return Connect_Orion();
-			case GWObjects::RadiusEndpointType::globalreach: return Connect_GlobalReach();
-			case GWObjects::RadiusEndpointType::radsec: return Connect_Radsec();
-			default:
-				return Connect_Generic();
-			}
-		}
-
-		inline void Disconnect() {
-			if (Connected_) {
-				std::lock_guard G(LocalMutex_);
-				if(Type_==GWObjects::RadiusEndpointType::generic) {
-					poco_information(Logger_, fmt::format("Disconnecting {} generic server. Releasing all UDP resources.", Pool_.name));
-
-					if(AuthenticationSocketV4_) {
-						Reactor_.removeEventHandler(
-							*AuthenticationSocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-						AuthenticationSocketV4_->close();
-						AuthenticationSocketV4_.reset();
-					}
-
-					if(AccountingSocketV4_) {
-						Reactor_.removeEventHandler(
-							*AccountingSocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAccountingSocketReadable));
-						AccountingSocketV4_->close();
-						AccountingSocketV4_.reset();
-					}
-
-					if(CoASocketV4_) {
-						Reactor_.removeEventHandler(
-							*CoASocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnCoASocketReadable));
-						CoASocketV4_->close();
-						CoASocketV4_.reset();
-					}
-
-/*
- 					if(AuthenticationSocketV6_) {
-						Reactor_.removeEventHandler(
-							*AuthenticationSocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-						AuthenticationSocketV6_->close();
-						AuthenticationSocketV6_.reset();
-					}
-
-					if(AccountingSocketV6_) {
-						Reactor_.removeEventHandler(
-							*AccountingSocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAccountingSocketReadable));
-						AccountingSocketV6_->close();
-						AccountingSocketV6_.reset();
-					}
-
-					if(CoASocketV6_) {
-						Reactor_.removeEventHandler(
-							*CoASocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnCoASocketReadable));
-						CoASocketV6_->close();
-						CoASocketV6_.reset();
-					}
-*/
-				} else {
-					if(Socket_!=nullptr) {
-						Reactor_.removeEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-										  *this, &RADIUS_Destination::onData));
-						Reactor_.removeEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.removeEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::onShutdown));
-						Socket_->close();
-					}
-				}
-				Connected_ = false;
-			}
-			poco_information(Logger_, fmt::format("Disconnecting {}", Pool_.name));
-		}
-
-		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 "";
-		}
-
-		const auto &Pool() const { return Pool_; }
-		auto ServerType() const { return Type_; }
-
-		inline bool SendRadiusDataAuthData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS Auth {} bytes.", serialNumber, size));
-			AuthenticationSocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.authConfig.servers[0].ip, Pool_.authConfig.servers[0].port));
-			return true;
-		}
-
-		inline bool SendRadiusDataAcctData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS Acct {} bytes.", serialNumber, size));
-			AccountingSocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.acctConfig.servers[0].ip, Pool_.acctConfig.servers[0].port));
-			return true;
-		}
-
-		inline bool SendRadiusDataCoAData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS CoA {} bytes.", serialNumber, size));
-			CoASocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.coaConfig.servers[0].ip, Pool_.coaConfig.servers[0].port));
-			return true;
-		}
-
-	  private:
-		std::recursive_mutex 							LocalMutex_;
-		Poco::Net::SocketReactor 						&Reactor_;
-		Poco::Logger 									&Logger_;
-
-		std::unique_ptr<Poco::Net::SecureStreamSocket> 	Socket_;
-
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AccountingSocketV4_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AuthenticationSocketV4_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		CoASocketV4_;
-
-/*
- 		std::unique_ptr<Poco::Net::DatagramSocket> 		CoASocketV6_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AccountingSocketV6_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AuthenticationSocketV6_;
-*/
-
-		Poco::Thread 									ReconnectThread_;
-		std::unique_ptr<Poco::Crypto::X509Certificate> 	Peer_Cert_;
-		volatile bool 									Connected_ = false;
-		volatile bool 									TryAgain_ = true;
-		enum GWObjects::RadiusEndpointType				Type_{GWObjects::RadiusEndpointType::unknown};
-		GWObjects::RadiusProxyPool						Pool_;
-		uint64_t 										ServerIndex_=0;
-	};
-} // namespace OpenWifi

src/RADIUS_proxy_server.cpp

@@ -4,265 +4,394 @@
 
 #include "Poco/JSON/Parser.h"
 
-#include "AP_WS_Server.h"
-#include "RADIUS_helpers.h"
 #include "RADIUS_proxy_server.h"
+#include "RADIUS_helpers.h"
+#include "AP_WS_Server.h"
 
-#include "RADIUSSessionTracker.h"
 #include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
-/*
+	const int SMALLEST_RADIUS_PACKET = 20+19+4;
- 	const int SMALLEST_RADIUS_PACKET = 20 + 19 + 4;
 	const int DEFAULT_RADIUS_AUTHENTICATION_PORT = 1812;
 	const int DEFAULT_RADIUS_ACCOUNTING_PORT = 1813;
 	const int DEFAULT_RADIUS_CoA_PORT = 3799;
-*/
 
 	int RADIUS_proxy_server::Start() {
 
-		ConfigFilename_ = MicroServiceDataDirectory() + "/radius_pool_config.json";
+		ConfigFilename_ = MicroServiceDataDirectory()+"/radius_pool_config.json";
-		Poco::File Config(ConfigFilename_);
+		Poco::File	Config(ConfigFilename_);
 
-		Enabled_ = MicroServiceConfigGetBool("radius.proxy.enable", false);
+		enabled_ = MicroServiceConfigGetBool("radius.proxy.enable",false);
-		if (!Enabled_ && !Config.exists()) {
+		if(!enabled_ && !Config.exists()) {
-			StopRADIUSDestinations();
+			StopRADSECServers();
 			return 0;
 		}
 
-		poco_notice(Logger(), "Starting...");
+		poco_notice(Logger(),"Starting...");
 
-		Enabled_ = true;
+		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);
+		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);
+
+		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);
+		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);
+
+		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);
+		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);
+
+		RadiusReactor_.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>(
+																			 *this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
+
+		RadiusReactor_.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>(
+																   *this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+
+
+		RadiusReactor_.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>(
+																	 *this, &RADIUS_proxy_server::OnCoASocketReadable));
 
 		ParseConfig();
-		StartRADIUSDestinations();
+
+		//	start RADSEC servers...
+		StopRADSECServers();
+		StartRADSECServers();
 		RadiusReactorThread_.start(RadiusReactor_);
-		Utils::SetThreadName(RadiusReactorThread_, "rad:reactor");
+
-		Running_ = true;
+		Utils::SetThreadName(RadiusReactorThread_,"rad:reactor");
+
+		running_ = true;
+
 		return 0;
 	}
 
 	void RADIUS_proxy_server::Stop() {
-		if (Enabled_ && Running_) {
+		poco_information(Logger(),"Stopping...");
-			poco_information(Logger(), "Stopping...");
+		if(enabled_ && running_) {
+			RadiusReactor_.removeEventHandler(
+				*AuthenticationSocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
+			RadiusReactor_.removeEventHandler(
+				*AuthenticationSocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
 
-			StopRADIUSDestinations();
+			RadiusReactor_.removeEventHandler(
+				*AccountingSocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+			RadiusReactor_.removeEventHandler(
+				*AccountingSocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+
+			RadiusReactor_.removeEventHandler(
+				*CoASocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnCoASocketReadable));
+			RadiusReactor_.removeEventHandler(
+				*CoASocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnCoASocketReadable));
+
+			StopRADSECServers();
 			RadiusReactor_.stop();
 			RadiusReactorThread_.join();
-			Running_ = false;
+			enabled_=false;
-			poco_information(Logger(), "Stopped...");
+			running_=false;
 		}
+		poco_information(Logger(),"Stopped...");
 	}
 
-/*	inline static bool isRadsec(const GWObjects::RadiusProxyPool &Cfg) {
+	void RADIUS_proxy_server::StartRADSECServers() {
-		return Cfg.radsecPoolType=="orion" || Cfg.radsecPoolType=="globalreach" || Cfg.radsecPoolType=="radsec";
+		for(const auto &pool:PoolList_.pools) {
-	}
+			for(const auto &entry:pool.authConfig.servers) {
- */
+				if(entry.radsec) {
-
+					StartRADSECServer(entry);
-	void RADIUS_proxy_server::StartRADIUSDestinations() {
-		std::lock_guard G(Mutex_);
-		for (const auto &pool : PoolList_.pools) {
-			if(pool.enabled) {
-				RADIUS_Destinations_[Utils::IPtoInt(pool.poolProxyIp)] =
-						std::make_unique<RADIUS_Destination>(RadiusReactor_, pool);
-			} else {
-				poco_information(Logger(),fmt::format("Pool {} is not enabled.", pool.name));
-			}
-		}
-	}
-
-	void RADIUS_proxy_server::StopRADIUSDestinations() {
-		std::lock_guard G(Mutex_);
-		RADIUS_Destinations_.clear();
-	}
-
-	void RADIUS_proxy_server::RouteAndSendAccountingPacket(const std::string &Destination,const std::string &serialNumber, RADIUS::RadiusPacket &P, bool RecomputeAuthenticator, std::string &Secret) {
-		try{
-
-			//	are we sending this to a pool?
-			auto DstParts = Utils::Split(Destination, ':');
-			std::uint32_t DtsIp = Utils::IPtoInt(DstParts[0]);
-
-			std::lock_guard G(Mutex_);
-
-			auto DestinationServer = RADIUS_Destinations_.find(DtsIp);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
-				if(Logger().trace()) {
-					auto CallingStationID = P.ExtractCallingStationID();
-					auto CalledStationID = P.ExtractCalledStationID();
-					auto SessionID = P.ExtractAccountingSessionID();
-					auto MultiSessionID = P.ExtractAccountingMultiSessionID();
-					Logger().trace(
-						fmt::format("{}: Sending Accounting {} bytes to {}. CalledStationID={} CallingStationID={} SessionID={}:{}",
-									serialNumber, P.Size(),
-									DestinationServer->second->Pool().authConfig.servers[0].ip,
-									CalledStationID, CallingStationID, SessionID, MultiSessionID));
-				}
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
-					Secret = DestinationServer->second->Pool().acctConfig.servers[0].secret;
-					if(RecomputeAuthenticator) {
-						P.RecomputeAuthenticator(Secret);
-					}
-					DestinationServer->second->SendData(serialNumber, (const unsigned char *)P.Buffer(),
-														P.Size());
-				} else {
-					DestinationServer->second->SendRadiusDataAcctData(
-						serialNumber, (const unsigned char *)P.Buffer(), P.Size());
 				}
 			}
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),
-						 fmt::format("Bad RADIUS ACCT Packet from {}. Dropped.", serialNumber));
 		}
 	}
 
-	void store_packet(const std::string &serialNumber, const char *buffer, std::size_t size) {
+	void RADIUS_proxy_server::StopRADSECServers() {
-		static std::uint64_t pkt=0;
+		RADSECservers_.clear();
-
-		std::string filename = MicroServiceDataDirectory() + "/radius." + serialNumber + "." + std::to_string(pkt++) + ".bin";
-
-		std::ofstream ofs(filename,std::ios_base::binary | std::ios_base::trunc | std::ios_base::out);
-		ofs.write(buffer,size);
-		ofs.close();
 	}
 
-	void RADIUS_proxy_server::SendAccountingData( const std::string &serialNumber,
+	void RADIUS_proxy_server::StartRADSECServer(const GWObjects::RadiusProxyServerEntry &E) {
-												 const char *buffer, std::size_t size) {
+		RADSECservers_[ Poco::Net::SocketAddress(E.ip,0) ] = std::make_unique<RADSEC_server>(RadiusReactor_,E);
+	}
 
-		if (!Continue())
+	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.");
+			return;
+		}
+		P.Evaluate(ReceiveSize);
+		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+		if(SerialNumber.empty()) {
+			poco_warning(Logger(),"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());
+	}
+
+	void RADIUS_proxy_server::OnAuthenticationSocketReadable(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(),"Authentication: bad packet received.");
+			return;
+		}
+		P.Evaluate(ReceiveSize);
+		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+		if(SerialNumber.empty()) {
+			poco_warning(Logger(),"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());
+	}
+
+	void RADIUS_proxy_server::OnCoASocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification>& pNf) {
+		Poco::Net::SocketAddress	Sender;
+		RADIUS::RadiusPacket		P;
+
+		auto ReceiveSize = pNf.get()->socket().impl()->receiveBytes(P.Buffer(),P.BufferLen());
+		if(ReceiveSize<SMALLEST_RADIUS_PACKET) {
+			poco_warning(Logger(),"CoA/DM: bad packet received.");
+			return;
+		}
+		P.Evaluate(ReceiveSize);
+		auto SerialNumber = P.ExtractSerialNumberTIP();
+		if(SerialNumber.empty()) {
+			poco_warning(Logger(),"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());
+	}
+
+	void RADIUS_proxy_server::SendAccountingData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+
+		if(Pools_.empty() || !enabled_)
 			return;
 
 		try {
 			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
 			auto Destination = P.ExtractProxyStateDestination();
-			std::string Secret;
-			RouteAndSendAccountingPacket(Destination, serialNumber, P, false, Secret);
-			RADIUSSessionTracker()->AddAccountingSession(Destination, serialNumber, P, Secret);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),
-						 fmt::format("Bad RADIUS ACCT Packet from {}. Dropped.", serialNumber));
-		}
-	}
-
-	bool RADIUS_proxy_server::SendData(Poco::Net::DatagramSocket &Sock, const unsigned char *buf,
-									   std::size_t size, const Poco::Net::SocketAddress &S) {
-		return Sock.sendTo(buf, size, S) == (int)size;
-	}
-
-	void RADIUS_proxy_server::SendAuthenticationData(const std::string &serialNumber,
-													 const char *buffer, std::size_t size) {
-
-		if (!Continue())
-			return;
-
-		try {
-			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
-
-			std::lock_guard G(Mutex_);
-
-			std::uint32_t 	DstIp = P.ExtractProxyStateDestinationIPint();
-			auto DestinationServer = RADIUS_Destinations_.find(DstIp);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
-				if(Logger().trace()) {
-					auto CallingStationID = P.ExtractCallingStationID();
-					auto CalledStationID = P.ExtractCalledStationID();
-					auto SessionID = P.ExtractAccountingSessionID();
-					auto MultiSessionID = P.ExtractAccountingMultiSessionID();
-					Logger().trace(
-						fmt::format("{}: Sending Authentication {} bytes to {}. CalledStationID={} CallingStationID={} SessionID={}:{}",
-									serialNumber, P.Size(),
-									DestinationServer->second->Pool().authConfig.servers[0].ip,
-									CalledStationID, CallingStationID, SessionID, MultiSessionID));
-				}
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
-						DestinationServer->second->SendData(serialNumber,
-															(const unsigned char *)buffer, size);
-				}
-				else {
-					DestinationServer->second->SendRadiusDataAuthData(
-						serialNumber, (const unsigned char *)buffer, size);
-				}
-			}
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		} catch (...) {
-			poco_warning(Logger(),
-						 fmt::format("Bad RADIUS AUTH Packet from {}. Dropped.", serialNumber));
-		}
-	}
-
-	void RADIUS_proxy_server::SendCoAData(const std::string &serialNumber, const char *buffer,
-										  std::size_t size) {
-
-		if (!Continue())
-			return;
-
-		try {
-			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
 			auto CallingStationID = P.ExtractCallingStationID();
 			auto CalledStationID = P.ExtractCalledStationID();
 			Poco::Net::SocketAddress Dst(Destination);
 
 			std::lock_guard G(Mutex_);
-			std::uint32_t 	DstIp = P.ExtractProxyStateDestinationIPint();
+			bool UseRADSEC = false;
-			auto DestinationServer = RADIUS_Destinations_.find(DstIp);
+			auto FinalDestination = Route(radius_type::acct, Dst, P, UseRADSEC);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
+			if (UseRADSEC) {
-				poco_trace(Logger(),fmt::format("{}: Sending CoA {} bytes to {}", serialNumber, P.Size(), DestinationServer->second->Pool().coaConfig.servers[0].ip));
+				Poco::Net::SocketAddress RSP(FinalDestination.host(), 0);
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
+				auto DestinationServer = RADSECservers_.find(RSP);
+				if (DestinationServer != end(RADSECservers_)) {
 					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer,
 														size);
-				} else {
-					DestinationServer->second->SendRadiusDataCoAData(
-						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(),
+			poco_warning(Logger(),fmt::format("Bad RADIUS ACCT Packet from {}. Dropped.",serialNumber));
-						 fmt::format("Bad RADIUS AUTH Packet from {}. Dropped.", serialNumber));
 		}
 	}
 
-	void RADIUS_proxy_server::ParseServerList(const GWObjects::RadiusProxyServerConfig &Config,
+	bool RADIUS_proxy_server::SendData( Poco::Net::DatagramSocket & Sock, const unsigned char *buf , std::size_t size, const Poco::Net::SocketAddress &S) {
-											  std::vector<Destination> &V4,
+		return Sock.sendTo(buf, size, S)==(int)size;
-											  std::vector<Destination> &V6, bool setAsDefault,
+	}
-											  const std::string &poolProxyIp) {
-		uint64_t TotalV4 = 0, TotalV6 = 0;
 
-		for (const auto &server : Config.servers) {
+	void RADIUS_proxy_server::SendAuthenticationData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+
+		if(Pools_.empty() || !enabled_)
+			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));
+		}
+
+	}
+
+	void RADIUS_proxy_server::SendCoAData(const std::string &serialNumber, const char *buffer, std::size_t size) {
+
+		if(Pools_.empty() || !enabled_)
+			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));
+		}
+	}
+
+	void RADIUS_proxy_server::ParseServerList(const GWObjects::RadiusProxyServerConfig & Config, std::vector<Destination> &V4, std::vector<Destination> &V6, bool setAsDefault) {
+		uint64_t TotalV4=0, TotalV6=0;
+
+		for(const auto &server:Config.servers) {
 			Poco::Net::IPAddress a;
-			if (!Poco::Net::IPAddress::tryParse(server.ip, a)) {
+			if(!Poco::Net::IPAddress::tryParse(server.ip,a)) {
-				poco_error(Logger(), fmt::format("RADIUS-PARSE Config: server address {} is nto a "
+				poco_error(Logger(),fmt::format("RADIUS-PARSE Config: server address {} is nto a valid address in v4 or v6. Entry skipped.",server.ip));
-												 "valid address in v4 or v6. Entry skipped.",
-												 server.ip));
 				continue;
 			}
-			auto S = Poco::Net::SocketAddress(fmt::format("{}:{}", server.ip, server.port));
+			auto S = Poco::Net::SocketAddress(fmt::format("{}:{}",server.ip,server.port));
-			Destination D{.Addr = S,
+			Destination	D{
-						  .state = 0,
+				.Addr = S,
-						  .step = 0,
+				.state = 0,
-						  .weight = server.weight,
+				.step = 0,
-						  .available = true,
+				.weight = server.weight,
-						  .strategy = Config.strategy,
+				.available = true,
-						  .monitor = Config.monitor,
+				.strategy = Config.strategy,
-						  .monitorMethod = Config.monitorMethod,
+				.monitor = Config. monitor,
-						  .methodParameters = Config.methodParameters,
+				.monitorMethod = Config.monitorMethod,
-						  .useAsDefault = setAsDefault,
+				.methodParameters = Config.methodParameters,
-						  .useRADSEC = server.radsec,
+				.useAsDefault = setAsDefault,
-						  .realms = server.radsecRealms,
+				.useRADSEC = server.radsec,
-						  .secret = server.secret,
+				.realms = server.radsecRealms
-						  .poolProxyIp = poolProxyIp};
+			};
 
-			if (setAsDefault && D.useRADSEC)
+			if(setAsDefault && D.useRADSEC)
-				DefaultIsRADSEC_ = true;
+				defaultIsRADSEC_ = true;
 
-			if (S.family() == Poco::Net::IPAddress::IPv4) {
+			if(S.family()==Poco::Net::IPAddress::IPv4) {
 				TotalV4 += server.weight;
 				V4.push_back(D);
 			} else {
@@ -271,16 +400,16 @@ namespace OpenWifi {
 			}
 		}
 
-		for (auto &i : V4) {
+		for(auto &i:V4) {
-			if (TotalV4 == 0) {
+			if(TotalV4==0) {
 				i.step = 1000;
 			} else {
 				i.step = 1000 - ((1000 * i.weight) / TotalV4);
 			}
 		}
 
-		for (auto &i : V6) {
+		for(auto &i:V6) {
-			if (TotalV6 == 0) {
+			if(TotalV6==0) {
 				i.step = 1000;
 			} else {
 				i.step = 1000 - ((1000 * i.weight) / TotalV6);
@@ -291,71 +420,60 @@ namespace OpenWifi {
 	void RADIUS_proxy_server::ParseConfig() {
 
 		try {
-			Poco::File F(ConfigFilename_);
+			Poco::File	F(ConfigFilename_);
 
-			std::lock_guard G(Mutex_);
+			std::lock_guard	G(Mutex_);
 
-			if (F.exists()) {
+			if(F.exists()) {
-				std::ifstream ifs(ConfigFilename_, std::ios_base::binary);
+				std::ifstream ifs(ConfigFilename_,std::ios_base::binary);
-				Poco::JSON::Parser P;
+				Poco::JSON::Parser	P;
 				auto RawConfig = P.parse(ifs).extract<Poco::JSON::Object::Ptr>();
-				GWObjects::RadiusProxyPoolList RPC;
+				GWObjects::RadiusProxyPoolList	RPC;
-				if (RPC.from_json(RawConfig)) {
+				if(RPC.from_json(RawConfig)) {
 					ResetConfig();
 					PoolList_ = RPC;
-					for (const auto &pool : RPC.pools) {
+					for(const auto &pool:RPC.pools) {
-						RadiusPool NewPool;
+						RadiusPool	NewPool;
-						ParseServerList(pool.authConfig, NewPool.AuthV4, NewPool.AuthV6,
+						ParseServerList(pool.authConfig, NewPool.AuthV4, NewPool.AuthV6, pool.useByDefault);
-										pool.useByDefault, pool.poolProxyIp);
+						ParseServerList(pool.acctConfig, NewPool.AcctV4, NewPool.AcctV6, pool.useByDefault);
-						ParseServerList(pool.acctConfig, NewPool.AcctV4, NewPool.AcctV6,
+						ParseServerList(pool.coaConfig, NewPool.CoaV4, NewPool.CoaV6, pool.useByDefault);
-										pool.useByDefault, pool.poolProxyIp);
-						ParseServerList(pool.coaConfig, NewPool.CoaV4, NewPool.CoaV6,
-										pool.useByDefault, pool.poolProxyIp);
 						Pools_.push_back(NewPool);
 					}
 				} else {
-					poco_warning(Logger(),
+					poco_warning(Logger(),fmt::format("Configuration file '{}' is bad.",ConfigFilename_));
-								 fmt::format("Configuration file '{}' is bad.", ConfigFilename_));
 				}
 			} else {
-				poco_warning(Logger(),
+				poco_warning(Logger(),fmt::format("No configuration file '{}' exists.",ConfigFilename_));
-							 fmt::format("No configuration file '{}' exists.", ConfigFilename_));
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		} catch (...) {
-			poco_error(Logger(),
+			poco_error(Logger(),fmt::format("Error while parsing configuration file '{}'",ConfigFilename_));
-					   fmt::format("Error while parsing configuration file '{}'", ConfigFilename_));
 		}
 	}
 
-/*
+	static bool RealmMatch(const std::string &user_realm, const std::string & realm) {
-	static bool RealmMatch(const std::string &user_realm, const std::string &realm) {
+		if(realm.find_first_of('*') == std::string::npos)
-		if (realm.find_first_of('*') == std::string::npos)
 			return user_realm == realm;
 		return realm.find(user_realm) != std::string::npos;
 	}
 
-	Poco::Net::SocketAddress
+	Poco::Net::SocketAddress RADIUS_proxy_server::DefaultRoute(radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress, const RADIUS::RadiusPacket &P,  bool &UseRADSEC) {
-	RADIUS_proxy_server::DefaultRoute(radius_type rtype,
+		bool IsV4 = RequestedAddress.family()==Poco::Net::SocketAddress::IPv4;
-									  const Poco::Net::SocketAddress &RequestedAddress,
-									  const RADIUS::RadiusPacket &P, bool &UseRADSEC,
-									  std::string &Secret) {
-
-		bool IsV4 = RequestedAddress.family() == Poco::Net::SocketAddress::IPv4;
 
 		// find the realm...
 		auto UserName = P.UserName();
-		if (!UserName.empty()) {
+		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 &pool:Pools_) {
-				for (const auto &server : pool.AuthV4) {
+				for(const auto &server:pool.AuthV4) {
-					if (!server.realms.empty()) {
+					if(!server.realms.empty()) {
-						for (const auto &realm : server.realms) {
+						for(const auto &realm:server.realms) {
-							if (RealmMatch(UserRealm, realm)) {
+							if (RealmMatch(UserRealm,realm)) {
+								std::cout << "Realm match..." << std::endl;
 								UseRADSEC = true;
 								return server.Addr;
 							}
@@ -365,86 +483,71 @@ namespace OpenWifi {
 			}
 		}
 
-		if (DefaultIsRADSEC_) {
+		if(defaultIsRADSEC_) {
 			UseRADSEC = true;
-			return (IsV4 ? Pools_[DefaultPoolIndex_].AuthV4[0].Addr
+			return (IsV4 ? Pools_[defaultPoolIndex_].AuthV4[0].Addr : Pools_[defaultPoolIndex_].AuthV6[0].Addr );
-						 : Pools_[DefaultPoolIndex_].AuthV6[0].Addr);
 		}
 
-		switch (rtype) {
+		switch(rtype) {
-		case radius_type::auth: {
+			case radius_type::auth: {
-			return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].AuthV4
+				return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].AuthV4
-									  : Pools_[DefaultPoolIndex_].AuthV6,
+										  : Pools_[defaultPoolIndex_].AuthV6,
-								 RequestedAddress, Secret);
+									 RequestedAddress);
-		}
+				}
-		case radius_type::coa: {
+			case radius_type::acct:
-			return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].CoaV4
+			default: {
-									  : Pools_[DefaultPoolIndex_].CoaV6,
+				return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].AcctV4
-								 RequestedAddress, Secret);
+										  : Pools_[defaultPoolIndex_].AcctV6,
-		}
+									 RequestedAddress);
-		case radius_type::acct:
+				}
-		default: {
+			case radius_type::coa: {
-			return ChooseAddress(IsV4 ? Pools_[DefaultPoolIndex_].AcctV4
+				return ChooseAddress(IsV4 ? Pools_[defaultPoolIndex_].CoaV4
-									  : Pools_[DefaultPoolIndex_].AcctV6,
+										  : Pools_[defaultPoolIndex_].CoaV6,
-								 RequestedAddress, Secret);
+									 RequestedAddress);
-		}
+				}
-		}
+			}
 	}
 
-	Poco::Net::SocketAddress
+	Poco::Net::SocketAddress RADIUS_proxy_server::Route([[maybe_unused]] radius_type rtype, const Poco::Net::SocketAddress &RequestedAddress, const RADIUS::RadiusPacket &P, bool &UseRADSEC) {
-	RADIUS_proxy_server::Route([[maybe_unused]] radius_type rtype,
+		std::lock_guard	G(Mutex_);
-							   const Poco::Net::SocketAddress &RequestedAddress,
-							   const RADIUS::RadiusPacket &P, bool &UseRADSEC,
-							   std::string &Secret) {
 
-		if (Pools_.empty()) {
+		if(Pools_.empty()) {
 			UseRADSEC = false;
 			return RequestedAddress;
 		}
 
-		bool IsV4 = RequestedAddress.family() == Poco::Net::SocketAddress::IPv4;
+		bool IsV4 = RequestedAddress.family()==Poco::Net::SocketAddress::IPv4;
 		bool useDefault;
+		useDefault = IsV4 ? RequestedAddress.host() == Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv4) : RequestedAddress.host() == Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv6) ;
 
-		useDefault = IsV4 ? RequestedAddress.host() ==
+		if(useDefault) {
-								Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv4)
+			return DefaultRoute(rtype, RequestedAddress, P, UseRADSEC);
-						  : RequestedAddress.host() ==
-								Poco::Net::IPAddress::wildcard(Poco::Net::IPAddress::IPv6);
-
-		if (useDefault) {
-			return DefaultRoute(rtype, RequestedAddress, P, UseRADSEC, Secret);
 		}
 
-		auto isAddressInPool = [&](const std::vector<Destination> &D, bool &UseRADSEC) -> bool {
+		auto isAddressInPool = [&](const std::vector<Destination> & D, bool &UseRADSEC) -> bool {
-			for (const auto &entry : D) {
+			for(const auto &entry:D)
-				if (!entry.poolProxyIp.empty() &&
+				if(entry.Addr.host()==RequestedAddress.host()) {
-					entry.poolProxyIp == RequestedAddress.host().toString()) {
 					UseRADSEC = entry.useRADSEC;
 					return true;
 				}
-				if (entry.Addr.host() == RequestedAddress.host()) {
-					UseRADSEC = entry.useRADSEC;
-					return true;
-				}
-			}
 			return false;
 		};
 
-		for (auto &pool : Pools_) {
+		for(auto &i:Pools_) {
-			// try and match the pool's address to the destination
+			switch(rtype) {
-			switch (rtype) {
 			case radius_type::coa: {
-				if (isAddressInPool((IsV4 ? pool.CoaV4 : pool.CoaV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.CoaV4 : i.CoaV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.CoaV4 : pool.CoaV6, RequestedAddress, Secret);
+					return ChooseAddress(IsV4 ? i.CoaV4 : i.CoaV6, RequestedAddress);
 				}
 			} break;
 			case radius_type::auth: {
-				if (isAddressInPool((IsV4 ? pool.AuthV4 : pool.AuthV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.AuthV4 : i.AuthV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.AuthV4 : pool.AuthV6, RequestedAddress, Secret);
+					return ChooseAddress(IsV4 ? i.AuthV4 : i.AuthV6, RequestedAddress);
 				}
 			} break;
 			case radius_type::acct: {
-				if (isAddressInPool((IsV4 ? pool.AcctV4 : pool.AcctV6), UseRADSEC)) {
+				if (isAddressInPool((IsV4 ? i.AcctV4 : i.AcctV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.AcctV4 : pool.AcctV6, RequestedAddress, Secret);
+					return ChooseAddress(IsV4 ? i.AcctV4 : i.AcctV6, RequestedAddress);
 				}
 			} break;
 			}
@@ -454,15 +557,10 @@ namespace OpenWifi {
 		return RequestedAddress;
 	}
 
-	Poco::Net::SocketAddress
+	Poco::Net::SocketAddress RADIUS_proxy_server::ChooseAddress(std::vector<Destination> &Pool, const Poco::Net::SocketAddress & OriginalAddress) {
-	RADIUS_proxy_server::ChooseAddress(std::vector<Destination> &Pool,
-									   const Poco::Net::SocketAddress &OriginalAddress,
-									   std::string &Secret) {
 
-		if (Pool.size() == 1) {
+		if(Pool.size()==1) {
-			Secret = Pool[0].secret;
+			return Pool[0].Addr;
-			auto A = Pool[0].Addr;
-			return A;
 		}
 
 		if (Pool[0].strategy == "weighted") {
@@ -478,7 +576,6 @@ namespace OpenWifi {
 					index = pos;
 					cur_state = i.state;
 					found = true;
-					Secret = i.secret ;
 				}
 				pos++;
 			}
@@ -486,9 +583,9 @@ namespace OpenWifi {
 			if (!found) {
 				return OriginalAddress;
 			}
+
 			Pool[index].state += Pool[index].step;
 			return Pool[index].Addr;
-
 		} else if (Pool[0].strategy == "round_robin") {
 			bool found = false;
 			uint64_t cur_state = std::numeric_limits<uint64_t>::max();
@@ -501,69 +598,68 @@ namespace OpenWifi {
 				if (i.state < cur_state) {
 					index = pos;
 					cur_state = i.state;
-					Secret = i.secret;
 					found = true;
 				}
 				pos++;
 			}
 
 			if (!found) {
-//				return OriginalAddress;
+				return OriginalAddress;
 			}
 
 			Pool[index].state += 1;
 			return Pool[index].Addr;
 		} else if (Pool[0].strategy == "random") {
 			if (Pool.size() > 1) {
-				auto index = std::rand() % Pool.size();
+				return Pool[std::rand() % Pool.size()].Addr;
-				Secret = Pool[index].secret;
-				return Pool[index].Addr;
 			} else {
 				return OriginalAddress;
 			}
 		}
 		return OriginalAddress;
 	}
-*/
-	void RADIUS_proxy_server::SetConfig(const GWObjects::RadiusProxyPoolList &C) {
-		std::lock_guard G(Mutex_);
 
-		Poco::JSON::Object Disk;
+	void RADIUS_proxy_server::SetConfig(const GWObjects::RadiusProxyPoolList &C) {
+		std::lock_guard	G(Mutex_);
+		PoolList_ = C;
+
+		Poco::JSON::Object	Disk;
 		C.to_json(Disk);
 
-		std::ofstream ofs(ConfigFilename_, std::ios_base::trunc | std::ios_base::binary);
+		std::ofstream ofs(ConfigFilename_, std::ios_base::trunc | std::ios_base::binary );
 		Disk.stringify(ofs);
 		ofs.close();
 
-		Stop();
+		if(!running_) {
-		ResetConfig();
+			Start();
-		PoolList_ = C;
+		}
-		Start();
+
+		ParseConfig();
 	}
 
 	void RADIUS_proxy_server::ResetConfig() {
 		PoolList_.pools.clear();
 		Pools_.clear();
-		DefaultPoolIndex_ = 0;
+		defaultPoolIndex_=0;
-		DefaultIsRADSEC_ = false;
 	}
 
 	void RADIUS_proxy_server::DeleteConfig() {
-		std::lock_guard G(Mutex_);
+		std::lock_guard	G(Mutex_);
 
 		try {
 			Poco::File F(ConfigFilename_);
 			if (F.exists())
 				F.remove();
 		} catch (...) {
+
 		}
-		Stop();
 		ResetConfig();
+		Stop();
 	}
 
 	void RADIUS_proxy_server::GetConfig(GWObjects::RadiusProxyPoolList &C) {
-		std::lock_guard G(Mutex_);
+		std::lock_guard	G(Mutex_);
 		C = PoolList_;
 	}
 
-} // namespace OpenWifi
+}