From: Russ Combs <rucombs@cisco.com>
Date: Mon, 14 Jul 2014 21:17:01 +0000 (-0400)
Subject: pulled in latest from tom
X-Git-Tag: 3.0.0-233~1444^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f8e1c43f9d7307a64df2f930cb64d4bbcce6e9;p=thirdparty%2Fsnort3.git

pulled in latest from tom
---

97f8e1c43f9d7307a64df2f930cb64d4bbcce6e9
diff --cc ChangeLog
index 7ec0dd5ba,51468945e..2d7b7ba34
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,3 +1,23 @@@
++101
++-- tweaked startup output
++-- fixed pattern matcher
++-- pulled in latest from Tom
++
 +100
 +-- adding profiling to module
 +-- profile.preprocs is now profile.modules
 +
 +99
 +-- updated wizard
++-- removed service / app id from inspectors
 +
 +98
 +-- initial wizard implementation
 +
 +97
 +-- latest from Tom
 +-- some valgrind fixes
 +
  96
  -- finished default fp selection
  -- added NHttpInspect::get_buf() and related
diff --cc configure.ac
index 9fda8402b,b343d2311..6c48b28be
--- a/configure.ac
+++ b/configure.ac
@@@ -25,7 -25,7 +25,7 @@@
  # initialization
  #--------------------------------------------------------------------------
  
- AC_INIT([snort], [2.10.100])
 -AC_INIT([snort], [2.10.096])
++AC_INIT([snort], [2.10.101])
  AC_PREREQ([2.68])
  
  AC_CONFIG_SRCDIR([src/main.h])
diff --cc src/service_inspectors/nhttp_inspect/nhttp_api.cc
index ec35c084a,db9420bb6..a62a987df
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
@@@ -1,6 -1,6 +1,6 @@@
  /****************************************************************************
   *
--** Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
++ * Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
   * Copyright (C) 2003-2013 Sourcefire, Inc.
   *
   * This program is free software; you can redistribute it and/or modify
@@@ -37,22 -37,16 +37,13 @@@
  #include "nhttp_inspect.h"
  #include "nhttp_api.h"
  
- Module* NHttpApi::nhttp_mod_ctor() { return new NHttpModule; }
- 
- void NHttpApi::nhttp_mod_dtor(Module* m) { delete m; }
 -int16_t NHttpApi::appProtocolId;
--
  const char* NHttpApi::nhttp_myName = "nhttp_inspect";
  
  void NHttpApi::nhttp_init()
  {
      NHttpFlowData::init();
 -    appProtocolId = AddProtocolReference("nhttp");
  }
  
- void NHttpApi::nhttp_term()
- {
- }
- 
  Inspector* NHttpApi::nhttp_ctor(Module* mod)
  {
      const NHttpModule* nhttpMod = (NHttpModule*) mod;
diff --cc src/service_inspectors/nhttp_inspect/nhttp_api.h
index 4335e7902,4e4b6ee85..7a4e82211
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.h
@@@ -36,21 -38,21 +38,20 @@@
  class NHttpApi {
  public:
      static const InspectApi nhttp_api;
--    static int16_t appProtocolId;
  private:
      NHttpApi() = delete;
-     static Module* nhttp_mod_ctor();
-     static void nhttp_mod_dtor(Module* m);
+     static Module* nhttp_mod_ctor() { return new NHttpModule; };
+     static void nhttp_mod_dtor(Module* m) { delete m; };
      static const char* nhttp_myName;
      static void nhttp_init();
-     static void nhttp_term();
+     static void nhttp_term() {};
      static Inspector* nhttp_ctor(Module* mod);
-     static void nhttp_dtor(Inspector* p);
-     static void nhttp_pinit();
-     static void nhttp_pterm();
-     static void nhttp_sum();
-     static void nhttp_stats();
-     static void nhttp_reset();
+     static void nhttp_dtor(Inspector* p) { delete p; };
+     static void nhttp_pinit() {};
+     static void nhttp_pterm() {};
+     static void nhttp_sum() {};
+     static void nhttp_stats() {};
+     static void nhttp_reset() {};
  };
  
  #endif