fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan/ofono: also recognize connman's "Powered" property

Browse source 
This property "controls [oFono] whether packet radio use is allowed". It
makes sense to consider the value of FALSE to mean DISABLED.
This commit is contained in:
Ratchanan Srirattanamet 2022-09-15 01:49:52 +07:00 • committed by Thomas Haller
parent ffbb8d2f51
commit 5abc6f5911
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/devices/wwan/nm-modem-ofono.c
View file

@ -56,6 +56,7 @@ typedef struct {
char *imsi;
gboolean modem_online;
gboolean connman_powered;
gboolean gprs_attached;
NML3ConfigData *l3cd_4;
@ -150,13 +151,16 @@ update_modem_state(NMModemOfono *self)
NMModemState new_state = NM_MODEM_STATE_DISABLED;
const char *reason = NULL;
_LOGI("'Attached': %s 'Online': %s 'IMSI': %s",
_LOGI("'Attached': %s 'Online': %s 'Powered': %s 'IMSI': %s",
priv->gprs_attached ? "true" : "false",
priv->modem_online ? "true" : "false",
priv->connman_powered ? "true" : "false",
priv->imsi);
if (priv->modem_online == FALSE) {
reason = "modem 'Online=false'";
} else if (priv->connman_powered == FALSE) {
reason = "ConnectionManager 'Powered=false'";
} else if (priv->imsi == NULL && state != NM_MODEM_STATE_ENABLING) {
reason = "modem not ready";
} else if (priv->gprs_attached == FALSE) {
@ -516,6 +520,19 @@ handle_connman_property(GDBusProxy *proxy, const char *property, GVariant *v, gp
old_attached ? "true" : "false",
attached ? "true" : "false");
update_modem_state(self);
}
} else if (nm_streq(property, "Powered") && VARIANT_IS_OF_TYPE_BOOLEAN(v)) {
gboolean powered = g_variant_get_boolean(v);
gboolean old_powered = priv->connman_powered;
_LOGD("Powered: %s", powered ? "True" : "False");
if (old_powered != powered) {
priv->connman_powered = powered;
_LOGI("Powered %s -> %s", old_powered ? "true" : "false", powered ? "true" : "false");
update_modem_state(self);
}
}