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

Conflicts:
	src/protocols/packet_manager.cc

diff --cc src/main/modules.cc
Simple merge

diff --cc src/protocols/packet_manager.cc
index bb298ee46f899b7a019b2d9cf90ce50908a62bd0,55cc6efd2fd6c61a71b0dacc626244fc21c20835..38d44c89daefcb6951584d3a56d688e2bdc28032
--- 1/src/protocols/packet_manager.cc
--- 2/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;