From: Russ Combs <rucombs@cisco.com>
Date: Fri, 3 Oct 2014 17:14:53 +0000 (-0400)
Subject: Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
X-Git-Tag: 3.0.0-233~1397^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953ba6914eaee810cef0f94625b9e52b6465ec0f;p=thirdparty%2Fsnort3.git

Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
---

953ba6914eaee810cef0f94625b9e52b6465ec0f
diff --cc src/helpers/markup.cc
index 30ab86498,1289819b4..90c8432f2
--- a/src/helpers/markup.cc
+++ b/src/helpers/markup.cc
@@@ -51,10 -51,9 +51,10 @@@ const string& Markup::emphasis(const st
  const string& Markup::sanitize(const char* const c)
  { return sanitize(string(c)); }
  
 +// FIXIT-L these escapes are emitted directly by asciidoc 8.6.9.
  const string& Markup::sanitize(const string& s)
  {
-     const char* const asciidoc_chars = "~*<>^'";
+     const char* const asciidoc_chars = "*<>^'";
      static string m;
      m.clear();
      m += s;
diff --cc src/protocols/packet.h
index 25616fc51,2df8449de..9c6d502f5
--- a/src/protocols/packet.h
+++ b/src/protocols/packet.h
@@@ -159,9 -150,12 +148,10 @@@ struct SO_PUBLIC Packe
      uint16_t proto_bits;        /* protocols contained within this packet */
      int16_t application_protocol_ordinal;
  
 -
      uint16_t alt_dsize;         /* the dsize of a packet before munging (used for log)*/
      uint8_t num_layers;         /* index into layers for next encap */
+     uint8_t ip_proto_next; /* the protocol ID after IP and all IP6 extension */
  
 -
      // nothing after this point is zeroed ...
  
      // Everything beyond this point is set by PacketManager::decode()
@@@ -172,9 -166,10 +162,9 @@@
      const uint8_t* data;        /* packet payload pointer */
      uint16_t dsize;             /* packet payload size */
  
-     SnortData ptrs; // convenience pointers used throughout Snort++
+     DecodeData ptrs; // convenience pointers used throughout Snort++
      Layer* layers;    /* decoded encapsulations */
  
 -
      PseudoPacketType pseudo_type;    // valid only when PKT_PSEUDO is set
      uint32_t iplist_id;
      uint16_t max_dsize;