aboutsummaryrefslogtreecommitdiff
path: root/mroute.c
diff options
context:
space:
mode:
authorJuanJo Ciarlante <jjo@google.com>2010-02-20 20:28:40 +0100
committerJuanJo Ciarlante <juanjosec@gmail.com>2011-03-25 13:30:31 +0100
commita69846411ae68dbd03b7552e33a63622bfbfc18b (patch)
treee4882bb71ae01c29383823a2aae6c26bbfd0e1d7 /mroute.c
parent* rebased to v2.1.1 release (diff)
downloadopenvpn-a69846411ae68dbd03b7552e33a63622bfbfc18b.tar.xz
* undo mroute.c changes related to ipv6 payload,
nothing to do w/ipv6 transport afterall.
Diffstat (limited to '')
-rw-r--r--mroute.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/mroute.c b/mroute.c
index 56e01a2..a0f8e4e 100644
--- a/mroute.c
+++ b/mroute.c
@@ -359,37 +359,7 @@ mroute_addr_print_ex (const struct mroute_addr *ma,
}
break;
case MR_ADDR_IPV6:
-#ifdef USE_PF_INET6
- {
- struct buffer buf;
- struct sockaddr_in6 sin6;
- int port;
- char buf6[INET6_ADDRSTRLEN] = "";
- CLEAR(sin6);
- sin6.sin6_family = AF_INET6;
- buf_set_read (&buf, maddr.addr, maddr.len);
- if (buf_read(&buf, &sin6.sin6_addr, sizeof (sin6.sin6_addr)))
- {
- if (getnameinfo((struct sockaddr *)&sin6, sizeof (struct sockaddr_in6),
- buf6, sizeof (buf6), NULL, 0, NI_NUMERICHOST) != 0)
- {
- buf_printf (&out, "MR_ADDR_IPV6 getnameinfo() err");
- break;
- }
- buf_puts (&out, buf6);
- if (maddr.type & MR_WITH_NETBITS)
- buf_printf (&out, "/%d", maddr.netbits);
- if (maddr.type & MR_WITH_PORT)
- {
- port = buf_read_u16 (&buf);
- if (port >= 0)
- buf_printf (&out, ":%d", port);
- }
- }
- }
-#else /* old, pre USE_PF_INET6 code */
buf_printf (&out, "IPV6");
-#endif
break;
default:
buf_printf (&out, "UNKNOWN");