From cefa0aaf8d1b96eb9b62d96f7fee5639a5c3cad0 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 3 May 2021 20:34:16 +0100 Subject: [PATCH] Fix setting of IP addresses in ip_info from PPP We were clearing vpninfo->ip_info.addr if it was already set, as shown in https://github.com/adrienverge/openfortivpn/issues/112#issuecomment-831471948 Signed-off-by: David Woodhouse --- ppp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ppp.c b/ppp.c index 18c8de8c..37aab047 100644 --- a/ppp.c +++ b/ppp.c @@ -947,16 +947,12 @@ static int handle_state_transition(struct openconnect_info *vpninfo, int dtls, if (ppp->want_ipv4 && !vpninfo->ip_info.addr) { vpninfo->ip_info.addr = add_option_ipaddr(&vpninfo->cstp_options, "ppp_ipv4", AF_INET, &ppp->out_ipv4_addr); - } else { - vpninfo->ip_info.addr = NULL; } /* Ensure that we use the addresses we configured on PPP */ if (ppp->want_ipv6 && !vpninfo->ip_info.addr6 && !vpninfo->ip_info.netmask6) { vpninfo->ip_info.addr6 = add_option_ipaddr(&vpninfo->cstp_options, "ppp_ipv6", AF_INET6, &ppp->out_ipv6_addr); - } else { - vpninfo->ip_info.addr6 = NULL; } if (ppp->got_peerns & IPCP_NBNS0) -- 2.50.1