-
Notifications
You must be signed in to change notification settings - Fork 41
Revert "RDKB-62644:Listen on br-home and wwan0 for XLEs" #161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -48,7 +48,7 @@ WAN_INTERFACE=$(getWanInterfaceName) | |||||
| DEFAULT_WAN_INTERFACE="erouter0" | ||||||
| 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 | ||||||
| USE_DEVKEYS="-f authorized_keys_dev" | ||||||
| echo_t "[utopia]: dropbear using dev authorization keys" | ||||||
| else | ||||||
|
|
@@ -207,19 +207,6 @@ do_start() { | |||||
| if [ ! -z "$CM_IPV4" ]; then | ||||||
| commandString="$commandString -p [$CM_IPV4]:22" | ||||||
| fi | ||||||
| elif [ "$BOX_TYPE" = "WNXL11BWL" ]; then | ||||||
| CM_IP=`ip -4 addr show dev $CMINTERFACE scope global | awk '/inet/{print $2}' | cut -d '/' -f1 | head -n1` | ||||||
| if [ ! -z $CM_IP ]; then | ||||||
| commandString="$commandString -p [$CM_IP]:22" | ||||||
| fi | ||||||
| CM_IPv6=`ip -6 addr show dev wwan0 scope global | awk '/inet/{print $2}' | cut -d '/' -f1 | head -n1` | ||||||
| if [ ! -z $CM_IPv6 ]; then | ||||||
| commandString="$commandString -p [$CM_IPv6]:22" | ||||||
| fi | ||||||
| CM_IPv4=`ip -4 addr show dev wwan0 scope global | awk '/inet/{print $2}' | cut -d '/' -f1 | head -n1` | ||||||
| if [ ! -z $CM_IPv4 ]; then | ||||||
| commandString="$commandString -p [$CM_IPv4]:22" | ||||||
| fi | ||||||
| else | ||||||
| CM_IP="" | ||||||
| if ([ "$BOX_TYPE" = "rpi" ] || [ "$BOX_TYPE" = "bpi" ]) ;then | ||||||
|
|
@@ -267,8 +254,8 @@ do_start() { | |||||
| echo_t "utopia: dropbear could not be started on erouter0 IPv6 interface." | ||||||
| fi | ||||||
| else | ||||||
| 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} | ||||||
|
||||||
| 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} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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" ]).