Merge branch 'jb54605' into 'master'

Fix PPPD noipv6 option use in pptp and l2tp See merge request mer-core/connman!315
sailfishos · Jun 11, 2021 · 5b4ae24 · 5b4ae24
2 parents 53673f2 + ca5f60e
commit 5b4ae24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/connman/vpn/plugins/l2tp.c b/connman/vpn/plugins/l2tp.c
@@ -387,7 +387,7 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 {
 	int i;
 	const char *opt_s;
-	bool no_ipv6 = false;
+	bool no_ipv6;
 
 	l2tp_write_option(fd, "nodetach", NULL);
 	l2tp_write_option(fd, "lock", NULL);
@@ -411,12 +411,6 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 		if (!opt_s)
 			continue;
 
-		if (!g_strcmp0(opt_s, "PPPD.NoIPv6")) {
-			no_ipv6 = vpn_provider_get_boolean(provider,
-						pppd_options[i].cm_opt, false);
-			continue;
-		}
-
 		if (pppd_options[i].type == OPT_STRING)
 			l2tp_write_option(fd,
 				pppd_options[i].pppd_opt, opt_s);
@@ -432,6 +426,7 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 	l2tp_write_option(fd, "plugin",
 				SCRIPTDIR "/libppp-plugin.so");
 
+	no_ipv6 = vpn_provider_get_boolean(provider, "PPPD.NoIPv6", false);
 	vpn_provider_set_supported_ip_networks(provider, true, !no_ipv6);
 
 	return 0;

diff --git a/connman/vpn/plugins/pptp.c b/connman/vpn/plugins/pptp.c
@@ -447,7 +447,7 @@ static int run_connect(struct vpn_provider *provider,
 	const char *opt_s;
 	const char *host;
 	char *str;
-	bool no_ipv6 = false;
+	bool no_ipv6;
 	int err, i;
 
 	if (!username || !password) {
@@ -484,12 +484,6 @@ static int run_connect(struct vpn_provider *provider,
 		if (!opt_s)
 			continue;
 
-		if (!g_strcmp0(opt_s, "PPPD.NoIPv6")) {
-			no_ipv6 = vpn_provider_get_boolean(provider,
-						pptp_options[i].cm_opt, false);
-			continue;
-		}
-
 		if (pptp_options[i].type == OPT_STRING)
 			connman_task_add_argument(task,
 					pptp_options[i].pptp_opt, opt_s);
@@ -508,6 +502,7 @@ static int run_connect(struct vpn_provider *provider,
 	connman_task_add_argument(task, "plugin",
 				SCRIPTDIR "/libppp-plugin.so");
 
+	no_ipv6 = vpn_provider_get_boolean(provider, "PPPD.NoIPv6", false);
 	vpn_provider_set_supported_ip_networks(provider, true, !no_ipv6);
 
 	err = connman_task_run(task, vpn_died, provider,