Co-pilot and Reviewer-s review comment addressed

Author: rirfha948

source/firewall/firewall_ipv6.c

@@ -862,11 +862,11 @@ void do_ipv6_filter_table(FILE *fp){
    }
 #endif /*_HUB4_PRODUCT_REQ_*/
 
-#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) && !defined(_CBR_PRODUCT_REQ_)
+    #if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) && ! defined(_CBR_PRODUCT_REQ_)
       /*Add a simple logic here to make traffic allowed for lan interfaces
        * exclude primary lan*/
       prepare_ipv6_multinet(fp);
-#endif
+    #endif
     #if !defined(_XER5_PRODUCT_REQ_) && !defined (_SCER11BEL_PRODUCT_REQ_) && !defined(_COSA_QCA_ARM_) //wan0 is not applicable for XER5
       /* not allow ping wan0 from brlan0 */
       int i;
@@ -1717,8 +1717,8 @@ void do_ipv6_filter_table(FILE *fp){
       FIREWALL_DEBUG("Exiting prepare_ipv6_firewall \n");
 }
 
-#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) && !defined(_CBR_PRODUCT_REQ_)
-int prepare_ipv6_multinet(FILE *fp)
+#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) && ! defined(_CBR_PRODUCT_REQ_) 
+static int prepare_ipv6_multinet(FILE *fp)
 {    
     char active_insts[32] = {0};
     char lan_pd_if[128] = {0};

source/scripts/init/c_registration/15_dhcpv6_server.c

@@ -74,7 +74,8 @@ const char* SERVICE_CUSTOM_EVENTS_BUSINESS[] = {
                                         "dhcpv6_server-stop|/etc/utopia/service.d/service_dhcpv6_server_bci.sh",
                                         "dhcpv6_server-restart|/etc/utopia/service.d/service_dhcpv6_server_bci.sh",
                                         "ipv6_prefix_delegation|/etc/utopia/service.d/service_dhcpv6_server_bci.sh",
-                                        "dhcpv6_option_changed|/etc/utopia/service.d/service_dhcpv6_server_bci.sh|NULL|"TUPLE_FLAG_EVENT,NULL
+					"dhcpv6_option_changed|/etc/utopia/service.d/service_dhcpv6_server_bci.sh|NULL|"TUPLE_FLAG_EVENT,
+                                        NULL
                                       };
 #else
 const char* SERVICE_CUSTOM_EVENTS[] = { 

source/scripts/init/c_registration/20_routing.c

@@ -70,7 +70,7 @@ const char* SERVICE_CUSTOM_EVENTS_RESIDENTIAL[] = {
                                         "staticroute-restart|/etc/utopia/service.d/service_routed.sh|NULL|"TUPLE_FLAG_EVENT,
                                         #ifdef WAN_FAILOVER_SUPPORTED
                                         "routeset-ula|/usr/bin/service_routed|NULL|"TUPLE_FLAG_EVENT,
-                                        "routeunset-ula|/usr/bin//service_routed|NULL|"TUPLE_FLAG_EVENT,
+                                        "routeunset-ula|/usr/bin/service_routed|NULL|"TUPLE_FLAG_EVENT,
                                         #endif 
                                         NULL
                                       };

source/scripts/init/c_registration/Makefile.am

@@ -133,5 +133,5 @@ if ENABLE_HOTSPOT_SERVICE
 15_hotspot_SOURCES = 15_hotspot.c
 endif
 if ONESTACK_PRODUCT_REQ
-LDFLAGS += -lrdkb_feature_mode_gate -ldevicemode
+LDFLAGS += -lrdkb_feature_mode_gate
 endif

source/scripts/init/service.d/service_crond.sh

@@ -120,7 +120,7 @@ service_start ()
       echo "1 */12 * * *   /usr/ccsp/tad/FileHandle_Monitor.sh" >> $CRONTAB_FILE
 
 
-      if [ "$MODEL_NUM" = "DPC3941B" ] || [ "$MODEL_NUM" = "DPC3939B" ] || [ "$MODEL_NUM" = "CGA4131COM" ] || [ "$MODEL_NUM" = "CGA4332COM" ]  || [ "$MODEL_NUM" = "SG417DBCT" ]; then
+      if [ "$MODEL_NUM" = "DPC3941B" ] || [ "$MODEL_NUM" = "DPC3939B" ] || [ "$MODEL_NUM" = "CGA4131COM" ] || [ "$MODEL_NUM" = "CGA4332COM" ]; then
             echo "*/15 * * * *  /usr/ccsp/tad/log_staticIP_client_info.sh" >> $CRONTAB_FILE
       fi
 

source/scripts/init/service.d/service_registration_functions.sh

@@ -306,7 +306,6 @@ sm_register_one_event() {
    if [ "NULL" = "$SMR_EVENT" ] ; then
       return 0
    fi
-   echo "[DEBUG] sm_rm_event ${SMR_SERVICE} ${SMR_EVENT_NAME}"
    # if this service has already registered for this event, then cancel the previous registration
    # this is probably overkill since we likely already called sm_unregister, but better safe than sorry
    sm_rm_event "${SMR_SERVICE}" "${SMR_EVENT_NAME}"
@@ -445,7 +444,6 @@ sm_register() {
       IFS=';'
       for custom in $SM_CUSTOM_EVENTS ; do
          if [ -n "$custom" ] && [ " " != "$custom" ] ; then
-	    echo "[DHCPV6][DEBUG] Registering custom event: '$custom' for service '$SM_SERVICE'"
             IFS=$SAVEIFS
             sm_register_one_event "$SM_SERVICE" "$custom"
             IFS=';'

source/service_ipv6/Makefile.am

@@ -26,7 +26,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/source/include \
 AM_LDFLAGS = -lccsp_common -lsecure_wrapper $(DBUS_LIBS)
 
 if ONESTACK_PRODUCT_REQ
-AM_LDFLAGS += -ldevicemode -lonestack_syscfg -lonestack_log -lrdkb_feature_mode_gate
+AM_LDFLAGS += -lrdkb_feature_mode_gate
 endif
 service_ipv6_SOURCES = service_ipv6.c service_ipv6_main.c
 

source/service_routed/Makefile.am

@@ -46,7 +46,7 @@ service_routed_LDADD = $(top_builddir)/source/util/utils/libutopiautil.la \
                        -ltelemetry_msgsender
 service_routed_LDFLAGS = -L${PKG_CONFIG_SYSROOT_DIR}${libdir}
 if ONESTACK_PRODUCT_REQ
-service_routed_LDFLAGS += -ldevicemode -lonestack_syscfg -lonestack_log -lrdkb_feature_mode_gate
+service_routed_LDFLAGS += -lrdkb_feature_mode_gate
 endif
 if CORE_NET_LIB_FEATURE_SUPPORT
 service_routed_LDFLAGS += -lnet

source/util/utils/Makefile.am

@@ -26,6 +26,4 @@ libutopiautil_la_CPPFLAGS = -I$(top_srcdir)/source/include \
                              $(DBUS_CFLAGS)
 
 libutopiautil_la_LDFLAGS = -lccsp_common $(DBUS_LIBS)
-if ONESTACK_PRODUCT_REQ
-libutopiautil_la_LDFLAGS += -ldevicemode -lonestack_syscfg -lonestack_log -lrdkb_feature_mode_gate
-endif
+