April 2021 - connman - Ml01.01.Org

Re: [PATCH 0/1] start online check even if service is not the default service

by Daniel Wagner

Hi, On 29.04.21 16:42, VAUTRIN Emmanuel (Canal Plus Prestataire) wrote: >> I have a platform with Ethernet and WiFi and I usually use Connman 1.36. >> I have recently upgraded to Connman 1.38. > By our side, we have integrated ConnMan on devices with a similar setup. The current release is v1.39 and as Emmanuel points out there were several fixes regarding online checks. Please give the latest release a go. Thanks, Daniel

5 days, 12 hours

3
2
0 / 0

[PATCH 0/1] start online check even if service is not the default service

by Christophe Ronco

Hi, I have a platform with Ethernet and WiFi and I usually use Connman 1.36. I have recently upgraded to Connman 1.38. When preferred technology service is back, it does not go to Online state as it was doing with Connman 1.36. I think this is easier to explain with an example: I start platform with a WiFi service configured and Ethernet cable plugged. My preferred technologies are: PreferredTechnologies = ethernet, wifi, cellular 1) After boot, wired service is online, WiFi service is not configured 2) Unplug Eth cable => WiFi is set to online 3) Re-plug Ethernet cable =>WiFi stays online, Wired service is Ready. I think that online check is not started in this case. I assume it comes from changes done in patch e600366f603590b01449b34a8215efde54f566dd. I have fixed that by starting online check for all services, not only for default service. With the fix, at step 3, Wired service becomes Online and WiFi service becomes ready. Best Regards, Christophe Ronco Christophe Ronco (1): service: start online check even if service is not the default service src/service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.25.1

6 days, 12 hours

2
2
0 / 0

RE: Orbi router won't reconnect

by VAUTRIN Emmanuel (Canal Plus Prestataire)

Hello Thomas, Unfortunately I won't have any time to check this. Have you tried, as I have proposed to you, to test with the patch from Re: [PATCH] service: Fix autoconnect after rejection https://lists.01.org/hyperkitty/list/connman@lists.01.org/thread/K32CVCRY... I copy it below. Do not use it in production, it is a bit risky, maybe you should add a counter to avoid to be completely blocked by the AP. Best Regards, Emmanuel From 9df3909aa487eb1f8c8796d82b0ee09adcead36b Mon Sep 17 00:00:00 2001 From: Emmanuel VAUTRIN <Emmanuel.VAUTRIN(a)cpexterne.org> Date: Wed, 13 Jan 2021 18:19:55 +0100 Subject: [PATCH] service: Fix autoconnection of a service in failure state Prevents a service to be blocked in failure state, when its autoconnection fails. --- src/service.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/service.c b/src/service.c index 5a582cdf..64ee1f44 100644 --- a/src/service.c +++ b/src/service.c @@ -4186,6 +4186,12 @@ static bool auto_connect_service(GList *services, return autoconnecting; } + if (service->state == CONNMAN_SERVICE_STATE_FAILURE) { + /* Back to idle to unblock next autoconnection. */ + service->state = CONNMAN_SERVICE_STATE_IDLE; + continue; + } + if (is_ignore(service) || service->state != CONNMAN_SERVICE_STATE_IDLE) continue; -- 2.25.1

1 week

1
0
0 / 0

[PATCH 3/3] wispr: Support of common redirection status codes

by VAUTRIN Emmanuel (Canal Plus Prestataire)

