him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-16 16:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

wwan: Bugfixes in interface handling and replacement of deprecated commands

Browse Source 
**BUGFIX***:
`ls "$devpath/net"` can potentially return multiple interfaces, limit it to one using `head -n 1`

`ifname6` initialization bug:
  - Now properly initializes `ifname6="$ifname4"` before the multiplexing check
  - The previous logic could leave `ifname6` unset if `multiplexing != 1` and `${ifname}_2` didn't exist

**IMPROVEMENTS**:
Replace deprecated `ifconfig` with modern `ip` commands:
  - `ifconfig "$ifname" up` → `ip link set "$ifname" up`
  - `/sbin/ip link set dev` → `ip link set dev` (removed hardcoded path)

Interface existence checks:
  - Replaced `ifconfig "${ifname}_1" &>"/dev/null"` check with `[ -r "/sys/class/net/${ifname}_1" ]`
  - This avoids spawning external processes and uses filesystem checks instead

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2025-07-09 22:22:59 -04:00
parent a688db7c58
commit af8601299e
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wwan/utils/quectel-cm/files/quectel.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# shellcheck shell=busybox disable=3043,2166,3037,3036
# shellcheck shell=busybox disable=1091,3043,2166,3037,3036
[ -n "$INCLUDE_ONLY" ] || {
. /lib/functions.sh
@ -93,7 +93,8 @@ proto_quectel_setup() {
devname="$(basename "$device")"
devpath="$(readlink -f "/sys/class/usbmisc/$devname/device/")"
ifname="$(ls "$devpath/net" 2>"/dev/null")"
# shellcheck disable=2012
ifname="$(ls "$devpath/net" 2>"/dev/null" | head -n 1)"
[ -n "$ifname" ] || {
echo "The interface could not be found."
proto_notify_error "$interface" NO_IFACE
@ -124,27 +125,25 @@ proto_quectel_setup() {
sleep 5
ifconfig "$ifname" up
ip link set "$ifname" up
ifname4="$ifname"
# If $ifname_1 is not a valid device set $ifname4 to base $ifname as fallback
# so modems not using RMNET/QMAP data aggregation still set up properly. QMAP
# can be set via qmap_mode=n parameter during qmi_wwan_q module loading.
if ifconfig "${ifname}_1" &>"/dev/null"; then
ifname4="${ifname}_1"
else
ifname4="$ifname"
fi
[ -r "/sys/class/net/${ifname}_1" ] && ifname4="${ifname}_1"
if [ "$multiplexing" = 1 ]; then
ifconfig "${ifname}_2" &>"/dev/null" && ifname6="${ifname}_2"
else
ifname6="$ifname4"
ifname6="$ifname4"
if [ "$multiplexing" = 1 ] && [ -r "/sys/class/net/${ifname}_2" ]; then
ifname6="${ifname}_2"
fi
if [ -n "$mtu" ]; then
echo "Setting MTU to $mtu"
/sbin/ip link set dev "$ifname4" mtu "$mtu"
[ "$multiplexing" = 1 ] && /sbin/ip link set dev "$ifname6" mtu "$mtu"
ip link set dev "$ifname4" mtu "$mtu"
[ "$multiplexing" = 1 ] && ip link set dev "$ifname6" mtu "$mtu"
fi
echo "Setting up $ifname"