From: David Sommerseth <davids@redhat.com>
Date: Tue, 13 Dec 2011 17:08:24 +0000 (+0100)
Subject: Only warn about non-tackled IPv6 packets once
X-Git-Tag: v2.2.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7bbe47a7fcfa74297ff04a50982b70113f28f96;p=thirdparty%2Fopenvpn.git

Only warn about non-tackled IPv6 packets once

When using OpenVPN 2.2 on clients and server with Windows based
clients, it will try to push IPv6 packets through the tunnel.  This
causes the server log to be filled up with log entries like this:

 Wed Jun 29 22:12:51 2011 username/1.2.3.4:56990 Need IPv6 code in mroute_extract_addr_from_packet

This patch modifies this message to state that IPv6 packets are not
tackled in tun mode, and prints it only once.

Trac: 147
Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/mroute.c b/mroute.c
index 3debd80f2..1b3488f37 100644
--- a/mroute.c
+++ b/mroute.c
@@ -131,6 +131,8 @@ mroute_extract_addr_ipv4 (struct mroute_addr *src,
 			  const struct buffer *buf)
 {
   unsigned int ret = 0;
+  static bool ipv6warned = false;
+
   if (BLEN (buf) >= 1)
     {
       switch (OPENVPN_IPH_GET_VER (*BPTR(buf)))
@@ -156,7 +158,10 @@ mroute_extract_addr_ipv4 (struct mroute_addr *src,
 	  break;
 	case 6:
 	  {
-	    msg (M_WARN, "Need IPv6 code in mroute_extract_addr_from_packet"); 
+            if( !ipv6warned ) {
+              msg (M_WARN, "IPv6 in tun mode is not supported in OpenVPN 2.2");
+              ipv6warned = true;
+            }
 	    break;
 	  }
 	}