Send connman mailing list submissions to
connman@lists.01.org
To subscribe or unsubscribe via email, send a message with subject or
body 'help' to
connman-requ...@lists.01.org
You can reach the person managing the list at
connman-ow...@lists.01.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of connman digest..."
Today's Topics:
1. [PATCH v2 0/5] Teach autoconnect algorithm native mode
(Daniel Wagner)
2. [PATCH v2 1/5] service: Remove unused __connman_service_disconnect_all()
(Daniel Wagner)
3. [PATCH v2 2/5] service: Factor autoconnect trigger code into a new
function
(Daniel Wagner)
4. [PATCH v2 3/5] iwd: Init AutoConnect of know networks
(Daniel Wagner)
5. [PATCH v2 4/5] network: Add __connman_network_native_autoconnect()
(Daniel Wagner)
6. [PATCH v2 5/5] service: Teach autoconnect algorithm native mode
(Daniel Wagner)
----------------------------------------------------------------------
Date: Sun, 11 Apr 2021 20:30:04 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 0/5] Teach autoconnect algorithm native mode
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-1-w...@monom.org>
Tested with the current HEAD of iwd. I've tested various scenarios
with two network and
- restarting the daemons
- manual disconnect/connect
- switching off networks
The missing step from last weeks is that we need to set the
AutoConnect flag when starting up to avoid inconsisteny.
changes v2:
- reorder patches
- dropped the explicit connect attempt as iwd will
trigger the connect when AutoConnect is set
- make sure the AutoConnect flag is always set (during init)
The iwd plugin support native autoconnect so we need to disable the
core autoconnect algorithm in this case. Only lightly tested.
I saw some corner case with iwd's autoconnect algorithm. For example
there are two network net0 and net1. Both have autoconnect set. iwd
connects to net0. Then net0 dissapears and iwd chooses to connect
net1. Now user decides to disconnect from net1. After that net0
appears again, iwd doesn't auto connect to it anymore.
Daniel Wagner (5):
service: Remove unused __connman_service_disconnect_all()
service: Factor autoconnect trigger code into a new function
iwd: Init AutoConnect of know networks
network: Add __connman_network_native_autoconnect()
service: Teach autoconnect algorithm native mode
include/service.h | 1 +
plugins/iwd.c | 26 ++++++++++
src/connman.h | 2 +-
src/network.c | 7 +++
src/service.c | 129 +++++++++++++++++++++++-----------------------
5 files changed, 100 insertions(+), 65 deletions(-)
--
2.31.1
------------------------------
Date: Sun, 11 Apr 2021 20:30:05 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 1/5] service: Remove unused
__connman_service_disconnect_all()
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-2-w...@monom.org>
There is no user for this function. Remove it.
---
src/connman.h | 1 -
src/service.c | 30 ------------------------------
2 files changed, 31 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 898174cbfc03..35dae6223a50 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -749,7 +749,6 @@ int __connman_service_indicate_default(struct
connman_service *service);
int __connman_service_connect(struct connman_service *service,
enum connman_service_connect_reason reason);
int __connman_service_disconnect(struct connman_service *service);
-int __connman_service_disconnect_all(void);
void __connman_service_set_active_session(bool enable, GSList *list);
void __connman_service_auto_connect(enum connman_service_connect_reason
reason);
bool __connman_service_remove(struct connman_service *service);
diff --git a/src/service.c b/src/service.c
index 7dfa89f23164..30f5f64915c6 100644
--- a/src/service.c
+++ b/src/service.c
@@ -6810,36 +6810,6 @@ int __connman_service_disconnect(struct connman_service
*service)
return err;
}
-int __connman_service_disconnect_all(void)
-{
- struct connman_service *service;
- GSList *services = NULL, *list;
- GList *iter;
-
- DBG("");
-
- for (iter = service_list; iter; iter = iter->next) {
- service = iter->data;
-
- if (!is_connected(service->state))
- break;
-
- services = g_slist_prepend(services, service);
- }
-
- for (list = services; list; list = list->next) {
- struct connman_service *service = list->data;
-
- service->ignore = true;
-
- __connman_service_disconnect(service);
- }
-
- g_slist_free(services);
-
- return 0;
-}
-
/**
* lookup_by_identifier:
* @identifier: service identifier
--
2.31.1
------------------------------
Date: Sun, 11 Apr 2021 20:30:06 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 2/5] service: Factor autoconnect trigger code into
a new function
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-3-w...@monom.org>
Let's move the autoconnect code from __conman_service_create_network()
into it's own function. This seperates the init/setup code from the
autoconnect logic.
---
src/service.c | 74 ++++++++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 34 deletions(-)
diff --git a/src/service.c b/src/service.c
index 30f5f64915c6..5bb7f12594ce 100644
--- a/src/service.c
+++ b/src/service.c
@@ -7337,6 +7337,45 @@ static void update_from_network(struct connman_service
*service,
service_list_sort();
}
+static void trigger_autoconnect(struct connman_service *service)
+{
+ struct connman_device *device;
+
+ connman_network_set_autoconnect(service->network,
+ service->favorite && service->autoconnect);
+ if (service->favorite) {
+ device = connman_network_get_device(service->network);
+ if (device && !connman_device_get_scanning(device,
+ CONNMAN_SERVICE_TYPE_UNKNOWN)) {
+
+ switch (service->type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ case CONNMAN_SERVICE_TYPE_SYSTEM:
+ case CONNMAN_SERVICE_TYPE_P2P:
+ break;
+
+ case CONNMAN_SERVICE_TYPE_GADGET:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ if (service->autoconnect) {
+ __connman_service_connect(service,
+
CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+ break;
+ }
+
+ /* fall through */
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_GPS:
+ case CONNMAN_SERVICE_TYPE_VPN:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ do_auto_connect(service,
+ CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+ break;
+ }
+ }
+ }
+}
+
/**
* __connman_service_create_from_network:
* @network: network structure
@@ -7346,7 +7385,6 @@ static void update_from_network(struct connman_service
*service,
struct connman_service * __connman_service_create_from_network(struct
connman_network *network)
{
struct connman_service *service;
- struct connman_device *device;
const char *ident, *group;
char *name;
unsigned int *auto_connect_types, *favorite_types;
@@ -7420,39 +7458,7 @@ struct connman_service *
__connman_service_create_from_network(struct connman_ne
service_register(service);
service_schedule_added(service);
- connman_network_set_autoconnect(network,
- service->favorite && service->autoconnect);
- if (service->favorite) {
- device = connman_network_get_device(service->network);
- if (device && !connman_device_get_scanning(device,
- CONNMAN_SERVICE_TYPE_UNKNOWN)) {
-
- switch (service->type) {
- case CONNMAN_SERVICE_TYPE_UNKNOWN:
- case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_P2P:
- break;
-
- case CONNMAN_SERVICE_TYPE_GADGET:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
- if (service->autoconnect) {
- __connman_service_connect(service,
-
CONNMAN_SERVICE_CONNECT_REASON_AUTO);
- break;
- }
-
- /* fall through */
- case CONNMAN_SERVICE_TYPE_BLUETOOTH:
- case CONNMAN_SERVICE_TYPE_GPS:
- case CONNMAN_SERVICE_TYPE_VPN:
- case CONNMAN_SERVICE_TYPE_WIFI:
- case CONNMAN_SERVICE_TYPE_CELLULAR:
- do_auto_connect(service,
- CONNMAN_SERVICE_CONNECT_REASON_AUTO);
- break;
- }
- }
- }
+ trigger_autoconnect(service);
__connman_notifier_service_add(service, service->name);
--
2.31.1
------------------------------
Date: Sun, 11 Apr 2021 20:30:07 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 3/5] iwd: Init AutoConnect of know networks
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-4-w...@monom.org>
When creating a new know network object, check if we have already a
registered network object with the autoconnect flag. If we find one,
update the value of the known network object.
During the initial D-Bus API discovering, ConnMan will create the
network objects first. This means the core will see the new network
and will try to use iwd's auto connect mode. Also ConnMan will set the
AutoConnect flag for the (ConnMan's) known networks. At this point
though, the plugin has not yet discovered the known networks object
from the D-Bus API. Thus, the initial AutoConnect value could be lost.
In theory this is not necessary but it is possible that ConnMan's
state and iwd state do not match, e.g. the user has disabled the
autoconnect via iwdctl.
This can lead to the situation where ConnMan thinks the AutoConnect
flag has been set but it is not and hence iwd's auto connect is not
enabled and hence autoconnect.
---
plugins/iwd.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/plugins/iwd.c b/plugins/iwd.c
index 0a25fabf856d..d5c1f88b8658 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -1653,6 +1653,30 @@ static void known_network_property_change(GDBusProxy
*proxy, const char *name,
}
}
+static void init_auto_connect(struct iwd_known_network *iwdkn)
+{
+ GHashTableIter iter;
+ gpointer key, value;
+
+ g_hash_table_iter_init(&iter, networks);
+
+ while (g_hash_table_iter_next(&iter, &key, &value)) {
+ struct iwd_network *iwdn = value;
+ struct iwd_known_network *kn;
+
+ if (!iwdn->known_network)
+ continue;
+
+ kn = g_hash_table_lookup(known_networks, iwdn->known_network);
+ if (iwdkn != kn)
+ continue;
+
+ iwdkn->autoconnect = iwdn->autoconnect;
+ update_auto_connect(iwdkn);
+ return;
+ }
+}
+
static void create_know_network(GDBusProxy *proxy)
{
const char *path = g_dbus_proxy_get_path(proxy);
@@ -1686,6 +1710,8 @@ static void create_know_network(GDBusProxy *proxy)
iwdkn->name, iwdkn->type, iwdkn->hidden,
iwdkn->last_connected_time, iwdkn->auto_connect);
+ init_auto_connect(iwdkn);
+
g_dbus_proxy_set_property_watch(iwdkn->proxy,
known_network_property_change, NULL);
}
--
2.31.1
------------------------------
Date: Sun, 11 Apr 2021 20:30:08 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 4/5] network: Add
__connman_network_native_autoconnect()
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-5-w...@monom.org>
This function allows to query if the network/transport supports native
autoconnect such as iwd.
---
src/connman.h | 1 +
src/network.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/src/connman.h b/src/connman.h
index 35dae6223a50..c70999c5fbd2 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -616,6 +616,7 @@ const char *__connman_network_get_type(struct
connman_network *network);
const char *__connman_network_get_group(struct connman_network *network);
const char *__connman_network_get_ident(struct connman_network *network);
bool __connman_network_get_weakness(struct connman_network *network);
+bool __connman_network_native_autoconnect(struct connman_network *network);
int __connman_config_init();
void __connman_config_cleanup(void);
diff --git a/src/network.c b/src/network.c
index 256e3b5f1c12..b12bbc091b0c 100644
--- a/src/network.c
+++ b/src/network.c
@@ -2120,6 +2120,13 @@ int connman_network_set_autoconnect(struct
connman_network *network,
return network->driver->set_autoconnect(network, autoconnect);
}
+bool __connman_network_native_autoconnect(struct connman_network *network)
+{
+ if (!network->driver || !network->driver->set_autoconnect)
+ return false;
+ return true;
+}
+
uint16_t connman_network_get_wifi_channel(struct connman_network *network)
{
return network->wifi.channel;
--
2.31.1
------------------------------
Date: Sun, 11 Apr 2021 20:30:09 +0200
From: Daniel Wagner <w...@monom.org>
Subject: [PATCH v2 5/5] service: Teach autoconnect algorithm native
mode
To: connman@lists.01.org
Cc: Daniel Wagner <w...@monom.org>
Message-ID: <20210411183009.23396-6-w...@monom.org>
When network supports native autoconnnect skip the internal
autoconnect algorithm for this network. Introduce for this a new
CONNMAN_SERVICE_CONNECT_REASON_NATIVE and track the service connection
reason.
---
include/service.h | 1 +
src/service.c | 83 ++++++++++++++++++++++++++++++-----------------
2 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/include/service.h b/include/service.h
index 4a129b49315e..8f6b36b486c0 100644
--- a/include/service.h
+++ b/include/service.h
@@ -94,6 +94,7 @@ enum connman_service_connect_reason {
CONNMAN_SERVICE_CONNECT_REASON_AUTO = 1,
CONNMAN_SERVICE_CONNECT_REASON_USER = 2,
CONNMAN_SERVICE_CONNECT_REASON_SESSION = 3,
+ CONNMAN_SERVICE_CONNECT_REASON_NATIVE = 4,
};
struct connman_service;
diff --git a/src/service.c b/src/service.c
index 5bb7f12594ce..dd0adabd541e 100644
--- a/src/service.c
+++ b/src/service.c
@@ -195,6 +195,8 @@ static const char *reason2string(enum
connman_service_connect_reason reason)
return "auto";
case CONNMAN_SERVICE_CONNECT_REASON_SESSION:
return "session";
+ case CONNMAN_SERVICE_CONNECT_REASON_NATIVE:
+ return "native";
}
return "unknown";
@@ -3490,6 +3492,13 @@ static void do_auto_connect(struct connman_service
*service,
service->type == CONNMAN_SERVICE_TYPE_WIFI))
return;
+ /*
+ * Do not use the builtin auto connect, instead rely on the
+ * native auto connect feature of the service.
+ */
+ if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_NATIVE)
+ return;
+
/*
* Run service auto connect for other than VPN services. Afterwards
* start also VPN auto connect process.
@@ -4215,6 +4224,12 @@ static bool auto_connect_service(GList *services,
continue;
}
+ if (service->connect_reason ==
+ CONNMAN_SERVICE_CONNECT_REASON_NATIVE) {
+ DBG("service %p uses native autonnect, skip", service);
+ continue;
+ }
+
if (service->pending ||
is_connecting(service->state) ||
is_connected(service->state)) {
@@ -6716,6 +6731,11 @@ int __connman_service_connect(struct connman_service
*service,
DBG("service %p err %d", service, err);
+ if (service->autoconnect &&
+ reason == CONNMAN_SERVICE_CONNECT_REASON_USER) {
+ DBG("service %p switch connecting reason to native", service);
+ reason = CONNMAN_SERVICE_CONNECT_REASON_NATIVE;
+ }
service->connect_reason = reason;
if (err >= 0)
@@ -7340,39 +7360,44 @@ static void update_from_network(struct connman_service
*service,
static void trigger_autoconnect(struct connman_service *service)
{
struct connman_device *device;
+ bool native;
- connman_network_set_autoconnect(service->network,
- service->favorite && service->autoconnect);
- if (service->favorite) {
- device = connman_network_get_device(service->network);
- if (device && !connman_device_get_scanning(device,
- CONNMAN_SERVICE_TYPE_UNKNOWN)) {
-
- switch (service->type) {
- case CONNMAN_SERVICE_TYPE_UNKNOWN:
- case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_P2P:
- break;
+ if (!service->favorite)
+ return;
- case CONNMAN_SERVICE_TYPE_GADGET:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
- if (service->autoconnect) {
- __connman_service_connect(service,
-
CONNMAN_SERVICE_CONNECT_REASON_AUTO);
- break;
- }
+ native = __connman_network_native_autoconnect(service->network);
+ if (native && service->autoconnect) {
+ DBG("trigger native autoconnect");
+ connman_network_set_autoconnect(service->network, true);
+ return;
+ }
- /* fall through */
- case CONNMAN_SERVICE_TYPE_BLUETOOTH:
- case CONNMAN_SERVICE_TYPE_GPS:
- case CONNMAN_SERVICE_TYPE_VPN:
- case CONNMAN_SERVICE_TYPE_WIFI:
- case CONNMAN_SERVICE_TYPE_CELLULAR:
- do_auto_connect(service,
- CONNMAN_SERVICE_CONNECT_REASON_AUTO);
- break;
- }
+ device = connman_network_get_device(service->network);
+ if (device && connman_device_get_scanning(device,
CONNMAN_SERVICE_TYPE_UNKNOWN))
+ return;
+
+ switch (service->type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ case CONNMAN_SERVICE_TYPE_SYSTEM:
+ case CONNMAN_SERVICE_TYPE_P2P:
+ break;
+
+ case CONNMAN_SERVICE_TYPE_GADGET:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ if (service->autoconnect) {
+ __connman_service_connect(service,
+
CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+ break;
}
+
+ /* fall through */
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_GPS:
+ case CONNMAN_SERVICE_TYPE_VPN:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+ break;
}
}
--
2.31.1
------------------------------
Subject: Digest Footer
_______________________________________________
connman mailing list -- connman@lists.01.org
To unsubscribe send an email to connman-le...@lists.01.org
------------------------------
End of connman Digest, Vol 66, Issue 21
***************************************
