RDK-59247: cleaning up network scripts. #402

bpunnuru · 2025-12-19T19:27:09Z

No description provided.

Copilot

Pull request overview

This PR refactors network script functionality by inlining code from updateGlobalIPInfo.sh directly into the dispatcher scripts, eliminating external script invocations and improving script organization.

Key Changes

Refactored updateGlobalIPInfo.sh functionality into inline functions within NM_preDown.sh and NM_Dispatcher.sh
Replaced external script calls with direct function invocations for better performance
Added helper functions refresh_devicedetails(), check_valid_IPaddress(), and update_global_ip_info_{add,delete}() to both scripts

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 12 comments.

File	Description
lib/rdk/NM_preDown.sh	Added three helper functions and replaced external `updateGlobalIPInfo.sh` calls with inline `update_global_ip_info_delete()` function for handling IP address deletion
lib/rdk/NM_Dispatcher.sh	Added three helper functions and replaced external `updateGlobalIPInfo.sh` calls with inline `update_global_ip_info_add()` function for handling IP address addition

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/rdk/NM_preDown.sh

Copilot · 2025-12-19T19:31:58Z

lib/rdk/NM_Dispatcher.sh

+
+    NMdispatcherLog "update_global_ip_info: cmd:$cmd, mode:$mode, ifc:$ifc, addr:$addr, flags:$flags"
+
+    if [ "x$cmd" == "xadd" ] && [ "x$flags" == "xglobal" ]; then


Use single brackets '[' with '=' instead of double brackets '[[' with '==' for POSIX compliance in shell scripts. The current syntax is bash-specific, but the shebang indicates a generic sh interpreter.

Copilot · 2025-12-19T19:31:58Z

lib/rdk/NM_preDown.sh

+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then
+        autoIPTrunc=$(echo $addr | cut -d "." -f1-2)


The variable 'autoIPTrunc' is not declared as local, which could lead to variable leakage in the shell environment. Declare it with 'local' to keep it scoped to this function.

Suggested change

autoIPTrunc=$(echo $addr | cut -d "." -f1-2)

local autoIPTrunc=$(echo $addr | cut -d "." -f1-2)

Copilot · 2025-12-19T19:31:58Z

lib/rdk/NM_Dispatcher.sh

+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then
+        autoIPTrunc=$(echo $addr | cut -d "." -f1-2)


The variable 'autoIPTrunc' is not declared as local, which could lead to variable leakage in the shell environment. Declare it with 'local' to keep it scoped to this function.

Suggested change

autoIPTrunc=$(echo $addr | cut -d "." -f1-2)

local autoIPTrunc=$(echo $addr | cut -d "." -f1-2)

Copilot · 2025-12-19T19:31:58Z

lib/rdk/NM_preDown.sh

+
+    NMdispatcherLog "update_global_ip_info: cmd:$cmd, mode:$mode, ifc:$ifc, addr:$addr, flags:$flags"
+
+    if [ "x$cmd" == "xdelete" ] && [ "x$flags" == "xglobal" ]; then


Use single brackets '[' with '=' instead of double brackets '[[' with '==' for POSIX compliance in shell scripts. The current syntax is bash-specific, but the shebang indicates a generic sh interpreter.

Copilot · 2025-12-19T19:31:59Z

lib/rdk/NM_Dispatcher.sh

+        if [[ $addr == fc* || $addr == fd* ]]; then
+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then


Use single brackets '[' with '=' instead of double brackets '[[' with '==' for POSIX compliance in shell scripts. The current syntax is bash-specific, but the shebang indicates a generic sh interpreter.

Copilot · 2025-12-19T19:31:59Z

lib/rdk/NM_Dispatcher.sh

