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 <dlenski@gmail.com>

diff --git a/main.c b/main.c
index 17af950b35281701de8087f7aca526610d1ce936..c43f87311bc863c2644b232b47121789e5b767cf 100644 (file)
--- 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 ? : "",