Merge branch 'rdkcentral:develop' into develop

Author: jincysam87

CHANGELOG.md

@@ -14,6 +14,12 @@ All notable changes to this RDK Service will be documented in this file.
 
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
+## [1.3.0] - 2025-09-17
+### Added
+- Implemented NetworkManagerProxy library which can help Thunder to Create COM-RPC connection to Out-Of-Process plugin
+- Implemented Internet Connectivity Monitoring for specific to Primary Interface.
+- Updated to not to post onInternetStatusChanged event when secondary interface is disturbed.
+
 ## [1.2.0] - 2025-09-15
 ### Changed
 - Reverted NetworkManager to continue to run as out-of-process-plugin

CMakeLists.txt

@@ -23,7 +23,7 @@ find_package(WPEFramework)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 2)
+set(VERSION_MINOR 3)
 set(VERSION_PATCH 0)
 
 add_compile_definitions(NETWORKMANAGER_MAJOR_VERSION=${VERSION_MAJOR})

definition/NetworkManager.json

@@ -9,7 +9,7 @@
         "status": "production",
         "description": "A Unified `NetworkManager` plugin that allows you to manage Ethernet and Wifi interfaces on the device.",
         "sourcelocation": "https://github.com/rdkcentral/networkmanager/blob/main/definition/NetworkManager.json",
-        "version": "1.2.0"
+        "version": "1.3.0"
     },
     "definitions": {
         "success": {
@@ -1433,13 +1433,19 @@
                         "summary": "The internet connection status",
                         "type": "string",
                         "example": "FULLY_CONNECTED"
+                    },
+                    "interface":{
+                        "summary": "The internet status change on default interface",
+                        "type": "string",
+                        "example": "wlan0"
                     }
                 },
                 "required": [
                     "prevState",
                     "prevStatus",
                     "state",
-                    "status"
+                    "status",
+                    "interface"
                 ]
             }
         },

docs/NetworkManagerPlugin.md

@@ -2,7 +2,7 @@
 <a name="head.NetworkManager_Plugin"></a>
 # NetworkManager Plugin
 
-**Version: 1.2.0**
+**Version: 1.3.0**
 
 **Status: :black_circle::black_circle::black_circle:**
 
@@ -23,7 +23,7 @@ org.rdk.NetworkManager interface for Thunder framework.
 <a name="head.Scope"></a>
 ## Scope
 
-This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 1.2.0). It includes detailed specification about its methods provided and notifications sent.
+This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 1.3.0). It includes detailed specification about its methods provided and notifications sent.
 
 <a name="head.Case_Sensitivity"></a>
 ## Case Sensitivity
@@ -1840,6 +1840,7 @@ Triggered when internet connection state changed.The possible internet connectio
 | params.prevStatus | string | The previous internet connection status |
 | params.state | integer | The internet connection state |
 | params.status | string | The internet connection status |
+| params.interface | string | The internet status change on default interface |
 
 ### Example
 
@@ -1851,7 +1852,8 @@ Triggered when internet connection state changed.The possible internet connectio
     "prevState": 1,
     "prevStatus": "NO_INTERNET",
     "state": 4,
