1:35 p.m.
The active flag for gateway should be set also when it is set or unset
as default gateway as it is done with VPN gateways. The active flag is
used in finding the active gateway (find_active_gateway(), choosing the
default gateway (choose_default_gateway()), updating the default gateway
(__connman_connection_update_gateway()) and to delete routes
(disable_gateway()).
The active flag is set/unset when adding or removing the gateway but not
touched when updating the interface using set_default_gateway() and
unset_default_gateway(). This adds setting of the flag in both of the
uses of the set/unset default gateway and unset_default_gateway(). This
adds setting of the flag in both of the uses of the set/unset default
gateway.
---
src/connection.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/connection.c b/src/connection.c
index 6b005e7..198432f 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -460,6 +460,7 @@ static void set_default_gateway(struct gateway_data *data,
"0.0.0.0") == 0) {
if (connman_inet_set_gateway_interface(index) < 0)
return;
+ data->ipv4_gateway->active = true;
goto done;
}
@@ -468,6 +469,7 @@ static void set_default_gateway(struct gateway_data *data,
"::") == 0) {
if (connman_inet_set_ipv6_gateway_interface(index) < 0)
return;
+ data->ipv6_gateway->active = true;
goto done;
}
@@ -534,6 +536,7 @@ static void unset_default_gateway(struct gateway_data *data,
g_strcmp0(data->ipv4_gateway->gateway,
"0.0.0.0") == 0) {
connman_inet_clear_gateway_interface(index);
+ data->ipv4_gateway->active = false;
return;
}
@@ -541,6 +544,7 @@ static void unset_default_gateway(struct gateway_data *data,
g_strcmp0(data->ipv6_gateway->gateway,
"::") == 0) {
connman_inet_clear_ipv6_gateway_interface(index);
+ data->ipv6_gateway->active = false;
return;
}
--
2.7.4
1:35 p.m.
New subject: [PATCH 2/2] connection: Check for active flag when updating default gateway
Set default gateway if it has been updated or if it has not been set as
active yet.
The check for active interface is required in cases that are induced by
a race condition caused by a change of interfaces that are either too
fast or too slow to go down, or to get up. In such case the interface
that should be used as default gateway may end up with no default route
set in routing table.
This is because the change happens in a situation where the old default
service A going down is still online, when the new service B that is
becoming the new default, is still in ready state. The new default
service B is not detected as default gateway because of the service list
order. The new service B has been added to gateway_hash and the routes
other than the default route have been set into routing table.
After this the routes of the old default service A are removed but
because of the old default service A still being the default service
according to service list, the removal of routes of the old default
service A does not get the new default gateway B to be selected as the
default gateway. After this the old default service A is properly
disconnected and set to idle setting the new default service B as the
default service.
The next call to this update gateway function results in a situation where
updated flag is not set, hence new default service B is the only one in
the gateway_hash. By checking also the active flag of the gateway the
new default gateway B in the scenario above will have a default route
set also in routing table.
---
src/connection.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/connection.c b/src/connection.c
index 198432f..582f34d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1012,12 +1012,18 @@ bool __connman_connection_update_gateway(void)
}
}
- if (updated && default_gateway) {
- if (default_gateway->ipv4_gateway)
+ /*
+ * Set default gateway if it has been updated or if it has not been
+ * set as active yet.
+ */
+ if (default_gateway) {
+ if (default_gateway->ipv4_gateway &&
+ (updated || !default_gateway->ipv4_gateway->active))
set_default_gateway(default_gateway,
CONNMAN_IPCONFIG_TYPE_IPV4);
- if (default_gateway->ipv6_gateway)
+ if (default_gateway->ipv6_gateway &&
+ (updated || !default_gateway->ipv6_gateway->active))
set_default_gateway(default_gateway,
CONNMAN_IPCONFIG_TYPE_IPV6);
}
--
2.7.4
8:19 a.m.
New subject: [PATCH 2/2] connection: Check for active flag when updating default gateway
Hi Jussi,
On 08/31/2018 01:35 PM, Jussi Laakkonen wrote:
Set default gateway if it has been updated or if it has not been set
as
active yet.
The check for active interface is required in cases that are induced by
a race condition caused by a change of interfaces that are either too
fast or too slow to go down, or to get up. In such case the interface
that should be used as default gateway may end up with no default route
set in routing table.
This is because the change happens in a situation where the old default
service A going down is still online, when the new service B that is
becoming the new default, is still in ready state. The new default
service B is not detected as default gateway because of the service list
order. The new service B has been added to gateway_hash and the routes
other than the default route have been set into routing table.
After this the routes of the old default service A are removed but
because of the old default service A still being the default service
according to service list, the removal of routes of the old default
service A does not get the new default gateway B to be selected as the
default gateway. After this the old default service A is properly
disconnected and set to idle setting the new default service B as the
default service.
The next call to this update gateway function results in a situation where
updated flag is not set, hence new default service B is the only one in
the gateway_hash. By checking also the active flag of the gateway the
new default gateway B in the scenario above will have a default route
set also in routing table.
Both patches applied. Thanks for the really helpful commit message.
Excellent work!
Thanks,
Daniel
873
days inactive
876
days old
2 comments
2 participants
participants (2)
-
Daniel Wagner -
Jussi Laakkonen