codecs update

diff --cc ChangeLog
index 578dc09182dc4d06fae4244f406a7b9350fb2015,61bc630b11110c00d00c02dfe30813dfde786df8..152dfecdb296cb61e629f0cd783d808b6a6c729d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,3 +1,11 @@@
++79
++-- pulled in latest codecs
++
 +78
 +-- deleted ha code; too much churn to support now
 +-- refactored session and related
 +-- changed inspector api (priority -> type, purge -> get ssn)
 +
  77
  -- pulled in josh's changes to make on Linux
  -- updated snort.lua for bindings

diff --cc configure.ac
index c71dbc6aa8c590e340e81949a249b4e85ecb17e9,7b8cb261489abef01161be1c87820b9cbefc9137..cc14aad5cea890505b04bba94e39287eaea9f024
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -25,7 -25,7 +25,7 @@@
  # initialization
  #--------------------------------------------------------------------------
  
- AC_INIT([snort], [2.10.078])
 -AC_INIT([snort], [2.10.077])
++AC_INIT([snort], [2.10.079])
  AC_PREREQ([2.68])
  
  AC_CONFIG_SRCDIR([src/main.h])

diff --cc src/CMakeLists.txt
index cae76c77a36cc0ef49dc97164a84ff5a81218798,f8b5417a4cbc87c9091a9c727fa74aafa541adf5..da566e9079c4076a8b24cfdd8958d5fa85a0d7c9
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -58,12 -57,9 +58,13 @@@ target_link_libraries(snor
      normalize
      perf_monitor
      stream
 +    stream_base
 +    stream_ip
 +    stream_icmp
 +    stream_tcp
 +    stream_udp
      http_inspect
+     nhttp_inspect
      flow
      parser
      file_api

diff --cc src/Makefile.am
index 81d1ca82b5265e91081c480811eafbecdb09ab3b,4ab550515c5468f8ecd7eb9a74d2abf65a6f72ec..1bad3dd2901c3771af25c0c06db58bd62f9d9ce2
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -25,16 -25,17 +25,20 @@@ main/libmain.a 
  parser/libparser.a \
  loggers/libloggers.a \
  codecs/libcodecs.a \
- codecs/basic/libbasic_codecs.a \
+ codecs/ip/libip_codecs.a \
+ codecs/link/liblink_codecs.a \
+ codecs/misc/libmisc_codecs.a \
+ codecs/root/libroot_codecs.a \
+ codecs/libcodec_utils.a \
 +stream/libstream.a \
 +stream/base/libstream_base.a \
 +stream/ip/libstream_ip.a \
 +stream/icmp/libstream_icmp.a \
 +stream/tcp/libstream_tcp.a \
 +stream/udp/libstream_udp.a \
  network_inspectors/libnetwork_inspectors.a \
 -network_inspectors/defrag/libdefrag.a \
  network_inspectors/normalize/libnormalize.a \
  network_inspectors/perf_monitor/libperf_monitor.a \
 -network_inspectors/stream5/libstream.a \
 -network_inspectors/stream5/libstream_api.a \
  service_inspectors/libservice_inspectors.a \
  service_inspectors/http_inspect/libhttp_inspect.a \
  file_api/libfile_api.a \

diff --cc src/codecs/encode.cc
Simple merge

diff --cc src/detection/fpdetect.cc
Simple merge

diff --cc src/protocols/packet.h
Simple merge