From: Josh <jrosenba@cisco.com>
Date: Thu, 18 Sep 2014 17:53:06 +0000 (-0400)
Subject: Merge branch 'codecs' of /nfs/home/jrosenba/codecs
X-Git-Tag: 3.0.0-233~1410^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9ba188b8acd7cf11e2701e83bae91bca2618def;p=thirdparty%2Fsnort3.git

Merge branch 'codecs' of /nfs/home/jrosenba/codecs

Conflicts:
	src/protocols/packet_manager.cc
---

c9ba188b8acd7cf11e2701e83bae91bca2618def
diff --cc src/protocols/packet_manager.cc
index bb298ee46,55cc6efd2..38d44c89d
--- a/src/protocols/packet_manager.cc
+++ b/src/protocols/packet_manager.cc
@@@ -207,7 -205,7 +205,7 @@@ void PacketManager::decode
  
  
          // internal statistics and record keeping
-         push_layer(p, prev_prot_id, raw.data, codec_data.lyr_len, CodecManager::s_protocols[mapped_prot]);
 -        push_layer(p, prev_prot_id, pkt, codec_data.lyr_len);
++        push_layer(p, prev_prot_id, raw.data, codec_data.lyr_len);
          s_stats[mapped_prot + stat_offset]++; // add correct decode for previous layer
          mapped_prot = CodecManager::s_proto_map[codec_data.next_prot_id];
          prev_prot_id = codec_data.next_prot_id;