cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/870?usp=email )
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 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 the same, e.g., 2001:db8::1 . Change-Id: Ia58cff107d14e29e51df0a988e8337cbb70ebfbb Signed-off-by: Marco Baffo <ma...@mandelbit.com> Acked-by: Gert Doering <g...@greenie.muc.de> Message-Id: <20250117110422.921-1-g...@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30480.html Signed-off-by: Gert Doering <g...@greenie.muc.de> --- 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.v4mappedv6.addr, 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)); - } + } + 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=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ia58cff107d14e29e51df0a988e8337cbb70ebfbb Gerrit-Change-Number: 870 Gerrit-PatchSet: 3 Gerrit-Owner: mrbff <ma...@mandelbit.com> Gerrit-Reviewer: cron2 <g...@greenie.muc.de> Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com> Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
