Sync with Main Branch

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # the repository. Unless a later match takes precedence,
 # @org/actor will be requested for
 # review when someone opens a pull request.
-*       @rdkcentral/wanmanager-owners
+*       @rdkcentral/wanmanager-maintainers

.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 }}

configure.ac

@@ -124,8 +124,6 @@ dnl Checks for library functions.
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset strdup strerror])
 
-PKG_CHECK_MODULES([DBUS],[dbus-1 >= 1.6.18])
-
 AC_CONFIG_FILES([Makefile
 		source/Makefile
 		source/TR-181/Makefile

source/TR-181/include/wanmgr_dml.h

@@ -581,6 +581,7 @@ typedef struct _DML_WAN_INTERFACE
     DATAMODEL_MARKING           Marking;
     UINT                        NoOfVirtIfs;
     DML_VIRTUAL_IFACE*          VirtIfList;
+    BOOL                        bSendSelectionTimerExpired;
 } DML_WAN_IFACE;
 
 

source/TR-181/middle_layer_src/wanmgr_dml_iface_v2_apis.c

@@ -43,6 +43,7 @@
 #if defined (_XB6_PRODUCT_REQ_) || defined (_CBR2_PRODUCT_REQ_) || defined(_PLATFORM_RASPBERRYPI_)
 #include "wanmgr_utils.h"
 #endif
+#include "wanmgr_telemetry.h"
 
 extern WANMGR_DATA_ST gWanMgrDataBase;
 /***********************************************************************
@@ -1618,6 +1619,7 @@ BOOL WanVirtualIf_SetParamBoolValue(ANSC_HANDLE hInsContext, char* ParamName, BO
                 WanMgr_SetConnectivityCheckTypeToPSM(p_VirtIf, type);
                 p_VirtIf->IP.WCC_TypeChanged = TRUE;
                 p_VirtIf->IP.ConnectivityCheckType = type;
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_CONNECTIVITY_CHECK_TYPE);
                 ret = TRUE;
             }
         }
@@ -2088,6 +2090,7 @@ BOOL WanIfIpCfg_SetParamUlongValue(ANSC_HANDLE hInsContext, char* ParamName, ULO
                 p_VirtIf->IP.RefreshDHCP = TRUE;
                 p_VirtIf->IP.ModeForceEnable = TRUE;
                 CcspTraceInfo(("%s %d IP.%s changed for %s to %d. ModeForceEnable set and Refreshing DHCP \n", __FUNCTION__, __LINE__, ParamName, p_VirtIf->Name, p_VirtIf->IP.Mode));
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_IP_MODE);
             }
             ret = TRUE;
         }
@@ -2098,6 +2101,7 @@ BOOL WanIfIpCfg_SetParamUlongValue(ANSC_HANDLE hInsContext, char* ParamName, ULO
                 p_VirtIf->IP.IPv4Source = uValue;
                 p_VirtIf->IP.RefreshDHCP = TRUE;
                 CcspTraceInfo(("%s %d IP.%s changed for %s to %d. Refreshing DHCP \n", __FUNCTION__, __LINE__, ParamName, p_VirtIf->Name,p_VirtIf->IP.IPv4Source));
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_IPv4_CONFIG_TYPE);
             }
             ret = TRUE;
         }
@@ -2107,7 +2111,8 @@ BOOL WanIfIpCfg_SetParamUlongValue(ANSC_HANDLE hInsContext, char* ParamName, ULO
             {
                 p_VirtIf->IP.IPv6Source = uValue;
                 p_VirtIf->IP.RefreshDHCP = TRUE;
-                CcspTraceInfo(("%s %d IP.%s changed for %s to %d. Refreshing DHCP \n", __FUNCTION__, __LINE__, ParamName, p_VirtIf->Name,p_VirtIf->IP.IPv4Source));
+                CcspTraceInfo(("%s %d IP.%s changed for %s to %d. Refreshing DHCP \n", __FUNCTION__, __LINE__, ParamName, p_VirtIf->Name,p_VirtIf->IP.IPv6Source));
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_IPv6_CONFIG_TYPE);
             }
             ret = TRUE;
         }

source/TR-181/middle_layer_src/wanmgr_rbus_handler_apis.c

@@ -23,6 +23,7 @@
 #include "wanmgr_rbus_handler_apis.h"
 #include "wanmgr_rdkbus_apis.h"
 #include "dmsb_tr181_psm_definitions.h"
+#include "wanmgr_telemetry.h"
 
 enum {
 ENUM_PHY = 1,
@@ -455,6 +456,14 @@ rbusError_t WanMgr_Interface_SetHandler(rbusHandle_t handle, rbusProperty_t prop
                 char String[20] = {0};
                 strncpy(String , rbusValue_GetString(value, NULL),sizeof(String)-1);
                 CcspTraceInfo(("%s-%d : %s BaseInterfaceStatus changed to %s\n", __FUNCTION__, __LINE__, pWanDmlIface->Name, String));
+                if (strncmp(String,"Down",strlen(String)) == 0)
+                {
+                    WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_ERROR_PHY_DOWN);
+                }
+                else if (strncmp(String,"Up",strlen(String)) == 0) 
+                {
+                    WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_PHY_UP);
+                }			
                 WanMgr_StringToEnum(&pWanDmlIface->BaseInterfaceStatus, ENUM_PHY, String);
                 if (pWanDmlIface->Sub.BaseInterfaceStatusSub)
                 {
@@ -479,6 +488,10 @@ rbusError_t WanMgr_Interface_SetHandler(rbusHandle_t handle, rbusProperty_t prop
             {
                 char String[20] = {0};
                 strncpy(String , rbusValue_GetString(value, NULL),sizeof(String)-1);
+                if(strncmp(String,"Down",strlen(String)) == 0)
+                {
+                    WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_ERROR_VLAN_DOWN);
+                }			
                 WanMgr_StringToEnum(&p_VirtIf->VLAN.Status, ENUM_WAN_LINKSTATUS, String);
                 if (pWanDmlIface->Sub.WanLinkStatusSub)
                 {
@@ -786,10 +799,22 @@ static void WanMgr_Rbus_EventReceiveHandler(rbusHandle_t handle, rbusEvent_t con
 
                 if( strstr(pParamName, WANMGR_INFACE_PHY_STATUS_SUFFIX) != NULL )
                 {
+                    if(strncmp(pValue,"Down",strlen(pValue)) == 0)
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_ERROR_PHY_DOWN);
+                    }
+                    else if (strncmp(pValue,"Up",strlen(pValue)) == 0)
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_INFO_PHY_UP);
+                    }					
                     WanMgr_StringToEnum(&pWanIfaceData->BaseInterfaceStatus, ENUM_PHY, pValue);
                 }
                 else if( strstr(pParamName, WANMGR_INFACE_WAN_LINKSTATUS_SUFFIX) != NULL )
                 {
+                    if (strncmp(pValue,"Down",strlen(pValue)) == 0 )
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_ERROR_VLAN_DOWN);
+                    }				
                     WanMgr_StringToEnum(&pWanIfaceData->VirtIfList->VLAN.Status, ENUM_WAN_LINKSTATUS, pValue);
                     if(pWanIfaceData->VirtIfList->VLAN.Status == WAN_IFACE_LINKSTATUS_UP)
                     {
@@ -1597,6 +1622,16 @@ void *WanMgr_WanRemoteIfaceConfigure_thread(void *arg)
         }
     }
 
+    pWanDmlIfaceData = WanMgr_GetIfaceData_locked(cpeInterfaceIndex);
+    if (pWanDmlIfaceData != NULL)
+    {
+        DML_WAN_IFACE* pWanDmlIface = &(pWanDmlIfaceData->data);
+        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanDmlIface->VirtIfList,0),WAN_INFO_IPv4_CONFIG_TYPE);
+        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanDmlIface->VirtIfList,0),WAN_INFO_IPv6_CONFIG_TYPE);
+        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanDmlIface->VirtIfList,0),WAN_INFO_CONNECTIVITY_CHECK_TYPE);
+        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanDmlIface->VirtIfList,0),WAN_INFO_IP_MODE);
+        WanMgrDml_GetIfaceData_release(pWanDmlIfaceData);
+    }
     free(pDeviceChangeEvent);
     pthread_exit(NULL);
     return NULL;
@@ -1699,10 +1734,22 @@ static void CPEInterface_AsyncMethodHandler(
                 }
                 else if( WANMGR_PHY_STATUS_CHECK )
                 {
+                    if(strncmp(pValue,"Down",strlen(pValue)) == 0)
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_ERROR_PHY_DOWN);
+                    }
+                    else if(strncmp(pValue,"Up",strlen(pValue)) == 0)
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_INFO_PHY_UP);
+                    }				
                     WanMgr_StringToEnum(&pWanIfaceData->BaseInterfaceStatus, ENUM_PHY, pValue);
                 }
                 else if( WANMGR_WAN_LINKSTATUS_CHECK )
                 {
+                    if(strncmp(pValue,"Down",strlen(pValue)) == 0)
+                    {
+                        WanMgr_ProcessTelemetryMarker(WanMgr_getVirtualIfaceById( pWanIfaceData->VirtIfList,0),WAN_ERROR_VLAN_DOWN);
+                    }				
                     WanMgr_StringToEnum(&pWanIfaceData->VirtIfList->VLAN.Status, ENUM_WAN_LINKSTATUS, pValue);
                     if(pWanIfaceData->VirtIfList->VLAN.Status == WAN_IFACE_LINKSTATUS_UP)
                     {
@@ -1868,7 +1915,17 @@ static void WanMgr_TandD_EventHandler(rbusHandle_t handle, rbusEvent_t const* ev
 
         DML_VIRTUAL_IFACE *p_VirtIf = WanMgr_GetVirtIfDataByAlias_locked(Alias);
         if(p_VirtIf != NULL)
-        {
+        {           
+            if(res == WAN_CONNECTIVITY_UP)
+            {
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_CONNECTIVITY_CHECK_STATUS_UP_IPV4);
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_CONNECTIVITY_CHECK_STATUS_UP_IPV6);
+            }
+            else if(res == WAN_CONNECTIVITY_DOWN)
+            {
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_ERROR_CONNECTIVITY_CHECK_STATUS_DOWN_IPV4);
+                WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_ERROR_CONNECTIVITY_CHECK_STATUS_DOWN_IPV6);
+            }		
             p_VirtIf->IP.Ipv4ConnectivityStatus = res;
             p_VirtIf->IP.Ipv6ConnectivityStatus = res;
             WanMgr_VirtualIfaceData_release(p_VirtIf);

source/TR-181/middle_layer_src/wanmgr_rdkbus_apis.c

@@ -41,7 +41,8 @@
 #ifdef RBUS_BUILD_FLAG_ENABLE
 #include "wanmgr_rbus_handler_apis.h"
 #endif //RBUS_BUILD_FLAG_ENABLE
-//
+#include "wanmgr_telemetry.h"
+
 #define PSM_ENABLE_STRING_TRUE  "TRUE"
 #define PSM_ENABLE_STRING_FALSE  "FALSE"
 #define PPP_LINKTYPE_PPPOA "PPPoA"
@@ -326,6 +327,7 @@ int get_Virtual_Interface_FromPSM(ULONG instancenum, ULONG virtInsNum ,DML_VIRTU
     if (retPsmGet == CCSP_SUCCESS)
     {
         _ansc_sscanf(param_value, "%d", &(pVirtIf->IP.Mode));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_IP_MODE);	
     }
 
     _ansc_memset(param_name, 0, sizeof(param_name));
@@ -335,6 +337,7 @@ int get_Virtual_Interface_FromPSM(ULONG instancenum, ULONG virtInsNum ,DML_VIRTU
     if(retPsmGet == CCSP_SUCCESS)
     {
         _ansc_sscanf(param_value, "%d", &(pVirtIf->IP.IPv4Source));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_IPv4_CONFIG_TYPE);	
     }
 
     _ansc_memset(param_name, 0, sizeof(param_name));
@@ -350,6 +353,7 @@ int get_Virtual_Interface_FromPSM(ULONG instancenum, ULONG virtInsNum ,DML_VIRTU
     if(retPsmGet == CCSP_SUCCESS)
     {
         _ansc_sscanf(param_value, "%d", &(pVirtIf->IP.IPv6Source));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_IPv6_CONFIG_TYPE);	
     }
 
     _ansc_memset(param_name, 0, sizeof(param_name));
@@ -384,6 +388,7 @@ int get_Virtual_Interface_FromPSM(ULONG instancenum, ULONG virtInsNum ,DML_VIRTU
     if(retPsmGet == CCSP_SUCCESS)
     {
         _ansc_sscanf(param_value, "%d", &(pVirtIf->IP.ConnectivityCheckType));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_CONNECTIVITY_CHECK_TYPE);	
     }
 }
 
@@ -399,6 +404,7 @@ int get_Remote_Virtual_Interface_FromPSM(ULONG instancenum, ULONG virtInsNum ,DM
     if(retPsmGet == CCSP_SUCCESS)
     {
         _ansc_sscanf(param_value, "%d", &(pVirtIf->IP.ConnectivityCheckType));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_CONNECTIVITY_CHECK_TYPE);	
     }
 }
 
@@ -1826,6 +1832,9 @@ int Update_Current_ActiveDNS(char* CurrentActiveDNS)
     if((fp = fopen(RESOLV_CONF_FILE, "r")) == NULL)
     {
         CcspTraceError(("%s %d - Open %s error!\n", __FUNCTION__, __LINE__, RESOLV_CONF_FILE));
+#ifdef ENABLE_FEATURE_TELEMETRY2_0
+		t2_event_d("SYST_ERROR_DNSFAIL", 1);
+#endif
         return RETURN_ERR;
     }
 
@@ -2026,8 +2035,29 @@ ANSC_STATUS Update_Interface_Status()
                 publishCurrentActiveDNS = TRUE;
 #endif
                 CcspTraceInfo(("%s %d - SYS_INFO_DNS_updated - old : [%s] new : [%s]\n",__FUNCTION__,__LINE__,prevCurrentActiveDNS,CurrentActiveDNS));
+
 #ifdef ENABLE_FEATURE_TELEMETRY2_0
-                t2_event_d("SYS_INFO_DNS_updated", 1);
+				t2_event_d("SYS_INFO_DNS_updated", 1);
+				struct timespec uptime;
+	            long long uptime_ms = 0;
+	            char uptime_str[32]="0";
+				static bool dns_start_sent = 0; 
+
+
+				if (!dns_start_sent) {
+	               if (CurrentActiveDNS && strlen(CurrentActiveDNS) > 0 &&
+                       strcmp(CurrentActiveDNS, "127.0.0.1") != 0 &&
+                       strcmp(CurrentActiveDNS, "::1") != 0 ) { 
+					   if (clock_gettime(CLOCK_MONOTONIC, &uptime) == 0)
+                       {
+                           uptime_ms = (long long)uptime.tv_sec * 1000LL + (uptime.tv_nsec / 1000000LL);
+                       }
+				       snprintf(uptime_str, sizeof(uptime_str), "%lld", uptime_ms);
+
+	                   t2_event_s("SYST_INFO_DNSSTART_split", uptime_str);
+				       dns_start_sent = 1; 
+				   }
+				}
 #endif
             }
         }
@@ -2040,6 +2070,12 @@ ANSC_STATUS Update_Interface_Status()
                 strncpy(prevCurrentActiveInterface,pWanDmlData->CurrentActiveInterface, sizeof(prevCurrentActiveInterface) - 1);
                 memset(pWanDmlData->CurrentActiveInterface, 0, sizeof(pWanDmlData->CurrentActiveInterface));
                 strncpy(pWanDmlData->CurrentActiveInterface,CurrentActiveInterface, sizeof(pWanDmlData->CurrentActiveInterface) - 1);
+                DML_VIRTUAL_IFACE* pVirtIf = WanMgr_GetVIfByName_VISM_running_locked((devMode == GATEWAY_MODE) ? CurrentActiveInterface : CELLULARMGR_WAN_NAME);
+                if(pVirtIf != NULL)
+                {
+                    WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_INFO_WAN_UP);
+                    WanMgr_VirtualIfaceData_release(pVirtIf);
+                }			
 #ifdef RBUS_BUILD_FLAG_ENABLE
                 publishCurrentActiveInf = TRUE;
 #endif //RBUS_BUILD_FLAG_ENABLE

source/TR-181/middle_layer_src/wanmgr_rdkbus_utils.c

@@ -59,6 +59,7 @@
 #include "wanmgr_data.h"
 #include "wanmgr_dhcpv4_apis.h"
 #include "wanmgr_dhcpv6_apis.h"
+#include "wanmgr_telemetry.h"
 
 #define UPSTREAM_SET_MAX_RETRY_COUNT 10 // max. retry count for Upstream set requests
 #define DATAMODEL_PARAM_LENGTH 256
@@ -142,6 +143,7 @@ ANSC_STATUS  WanMgr_SetDnsConnectivityCheck(BOOL Enable)
                         p_VirtIf->IP.ConnectivityCheckType = type;
                         p_VirtIf->IP.WCC_TypeChanged = TRUE;
                         retStatus = ANSC_STATUS_SUCCESS;
+                        WanMgr_ProcessTelemetryMarker(p_VirtIf,WAN_INFO_CONNECTIVITY_CHECK_TYPE);
                         CcspTraceInfo(("%s-%d: RFC- DNS Connectivity Check %s, Type=%s", __FUNCTION__, __LINE__,
                                         (Enable? "Enabled":"Disabled"), (Enable? "TAD":"None")));
                     }
@@ -1009,6 +1011,7 @@ ANSC_STATUS  WanMgr_RdkBus_ConfigureVlan(DML_VIRTUAL_IFACE* pVirtIf, BOOL VlanEn
     if(ret != ANSC_STATUS_SUCCESS)
     {
         CcspTraceError(("%s %d DM set %s %s failed\n", __FUNCTION__,__LINE__, acSetParamName, acSetParamValue));
+        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_ERROR_VLAN_CREATION_FAILED);	
         return ANSC_STATUS_FAILURE;
     }
 
@@ -1191,4 +1194,4 @@ BOOL WanMgr_isBridgeModeEnabled()
     }
 
     return FALSE;
-}
+}

source/TR-181/netmonitor/Makefile.am

@@ -25,6 +25,6 @@ netmonitor_CPPFLAGS = -I$(top_srcdir)/source/TR-181/middle_layer_src \
                       -I$(top_srcdir)/source/TR-181/include \
                       -I$(top_srcdir)/source/WanManager
 
-netmonitor_CFLAGS = -DFEATURE_SUPPORT_RDKLOG $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS)
+netmonitor_CFLAGS = -DFEATURE_SUPPORT_RDKLOG $(SYSTEMD_CFLAGS)
 netmonitor_SOURCES = network_route_monitor.c
-netmonitor_LDADD = -lccsp_common -lrdkloggers $(DBUS_LIBS) $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lwebconfig_framework -lmsgpackc -lnanomsg -lsyscfg -lsysevent -lpthread -lsecure_wrapper
+netmonitor_LDADD = -lccsp_common -lrdkloggers $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lwebconfig_framework -lmsgpackc -lnanomsg -lsyscfg -lsysevent -lpthread -lsecure_wrapper

source/WanManager/DHCPv6cMsgHandler/dhcpv6c_msg_apis.c

@@ -56,6 +56,7 @@
 #include "wanmgr_dml.h"
 #include "wanmgr_data.h"
 #include "dhcpv6c_msg_apis.h"
+#include "wanmgr_telemetry.h"
 
 /*
  * Macro definitions
@@ -700,7 +701,15 @@ static void * WanMgr_DhcpV6MsgHandler()
                             }
                             else 
                             {
-                                WanMgr_MaptParseOpt95Response(dhcpv6_data.sitePrefix, opt95_dBuf, &dhcpv6_data);
+                                if(STATUS_SUCCESS != WanMgr_MaptParseOpt95Response(dhcpv6_data.sitePrefix, opt95_dBuf, &dhcpv6_data))
+				{
+                                    DML_VIRTUAL_IFACE* pVirtIf = WanMgr_GetVIfByName_VISM_running_locked(dhcpv6_data.ifname);
+                                    if(pVirtIf != NULL)
+                                    {
+                                        WanMgr_ProcessTelemetryMarker(pVirtIf,WAN_ERROR_MAPT_STATUS_FAILED);
+                                        WanMgr_VirtualIfaceData_release(pVirtIf);
+                                    }
+                                }				    
                             }
 #endif // MAPT_UNIFICATION_ENABLED
                         }

source/WanManager/Makefile.am

@@ -28,10 +28,11 @@ wanmanager_CPPFLAGS = -I$(top_srcdir)/source/TR-181/middle_layer_src \
                       -I$(top_srcdir)/source/WanManager/MaptParsing \ 
                       -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/rbus
 
-wanmanager_CFLAGS = -DFEATURE_SUPPORT_RDKLOG $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS)
+wanmanager_CFLAGS = -DFEATURE_SUPPORT_RDKLOG $(SYSTEMD_CFLAGS)
 wanmanager_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-wanmanager_SOURCES = wanmgr_webconfig_apis.c wanmgr_webconfig.c wanmgr_main.c  wanmgr_ssp_action.c wanmgr_ssp_messagebus_interface.c wanmgr_core.c wanmgr_controller.c wanmgr_data.c wanmgr_sysevents.c wanmgr_interface_sm.c wanmgr_utils.c wanmgr_net_utils.c wanmgr_dhcpv4_apis.c wanmgr_dhcpv6_apis.c wanmgr_ipc.c wanmgr_dhcpv4_internal.c wanmgr_dhcpv6_internal.c wanmgr_policy_auto_impl.c dm_pack_datamodel.c wanmgr_wan_failover.c wanmgr_policy_parallel_scan_impl.c wanmgr_dhcp_legacy_apis.c 
-wanmanager_LDADD = $(wanmanager_DEPENDENCIES) -lccsp_common -lrdkloggers $(DBUS_LIBS) $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lnanomsg -lwebconfig_framework -lmsgpackc  -lprivilege -lrbus -lsecure_wrapper
+
+wanmanager_SOURCES = wanmgr_webconfig_apis.c wanmgr_webconfig.c wanmgr_main.c  wanmgr_ssp_action.c wanmgr_ssp_messagebus_interface.c wanmgr_core.c wanmgr_controller.c wanmgr_data.c wanmgr_sysevents.c wanmgr_interface_sm.c wanmgr_utils.c wanmgr_net_utils.c wanmgr_dhcpv4_apis.c wanmgr_dhcpv6_apis.c wanmgr_ipc.c wanmgr_dhcpv4_internal.c wanmgr_dhcpv6_internal.c wanmgr_policy_auto_impl.c dm_pack_datamodel.c wanmgr_wan_failover.c wanmgr_policy_parallel_scan_impl.c wanmgr_dhcp_legacy_apis.c wanmgr_telemetry.c wanmgr_t2_telemetry.c
+wanmanager_LDADD = $(wanmanager_DEPENDENCIES) -lccsp_common -lrdkloggers $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lnanomsg -lwebconfig_framework -lmsgpackc  -lprivilege -lrbus -lsecure_wrapper
 
 
 if WAN_UNIFICATION_ENABLED 
@@ -46,4 +47,4 @@ if DHCPMANAGER_ENABLED
 wanmanager_SOURCES += wanmgr_dhcp_event_handler.c
 else
 wanmanager_LDADD += -ldhcp_client_utils
-endif
+endif