rebase (#123)

* Deploy cla action

* RDKEMW-7174 : update AMC APP key mapping (#98)

* RDKEMW-3409 : move certselector logic into ctrlm-main repo (#102)

* RDKEMW-6767: getNetStatus call time out due to SAT download retries (#97)

Reason for change: During initial setup, the device is attempting
to download the SAT token and timing out, which is holding up
the ctrlm message queue processing, which allows BLE pairing to
fail

Test Procedure: boot and attempt to pair BLE remote, keeping an eye
on ctrlm loggging. Look for "CTRLM : ERROR: call_plugin: Thunder
call failed <getServiceAccessToken> <11>, attempt 1 of 1"
We expect BLE pairing to succeed rather than timeout. If the
call_plugin log error occurs and BLE pairing succeed then the
code change has been exercised and the issue is resolved.

Risks: Low

Priority: P1

Signed-off-by: Jason Thomson <jason_thomson@comcast.com>

* RDKEMW-7333: remove device from bluez during factory reset (#100)

When an RDK device is factory reset, controlMgr will send a message to the remote to also factory reset itself. Once controlMgr gets notified from the remote of a successful RCU factory reset, it needs to be requested to bluez to remove the device. This prevents a connection attempt from happening to the just factory-reset RCU before the RDK device reboots. This connection attempt will prevent the RCU from autopairing during the activation flow after the RDK factory reset.

* RDKEMW-7573 : remove ctrlm compile flags (#104)

* RDKEMW-7694 : remove ctrlm build flags - CPC, DUNFELL (#105)

* RDKEMW-7834 : remove ctrlm build flags - RF4CE_PACKET_ANALYSIS (#107)

* RDKEMW-7772 : remove ctrlm build flags - DISABLE_BLE_VOICE (#106)

* RDKEMW-7122 : Missing Thunder cflags in ctrlm implemenation (#103)

* RDKEMW-7979 : use version/branch from recipe (#109)

* RDKEMW-8349 : ctrlm release v1.1.4 (#113)

* RDKEMW-8133: Optional param name for voiceSessionRequest (#108)

* RDKEMW-8133: Optional param name for voiceSessionRequest

Reason for change: Adding optional name param for voiceSessionRequest
                   which is needed to track metadata about voice
                   sessions from various ipcontrol clients
Test Procedure: Use VoiceControl voiceSessionRequest method with name
                param
Risks: Low
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* RDKEMW-8133: Optional param name for voiceSessionRequest

Reason for change: remove the required conditional of name
Test Procedure:
Risks:
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* RDKEMW-8133: Optional param name for voiceSessionRequest

Reason for change: Clean up log messaging
Test Procedure:
Risks:
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* RDKEMW-8133: Optional param name for voiceSessionRequest

Reason for change: Move obj != NULL block to prevent null dereference
Test Procedure:
Risks:
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

---------

Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* RDKEMW-8354: ctrlm-main crash while holding standby during OTA (#115)

* RDKEMW-8354: ctrlm-main crash while holding standby during OTA

Reason for change: crash due to null reference on repeating timer event
Test Procedure: see ticket
Risks: low
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* RDKEMW-8354: ctrlm-main crash on timer

Reason for change: add comment for clarity
Test Procedure:
Risks:
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

---------

Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

* Deploy cla action

* Deploy fossid_integration_stateless_diffscan_target_repo action

---------

Signed-off-by: Jason Thomson <jason_thomson@comcast.com>
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>
Co-authored-by: rdkcmf <github@code.rdkcentral.com>
Co-authored-by: dwolaver <44593664+dwolaver@users.noreply.github.com>
Co-authored-by: jthomp007c <jason_thomson@cable.comcast.com>
Co-authored-by: Kelvin Lu <119349872+klu339@users.noreply.github.com>
Co-authored-by: Alan Ryan <20208488+Alan-Ryan@users.noreply.github.com>

Author: 6 people

.github/workflows/cla.yml

@@ -0,0 +1,20 @@
+name: "CLA"
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, closed, synchronize]
+
+jobs:
+  CLA-Lite:
+    name: "Signature"
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
+    secrets:
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml

@@ -1,11 +1,18 @@
 name: Fossid Stateless Diff Scan
 
-on: pull_request
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: read
 
 jobs:
   call-fossid-workflow:
-    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@develop
-    secrets: 
+    if: ${{ ! github.event.pull_request.head.repo.fork }}
+    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@1.0.0
+    secrets:
         FOSSID_CONTAINER_USERNAME: ${{ secrets.FOSSID_CONTAINER_USERNAME }}
         FOSSID_CONTAINER_PASSWORD: ${{ secrets.FOSSID_CONTAINER_PASSWORD }}
         FOSSID_HOST_USERNAME: ${{ secrets.FOSSID_HOST_USERNAME }}

CHANGELOG.md

@@ -16,6 +16,26 @@ All notable changes to this project will be documented in this file.
 
 * In the future, generate this file by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [1.1.4] - 2025-09-17
+
+### Changed
+- move certselector logic into ctrlm-main repo (#102)
+- use version/branch from recipe (#109)
+
+### Added
+- update AMC APP key mapping (#98)
+
+### Fixed
+- getNetStatus call time out due to SAT download retries (#97)   
+- remove device from bluez during factory reset (#100)
+- Missing Thunder cflags in ctrlm implemenation (#103)
+
+### Removed
+- remove ctrlm compile flags (#104)
+- remove ctrlm build flags - CPC, DUNFELL (#105)
+- remove ctrlm build flags - RF4CE_PACKET_ANALYSIS (#107)
+- remove ctrlm build flags - DISABLE_BLE_VOICE (#106)
+
 ## [1.1.3] - 2025-08-19
 
 ### Changed

CMakeLists.txt

@@ -31,7 +31,7 @@ set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
 
 # PROJECT
-project(ctrlm-main)
+project(ctrlm-main VERSION ${CMAKE_PROJECT_VERSION})
 
 # OPTIONS
 option(A5000_ENABLE "ES1 A5000 use libse051" OFF)
@@ -42,25 +42,20 @@ option(BLE_ENABLED "Enable BLE" ON)
 option(BLE_SERVICES "Enable BLE Services" OFF)
 option(BREAKPAD "Enable BREAKPAD" OFF)
 option(BUILD_CTRLM_FACTORY "Build Control Factory Test" OFF)
-option(CPC "Enable CPC" OFF)
-option(DISABLE_BLE_VOICE "Disable BLE voice" OFF)
 option(DEEPSLEEP_CLOSE_DB "Deep Sleep Close DB" OFF)
-option(DUNFELL_BUILD_SUPPORT "Enable DUNFELL_BUILD_SUPPORT" OFF)
 option(ENABLE_NETWORKED_STANDBY_MODE "Enable Networked Standby Mode)" OFF)
 option(FACTORY_AUDIO_PLAYBACK "Factory test audio playback" OFF)
 option(FACTORY_CUSTOM_AUDIO_ANALYSIS "Factory custom audio analysis" OFF)
 option(FDC_ENABLED "Enable FDC" OFF)
-option(GIT_BRANCH, "Repository Branch" OFF)
 option(IP_ENABLED "Enable IP" OFF)
 option(LOCAL_MIC "Local Microphone" OFF)
 option(LOCAL_MIC_DISABLE_VIA_PRIVACY "Use Privacy to disable microphone" OFF)
 option(MEM_DEBUG "Enable memory debugging" OFF)
 option(MEMORY_LOCK "Memory Lock" OFF)
 option(MIC_TAP "Enable MIC_TAP" OFF)
 option(RF4CE_ENABLED "Enable RF4CE" ON)
-option(RF4CE_PACKET_ANALYSIS "Enable RF4CE_PACKET_ANALYSIS" OFF)
 option(TELEMETRY_SUPPORT "Enable TELEMETRY_SUPPORT" OFF)
-option(THUNDER "Enable THUNDER" OFF)
+option(THUNDER "Enable THUNDER" ON)
 option(THUNDER_SECURITY "Enable THUNDER_SECURITY" OFF)
 option(USE_SAFEC "Use safec" OFF)
 option(USE_IARM_POWER_MANAGER "Use IARM Power Manager" OFF)
@@ -84,7 +79,7 @@ set(BEEP_ON_KWD_FILE "NONE" CACHE STRING "Keyword Beep file name")
 set(CMAKE_ENABLE_EXPORTS ON)
 
 # EXECUTABLE(S)
-add_executable(controlMgr src/ctrlm_config_default.json ctrlm_version_build.h ctrlm_config_default.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ctrlm_config_default.c ${CMAKE_CURRENT_SOURCE_DIR}/src/voice/ipc/ctrlm_voice_ipc_request_type.c)
+add_executable(controlMgr src/ctrlm_config_default.json ctrlm_version_build.h ctrlm_config_default.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ctrlm_config_default.c)
 
 if(BUILD_CTRLM_FACTORY)
     add_library(ctrlm-fta)
@@ -146,7 +141,7 @@ add_subdirectory(src)
 
 # COMPILER OPTIONS
 target_compile_options(controlMgr PUBLIC -fPIC -rdynamic -Wall -Werror)
-add_compile_definitions(_REENTRANT _POSIX_C_SOURCE=200809L _GNU_SOURCE SYSTEMD_NOTIFY XR15_704 _REENTRANT)
+add_compile_definitions(_REENTRANT _POSIX_C_SOURCE=200809L _GNU_SOURCE _REENTRANT)
 
 target_link_libraries(
       controlMgr
@@ -199,25 +194,6 @@ if(ASSERT_ON_WRONG_THREAD)
    add_compile_definitions(ASSERT_ON_WRONG_THREAD)
 endif()
 
-if(AUTH_ENABLED)
-   if(EXISTS ${CMAKE_SYSROOT}/usr/lib/libctrlm-hal-certificate.so)
-      add_compile_definitions(AUTH_ENABLED)
-      add_compile_definitions(AUTH_ACCOUNT_ID)
-      add_compile_definitions(AUTH_DEVICE_ID)
-      add_compile_definitions(AUTH_PARTNER_ID)
-      add_compile_definitions(AUTH_SAT_TOKEN)
-      if(AUTH_ACTIVATION_STATUS)
-         add_compile_definitions(AUTH_ACTIVATION_STATUS)
-      endif()
-      #By default disabled but can be enabled
-      #add_compile_definitions(AUTH_EXPERIENCE)
-      target_link_libraries(controlMgr ctrlm-hal-certificate)
-   else()
-      message(WARNING "ctrlm-hal-certificate library is not provided, disabling authentication")
-      unset(AUTH_ENABLED)
-   endif()
-endif()
-
 if(BLE_ENABLED)
    target_link_libraries(controlMgr BTMgr)
    if(BLE_SERVICES)
@@ -231,18 +207,10 @@ if(BREAKPAD)
    add_compile_definitions(BREAKPAD_SUPPORT)
 endif()
 
-if(CPC_ENABLED)
-   target_link_libraries(controlMgr ${CTRLM_CPC_LIBRARY})
-endif()
-
 if(DEEPSLEEP_CLOSE_DB)
    add_compile_definitions(DEEPSLEEP_CLOSE_DB)
 endif()
 
-if(DISABLE_BLE_VOICE)
-   add_compile_definitions(DISABLE_BLE_VOICE)
-endif()
-
 if(ENABLE_ASYNC_SRVR_MSG)
    add_compile_definitions(SUPPORT_ASYNC_SRVR_MSG)
 endif()
@@ -263,10 +231,6 @@ if(IP_ENABLED)
    add_compile_definitions(CTRLM_NETWORK_IP CTRLM_IP_HAL_LOG_ENABLED)
 endif()
 
-if(THUNDER)
-   add_compile_definitions(CTRLM_THUNDER)
-endif()
-
 if(LOCAL_MIC)
    add_compile_definitions(CTRLM_LOCAL_MIC)
    if(MIC_TAP)
@@ -306,11 +270,23 @@ if(THUNDER)
    if(WPE_FRAMEWORK_PROTO_TRACING)
       target_link_libraries(controlMgr WPEFrameworkProtocols WPEFrameworkTracing)
    endif()
-endif()
-
-if(THUNDER_SECURITY)
-   add_compile_definitions(THUNDER_SECURITY)
-   target_link_libraries(controlMgr WPEFrameworkSecurityUtil)
+   if(THUNDER_SECURITY)
+      add_compile_definitions(THUNDER_SECURITY)
+      target_link_libraries(controlMgr WPEFrameworkSecurityUtil)
+   endif()
+   if(AUTH_ENABLED)
+      add_compile_definitions(AUTH_ENABLED)
+      add_compile_definitions(AUTH_ACCOUNT_ID)
+      add_compile_definitions(AUTH_DEVICE_ID)
+      add_compile_definitions(AUTH_PARTNER_ID)
+      add_compile_definitions(AUTH_SAT_TOKEN)
+      if(AUTH_ACTIVATION_STATUS)
+         add_compile_definitions(AUTH_ACTIVATION_STATUS)
+      endif()
+      #By default disabled but can be enabled
+      #add_compile_definitions(AUTH_EXPERIENCE)
+      target_link_libraries(controlMgr RdkCertSelector)
+   endif()
 endif()
 
 if(USE_IARM_POWER_MANAGER)
@@ -343,15 +319,14 @@ install(FILES ${CMAKE_BINARY_DIR}/ctrlm_config.json.template DESTINATION ${CMAKE
 
 # GENERATED FILES
 add_custom_command( OUTPUT ctrlm_version_build.h
-   COMMAND echo "#define CTRLM_MAIN_VER_MAJOR \"1\"" > ctrlm_version_build.h
-   COMMAND echo -n "#define CTRLM_MAIN_VER_MINOR \"" >> ctrlm_version_build.h
-   COMMAND bash -c "echo -n $(git -C ${CMAKE_CURRENT_SOURCE_DIR} rev-list --count 4b825dc642cb6eb9a060e54bf8d69288fbee4904..HEAD) >> ctrlm_version_build.h"
-   COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} diff --quiet || echo -n "++" >> ctrlm_version_build.h
+   COMMAND echo -n "#define CTRLM_MAIN_BRANCH    \"" >> ctrlm_version_build.h
+   COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} branch --all --contains | sed -n -e "s/^\\s*remotes\\/origin\\///" -e "2p" | tr -d "\\n" >> ctrlm_version_build.h
    COMMAND echo "\"" >> ctrlm_version_build.h
-   COMMAND echo "#define CTRLM_MAIN_BRANCH    \"${GIT_BRANCH}\"" >> ctrlm_version_build.h
    COMMAND echo -n "#define CTRLM_MAIN_COMMIT_ID " >> ctrlm_version_build.h
    COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} log --format=\"%H\" -n 1 >> ctrlm_version_build.h
-   COMMAND echo "#define CTRLM_MAIN_VERSION (CTRLM_MAIN_VER_MAJOR \".\" CTRLM_MAIN_VER_MINOR)" >> ctrlm_version_build.h
+   COMMAND echo -n "#define CTRLM_MAIN_VERSION   \"${CMAKE_PROJECT_VERSION}" >> ctrlm_version_build.h
+   COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} diff --quiet || echo -n "++" >> ctrlm_version_build.h
+   COMMAND echo "\"" >> ctrlm_version_build.h
    VERBATIM
 )
 

src/CMakeLists.txt

@@ -81,7 +81,6 @@ target_sources(controlMgr PRIVATE
    voice/endpoints/ctrlm_voice_endpoint_ws_nsp.cpp
    voice/ipc/ctrlm_voice_ipc_iarm_all.cpp
    voice/ipc/ctrlm_voice_ipc_iarm_legacy.cpp
-   voice/ipc/ctrlm_voice_ipc_request_type.c
    )
 
 if(BLE_ENABLED)
@@ -174,16 +173,6 @@ if(RF4CE_ENABLED)
       rf4ce/rib/ctrlm_rf4ce_rib.cpp
       rf4ce/rib/ctrlm_rf4ce_rib_attr.cpp
    )
-
-   if(RF4CE_PACKET_ANALYSIS)
-      target_sources(controlMgr PRIVATE
-      ctrlm_rf4ce_voice_packet_analysis.cpp
-   )
-   else()
-      target_sources(controlMgr PRIVATE
-      stubs/stubs_voice_packet_analysis.cpp
-   )
-   endif()
 endif()
 
 if(TELEMETRY_SUPPORT)
@@ -209,12 +198,14 @@ if(THUNDER)
       thunder/plugins/ctrlm_thunder_plugin_system.cpp
       ipc/ctrlm_rcp_ipc_iarm_thunder.cpp
       voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp
+      voice/ipc/ctrlm_voice_ipc_request_type.c
    )
 
    if(AUTH_ENABLED)
       target_sources(controlMgr PRIVATE
          auth/ctrlm_auth.cpp
          auth/ctrlm_auth_thunder.cpp
+         auth/ctrlm_auth_certificate.cpp
          auth/ctrlm_thunder_plugin_authservice.cpp
       )
   endif()