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

Merge pull request #12775 from nickberry17/add_mm_err_messages

Browse source 
modemmanager: add error message notifications to proto handler
This commit is contained in:
Rosen Penev 2020-07-15 17:24:47 -07:00 committed by GitHub
commit 6b269abde8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/modemmanager/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager PKG_NAME:=modemmanager
PKG_VERSION:=1.14.0 PKG_VERSION:=1.14.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager

7
net/modemmanager/files/modemmanager.proto
View file

@ -327,6 +327,7 @@ modemmanager_disconnected_method_common() {
local interface="$1" local interface="$1"
echo "running disconnection (common)" echo "running disconnection (common)"
proto_notify_error "${interface}" MM_DISCONNECT_IN_PROGRESS
proto_init_update "*" 0 proto_init_update "*" 0
proto_send_update "${interface}" proto_send_update "${interface}"
@ -393,9 +394,11 @@ proto_modemmanager_setup() {
# setup connect args; APN mandatory (even if it may be empty) # setup connect args; APN mandatory (even if it may be empty)
echo "starting connection with apn '${apn}'..." echo "starting connection with apn '${apn}'..."
proto_notify_error "${interface}" MM_CONNECT_IN_PROGRESS
connectargs="apn=${apn}${iptype:+,ip-type=${iptype}}${cliauth:+,allowed-auth=${cliauth}}${username:+,user=${username}}${password:+,password=${password}}${pincode:+,pin=${pincode}}" connectargs="apn=${apn}${iptype:+,ip-type=${iptype}}${cliauth:+,allowed-auth=${cliauth}}${username:+,user=${username}}${password:+,password=${password}}${pincode:+,pin=${pincode}}"
mmcli --modem="${device}" --timeout 120 --simple-connect="${connectargs}" || { mmcli --modem="${device}" --timeout 120 --simple-connect="${connectargs}" || {
proto_notify_error "${interface}" CONNECT_FAILED proto_notify_error "${interface}" MM_CONNECT_FAILED
proto_block_restart "${interface}" proto_block_restart "${interface}"
return 1 return 1
} }
@ -497,6 +500,7 @@ proto_modemmanager_teardown() {
json_get_vars device lowpower iptype json_get_vars device lowpower iptype
echo "stopping network" echo "stopping network"
proto_notify_error "${interface}" MM_TEARDOWN_IN_PROGRESS
# load connected bearer information, just the first one should be ok # load connected bearer information, just the first one should be ok
modemstatus=$(mmcli --modem="${device}" --output-keyvalue) modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
@ -525,6 +529,7 @@ proto_modemmanager_teardown() {
# disable # disable
mmcli --modem="${device}" --disable mmcli --modem="${device}" --disable
proto_notify_error "${interface}" MM_MODEM_DISABLED
# low power, only if requested # low power, only if requested
[ "${lowpower:-0}" -lt 1 ] || [ "${lowpower:-0}" -lt 1 ] ||