From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============4342659181011139272==" MIME-Version: 1.0 From: Dragos Tatulea Subject: [PATCH] gprs: lte: set attached after successful activation Date: Tue, 22 Nov 2016 16:03:47 +0100 Message-ID: <1479827027-13985-1-git-send-email-dragos@endocode.com> List-Id: To: ofono@ofono.org --===============4342659181011139272== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Otherwise the attached state gets to be set before the actual LTE automatic context is ready. This triggers a race between connman and ofono: connman sees status attached before the context is active so connman will try to activate another context with same apn and will fail over and over again. --- src/gprs.c | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/gprs.c b/src/gprs.c index 5f7620b..c5fda35 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -959,6 +959,24 @@ static void pri_deactivate_callback(const struct ofono= _error *error, void *data) } } = +static void gprs_set_attached_property(struct ofono_gprs *gprs, + ofono_bool_t attached) +{ + const char *path; + DBusConnection *conn =3D ofono_dbus_get_connection(); + dbus_bool_t value =3D attached; + + if (gprs->attached =3D=3D attached) + return; + + gprs->attached =3D attached; + + path =3D __ofono_atom_get_path(gprs->atom); + ofono_dbus_signal_property_changed(conn, path, + OFONO_CONNECTION_MANAGER_INTERFACE, + "Attached", DBUS_TYPE_BOOLEAN, &value); +} + static void pri_read_settings_callback(const struct ofono_error *error, void *data) { @@ -987,6 +1005,9 @@ static void pri_read_settings_callback(const struct of= ono_error *error, } = value =3D pri_ctx->active; + + gprs_set_attached_property(pri_ctx->gprs, TRUE); + ofono_dbus_signal_property_changed(conn, pri_ctx->path, OFONO_CONNECTION_CONTEXT_INTERFACE, "Active", DBUS_TYPE_BOOLEAN, &value); @@ -1596,24 +1617,6 @@ static void release_active_contexts(struct ofono_gpr= s *gprs) } } = -static void gprs_set_attached_property(struct ofono_gprs *gprs, - ofono_bool_t attached) -{ - const char *path; - DBusConnection *conn =3D ofono_dbus_get_connection(); - dbus_bool_t value =3D attached; - - if (gprs->attached =3D=3D attached) - return; - - gprs->attached =3D attached; - - path =3D __ofono_atom_get_path(gprs->atom); - ofono_dbus_signal_property_changed(conn, path, - OFONO_CONNECTION_MANAGER_INTERFACE, - "Attached", DBUS_TYPE_BOOLEAN, &value); -} - static void gprs_attached_update(struct ofono_gprs *gprs) { ofono_bool_t attached; @@ -1644,8 +1647,6 @@ static void gprs_attached_update(struct ofono_gprs *g= prs) gprs->flags |=3D GPRS_FLAG_ATTACHED_UPDATE; return; } - - gprs_set_attached_property(gprs, attached); } = static void registration_status_cb(const struct ofono_error *error, @@ -1717,11 +1718,12 @@ static void gprs_netreg_update(struct ofono_gprs *g= prs) DBG("attach: %u, driver_attached: %u", attach, gprs->driver_attached); = if (ofono_netreg_get_technology(gprs->netreg) =3D=3D - ACCESS_TECHNOLOGY_EUTRAN) { - /* Ignore attach logic for LTE. There is no such concept. */ - gprs_set_attached_property(gprs, attach); - return; - } + ACCESS_TECHNOLOGY_EUTRAN) + /* + * For LTE we set attached status only on successful + * context activation. + */ + return; = if (gprs->driver_attached =3D=3D attach) return; -- = 2.7.4 --===============4342659181011139272==--