no_device=1
proto_config_add_string "device:device"
proto_config_add_string apn
+ proto_config_add_string v6apn
proto_config_add_string auth
proto_config_add_string username
proto_config_add_string password
proto_config_add_string modes
proto_config_add_string pdptype
proto_config_add_int profile
+ proto_config_add_int v6profile
proto_config_add_boolean dhcp
proto_config_add_boolean dhcpv6
proto_config_add_boolean autoconnect
proto_qmi_setup() {
local interface="$1"
local dataformat connstat plmn_mode mcc mnc
- local device apn auth username password pincode delay modes pdptype
- local profile dhcp dhcpv6 autoconnect plmn timeout mtu $PROTO_DEFAULT_OPTIONS
+ local device apn v6apn auth username password pincode delay modes pdptype
+ local profile v6profile dhcp dhcpv6 autoconnect plmn timeout mtu $PROTO_DEFAULT_OPTIONS
local ip4table ip6table
local cid_4 pdh_4 cid_6 pdh_6
local ip_6 ip_prefix_length gateway_6 dns1_6 dns2_6
- json_get_vars device apn auth username password pincode delay modes
- json_get_vars pdptype profile dhcp dhcpv6 autoconnect plmn ip4table
+ json_get_vars device apn v6apn auth username password pincode delay modes
+ json_get_vars pdptype profile v6profile dhcp dhcpv6 autoconnect plmn ip4table
json_get_vars ip6table timeout mtu $PROTO_DEFAULT_OPTIONS
[ "$timeout" = "" ] && timeout="10"
echo "Waiting for SIM initialization"
local uninitialized_timeout=0
+ # timeout 3s for first call to avoid hanging uqmi
+ uqmi -d "$device" --get-pin-status -t 3000 > /dev/null 2>&1
while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
[ -e "$device" ] || return 1
if [ "$uninitialized_timeout" -lt "$timeout" -o "$timeout" = "0" ]; then
fi
done
+ # Check if UIM application is stuck in illegal state
+ local uim_state_timeout=0
+ while true; do
+ json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
+ json_get_var card_application_state card_application_state
+
+ # SIM card is either completely absent or state is labeled as illegal
+ # Try to power-cycle the SIM card to recover from this state
+ if [ -z "$card_application_state" -o "$card_application_state" = "illegal" ]; then
+ echo "SIM in illegal state - Power-cycling SIM"
+
+ # Try to reset SIM application
+ uqmi -d "$device" --uim-power-off --uim-slot 1
+ sleep 3
+ uqmi -d "$device" --uim-power-on --uim-slot 1
+
+ if [ "$uim_state_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
+ let uim_state_timeout++
+ sleep 1
+ continue
+ fi
+
+ # Recovery failed
+ proto_notify_error "$interface" SIM_ILLEGAL_STATE
+ proto_block_restart "$interface"
+ return 1
+ else
+ break
+ fi
+ done
+
if uqmi -s -d "$device" --uim-get-sim-state | grep -q '"Not supported"\|"Invalid QMI command"' &&
uqmi -s -d "$device" --get-pin-status | grep -q '"Not supported"\|"Invalid QMI command"' ; then
[ -n "$pincode" ] && {
}
}
else
- . /usr/share/libubox/jshn.sh
- json_load "$(uqmi -s -d "$device" --get-pin-status)" 2>&1 | grep -q Failed &&
- json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
+ json_load "$(uqmi -s -d "$device" --get-pin-status)"
json_get_var pin1_status pin1_status
+ if [ -z "$pin1_status" ]; then
+ json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
+ json_get_var pin1_status pin1_status
+ fi
json_get_var pin1_verify_tries pin1_verify_tries
case "$pin1_status" in
return 1
;;
esac
+ json_cleanup
fi
if [ -n "$plmn" ]; then
# Cleanup current state if any
uqmi -s -d "$device" --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
+ uqmi -s -d "$device" --set-ip-family ipv6 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
# Go online
uqmi -s -d "$device" --set-device-operating-mode online > /dev/null 2>&1
fi
proto_notify_error "$interface" NETWORK_REGISTRATION_FAILED
- proto_block_restart "$interface"
return 1
done
echo "Starting network $interface"
- pdptype=$(echo "$pdptype" | awk '{print tolower($0)}')
+ pdptype="$(echo "$pdptype" | awk '{print tolower($0)}')"
+
[ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip"
if [ "$pdptype" = "ip" ]; then
fi
# Check data connection state
- connstat=$(uqmi -s -d "$device" --get-data-status)
+ connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" --get-data-status)
[ "$connstat" == '"connected"' ] || {
echo "No data link!"
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null 2>&1
+ : "${v6apn:=${apn}}"
+ : "${v6profile:=${profile}}"
+
pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
--start-network \
- ${apn:+--apn $apn} \
- ${profile:+--profile $profile} \
+ ${v6apn:+--apn $v6apn} \
+ ${v6profile:+--profile $v6profile} \
${auth:+--auth-type $auth} \
${username:+--username $username} \
${password:+--password $password} \
fi
# Check data connection state
- connstat=$(uqmi -s -d "$device" --get-data-status)
+ connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 --get-data-status)
[ "$connstat" == '"connected"' ] || {
echo "No data link!"
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
json_init
json_add_string name "${interface}_6"
json_add_string ifname "@$interface"
+ [ "$pdptype" = "ipv4v6" ] && json_add_string iface_464xlat "0"
json_add_string proto "dhcpv6"
[ -n "$ip6table" ] && json_add_string ip6table "$ip6table"
proto_add_dynamic_defaults