+        if [[ "$ifc" == "$ESTB_INTERFACE" || "$ifc" == "$DEFAULT_ESTB_INTERFACE" || "$ifc" == "$ESTB_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating Box/ESTB IP"
+            echo "$addr" > /tmp/.$mode$ESTB_INTERFACE
+            refresh_devicedetails "estb_ip"
+        elif [[ "$ifc" == "$MOCA_INTERFACE" || "$ifc" == "$MOCA_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating MoCA IP"
+            echo "$addr" > /tmp/.$mode$MOCA_INTERFACE
+            refresh_devicedetails "moca_ip"
+        elif [[ "$ifc" == "$WIFI_INTERFACE" || "$ifc" == "$WIFI_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating Wi-Fi IP"
+            echo "$addr" > /tmp/.$mode$WIFI_INTERFACE
+            refresh_devicedetails "boxIP"
+        fi


Use single brackets '[' with '=' instead of double brackets '[[' with '==' for POSIX compliance in shell scripts. The pattern matching in these conditions should use 'case' statements or be refactored to use single brackets with proper quoting.

Copilot · 2025-12-19T19:31:59Z

lib/rdk/NM_preDown.sh

+refresh_devicedetails()
+{
+    #Refresh device cache info
+    if [ -f /lib/rdk/getDeviceDetails.sh ]; then
+        sh /lib/rdk/getDeviceDetails.sh refresh $1
+    else
+        NMdispatcherLog "DeviceDetails file not present"
+    fi
+}
+
+check_valid_IPaddress()
+{
+    local mode=$1
+    local addr=$2
+    # Neglect IPV6 ULA address and autoconfigured IPV4 address
+    if [ "x$mode" == "xipv6" ]; then
+        if [[ $addr == fc* || $addr == fd* ]]; then
+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then
+        autoIPTrunc=$(echo $addr | cut -d "." -f1-2)
+        if [ "$autoIPTrunc" == "169.254" ]; then
+            return 1
+        fi
+    fi
+    return 0
+}


The code is duplicated between NM_preDown.sh and NM_Dispatcher.sh. Consider creating a shared library file that both scripts can source to avoid code duplication and improve maintainability.

Copilot · 2025-12-19T19:32:00Z

lib/rdk/NM_Dispatcher.sh

+refresh_devicedetails()
+{
+    #Refresh device cache info
+    if [ -f /lib/rdk/getDeviceDetails.sh ]; then
+        sh /lib/rdk/getDeviceDetails.sh refresh $1
+    else
+        NMdispatcherLog "DeviceDetails file not present"
+    fi
+}
+
+check_valid_IPaddress()
+{
+    local mode=$1
+    local addr=$2
+    # Neglect IPV6 ULA address and autoconfigured IPV4 address
+    if [ "x$mode" == "xipv6" ]; then
+        if [[ $addr == fc* || $addr == fd* ]]; then
+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then
+        autoIPTrunc=$(echo $addr | cut -d "." -f1-2)
+        if [ "$autoIPTrunc" == "169.254" ]; then
+            return 1
+        fi
+    fi
+    return 0
+}


The code is duplicated between NM_preDown.sh and NM_Dispatcher.sh. Consider creating a shared library file that both scripts can source to avoid code duplication and improve maintainability.

Copilot · 2025-12-19T19:32:00Z

lib/rdk/NM_preDown.sh

+    local mode=$1
+    local addr=$2
+    # Neglect IPV6 ULA address and autoconfigured IPV4 address
+    if [ "x$mode" == "xipv6" ]; then


Use single brackets '[' with '=' instead of double brackets '[[' with '==' for POSIX compliance in shell scripts. The current syntax is bash-specific, but the shebang indicates a generic sh interpreter.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

github-actions · 2025-12-19T21:16:31Z

Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.

I have read the CLA Document and I hereby sign the CLA

_{You can retrigger this bot by commenting recheck in this Pull Request.}_{Posted by the CLA Assistant Lite bot.}

Garpathi, Uday Krishna added 5 commits October 15, 2025 15:07

RDK-59247:Migrate Functionality In Network scripts To Core Modules

8dd5ab9

Merge branch 'develop' into topic/RDK-59247

2fafedf

Merge branch 'develop' into topic/RDK-59247

8ac42a4

Merge branch 'develop' into topic/RDK-59247

35adb09

Merge branch 'develop' into topic/RDK-59247

1f69450

Copilot AI review requested due to automatic review settings December 19, 2025 19:27

bpunnuru requested a review from a team as a code owner December 19, 2025 19:27

Copilot started reviewing on behalf of bpunnuru December 19, 2025 19:27 View session

Copilot AI reviewed Dec 19, 2025

View reviewed changes

Merge branch 'develop' into topic/RDK-59247

937d21f

udaykrishnag force-pushed the topic/RDK-59247 branch from 3ba3a68 to 937d21f Compare December 19, 2025 19:34

RDK-59247: cleaning up network scripts.

b86bfe3

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings December 19, 2025 21:16

Copilot AI reviewed Dec 19, 2025

View reviewed changes


		NMdispatcherLog "update_global_ip_info: cmd:$cmd, mode:$mode, ifc:$ifc, addr:$addr, flags:$flags"

		if [ "x$cmd" == "xadd" ] && [ "x$flags" == "xglobal" ]; then

	autoIPTrunc=$(echo $addr \| cut -d "." -f1-2)
	local autoIPTrunc=$(echo $addr \| cut -d "." -f1-2)


		NMdispatcherLog "update_global_ip_info: cmd:$cmd, mode:$mode, ifc:$ifc, addr:$addr, flags:$flags"

		if [ "x$cmd" == "xdelete" ] && [ "x$flags" == "xglobal" ]; then

RDK-59247: cleaning up network scripts. #402

Are you sure you want to change the base?

RDK-59247: cleaning up network scripts. #402

Uh oh!

Conversation

bpunnuru commented Dec 19, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants