rdkcentral · biju-vi · Jul 20, 2026 · Jul 20, 2026
diff --git a/source/LedManager/Makefile.am b/source/LedManager/Makefile.am
@@ -26,17 +26,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/../CcspCommonLibrary/source/ccsp/components/includ
         -I$(top_srcdir)/../hal/include \
         -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)
 
-if FEATURE_LEDMGR_WEBCONFIG
 AM_CPPFLAGS += -I$(top_srcdir)/source/TR-181/middle_layer_src
-endif
 
 rdkledmanager_DEPENDENCIES = \
         $(EXTRA_DEPENDENCIES)
 
-if FEATURE_LEDMGR_WEBCONFIG
 EXTRA_DEPENDENCIES= \
         ${top_builddir}/source/TR-181/middle_layer_src/libCcspLedManager_middle_layer_src.la
-endif
 
 rdkledmanager_CFLAGS = -Werror -D_ANSC_LINUX -D_ANSC_USER -D_ANSC_LITTLE_ENDIAN_ -DFEATURE_SUPPORT_RDKLOG $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS)
 rdkledmanager_SOURCES = led_manager.c led_manager_events.c led_manager_utils.c led_manager_dbus_utils.c

diff --git a/source/LedManager/led_manager.c b/source/LedManager/led_manager.c
@@ -40,10 +40,10 @@
 #include "cap.h"
 #ifdef LEDMGR_WEBCONFIG
 #include "ledmgr_webconfig.h"
-#include "ledmgr_rbus_handler_apis.h"
 #else
 #include "led_manager_global.h"
 #endif
+#include "ledmgr_rbus_handler_apis.h"
 
 #define DEBUG_INI_NAME "/etc/debug.ini"
 extern char * pComponentName;
@@ -56,10 +56,8 @@ extern char g_Subsystem[32];
 extern PCOMPONENT_COMMON_LED_MANAGER g_pComponentCommonLedMgr;
 cap_user appcaps;
 
-#ifdef LEDMGR_WEBCONFIG
 char conf_filepath[BUFLEN_128];
 ANSC_STATUS retStatus = ANSC_STATUS_FAILURE;
-#endif
 
 static void ledmgr_start ()
 {
@@ -254,14 +252,12 @@ int main(int argc, char* argv[])
         exit(1);
     }
 
-#ifdef LEDMGR_WEBCONFIG
     retStatus = LedMgr_Rbus_Init();
     if(retStatus != ANSC_STATUS_SUCCESS)
     {
         CcspTraceError(("%s %d - Rbus Init failed !\n", __FUNCTION__, __LINE__ ));
         return retStatus;
     }
-#endif
 
     ledmgr_start();
 

diff --git a/source/LedManager/led_manager.h b/source/LedManager/led_manager.h
@@ -93,6 +93,8 @@ eIPv6Only,
 eDualStackUp,
 eMaptUp,
 #endif
+eWanBackupActive,
+eWanPrimaryActive,
 eFwUpdateStart,
 eFwUpdateStop,
 eFwUpdateComplete,

diff --git a/source/LedManager/led_manager_events.c b/source/LedManager/led_manager_events.c
@@ -37,7 +37,7 @@
 #ifdef WAN_STATUS_LED_EVENT
 #define LED_WAN_SYSEVENT_KEY  "rdkb_wan_status"
 #endif
-
+static pthread_mutex_t event_lock = PTHREAD_MUTEX_INITIALIZER;
 cpe_led_events_t led_events[] = 
 {
 {    ePowerOn,          "power_on"               },
@@ -59,6 +59,8 @@ cpe_led_events_t led_events[] =
 {    eDualStackUp,      "rdkb_dualstack"         },
 {    eMaptUp,           "rdkb_mapt"              },
 #endif
+{    eWanBackupActive,  "rdkb_wan_backup_active" },
+{    eWanPrimaryActive, "rdkb_wan_primary_active" },
 {    eFwUpdateStart,    "rdkb_fwupdate_start"    },
 {    eFwUpdateStop,     "rdkb_fwupdate_stop"     },
 {    eFwUpdateComplete, "rdkb_fwupdate_complete" },
@@ -103,15 +105,17 @@ cpe_event_t ledmgr_get_event_from_str (char * event_str);
 #ifdef WAN_STATUS_LED_EVENT
 cpe_event_t ledmgr_get_wan_event_from_str (char * event_str);
 #endif
-static int handle_event(cpe_event_t event)
+int handle_event(cpe_event_t event)
 {
 
+    pthread_mutex_lock(&event_lock);
     led_t * led_data_arr = g_led_data.led_obj_head;
     led_mode_t * mode_data_arr = g_mode_data.mode_obj_head;
 
     if ((mode_data_arr == NULL) || (led_data_arr == NULL))
     {
         CcspTraceError(("%s %d: invalid event or invalid config\n", __func__, __LINE__));
+        pthread_mutex_unlock(&event_lock);
         return FAILURE;
     }
 
@@ -164,9 +168,15 @@ static int handle_event(cpe_event_t event)
     }
 
     if (bupdate)
+    {
+        pthread_mutex_unlock(&event_lock);
         return SUCCESS;
+    }
     else
+    {
+        pthread_mutex_unlock(&event_lock);
         return FAILURE;
+    }
 }
 
 int ledmgr_catch_events()

diff --git a/source/Makefile.am b/source/Makefile.am
@@ -18,8 +18,6 @@
 ##########################################################################
 SUBDIRS =
 
-if FEATURE_LEDMGR_WEBCONFIG
 SUBDIRS += TR-181
-endif
 
 SUBDIRS += LedManager
diff --git a/source/TR-181/middle_layer_src/Makefile.am b/source/TR-181/middle_layer_src/Makefile.am
@@ -30,7 +30,12 @@ libCcspLedManager_middle_layer_src_la_CPPFLAGS = -I$(top_srcdir)/source/TR-181/m
                                                 -I$(top_srcdir)/source/LedManager 
 
 libCcspLedManager_middle_layer_src_la_SOURCES = ledmgr_dml_apis.c ledmgr_plugin_main_apis.c cJSON.c secure_wrapper.c
-libCcspLedManager_middle_layer_src_la_LDFLAGS = -lccsp_common -lsyscfg -lsysevent -lpthread -ljson_schema_validator_wrapper -lsecure_wrapper -lm
+libCcspLedManager_middle_layer_src_la_LDFLAGS = -lccsp_common -lsyscfg -lsysevent -lpthread -lsecure_wrapper -lm
+
+if FEATURE_LEDMGR_WEBCONFIG
+libCcspLedManager_middle_layer_src_la_CPPFLAGS += -I$(top_srcdir)/source/TR-181/middle_layer_src/json_schema_validator_wrapper
+libCcspLedManager_middle_layer_src_la_LDFLAGS +=  -ljson_schema_validator_wrapper
+endif
 
 libCcspLedManager_middle_layer_src_la_CPPFLAGS += -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/rbus
 libCcspLedManager_middle_layer_src_la_SOURCES += ledmgr_rbus_handler_apis.c

diff --git a/source/TR-181/middle_layer_src/ledmgr_plugin_main_apis.c b/source/TR-181/middle_layer_src/ledmgr_plugin_main_apis.c
@@ -191,7 +191,9 @@ ANSC_STATUS BackEndManagerInitialize(ANSC_HANDLE hThisObject)
     }
 #endif //RBUS_BUILD_FLAG_ENABLE
 
+#ifdef LEDMGR_WEBCONFIG
     LedMgrDmlLedWebConfigInit();
+#endif
 
     return returnStatus;
 }