| Message ID | DB6PR10MB1845EBB07DB785B580B3F6ECE1E02@DB6PR10MB1845.EURPRD10.PROD.OUTLOOK.COM (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | gateway: fix calculation of is_vpn6 | expand |
Hi I have installed the patch but I am not sure about the config file in /usr/lib/connman-vpn does it look like this [provider_wireguard] Type = WireGuard Name = Wireguard VPN Tunnel Host = 3.2.5.6 Domain = my.home.network WireGuard.Address = 10.2.0.2/24 WireGuard.ListenPort = 47824 WireGuard.DNS = 10.2.0.1 WireGuard.PrivateKey = qKIj010hDdWSjQQyVCnEgthLXusBgm3I6HWrJUaJymc= WireGuard.PublicKey = zzqUfWGIil6QxrAGz77HE5BGUEdD2PgHYnCg3CDKagE= WireGuard.AllowedIPs = 0.0.0.0/0, ::/0 WireGuard.EndpointPort = 51820 I am not sure if the options Domain WireGuard.DNS and WireGuard.ListenPort are mandatory. The host must be an Ip address or a name like mysite.fr ? Best regards Daniel Le jeu. 23 janv. 2025 à 12:38, Gabriel Sanches <gabriel.sanches@prevas.dk> a écrit : > > Fix is_vpn6 to use ipv6 variables not ipv4 variables. This stops > the WireGuard plugin from faulting on startup. > > Fixes: commit 823d5a2a8cc4 ("connection: Refactor ‘__connman_connection_gateway_add’”)” > > Signed-of-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(-) > > diff --git a/src/gateway.c b/src/gateway.c > index 16c87f83..b2c211e2 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) > -- > 2.43.0
diff --git a/src/gateway.c b/src/gateway.c index 16c87f83..b2c211e2 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)
Fix is_vpn6 to use ipv6 variables not ipv4 variables. This stops the WireGuard plugin from faulting on startup. Fixes: commit 823d5a2a8cc4 ("connection: Refactor ‘__connman_connection_gateway_add’”)” Signed-of-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(-)