From: Josh <jrosenba@cisco.com>
Date: Tue, 9 Sep 2014 21:29:26 +0000 (-0400)
Subject: Merge branch 'master' of /nfs/home/rucombs/Snort++ into codecs
X-Git-Tag: 3.0.0-233~1414^2~2^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ca9ceb25b5921dbad8d289fc920db907966a6fb;p=thirdparty%2Fsnort3.git

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

Conflicts:
	src/codecs/root/cd_wlan.cc
---

2ca9ceb25b5921dbad8d289fc920db907966a6fb
diff --cc src/codecs/ip/cd_icmp4.cc
index 7bfc911f5,b8a9a2243..868206d43
--- a/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 aa6e7a7bf,48d1d9925..40ba6f088
--- a/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 609c944eb,fca16a4a9..b479a1ce1
--- a/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_ipv6.cc
index 6f6d926dc,208cfb707..4b770f900
--- a/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 bad73f4bc,9faea90d6..5fc7a5d0c
--- a/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 deafc055f,e5a7740bb..6b7500a26
--- a/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 fa23a11d7,d31d8cadc..7e7402b83
--- a/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/root/cd_wlan.cc
index 7fb9d4232,45fa12619..ba77a1c53
--- a/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
  {