| Message ID | 5e1a105eda4ae36e7a9132140949c569cd02fe02.1740157858.git.gerickson@nuovations.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f150db753256725728da8553397383335d6f951 |
| Headers | show |
| Series | gateway: Fix __connman_connection_gateway_add is_vpn6 calculation. | expand |
Hello: This patch was applied to connman.git (master) by Denis Kenzior <denkenz@gmail.com>: On Fri, 21 Feb 2025 09:11:10 -0800 you wrote: > Address a regression introduced in commit 823d5a2a8cc4 ("connection: > Refactor '__connman_connection_gateway_add'.") in which the 'is_vpn6' > calculation was inadvertently copied-and-pasted from the 'is_vpn4' > calculation by correctly using the associated IPv6-related > 'new_gateway' data members. > > This stops WireGuard and other VPN-related plugins from faulting on > start-up. > > [...] Here is the summary with links: - gateway: Fix __connman_connection_gateway_add is_vpn6 calculation. https://git.kernel.org/pub/scm/network/connman/connman.git/?id=6f150db75325 You are awesome, thank you!
diff --git a/src/gateway.c b/src/gateway.c index 16c87f83b4d6..b2c211e2dc8d 100644 --- a/src/gateway.c +++ b/src/gateway.c @@ -3704,10 +3704,10 @@ int __connman_gateway_add(struct connman_service *service, is_gateway_config_vpn( new_gateway->ipv4_config); - is_vpn6 = do_ipv4 && - new_gateway->ipv4_config && + is_vpn6 = do_ipv6 && + new_gateway->ipv6_config && is_gateway_config_vpn( - new_gateway->ipv4_config); + new_gateway->ipv6_config); } else { if (do_ipv4 && new_gateway->ipv4_config)
Address a regression introduced in commit 823d5a2a8cc4 ("connection: Refactor '__connman_connection_gateway_add'.") in which the 'is_vpn6' calculation was inadvertently copied-and-pasted from the 'is_vpn4' calculation by correctly using the associated IPv6-related 'new_gateway' data members. This stops WireGuard and other VPN-related plugins from faulting on start-up. Suggested-by: Gabriel Sanches <gabriel.sanches@prevas.dk> Signed-off-by: Gabriel Sanches <gabriel.sanches@prevas.dk> Tested-by: Christian Hewitt <christianshewitt@gmail.com> --- src/gateway.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)