[PATCH v3] service: Fix native connection with wrong passphrase

* [PATCH v3] service: Fix native connection with wrong passphrase
       [not found] <20220121102736.3323889-1-Emmanuel.VAUTRIN@cpexterne.org>
@ 2022-01-21 10:36 ` VAUTRIN Emmanuel (Canal Plus Prestataire)
  2022-01-23 13:23   ` Daniel Wagner
  0 siblings, 1 reply; 6+ messages in thread
From: VAUTRIN Emmanuel (Canal Plus Prestataire) @ 2022-01-21 10:36 UTC (permalink / raw)
  To: connman

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

When a native connection fails with a wrong passphrase, the user still
needs to be informed, via the agent.
However, in this case, the associated service is automatically
disconnected, canceling the pending agent requests.
The invalid key error shall be reported before this cancellation.

Commit b9a0a039ccc5 ("service: Report errors to user in native mode")
---
 src/service.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/service.c b/src/service.c
index 9141b85dbe9c..b2c01640bd5d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -6023,6 +6023,13 @@ static int service_indicate_state(struct connman_service *service)
                 break;
 
         case CONNMAN_SERVICE_STATE_IDLE:
+               if ((old_state == CONNMAN_SERVICE_STATE_FAILURE &&
+       service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_NATIVE &&
+       service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)) {
+                       __connman_service_clear_error(service);
+                       service_complete(service);
+               }
+
                 if (old_state != CONNMAN_SERVICE_STATE_DISCONNECT)
                         __connman_service_disconnect(service);
 
-- 
2.25.1

> service_list_sort() and __connman_connection_update_gateway() are
> already called after the switch. This seems to be redundant.
Indeed Daniel, you are perfectly right.

Please find the well formated patch in attachment.

Emmanuel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v3-0001-service-Fix-native-connection-with-wrong-passphra.patch --]
[-- Type: text/x-patch; name="v3-0001-service-Fix-native-connection-with-wrong-passphra.patch", Size: 1299 bytes --]

From a20048bfd8df802d4d5e191c6f6861726474c6c5 Mon Sep 17 00:00:00 2001
From: Emmanuel VAUTRIN <Emmanuel.VAUTRIN@cpexterne.org>
Date: Wed, 15 Dec 2021 15:06:59 +0100
Subject: [PATCH v3] service: Fix native connection with wrong passphrase

When a native connection fails with a wrong passphrase, the user still
needs to be informed, via the agent.
However, in this case, the associated service is automatically
disconnected, canceling the pending agent requests.
The invalid key error shall be reported before this cancellation.

Commit b9a0a039ccc5 ("service: Report errors to user in native mode")
---
 src/service.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/service.c b/src/service.c
index 9141b85dbe9c..b2c01640bd5d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -6023,6 +6023,13 @@ static int service_indicate_state(struct connman_service *service)
 		break;
 
 	case CONNMAN_SERVICE_STATE_IDLE:
+		if ((old_state == CONNMAN_SERVICE_STATE_FAILURE &&
+	service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_NATIVE &&
+	service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)) {
+			__connman_service_clear_error(service);
+			service_complete(service);
+		}
+
 		if (old_state != CONNMAN_SERVICE_STATE_DISCONNECT)
 			__connman_service_disconnect(service);
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread