uqmi: evaluate pin-status output in qmi_setup function

Load the json output from uqmi --get-pin-status command and evaluate the
"pin1_status" value.

The following uqmi "pin1_status" values are evaluated:

- disabled
  Do not verify PIN because SIM verification is disabled on this SIM

- blocked
  Stop qmi_setup because SIM is locked and a PUK is required

- not_verified
  SIM is not yet verified. Do a uqmi --verify-pin1 command if a SIM is
  specified

- verified:
  Do not verify the PIN because this was already done before

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(backported from 4b80bd878d)
This commit is contained in:
Florian Eckert 2018-04-10 12:55:11 +02:00 committed by Jo-Philipp Wich
parent 5a3810b386
commit 4f02bee9bb

View File

@ -83,6 +83,7 @@ proto_qmi_setup() {
fi fi
done done
if uqmi -s -d "$device" --get-pin-status | grep '"Not supported"' > /dev/null; then
[ -n "$pincode" ] && { [ -n "$pincode" ] && {
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null || { uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null || {
echo "Unable to verify PIN" echo "Unable to verify PIN"
@ -91,6 +92,47 @@ proto_qmi_setup() {
return 1 return 1
} }
} }
else
. /usr/share/libubox/jshn.sh
json_load "$(uqmi -s -d "$device" --get-pin-status)"
json_get_var pin1_status pin1_status
case "$pin1_status" in
disabled)
echo "PIN verification is disabled"
;;
blocked)
echo "SIM locked PUK required"
proto_notify_error "$interface" PUK_NEEDED
proto_block_restart "$interface"
return 1
;;
not_verified)
if [ -n "$pincode" ]; then
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null 2>&1 || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null 2>&1 || {
echo "Unable to verify PIN"
proto_notify_error "$interface" PIN_FAILED
proto_block_restart "$interface"
return 1
}
else
echo "PIN not specified but required"
proto_notify_error "$interface" PIN_NOT_SPECIFIED
proto_block_restart "$interface"
return 1
fi
;;
verified)
echo "PIN already verified"
;;
*)
echo "PIN status failed ($pin1_status)"
proto_notify_error "$interface" PIN_STATUS_FAILED
proto_block_restart "$interface"
return 1
;;
esac
fi
[ -n "$plmn" ] && { [ -n "$plmn" ] && {
local mcc mnc local mcc mnc