From: JuanJo Ciarlante <jjo@google.com>
Date: Sat, 20 Feb 2010 19:28:40 +0000 (+0100)
Subject: * undo mroute.c changes related to ipv6 payload,
X-Git-Tag: v2.3-alpha1~240^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a69846411ae68dbd03b7552e33a63622bfbfc18b;p=thirdparty%2Fopenvpn.git

* undo mroute.c changes related to ipv6 payload,
  nothing to do w/ipv6 transport afterall.
---

diff --git a/mroute.c b/mroute.c
index 56e01a2f8..a0f8e4e3a 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");