Merge branch 'master' of /nfs/home/rucombs/Snort++ into codecs

Conflicts:
	src/codecs/root/cd_wlan.cc

diff --cc src/codecs/ip/cd_frag.cc
Simple merge

diff --cc src/codecs/ip/cd_icmp4.cc
index 7bfc911f5ac2122de697794dc84c9c63d35787ad,b8a9a2243eec62d30e9b76a12db4b6e0b243357e..868206d43632b4767b66ce9ed33dd47834e17b4f
--- 1/src/codecs/ip/cd_icmp4.cc
--- 2/src/codecs/ip/cd_icmp4.cc
+++ b/src/codecs/ip/cd_icmp4.cc
@@@ -33,17 -33,15 +33,18 @@@
  #include "codecs/decode_module.h"
  #include "codecs/sf_protocols.h"
  #include "codecs/ip/ip_util.h"
 +#include "protocols/protocol_ids.h"
 +#include "protocols/packet.h"
 +#include "protocols/ipv4_options.h"
  #include "packet_io/active.h"
  #include "log/text_log.h"
 +#include "main/snort_debug.h"
 +#include "sfip/sf_ip.h"
  
- namespace{
- 
  #define CD_ICMP4_NAME "icmp4"
+ #define CD_ICMP4_HELP "support for internet control message protocol v4"
+ 
+ namespace{
  
  static const RuleMap icmp4_rules[] =
  {

diff --cc src/codecs/ip/cd_icmp6.cc
index aa6e7a7bf1935ef4b896ca1535c90fbb11e6bd3a,48d1d9925b554590dc4ce6f49608e600d14ee90e..40ba6f08805a2454f19144e1305008e54c3253ae
--- 1/src/codecs/ip/cd_icmp6.cc
--- 2/src/codecs/ip/cd_icmp6.cc
+++ b/src/codecs/ip/cd_icmp6.cc
@@@ -38,8 -38,9 +38,10 @@@
  #include "codecs/ip/ip_util.h"
  #include "packet_io/active.h"
  #include "log/text_log.h"
 +#include "main/snort_debug.h"
  
+ #define CD_ICMP6_NAME "icmp6"
+ #define CD_ICMP6_HELP "support for internet control message protocol v6"
  
  namespace
  {

diff --cc src/codecs/ip/cd_igmp.cc
index 609c944eb585f7c1d21384de3ad7430c9099804e,fca16a4a99fc33679625d999352698e3df7cc16e..b479a1ce1fc773d4909b436cfe0c918f4232bd3c
--- 1/src/codecs/ip/cd_igmp.cc
--- 2/src/codecs/ip/cd_igmp.cc
+++ b/src/codecs/ip/cd_igmp.cc
@@@ -29,9 -29,11 +29,12 @@@
  #include "codecs/decode_module.h"
  #include "codecs/codec_events.h"
  #include "protocols/packet.h"
 +#include "protocols/ipv4_options.h"
  
  
+ #define CD_IGMP_NAME "igmp"
+ #define CD_IGMP_HELP "support for internet group management protocol"
+ 
  namespace
  {
  

diff --cc src/codecs/ip/cd_ipv4.cc
Simple merge

diff --cc src/codecs/ip/cd_ipv6.cc
index 6f6d926dc30c9a115b2efc6ce761e65158ec3388,208cfb707ccaf04223dc7f09835f2143e84d5c31..4b770f900917307addce32e694c4da7002903beb
--- 1/src/codecs/ip/cd_ipv6.cc
--- 2/src/codecs/ip/cd_ipv6.cc
+++ b/src/codecs/ip/cd_ipv6.cc
@@@ -41,8 -40,10 +41,11 @@@
  #include "protocols/protocol_ids.h"
  #include "protocols/packet_manager.h"
  #include "log/text_log.h"
 +#include "sfip/sf_ip.h"
  
+ #define CD_IPV6_NAME "ipv6"
+ #define CD_IPV6_HELP "support for internet protocol v6"
+ 
  namespace
  {
  

diff --cc src/codecs/ip/cd_tcp.cc
index bad73f4bc9654a7d204bd135e66586fa1276a7e2,9faea90d6b590a59e7000e40d6e4a0a915555aa6..5fc7a5d0ca1e08c82a20405b85af28eed5e906ef
--- 1/src/codecs/ip/cd_tcp.cc
--- 2/src/codecs/ip/cd_tcp.cc
+++ b/src/codecs/ip/cd_tcp.cc
@@@ -43,9 -43,9 +43,11 @@@
  #include "log/log.h"
  #include "protocols/packet_manager.h"
  
+ #define CD_TCP_NAME "tcp"
+ #define CD_TCP_HELP "support for transmission control protocol"
  
 +using namespace tcp;
 +
  namespace
  {
  

diff --cc src/codecs/ip/cd_udp.cc
index deafc055f0555dfb88babc4b70730a1b4afde5f2,e5a7740bb65e098511c0ce77e44c1545c2e84d46..6b7500a26af4b3cf7a40d20ffffe25aee637b4aa
--- 1/src/codecs/ip/cd_udp.cc
--- 2/src/codecs/ip/cd_udp.cc
+++ b/src/codecs/ip/cd_udp.cc
@@@ -43,8 -43,9 +43,10 @@@
  #include "snort_config.h"
  #include "parser/config_file.h"
  #include "codecs/ip/ip_util.h"
 +#include "main/snort_debug.h"
  
+ #define CD_UDP_NAME "udp"
+ #define CD_UDP_HELP "support for user datagram protocol"
  
  namespace
  {

diff --cc src/codecs/link/cd_ppp_encap.cc
index fa23a11d7b9c741e72e51af1618df7cb52aa04ea,d31d8cadce2dfb972ee75049feab9605406d4ffa..7e7402b8346e168f6c2bf3407288bdd12e8f7926
--- 1/src/codecs/link/cd_ppp_encap.cc
--- 2/src/codecs/link/cd_ppp_encap.cc
+++ b/src/codecs/link/cd_ppp_encap.cc
@@@ -28,8 -28,10 +28,11 @@@
  #include "protocols/protocol_ids.h"
  #include "snort.h"
  #include "codecs/sf_protocols.h"
 +#include "main/snort_debug.h"
  
+ #define CD_PPPENCAP_NAME "ppp_encap"
+ #define CD_PPPENCAP_HELP "support for point-to-point encapsulation"
+ 
  namespace
  {
  

diff --cc src/codecs/link/cd_pppoe.cc
Simple merge

diff --cc src/codecs/misc/cd_icmp4_ip.cc
Simple merge

diff --cc src/codecs/root/cd_null.cc
Simple merge

diff --cc src/codecs/root/cd_wlan.cc
index 7fb9d423203dbc935228b845662a22afdbb70f4b,45fa12619871659b585eaf92f886390d8b100196..ba77a1c537828ed9e0896c4ed410bec5ed818fe8
--- 1/src/codecs/root/cd_wlan.cc
--- 2/src/codecs/root/cd_wlan.cc
+++ b/src/codecs/root/cd_wlan.cc
@@@ -31,8 -31,14 +31,10 @@@
  #include "codecs/codec_events.h"
  #include "protocols/protocol_ids.h"
  #include "main/snort.h"
 -
 -
 -#ifdef DEBUG_MSGS
 -#include "log/log.h"
 -#endif
 +#include "log/text_log.h"
  
+ #define CD_WLAN_NAME "wlan"
+ #define CD_WLAN_HELP "support for wireless local area network protocol"
  
  namespace
  {

diff --cc src/ips_options/ips_fragbits.cc
Simple merge

diff --cc src/ips_options/ips_fragoffset.cc
Simple merge

diff --cc src/ips_options/ips_ipopts.cc
Simple merge

diff --cc src/ips_options/ips_session.cc
Simple merge

diff --cc src/loggers/alert_csv.cc
Simple merge

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

diff --cc src/network_inspectors/arp_spoof/arp_spoof.cc
Simple merge

diff --cc src/stream/tcp/ips_stream_size.cc
Simple merge