From 6c1cc6b8c6903513cb004c90deb2417a095b6b29 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@regit.org>
Date: Wed, 8 Aug 2012 16:21:27 +0200
Subject: [PATCH] decode: decode IP6-in-IP6

This patch should fix #514.
---
 src/decode-ipv6.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/decode-ipv6.c b/src/decode-ipv6.c
index 15701e1..5516898 100644
--- a/src/decode-ipv6.c
+++ b/src/decode-ipv6.c
@@ -403,6 +403,7 @@ DecodeIPV6ExtHdrs(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt
                 plen -= hdrextlen;
                 break;
             }
+
             case IPPROTO_NONE:
                 IPV6_SET_L4PROTO(p,nh);
                 SCReturn;
@@ -482,6 +483,8 @@ void DecodeIPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt,
         case IPPROTO_SCTP:
             IPV6_SET_L4PROTO (p, IPPROTO_SCTP);
             return DecodeSCTP(tv, dtv, p, pkt + IPV6_HEADER_LEN, IPV6_GET_PLEN(p), pq);
+        case IPPROTO_IPV6:
+            return DecodeIPV6(tv, dtv, p, pkt + IPV6_HEADER_LEN, IPV6_GET_PLEN(p), pq);
         case IPPROTO_FRAGMENT:
         case IPPROTO_HOPOPTS:
         case IPPROTO_ROUTING:
-- 
1.7.10.4

