From: Daniel Lenski Date: Wed, 21 Apr 2021 04:37:15 +0000 (-0700) Subject: Make CLI print IPv6 address correctly X-Git-Tag: v8.20~264 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4161c391d19a46f53d68dbe66644a7dc8a1186ff;p=users%2Fdwmw2%2Fopenconnect.git Make CLI print IPv6 address correctly Previously, it only printed netmask6 (as set by Cisco/ocserv VPNs), and wouldn't print the IPv6 address if only addr6 was set. Signed-off-by: Daniel Lenski --- diff --git a/main.c b/main.c index 17af950b..c43f8731 100644 --- a/main.c +++ b/main.c @@ -1449,8 +1449,8 @@ static void print_connection_info(struct openconnect_info *vpninfo) vpn_progress(vpninfo, PRG_INFO, _("Configured as %s%s%s, with SSL%s%s %s and %s%s%s %s\n"), ip_info->addr?:"", - (ip_info->netmask6 && ip_info->addr) ? " + " : "", - ip_info->netmask6 ? : "", + ((ip_info->netmask6 || ip_info->addr6) && ip_info->addr) ? " + " : "", + ip_info->netmask6 ? : (ip_info->addr6 ? : ""), ssl_compr ? " + " : "", ssl_compr ? : "", ssl_state, vpninfo->proto->udp_protocol ? : "UDP", udp_compr ? " + " : "", udp_compr ? : "",