From 73726d13a38b2f5cd501681d4a806305c361af3d Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 29 Dec 2014 19:38:33 +0200 Subject: [PATCH] print IPv6 netmask only when in non-full mode Also use the network address if available to print netmask. --- src/worker-vpn.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/worker-vpn.c b/src/worker-vpn.c index 3d8e3074..d15f6758 100644 --- a/src/worker-vpn.c +++ b/src/worker-vpn.c @@ -1554,16 +1554,22 @@ static int connect_handler(worker_st * ws) ws->vinfo.ipv6, ws->vinfo.ipv6_prefix); SEND_ERR(ret); } else { + const char *net; + ret = cstp_printf(ws, "X-CSTP-Address: %s\r\n", ws->vinfo.ipv6); SEND_ERR(ret); - } - ret = - cstp_printf(ws, "X-CSTP-Netmask: %s/%u\r\n", - ws->vinfo.ipv6, ws->vinfo.ipv6_prefix); - SEND_ERR(ret); + net = ws->vinfo.ipv6_network; + if (net == NULL) + net = ws->vinfo.ipv6; + + ret = + cstp_printf(ws, "X-CSTP-Netmask: %s/%u\r\n", + net, ws->vinfo.ipv6_prefix); + SEND_ERR(ret); + } } for (i = 0; i < ws->vinfo.dns_size; i++) {