From: "cron2 (Code Review)" Date: Fri, 17 Jan 2025 11:29:14 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., marco@...2726..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <3b51c36035fe16c2a1ff980743b1a340ee8679f3-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="hCVCEZmGR0E="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and print port... List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mrbff Cc: plaisthos , flichtenheld , openvpn-devel --hCVCEZmGR0E= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/87= 0?usp=3Demail ) Change subject: IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and = print port when the port is specified ...................................................................... IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and print port when = the port is specified Updated the mroute_addr_print_ex() function to wrap IPv6 addresses in squ= are brackets and printing the port when the port is specified, e.g., [2001:db= 8::1]:8080 . When the port is not specified the IPv6 address formatting remain the sam= e, e.g., 2001:db8::1 . Change-Id: Ia58cff107d14e29e51df0a988e8337cbb70ebfbb Signed-off-by: Marco Baffo Acked-by: Gert Doering Message-Id: <20250117110422.921-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30= 480.html Signed-off-by: Gert Doering --- M src/openvpn/mroute.c 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c index f4539dc..80e18b7 100644 --- a/src/openvpn/mroute.c +++ b/src/openvpn/mroute.c @@ -430,18 +430,19 @@ { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv= 6.addr, IA_NET_ORDER, g= c)); - /* we only print port numbers for v4mapped v6 as of - * today, because "v6addr:port" is too ambiguous - */ - if (maddr.type & MR_WITH_PORT) - { - buf_printf(&out, ":%d", ntohs(maddr.v6.port)); - } + } + else if (maddr.type & MR_WITH_PORT) + { + buf_printf(&out, "[%s]", print_in6_addr(maddr.v6.addr,= 0, gc)); } else { buf_printf(&out, "%s", print_in6_addr(maddr.v6.addr, 0= , gc)); } + if (maddr.type & MR_WITH_PORT) + { + buf_printf(&out, ":%d", ntohs(maddr.v6.port)); + } if (maddr.type & MR_WITH_NETBITS) { buf_printf(&out, "/%d", maddr.netbits); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/870?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ia58cff107d14e29e51df0a988e8337cbb70ebfbb Gerrit-Change-Number: 870 Gerrit-PatchSet: 3 Gerrit-Owner: mrbff Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --hCVCEZmGR0E= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

IPv6 MADDR LOG: Wrap IPv6 addresses in square =
brackets and print port when the port is specified

Updated the mro= ute_addr_print_ex() function to wrap IPv6 addresses in square
brackets= and printing the port when the port is specified, e.g., [2001:db8::1]:8080= .
When the port is not specified the IPv6 address formatting remain t= he same, e.g., 2001:db8::1 .

Change-Id: Ia58cff107d14e29e51df0a988e8= 337cbb70ebfbb
Signed-off-by: Marco Baffo <marco@...2726...>
Ack= ed-by: Gert Doering <gert@...1296...>
Message-Id: <202501171104= 22.921-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-d= evel@lists.sourceforge.net/msg30480.html
Signed-off-by: Gert Doering <= ;gert@...1296...>
---
M src/openvpn/mroute.c
1 file changed, 8 = insertions(+), 7 deletions(-)

diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index f4539dc..80e18b7 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -430,18 +430,1= 9 @@
{
= buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv6.add= r,
= IA_NET_ORDER, gc));
- /* we only print port numbers for v4mapped v6 as of
- * = today, because "v6addr:port" is too ambiguous
- */
- if (maddr.type &= ; MR_WITH_PORT)
- = {
- = buf_printf(&out, ":%d", ntohs(maddr.v6.port= ));
- = }
+ = }
+ el= se if (maddr.type & MR_WITH_PORT)
+ {
+ buf_printf(&out, "[%s]", = print_in6_addr(maddr.v6.addr, 0, gc));
}
else
{

buf_printf(&out, "%s", prin= t_in6_addr(maddr.v6.addr, 0, gc));
}
+ if (maddr= .type & MR_WITH_PORT)
+ {
+ buf_printf(&out, ":%d", ntohs(maddr.v= 6.port));
+ = }
if (maddr.type & MR_WITH_NETBI= TS)
{
= buf_printf(&out, "/%d", maddr.netbits);

To view, visit change 870. To unsubscribe, or for help writing m= ail filters, visit settings<= /a>.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia58cff107d14e29e51df0a988e8= 337cbb70ebfbb
Gerrit-Change-Number: 870
Gerrit-PatchSet: 3
Gerrit-Owner: mrbff <marco@...2726...> <= /div>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--hCVCEZmGR0E=--