mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

inteno-netmode: support netmode-conf without band (apply to both) ref #12898

Browse source
This commit is contained in:
Reidar Cederqvist 2017-09-20 11:34:07 +02:00
parent 7b1f241dda
commit fe23056560
1 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
inteno-netmodes/files/sbin/netmode-conf
View file

@ -150,12 +150,12 @@ local dummy band ssid key encryption device iface_num
while json_get_var dummy $i; do while json_get_var dummy $i; do
json_select $i json_select $i
json_get_var band band json_get_var band band
[ "$apcliband" == "$band" ] && break [ "$band" == "" -o "$apcliband" == "$band" ] && break
json_select .. json_select ..
i=$((i+1)) i=$((i+1))
done done
[ "$apcliband" == "$band" ] || { [ "$apcliband" == "$band" -o "$band" == "" ] || {
[ "$from_gui" == "true" ] && restore "back" [ "$from_gui" == "true" ] && restore "back"
exit exit
} }
@ -184,29 +184,50 @@ i=1
while json_get_var dummy $i; do while json_get_var dummy $i; do
json_select $i json_select $i
json_get_var band band json_get_var band band
get_device "$band" device
case $band in
a)
get_iface_num "$device" "$a_num" iface_num
a_num=$((a_num+1))
;;
b)
get_iface_num "$device" "$b_num" iface_num
b_num=$((b_num+1))
;;
esac
[ -z $iface_num ] && {
[ "$from_gui" == "true" ] && restore "back"
exit
}
json_get_var ssid ssid json_get_var ssid ssid
json_get_var encryption encryption json_get_var encryption encryption
json_get_var key key json_get_var key key
set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device" if [ "$band" == "" ]; then
json_select .. get_device "a" device
get_iface_num "$device" "$a_num" iface_num
a_num=$((a_num+1))
[ -z $iface_num ] && {
[ "$from_gui" == "true" ] && restore "back"
exit
}
set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
get_device "b" device
get_iface_num "$device" "$b_num" iface_num
b_num=$((b_num+1))
[ -z $iface_num ] && {
[ "$from_gui" == "true" ] && restore "back"
exit
}
set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
else
get_device "$band" device
case $band in
a)
get_iface_num "$device" "$a_num" iface_num
a_num=$((a_num+1))
;;
b)
get_iface_num "$device" "$b_num" iface_num
b_num=$((b_num+1))
;;
esac
[ -z $iface_num ] && {
[ "$from_gui" == "true" ] && restore "back"
exit
}
set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
fi
i=$((i+1)) i=$((i+1))
json_select ..
done done
i=$((b_num + a_num + 1))
if [ $repeater_iface_num -gt $i ]; then if [ $repeater_iface_num -gt $i ]; then
i=$((i-1)) i=$((i-1))
fi fi