-    "status": "FULLY_CONNECTED"
+    "status": "FULLY_CONNECTED",
+    "interface": "wlan0"
   }
 }
 ```

interface/CMakeLists.txt

@@ -23,6 +23,7 @@ find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(ProxyStubGenerator REQUIRED)
 
+set(PROXYLIB ${NAMESPACE}${PROJECT_NAME}Proxy)
 set(ProxyStubGenerator_DIR ${CMAKE_SYSROOT}${CMAKE_INSTALL_PREFIX}/tools/cmake ${ProxyStubGenerator_DIR})
 
 if(NOT GENERATOR_SEARCH_PATH)
@@ -33,4 +34,26 @@ file(GLOB INTERFACE_HEADER ${CMAKE_CURRENT_SOURCE_DIR})
 
 ProxyStubGenerator(INPUT "${INTERFACE_HEADER}" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
 
+file(GLOB PROXY_STUB_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/ProxyStubs*.cpp")
+
+add_library(${PROXYLIB} SHARED ${PROXY_STUB_SOURCES}
+                                ../plugin/Module.cpp)
+
+target_include_directories(${PROXYLIB} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../plugin/)
+
+target_link_libraries(${PROXYLIB} PRIVATE
+                                  ${NAMESPACE}Core::${NAMESPACE}Core
+                                  ${NAMESPACE}COM::${NAMESPACE}COM
+                                  CompileSettingsDebug::CompileSettingsDebug)
+
+set_target_properties(${PROXYLIB} PROPERTIES
+                                  CXX_STANDARD 11
+                                  CXX_STANDARD_REQUIRED YES
+                                  FRAMEWORK FALSE)
+
+string(TOLOWER ${NAMESPACE} NAMESPACE_LIB)
+
+install(TARGETS ${PROXYLIB} EXPORT ${PROXYLIB}Targets
+        LIBRARY DESTINATION lib/${NAMESPACE_LIB}/proxystubs COMPONENT libs)
+
 install(FILES INetworkManager.h  DESTINATION include/${NAMESPACE}/interfaces)

interface/INetworkManager.h

@@ -271,7 +271,7 @@ namespace WPEFramework
                 virtual void onInterfaceStateChange(const InterfaceState state /* @in */, const string interface /* @in */) = 0;
                 virtual void onActiveInterfaceChange(const string prevActiveInterface /* @in */, const string currentActiveInterface /* @in */) = 0;
                 virtual void onIPAddressChange(const string interface /* @in */, const string ipversion /* @in */, const string ipaddress /* @in */, const IPStatus status /* @in */) = 0;
-                virtual void onInternetStatusChange(const InternetStatus prevState /* @in */, const InternetStatus currState /* @in */) = 0;
+                virtual void onInternetStatusChange(const InternetStatus prevState /* @in */, const InternetStatus currState /* @in */, const string interface /* @in */) = 0;
 
                 // WiFi Notifications that other processes can subscribe to
                 virtual void onAvailableSSIDs(const string jsonOfScanResults /* @in */) = 0;

plugin/CMakeLists.txt

@@ -52,16 +52,12 @@ add_definitions(-DPLUGIN_BUILD_REFERENCE=${PLUGIN_BUILD_REFERENCE})
 include_directories(${PROJECT_SOURCE_DIR}/interface)
 include_directories(${PROJECT_SOURCE_DIR}/plugin)
 
-#Setting up source files
-file(GLOB PROXY_STUB_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/../interface/generated/ProxyStubs*.cpp")
-
 # Build the main plugin that runs inside the WPEFramework daemon
 add_library(${MODULE_NAME} SHARED
                             NetworkManager.cpp
                             NetworkManagerJsonRpc.cpp
                             NetworkManagerLogger.cpp
-                            Module.cpp
-                            ${PROXY_STUB_SOURCES})
+                            Module.cpp)
 
 target_link_libraries(${MODULE_NAME}  PRIVATE
                                         ${NAMESPACE}Core::${NAMESPACE}Core
@@ -78,8 +74,7 @@ add_library(${MODULE_IMPL_NAME} SHARED
                             NetworkManagerConnectivity.cpp
                             NetworkManagerStunClient.cpp
                             NetworkManagerLogger.cpp
-                            Module.cpp
-                            ${PROXY_STUB_SOURCES})
+                            Module.cpp)
 
 if(ENABLE_GNOME_NETWORKMANAGER)
     if(ENABLE_GNOME_GDBUS)

plugin/NetworkManager.h

@@ -79,9 +79,9 @@ namespace WPEFramework
                     _parent.onIPAddressChange(interface, ipversion, ipaddress, status);
                 }
 
-                void onInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState) override
+                void onInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState, const string interface) override
                 {
-                    _parent.onInternetStatusChange(prevState, currState);
+                    _parent.onInternetStatusChange(prevState, currState, interface);
                 }
 
                 void onAvailableSSIDs(const string jsonOfScanResults) override
@@ -267,7 +267,7 @@ namespace WPEFramework
             void onInterfaceStateChange(const Exchange::INetworkManager::InterfaceState state, const string interface);
             void onActiveInterfaceChange(const string prevActiveInterface, const string currentActiveinterface);
             void onIPAddressChange(const string interface, const string ipversion, const string ipaddress, const Exchange::INetworkManager::IPStatus status);
-            void onInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState);
+            void onInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState, const string interface);
             void onAvailableSSIDs(const string jsonOfScanResults);
             void onWiFiStateChange(const Exchange::INetworkManager::WiFiState state);
             void onWiFiSignalQualityChange(const string ssid, const string strength, const string noise, const string snr, const Exchange::INetworkManager::WiFiSignalQuality quality);