Revert "RDKB-62644:Listen on br-home and wwan0 for XLEs" #161
Conversation
This reverts commit 5956d5a.
There was a problem hiding this comment.
Pull request overview
This PR reverts changes from PR #152 that were merged by mistake. The revert removes WNXL11BWL-specific SSH configuration and restores previous code patterns.
Key Changes:
- Removes WNXL11BWL device-specific SSH listening configuration block (lines 210-222 in original)
- Removes WNXL11BWL from device type conditional check (line 257)
- Reverts variable comparison quoting and echo command changes (lines 51, 258)
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| LANIPV6Support=`sysevent get LANIPv6GUASupport` | ||
| DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') | ||
| if [ "$DEVICETYPE" = "TEST" ] && [ "$USE_DYNAMICKEYING" = "TRUE" ]; then | ||
| if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then |
There was a problem hiding this comment.
The removal of quotes around variable comparisons makes the script vulnerable to errors when variables are empty or contain spaces. Shell scripts should quote variables in comparisons to prevent word splitting and glob expansion. This pattern is inconsistent with the rest of the file which consistently uses quoted variables (e.g., line 59: [ "$BOX_TYPE" = "HUB4" ]).
| if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then | |
| if [ "$DEVICETYPE" = "TEST" ] && [ "$USE_DYNAMICKEYING" = "TRUE" ]; then |
| if ([ "$MANUFACTURE" = "Technicolor" ] || [ "$MODEL_NUM" = "SG417DBCT" ] || [ "$BOX_TYPE" = "WNXL11BWL" ]) ; then | ||
| echo_t "dropbear -E -s -K 60 -b /etc/sshbanner.txt ${commandString} -r ${DROPBEAR_PARAMS_1} -r ${DROPBEAR_PARAMS_2} -a -P ${PID_FILE}" | ||
| if ([ "$MANUFACTURE" = "Technicolor" ] || [ "$MODEL_NUM" = "SG417DBCT" ]) ; then | ||
| echo dropbear -E -s -K 60 -b /etc/sshbanner.txt ${commandString} -r ${DROPBEAR_PARAMS_1} -r ${DROPBEAR_PARAMS_2} -a -P ${PID_FILE} |
There was a problem hiding this comment.
The change from echo_t to plain echo is inconsistent with the rest of the file. Throughout this script, echo_t is used for logging purposes (see lines 53, 56, 242, 246, 248, 252, 254, 270, 273, 275, etc.). Using plain echo here means this debug statement won't be properly logged with timestamps like other messages in the script.
| echo dropbear -E -s -K 60 -b /etc/sshbanner.txt ${commandString} -r ${DROPBEAR_PARAMS_1} -r ${DROPBEAR_PARAMS_2} -a -P ${PID_FILE} | |
| echo_t dropbear -E -s -K 60 -b /etc/sshbanner.txt ${commandString} -r ${DROPBEAR_PARAMS_1} -r ${DROPBEAR_PARAMS_2} -a -P ${PID_FILE} |
Reverts #152. Merged by mistake