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

diff --cc src/helpers/markup.cc
index 30ab8649858bfde8eea7da8924146d941004f017,1289819b45e76b2659edc196d1b048b4cb8ebd43..90c8432f237ea20574abe89e63c9d240197d4820
--- 1/src/helpers/markup.cc
--- 2/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/managers/module_manager.cc
Simple merge

diff --cc src/protocols/packet.h
index 25616fc518a2a11a7cafeb207defab315e45134a,2df8449de91183b27107b285636f29d8f340baf4..9c6d502f5bd6f576c29fa59fb868e2d578be2f2e
--- 1/src/protocols/packet.h
--- 2/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;

diff --cc src/stream/icmp/icmp_session.cc
Simple merge

diff --cc src/stream/ip/ip_defrag.cc
Simple merge

diff --cc src/stream/stream_api.cc
Simple merge

diff --cc src/stream/udp/udp_session.cc
Simple merge