7:43 a.m.
If the default value of do_split_routing is 0 (false) then
according to set_split_routing() the default order for VPN
services should be 10. If the whole structure is zeroed on
initialization, do_split_routing and order for VPN services
were left in inconsistent state.
---
src/service.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/service.c b/src/service.c
index 326bfa3..ea1a1ea 100644
--- a/src/service.c
+++ b/src/service.c
@@ -7350,6 +7350,7 @@ __connman_service_create_from_provider(struct connman_provider
*provider)
return NULL;
service->type = CONNMAN_SERVICE_TYPE_VPN;
+ service->order = service->do_split_routing ? 0 : 10;
service->provider = connman_provider_ref(provider);
service->autoconnect = false;
service->favorite = true;
--
1.9.1
7:43 a.m.
New subject: [PATCH 2/2] service: Remove __connman_service_get_order()
It doesn't do anything that's not done by set_split_routing()
and its return value was never used.
---
src/connman.h | 1 -
src/service.c | 30 ------------------------------
2 files changed, 31 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 34fdcb1..aeead52 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -700,7 +700,6 @@ bool __connman_service_is_connected_state(struct connman_service
*service,
const char *__connman_service_get_ident(struct connman_service *service);
const char *__connman_service_get_path(struct connman_service *service);
const char *__connman_service_get_name(struct connman_service *service);
-unsigned int __connman_service_get_order(struct connman_service *service);
enum connman_service_state __connman_service_get_state(struct connman_service *service);
struct connman_network *__connman_service_get_network(struct connman_service *service);
enum connman_service_security __connman_service_get_security(struct connman_service
*service);
diff --git a/src/service.c b/src/service.c
index ea1a1ea..84d849c 100644
--- a/src/service.c
+++ b/src/service.c
@@ -5265,9 +5265,6 @@ int __connman_service_set_favorite_delayed(struct connman_service
*service,
service->favorite = favorite;
- if (!delay_ordering)
- __connman_service_get_order(service);
-
favorite_changed(service);
if (!delay_ordering) {
@@ -6981,33 +6978,6 @@ enum connman_service_state __connman_service_get_state(struct
connman_service *s
return service->state;
}
-unsigned int __connman_service_get_order(struct connman_service *service)
-{
- unsigned int order = 0;
-
- if (!service)
- return 0;
-
- service->order = 0;
-
- if (!service->favorite)
- return 0;
-
- if (service == service_list->data)
- order = 1;
-
- if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
- !service->do_split_routing) {
- service->order = 10;
- order = 10;
- }
-
- DBG("service %p name %s order %d split %d", service, service->name,
- order, service->do_split_routing);
-
- return order;
-}
-
static enum connman_service_type convert_network_type(struct connman_network *network)
{
enum connman_network_type type = connman_network_get_type(network);
--
1.9.1
11:54 a.m.
New subject: [PATCH 2/2] service: Remove __connman_service_get_order()
Hi Slava,
Both patches applied.
On 08/29/2018 04:43 PM, Slava Monich wrote:
It doesn't do anything that's not done by
set_split_routing()
and its return value was never used.
No idea what Patrik wanted to do with that function. Anyway, it was
doing nothing for a long time so no need to keep it around.
Thanks!
Daniel
790
days inactive
790
days old
2 comments
2 participants
participants (2)
-
Daniel Wagner -
Slava Monich