The portal web result processing shall support common redirection status codes, not only 302. --- src/wispr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/wispr.c b/src/wispr.c index 5530d5548df1..ee5ec93137ce 100644 --- a/src/wispr.c +++ b/src/wispr.c @@ -756,7 +756,12 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) wp_context->redirect_url, wp_context); break; + case 300: + case 301: case 302: + case 303: + case 307: + case 308: if (!g_web_supports_tls() || !g_web_result_get_header(result, "Location", &redirect)) { -- 2.25.1

1 week

1
0
0 / 0

[PATCH 2/3] wispr: Add online check url config options

by VAUTRIN Emmanuel (Canal Plus Prestataire)

Global config options, which allow to set the urls (IPv4 and IPv6 respectively) used during the online status check. WARNING: The server shall respond with 200 status code and X-ConnMan-Status: online header. Default values are http://ipv4.connman.net/online/status.html and http://ipv6.connman.net/online/status.html respectively. --- doc/connman.conf.5.in | 7 +++++++ src/main.c | 33 +++++++++++++++++++++++++++++++++ src/main.conf | 8 ++++++++ src/wispr.c | 14 +++++++++----- 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/doc/connman.conf.5.in b/doc/connman.conf.5.in index 2e06b3ef1f3c..499e019f15a6 100644 --- a/doc/connman.conf.5.in +++ b/doc/connman.conf.5.in @@ -167,6 +167,13 @@ transitioned to ONLINE state. If this setting is false, the default service will remain in READY state. Default value is true. .TP +.BI OnlineCheckIpv4Url= url, OnlineCheckIpv6Url= url +Urls (IPv4 and IPv6 respectively) used during the online status check. +WARNING: The server shall respond with 200 status code and +X-ConnMan-Status: online header. +Default values are http://ipv4.connman.net/online/status.html and +http://ipv6.connman.net/online/status.html respectively. +.TP .BI OnlineCheckInitialInterval= secs, OnlineCheckMaxInterval= secs Range of intervals between two online check requests. When an online check request fails, another one is triggered after a diff --git a/src/main.c b/src/main.c index 73ecde418793..7a210902efda 100644 --- a/src/main.c +++ b/src/main.c @@ -44,6 +44,9 @@ #define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000) #define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000) +#define DEFAULT_ONLINE_CHECK_IPV4_URL "http://ipv4.connman.net/online/status.html" +#define DEFAULT_ONLINE_CHECK_IPV6_URL "http://ipv6.connman.net/online/status.html" + /* * We set the integer to 1 sec so that we have a chance to get * necessary IPv6 router advertisement messages that might have @@ -97,6 +100,8 @@ static struct { char *vendor_class_id; bool enable_online_check; bool enable_online_to_ready_transition; + char *online_check_ipv4_url; + char *online_check_ipv6_url; unsigned int online_check_initial_interval; unsigned int online_check_max_interval; bool auto_connect_roaming_services; @@ -122,6 +127,8 @@ static struct { .vendor_class_id = NULL, .enable_online_check = true, .enable_online_to_ready_transition = false, + .online_check_ipv4_url = DEFAULT_ONLINE_CHECK_IPV4_URL, + .online_check_ipv6_url = DEFAULT_ONLINE_CHECK_IPV6_URL, .online_check_initial_interval = DEFAULT_ONLINE_CHECK_INITIAL_INTERVAL, .online_check_max_interval = DEFAULT_ONLINE_CHECK_MAX_INTERVAL, .auto_connect_roaming_services = false, @@ -148,6 +155,8 @@ static struct { #define CONF_VENDOR_CLASS_ID "VendorClassID" #define CONF_ENABLE_ONLINE_CHECK "EnableOnlineCheck" #define CONF_ENABLE_ONLINE_TO_READY_TRANSITION "EnableOnlineToReadyTransition" +#define CONF_ONLINE_CHECK_IPV4_URL "OnlineCheckIpv4Url" +#define CONF_ONLINE_CHECK_IPV6_URL "OnlineCheckIpv6Url" #define CONF_ONLINE_CHECK_INITIAL_INTERVAL "OnlineCheckInitialInterval" #define CONF_ONLINE_CHECK_MAX_INTERVAL "OnlineCheckMaxInterval" #define CONF_AUTO_CONNECT_ROAMING_SERVICES "AutoConnectRoamingServices" @@ -174,6 +183,8 @@ static const char *supported_options[] = { CONF_VENDOR_CLASS_ID, CONF_ENABLE_ONLINE_CHECK, CONF_ENABLE_ONLINE_TO_READY_TRANSITION, + CONF_ONLINE_CHECK_IPV4_URL, + CONF_ONLINE_CHECK_IPV6_URL, CONF_ONLINE_CHECK_INITIAL_INTERVAL, CONF_ONLINE_CHECK_MAX_INTERVAL, CONF_AUTO_CONNECT_ROAMING_SERVICES, @@ -486,6 +497,20 @@ static void parse_config(GKeyFile *config) g_clear_error(&error); + string = __connman_config_get_string(config, "General", + CONF_ONLINE_CHECK_IPV4_URL, &error); + if (!error) + connman_settings.online_check_ipv4_url = string; + + g_clear_error(&error); + + string = __connman_config_get_string(config, "General", + CONF_ONLINE_CHECK_IPV6_URL, &error); + if (!error) + connman_settings.online_check_ipv6_url = string; + + g_clear_error(&error); + integer = g_key_file_get_integer(config, "General", CONF_ONLINE_CHECK_INITIAL_INTERVAL, &error); if (!error && integer >= 0) @@ -769,6 +794,12 @@ char *connman_setting_get_string(const char *key) if (g_str_equal(key, CONF_VENDOR_CLASS_ID)) return connman_settings.vendor_class_id; + if (g_str_equal(key, CONF_ONLINE_CHECK_IPV4_URL)) + return connman_settings.online_check_ipv4_url; + + if (g_str_equal(key, CONF_ONLINE_CHECK_IPV6_URL)) + return connman_settings.online_check_ipv6_url; + return NULL; } @@ -994,6 +1025,8 @@ int main(int argc, char *argv[]) g_strfreev(connman_settings.blacklisted_interfaces); g_strfreev(connman_settings.tethering_technologies); g_free(connman_settings.vendor_class_id); + g_free(connman_settings.online_check_ipv4_url); + g_free(connman_settings.online_check_ipv6_url); g_free(option_debug); g_free(option_wifi); diff --git a/src/main.conf b/src/main.conf index df70e178742a..7e2e556c73f0 100644 --- a/src/main.conf +++ b/src/main.conf @@ -125,6 +125,14 @@ # Default value is true. # EnableOnlineCheck = false +# Urls (IPv4 and IPv6 respectively) used during the online status check. +# WARNING: The server shall respond with 200 status code and +# X-ConnMan-Status: online header. +# Default values are http://ipv4.connman.net/online/status.html and +# http://ipv6.connman.net/online/status.html respectively. +# OnlineCheckIpv4Url= http://ipv4.connman.net/online/status.html +# OnlineCheckIpv6Url= http://ipv6.connman.net/online/status.html + # Range of intervals between two online check requests. # When an online check request fails, another one is triggered after a # longer interval. The intervals follow the power of two series of numbers diff --git a/src/wispr.c b/src/wispr.c index 27f5dc13f4a2..5530d5548df1 100644 --- a/src/wispr.c +++ b/src/wispr.c @@ -30,9 +30,6 @@ #include "connman.h" -#define STATUS_URL_IPV4 "http://ipv4.connman.net/online/status.html" -#define STATUS_URL_IPV6 "http://ipv6.connman.net/online/status.html" - struct connman_wispr_message { bool has_error; const char *current_element; @@ -96,6 +93,8 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data); static GHashTable *wispr_portal_list = NULL; +static char *online_check_ipv4_url = NULL; +static char *online_check_ipv6_url = NULL; static bool enable_online_to_ready_transition = false; static void connman_wispr_message_init(struct connman_wispr_message *msg) @@ -905,10 +904,10 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) if (wp_context->type == CONNMAN_IPCONFIG_TYPE_IPV4) { g_web_set_address_family(wp_context->web, AF_INET); - wp_context->status_url = STATUS_URL_IPV4; + wp_context->status_url = online_check_ipv4_url; } else { g_web_set_address_family(wp_context->web, AF_INET6); - wp_context->status_url = STATUS_URL_IPV6; + wp_context->status_url = online_check_ipv6_url; } for (i = 0; nameservers[i]; i++) @@ -1031,6 +1030,11 @@ int __connman_wispr_init(void) g_direct_equal, NULL, free_connman_wispr_portal); + online_check_ipv4_url = + connman_setting_get_string("OnlineCheckIpv4Url"); + online_check_ipv6_url = + connman_setting_get_string("OnlineCheckIpv6Url"); + enable_online_to_ready_transition = connman_setting_get_bool("EnableOnlineToReadyTransition"); -- 2.25.1

1 week

1
0
0 / 0

[PATCH 1/3] dhcp: Cleanup of VendorClassID config option

by VAUTRIN Emmanuel (Canal Plus Prestataire)

--- include/setting.h | 1 + src/dhcp.c | 2 +- src/main.c | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/setting.h b/include/setting.h index 8d2c37b7964d..920e6754169b 100644 --- a/include/setting.h +++ b/include/setting.h @@ -30,6 +30,7 @@ extern "C" { bool connman_setting_get_bool(const char *key); unsigned int connman_setting_get_uint(const char *key); +char *connman_setting_get_string(const char *key); char **connman_setting_get_string_list(const char *key); unsigned int *connman_setting_get_uint_list(const char *key); diff --git a/src/dhcp.c b/src/dhcp.c index 42e9f417d960..2d96c439207e 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -616,7 +616,7 @@ static int dhcp_initialize(struct connman_dhcp *dhcp) g_dhcp_client_set_request(dhcp_client, G_DHCP_ROUTER); g_dhcp_client_set_request(dhcp_client, G_DHCP_SUBNET); - vendor_class_id = connman_option_get_string("VendorClassID"); + vendor_class_id = connman_setting_get_string("VendorClassID"); if (vendor_class_id) g_dhcp_client_set_send(dhcp_client, G_DHCP_VENDOR_CLASS_ID, vendor_class_id); diff --git a/src/main.c b/src/main.c index 8bd44ba18027..73ecde418793 100644 --- a/src/main.c +++ b/src/main.c @@ -301,7 +301,7 @@ static void parse_config(GKeyFile *config) char **interfaces; char **str_list; char **tethering; - char *vendor_class_id; + char *string; gsize len; int integer; @@ -461,10 +461,10 @@ static void parse_config(GKeyFile *config) g_clear_error(&error); - vendor_class_id = __connman_config_get_string(config, "General", + string = __connman_config_get_string(config, "General", CONF_VENDOR_CLASS_ID, &error); if (!error) - connman_settings.vendor_class_id = vendor_class_id; + connman_settings.vendor_class_id = string; g_clear_error(&error); @@ -705,9 +705,6 @@ static GOptionEntry options[] = { const char *connman_option_get_string(const char *key) { - if (g_str_equal(key, CONF_VENDOR_CLASS_ID)) - return connman_settings.vendor_class_id; - if (g_strcmp0(key, "wifi") == 0) { if (!option_wifi) return "nl80211,wext"; @@ -767,6 +764,14 @@ unsigned int connman_setting_get_uint(const char *key) return 0; } +char *connman_setting_get_string(const char *key) +{ + if (g_str_equal(key, CONF_VENDOR_CLASS_ID)) + return connman_settings.vendor_class_id; + + return NULL; +} + char **connman_setting_get_string_list(const char *key) { if (g_str_equal(key, CONF_PREF_TIMESERVERS)) @@ -988,6 +993,7 @@ int main(int argc, char *argv[]) g_strfreev(connman_settings.fallback_nameservers); g_strfreev(connman_settings.blacklisted_interfaces); g_strfreev(connman_settings.tethering_technologies); + g_free(connman_settings.vendor_class_id); g_free(option_debug); g_free(option_wifi); -- 2.25.1

1 week

1
0
0 / 0

RE: Orbi router won't reconnect

by Thomas Green

Thanks for pointing me in the right direction. Connman is behaving as expected. As a result, what I have done with my application is to note when a service fails then is removed. If that service comes back and is still in the failed state, I issue a connect on that service to re-instate the connection. The connect usually returns with a success or a 'connection in progress' error. In the case of the connection in progress error, about 30 percent of the time the connection eventually succeeds. In the rest of the cases the connection fails, and the service just returns to the failed state. I would like to be able to find a way to connect the service in a reliable manner. Attached is the debug output from: connman -nd and in this scenario. The name of the AP to watch is nvpblk80. If you can point me in a better direction to get the desired behavior, I would appreciate it. The current router that I'm using to test is a Netgear NightHawk (AC1900) Thanks, Tom -----Original Message----- From: VAUTRIN Emmanuel (Canal Plus Prestataire) <Emmanuel.VAUTRIN(a)cpexterne.org> Sent: Tuesday, April 20, 2021 11:28 AM To: Thomas Green <TGreen2(a)Sorenson.com>; connman(a)lists.01.org Subject: RE: Orbi router won't reconnect [EXTERNAL] Hello Thomas, > the router doesn't reconnect even though it is set as an auto-connect > service. To make the connection happen again, all I have to do is issue the connect command in connmanctl. This behavior (auto connection failure, only manual connection succeeds) reminds me the following topic: [PATCH] service: Allow only user connection after WiFi failure https://lists.01.org/hyperkitty/list/connman@lists.01.org/thread/FY5JJF4V... linked to this one: [PATCH] service: Fix autoconnect after rejection https://lists.01.org/hyperkitty/list/connman@lists.01.org/thread/NA6UOMOS... Does it correspond to your observation and answer to your question? Best Regards, Emmanuel

1 week, 1 day

1
0
0 / 0

[PATCH] timerserver: Fix time update manual->auto

by Daniel Wagner

__connman_timeserver_conf_update() will block the update if the service is not matching the current used service. In case where ts_service is NULL it should not block the update. This can happen by a manual to auto TimeUpdate settings change. Reported by Emmanuel Vautrin --- src/timeserver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timeserver.c b/src/timeserver.c index 040a7aef8221..feef8e8398b4 100644 --- a/src/timeserver.c +++ b/src/timeserver.c @@ -398,7 +398,7 @@ static void ts_reset(struct connman_service *service) void __connman_timeserver_sync(struct connman_service *service) { - if (!service || service == ts_service) + if (!service || ts_service == service) return; ts_reset(service); @@ -406,7 +406,7 @@ void __connman_timeserver_sync(struct connman_service *service) void __connman_timeserver_conf_update(struct connman_service *service) { - if (!service || service != ts_service) + if (!service || (ts_service && ts_service != service)) return; ts_reset(service); -- 2.31.1

1 week, 1 day

2
2
0 / 0

Re: [PATCH] timeserver: Fix time update manual->auto at startup

by Daniel Wagner

On Mon, Apr 26, 2021 at 06:45:45PM +0000, VAUTRIN Emmanuel (Canal Plus Prestataire) wrote: > I have tested your patch by my side, excluding the first change that was probably cosmetics, > and it seems to work fine. I let you integrate it to the master. Thanks for testing. I am going to apply the patch now. And yes, the first hunk is just cosmetic, so that the two condition look alike. My future me will like it :)

1 week, 1 day

1
0
0 / 0

Re: [PATCH] service: Prevent auto connection during passphrase request

by Daniel Wagner

HI Emmanuel, On Sun, Apr 18, 2021 at 10:47:21PM +0000, VAUTRIN Emmanuel (Canal Plus Prestataire) wrote: > Thank you Daniel for your answer. > > > It seems you didn't understand my explenation, here what I think is > > the way to go. Just use the service pointer direcltly and remove the > > entry at the end. > In fact, it was clear, I was involving the interface (represented by service > index) in purpose. > > Let me illustrate with the following case: > The end-user has 2 Wifi networks and wants to connect to both. > The involved device has only one Wifi interface, 1 frequency. > 1. He connects successfully to Wifi 1, which is not secure. > 2. He tries to connect to Wifi 2 which is secure. > When doing that, the following steps happen: > A. ConnMan disconnect Wifi 1 > B. It tries to user connect to Wifi 2, but is paused by the passphrase > request. > C. Then, it auto connects to Wifi 1, which is available and succeeds. > D. The passphrase entered, it tries to user connect to Wifi 2 > but unfortunately, another Wifi (1) is already connected, so it fails. > > It will never be possible in this configuration for Wifi 2 to be connected. > The same issue also occurs if Wifi 1 is secure, as the passphrase is known. I see, thanks for the explanation. This needs to go into the commit message as it is important to understand why the index is used. And I still think you need to address the issue that you never remove the entries from the hash tables, so potentially it could be a memory hog. Thanks, Daniel

1 week, 2 days

2
1
0 / 0

2021

2020

2019

2018

2017

2016

2015

connman April 2021