diff mbox series

[Openvpn-devel,S] Change in openvpn[master]: IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and include po...

Message ID 2ad97b27f1fcdee2b4cd87d14bf41e7aa1dd2a53-HTML@gerrit.openvpn.net
State New
Headers show
Series [Openvpn-devel,S] Change in openvpn[master]: IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and include po... | expand

Commit Message

mrbff (Code Review) Jan. 16, 2025, 5:11 p.m. UTC 
Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/870?usp=email

to review the following change.


Change subject: IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and include port when specified
......................................................................

IPv6 MADDR LOG: Wrap IPv6 addresses in square brackets and include port when specified

- Updated the mroute_addr_print_ex() function to always wrap IPv6 addresses in square brackets for proper formatting.
- Added port printing for IPv6 addresses when specified, e.g., [2001:db8::1]:8080.

Change-Id: Ia58cff107d14e29e51df0a988e8337cbb70ebfbb
Signed-off-by: Marco Baffo <marco@mandelbit.com>
---
M src/openvpn/mroute.c
1 file changed, 5 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/870/1
diff mbox series

Patch

diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index f4539dc..91419ed 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -430,17 +430,14 @@ 
                 {
                     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
                 {
-                    buf_printf(&out, "%s", print_in6_addr(maddr.v6.addr, 0, gc));
+                    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)
                 {