From: David Overton <therealdave32@gmail.com>
Date: Fri, 28 Jan 2022 22:49:46 +0000 (+0000)
Subject: Bugfix Legacy IP split include/exclude routes for Pulse
X-Git-Tag: v8.20~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=52d1c6748d9181d28f7cda183a4c29aeb3b33ff3;p=users%2Fdwmw2%2Fopenconnect.git

Bugfix Legacy IP split include/exclude routes for Pulse

In 3d845bc9b, routing configuration was modified to use the `new_ip_info`
and `install_vpn_opts()`.  Pulse IPv6 split include/exclude handling were
modified accordingly in that commit, but Legacy IP split include/exclude
routes were overlooked.

Since `install_vpn_opts()` clobbers the split include/exclude routes, this
means Legacy IP split routes for Pulse have been ignored since then.

Closes https://gitlab.com/openconnect/openconnect/-/merge_requests/330

Signed-off-by: David Overton <therealdave32@gmail.com>
Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/pulse.c b/pulse.c
index bd21754d..d0e2fec0 100644
--- a/pulse.c
+++ b/pulse.c
@@ -2312,8 +2312,8 @@ static int handle_main_config_packet(struct openconnect_info *vpninfo,
 			if (inc) {
 				inc->route = add_option_dup(&new_opts, "split-include", buf, -1);
 				if (inc->route) {
-					inc->next = vpninfo->ip_info.split_includes;
-					vpninfo->ip_info.split_includes = inc;
+					inc->next = new_ip_info.split_includes;
+					new_ip_info.split_includes = inc;
 				} else
 					free(inc);
 			}
@@ -2325,8 +2325,8 @@ static int handle_main_config_packet(struct openconnect_info *vpninfo,
 			if (exc) {
 				exc->route = add_option_dup(&new_opts, "split-exclude", buf, -1);
 				if (exc->route) {
-					exc->next = vpninfo->ip_info.split_excludes;
-					vpninfo->ip_info.split_excludes = exc;
+					exc->next = new_ip_info.split_excludes;
+					new_ip_info.split_excludes = exc;
 				} else
 					free(exc);
 			}