Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

umbim: support multiple-valued configuration fields

Browse source 
MBIM supports multiple values for IP address and DNS server, and such
configuration is available through output of MBIM. Use new helper
method to support adding multiple addresses and DNS servers to static
interfaces for both IPv4 and IPv6.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
This commit is contained in:
Lech Perczak 2021-11-06 13:35:15 +01:00 committed by Hauke Mehrtens
parent f01fff63fb
commit c13a1b412b
1 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
View file

@ -203,18 +203,29 @@ _proto_mbim_setup() {
[ -z "$dhcpv6" ] && dhcpv6=1 [ -z "$dhcpv6" ] && dhcpv6=1
[ "$iptype" != "ipv6" ] && { [ "$iptype" != "ipv6" ] && {
ipv4address=$(_proto_mbim_get_field ipv4address "$mbimconfig")
if [ -n "$ipv4address" ]; then if [ -n "$ipv4address" ]; then
json_init json_init
json_add_string name "${interface}_4" json_add_string name "${interface}_4"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "static" json_add_string proto "static"
json_add_array ipaddr json_add_array ipaddr
json_add_string "" "$ipv4address" for address in $ipv4address; do
json_close_array json_add_string "" "$address"
json_add_string gateway "$ipv4gateway" done
json_add_array dns
[ "$peerdns" = 0 ] || json_add_string "" "$ipv4dnsserver"
json_close_array json_close_array
json_add_string gateway $(_proto_mbim_get_field ipv4gateway "$mbimconfig")
[ "$peerdns" = 0 ] || {
json_add_array dns
for server in $(_proto_mbim_get_field ipv4dnsserver "$mbimconfig"); do
json_add_string "" "$server"
done
json_close_array
}
proto_add_dynamic_defaults proto_add_dynamic_defaults
[ -n "$zone" ] && json_add_string zone "$zone" [ -n "$zone" ] && json_add_string zone "$zone"
[ -n "$ip4table" ] && json_add_string ip4table "$ip4table" [ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
@ -235,18 +246,29 @@ _proto_mbim_setup() {
} }
[ "$iptype" != "ipv4" ] && { [ "$iptype" != "ipv4" ] && {
ipv6address=$(_proto_mbim_get_field ipv6address "$mbimconfig")
if [ -n "$ipv6address" ]; then if [ -n "$ipv6address" ]; then
json_init json_init
json_add_string name "${interface}_6" json_add_string name "${interface}_6"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "static" json_add_string proto "static"
json_add_array ip6addr json_add_array ip6addr
json_add_string "" "$ipv6address" for address in $ipv6address; do
json_close_array json_add_string "" "$address"
json_add_string ip6gw "$ipv6gateway" done
json_add_array dns
[ "$peerdns" = 0 ] || json_add_string "" "$ipv6dnsserver"
json_close_array json_close_array
json_add_string ip6gw $(_proto_mbim_get_field ipv6gateway "$mbimconfig")
[ "$peerdns" = 0 ] || {
json_add_array dns
for server in $(_proto_mbim_get_field ipv6dnsserver "$mbimconfig"); do
json_add_string "" "$server"
done
json_close_array
}
proto_add_dynamic_defaults proto_add_dynamic_defaults
[ -n "$zone" ] && json_add_string zone "$zone" [ -n "$zone" ] && json_add_string zone "$zone"
[ -n "$ip6table" ] && json_add_string ip6table "$ip6table" [ -n "$ip6table" ] && json_add_string ip6table "$ip6table"