proto_config_add_string auth
proto_config_add_string username
proto_config_add_string password
- proto_config_add_boolean dhcp
+ [ -e /proc/sys/net/ipv6 ] && proto_config_add_string ipv6
+ proto_config_add_string dhcp
+ proto_config_add_string dhcpv6
proto_config_add_string pdptype
+ proto_config_add_int mtu
proto_config_add_defaults
}
+_proto_mbim_get_field() {
+ local field="$1"
+ shift
+ local mbimconfig="$@"
+ echo "$mbimconfig" | while read -r line; do
+ variable=${line%%:*}
+ [ "$variable" = "$field" ] || continue;
+ value=${line##* }
+ echo -n "$value "
+ done
+}
+
_proto_mbim_setup() {
local interface="$1"
local tid=2
local ret
- local device apn pincode delay allow_roaming allow_partner dhcp pdptype $PROTO_DEFAULT_OPTIONS
- json_get_vars device apn pincode delay auth username password allow_roaming allow_partner dhcp pdptype $PROTO_DEFAULT_OPTIONS
+ local device apn pincode delay auth username password allow_roaming allow_partner
+ local dhcp dhcpv6 pdptype ip4table ip6table mtu $PROTO_DEFAULT_OPTIONS
+ json_get_vars device apn pincode delay auth username password allow_roaming allow_partner
+ json_get_vars dhcp dhcpv6 pdptype ip4table ip6table mtu $PROTO_DEFAULT_OPTIONS
+
+ [ ! -e /proc/sys/net/ipv6 ] && ipv6=0 || json_get_var ipv6 ipv6
[ -n "$ctl_device" ] && device=$ctl_device
tid=$((tid + 1))
echo "mbim[$$]" "Checking pin"
- umbim $DBG -n -t $tid -d $device pinstate
- [ $? -eq 2 ] && {
- echo "mbim[$$]" "PIN required"
- tid=$((tid + 1))
- umbim $DBG -t $tid -d "$device" disconnect
- proto_notify_error "$interface" PIN_FAILED
- proto_block_restart "$interface"
- return 1
+ local pinstate="/var/run/mbim.$$.pinstate"
+ umbim $DBG -n -t $tid -d $device pinstate > "$pinstate" 2>&1 || {
+ local pin=$(awk '$2=="pin:" {print $5}' "$pinstate")
+ # we only need pin1 (the SIM pin) to connect
+ [ "$pin" = "pin1" ] && {
+ echo "mbim[$$]" "PIN required"
+ tid=$((tid + 1))
+ umbim $DBG -t $tid -d "$device" disconnect
+ proto_notify_error "$interface" PIN_FAILED
+ proto_block_restart "$interface"
+ return 1
+ }
}
tid=$((tid + 1))
tid=$((tid + 1))
pdptype=$(echo "$pdptype" | awk '{print tolower($0)}')
+ [ "$ipv6" = 0 ] && pdptype="ipv4"
local req_pdptype="" # Pass "default" PDP type to umbim if unconfigured
[ "$pdptype" = "ipv4" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && req_pdptype="$pdptype:"
echo "mbim[$$]" "Connected"
- if [ -z "$dhcp" -o "$dhcp" = 0 ]; then
- echo "mbim[$$]" "Setting up $ifname"
- eval $(umbim $DBG -n -t $tid -d $device config | sed 's/: /=/g')
- tid=$((tid + 1))
+ local zone="$(fw3 -q network "$interface" 2>/dev/null)"
- proto_init_update "$ifname" 1
- proto_send_update "$interface"
+ echo "mbim[$$]" "Setting up $ifname"
+ local mbimconfig="$(umbim $DBG -n -t $tid -d $device config)"
+ echo "$mbimconfig"
+ tid=$((tid + 1))
+
+ proto_init_update "$ifname" 1
+ proto_add_data
+ json_add_int tid $tid
+ proto_close_data
+ proto_send_update "$interface"
- [ "$iptype" != "ipv6" ] && {
- json_init
- json_add_string name "${interface}_4"
- json_add_string ifname "@$interface"
+ [ -z "$dhcp" ] && dhcp="auto"
+ [ -z "$dhcpv6" ] && dhcpv6="auto"
+
+ [ "$iptype" != "ipv6" ] && {
+ json_init
+ json_add_string name "${interface}_4"
+ json_add_string ifname "@$interface"
+ ipv4address=$(_proto_mbim_get_field ipv4address "$mbimconfig")
+ if [ -n "$ipv4address" -a "$dhcp" != 1 ]; then
json_add_string proto "static"
+
json_add_array ipaddr
- json_add_string "" "$ipv4address"
+ for address in $ipv4address; do
+ json_add_string "" "$address"
+ done
json_close_array
- json_add_string gateway "$ipv4gateway"
+
+ json_add_string gateway $(_proto_mbim_get_field ipv4gateway "$mbimconfig")
+ elif [ "$dhcp" != 0 ]; then
+ echo "mbim[$$]" "Starting DHCP on $ifname"
+ json_add_string proto "dhcp"
+ fi
+
+ [ "$peerdns" = 0 -a "$dhcp" != 1 ] || {
json_add_array dns
- json_add_string "" "$ipv4dnsserver"
+ for server in $(_proto_mbim_get_field ipv4dnsserver "$mbimconfig"); do
+ json_add_string "" "$server"
+ done
json_close_array
- proto_add_dynamic_defaults
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
}
- [ "$iptype" != "ipv4" ] && {
- json_init
- json_add_string name "${interface}_6"
- json_add_string ifname "@$interface"
+ proto_add_dynamic_defaults
+ [ -n "$zone" ] && json_add_string zone "$zone"
+ [ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
+ json_close_object
+ ubus call network add_dynamic "$(json_dump)"
+ }
+
+ [ "$iptype" != "ipv4" ] && {
+ json_init
+ json_add_string name "${interface}_6"
+ json_add_string ifname "@$interface"
+ ipv6address=$(_proto_mbim_get_field ipv6address "$mbimconfig")
+ if [ -n "$ipv6address" -a "$dhcpv6" != 1 ]; then
json_add_string proto "static"
+
json_add_array ip6addr
- json_add_string "" "$ipv6address"
+ for address in $ipv6address; do
+ json_add_string "" "$address"
+ done
json_close_array
- json_add_string ip6gw "$ipv6gateway"
- json_add_array dns
- json_add_string "" "$ipv6dnsserver"
+
+ json_add_array ip6prefix
+ for address in $ipv6address; do
+ json_add_string "" "$address"
+ done
json_close_array
- proto_add_dynamic_defaults
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
- }
- else
- echo "mbim[$$]" "Starting DHCP on $ifname"
- proto_init_update "$ifname" 1
- proto_send_update "$interface"
-
- [ "$pdptype" = "ipv4" -o "$pdptype" = "ipv4v6" ] && {
- json_init
- json_add_string name "${interface}_4"
- json_add_string ifname "@$interface"
- json_add_string proto "dhcp"
- proto_add_dynamic_defaults
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
- }
- [ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
- json_init
- json_add_string name "${interface}_6"
- json_add_string ifname "@$interface"
+ json_add_string ip6gw $(_proto_mbim_get_field ipv6gateway "$mbimconfig")
+
+ elif [ "$dhcpv6" != 0 ]; then
+ echo "mbim[$$]" "Starting DHCPv6 on $ifname"
json_add_string proto "dhcpv6"
json_add_string extendprefix 1
- proto_add_dynamic_defaults
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
+ fi
+
+ [ "$peerdns" = 0 -a "$dhcpv6" != 1 ] || {
+ json_add_array dns
+ for server in $(_proto_mbim_get_field ipv6dnsserver "$mbimconfig"); do
+ json_add_string "" "$server"
+ done
+ json_close_array
}
- fi
- uci_set_state network $interface tid "$tid"
+ proto_add_dynamic_defaults
+ [ -n "$zone" ] && json_add_string zone "$zone"
+ [ -n "$ip6table" ] && json_add_string ip6table "$ip6table"
+ json_close_object
+ ubus call network add_dynamic "$(json_dump)"
+ }
+
+ [ -z "$mtu" ] && {
+ local ipv4mtu=$(_proto_mbim_get_field ipv4mtu "$mbimconfig")
+ ipv4mtu="${ipv4mtu:-0}"
+ local ipv6mtu=$(_proto_mbim_get_field ipv6mtu "$mbimconfig")
+ ipv6mtu="${ipv6mtu:-0}"
+
+ mtu=$((ipv6mtu > ipv4mtu ? ipv6mtu : ipv4mtu))
+ }
+ [ -n "$mtu" -a "$mtu" != 0 ] && {
+ echo Setting MTU of $ifname to $mtu
+ /sbin/ip link set dev $ifname mtu $mtu
+ }
}
proto_mbim_setup() {
_proto_mbim_setup $@
ret=$?
+ rm -f "/var/run/mbim.$$."*
+
[ "$ret" = 0 ] || {
logger "mbim bringup failed, retry in 15s"
sleep 15
proto_mbim_teardown() {
local interface="$1"
- local device
- json_get_vars device
- local tid=$(uci_get_state network $interface tid)
+ local device tid
+ json_get_vars device tid
[ -n "$ctl_device" ] && device=$ctl_device
echo "mbim[$$]" "Stopping network"
- [ -n "$tid" ] && {
- umbim $DBG -t $tid -d "$device" disconnect
- uci_revert_state network $interface tid
- }
+ [ -n "$tid" ] && umbim $DBG -t $tid -d "$device" disconnect
proto_init_update "*" 0
proto_send_update "$interface"
projects / openwrt / staging / jow.git / blobdiff