[PATCH 1/2] sim-auth: Remove watch if open_channel fails

[PATCH 1/2] sim-auth: Remove watch if open_channel fails

[Slava Monich]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

Otherwise open_channel won't be called again after a failure.
---
 src/sim-auth.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sim-auth.c b/src/sim-auth.c
index 0e13b533..3c3f35e7 100644
--- a/src/sim-auth.c
+++ b/src/sim-auth.c
@@ -367,6 +367,8 @@ static void get_session_cb(ofono_bool_t active, int session_id,
 error:
 	__ofono_dbus_pending_reply(&sa->pending->msg,
 			__ofono_error_failed(sa->pending->msg));
+	__ofono_sim_remove_session_watch(sa->pending->session,
+			sa->pending->watch_id);
 	g_free(sa->pending);
 	sa->pending = NULL;
 }
-- 
2.25.1

[PATCH 2/2] sim-auth: Only close open sessions

[Slava Monich]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

Session has to be open in order to have a valid session_id
---
 src/sim.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sim.c b/src/sim.c
index 793ff64a..3319ecee 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -3805,7 +3805,8 @@ void __ofono_sim_remove_session_watch(struct ofono_sim_aid_session *session,
 {
 	__ofono_watchlist_remove_item(session->watches, id);
 
-	if (g_slist_length(session->watches->items) == 0) {
+	if (g_slist_length(session->watches->items) == 0 &&
+			session->state == SESSION_STATE_OPEN) {
 		/* last watcher, close session */
 		session->state = SESSION_STATE_CLOSING;
 		session->sim->driver->close_channel(session->sim,
-- 
2.25.1

Re: [PATCH 1/2] sim-auth: Remove watch if open_channel fails

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Hi Slava,

On 4/26/21 3:17 AM, Slava Monich wrote:
> Otherwise open_channel won't be called again after a failure.
> ---
>   src/sim-auth.c | 2 ++
>   1 file changed, 2 insertions(+)
> 

Both applied, thanks.

Regards,
-Denis