refactored various api for consistency wrt *init() and *term() naming (p* for plugin...

diff --git a/extra/src/codecs/pim.cc b/extra/src/codecs/pim.cc
index 1ffd1db6ccc2ae407081f50572cec35bf772cb3d..349f3e92eef3aea7aad95ed4d1f52a49a7a04d9d 100644 (file)
--- a/extra/src/codecs/pim.cc
+++ b/extra/src/codecs/pim.cc
@@ -93,10 +93,10 @@ static const CodecApi pim_api =
         nullptr,
         nullptr
     },
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
+    nullptr, // pinit
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     ctor,
     dtor,
 };

diff --git a/extra/src/codecs/token_ring.cc b/extra/src/codecs/token_ring.cc
index f71ec604e448e1ddefe9b57c964afdbaba1be648..759bd991da1858617d925cc6366a60196cc41820 100644 (file)
--- a/extra/src/codecs/token_ring.cc
+++ b/extra/src/codecs/token_ring.cc
@@ -215,10 +215,10 @@ static const CodecApi tr_api =
         mod_ctor,
         mod_dtor
     },
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
+    nullptr, // pinit
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     ctor,
     dtor,
 };

diff --git a/extra/src/inspectors/dpx.cc b/extra/src/inspectors/dpx.cc
index 6867ddf4f1bad1bfb044e3f092fa74dd95036cb4..2bd25c811b44b74b7b959529851aa71eedbd1928 100644 (file)
--- a/extra/src/inspectors/dpx.cc
+++ b/extra/src/inspectors/dpx.cc
@@ -149,12 +149,12 @@ static const InspectApi dpx_api
     PROTO_BIT__UDP,
     nullptr, // service
     nullptr, // contents
-    nullptr, // init
-    nullptr, // term
-    dpx_ctor,
-    dpx_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    dpx_ctor,
+    dpx_dtor,
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/extra/src/ips_options/ips_urg.cc b/extra/src/ips_options/ips_urg.cc
index 18baf3d9cb75bfbf8c5be1c22b20e240f14b797d..5994b98138e36a44ec9addfe9059fecf7f94118d 100644 (file)
--- a/extra/src/ips_options/ips_urg.cc
+++ b/extra/src/ips_options/ips_urg.cc
@@ -205,10 +205,10 @@ static const IpsApi urg_api =
     },
     OPT_TYPE_DETECTION,
     1, PROTO_BIT__TCP,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
+    nullptr, // pinit
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     urg_ctor,
     urg_dtor,
     nullptr

diff --git a/extra/src/so_rules/sid_18758.cc b/extra/src/so_rules/sid_18758.cc
index 36c4630448adbbb4342e53dcd3276526c61858ae..9c99b39cd206618e6bc1d58ade28961608e0f2cd 100644 (file)
--- a/extra/src/so_rules/sid_18758.cc
+++ b/extra/src/so_rules/sid_18758.cc
@@ -67,10 +67,10 @@ static const SoApi so_api =
     },
     sid_18758_gz,
     sid_18758_gz_len,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
+    nullptr, // pinit
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     ctor,
     dtor,
 };

diff --git a/src/framework/codec.h b/src/framework/codec.h
index ff3582179d8063b8457d722da20b98e4eae29caa..515e05431db2b31d835806142d3c2fa366cd9ddd 100644 (file)
--- a/src/framework/codec.h
+++ b/src/framework/codec.h
@@ -211,8 +211,8 @@ struct CodecApi
     BaseApi base;
 
     // these may be nullptr
-    CdAuxFunc ginit;  // initialize global plugin data
-    CdAuxFunc gterm;  // clean-up pinit()
+    CdAuxFunc pinit;  // initialize global plugin data
+    CdAuxFunc pterm;  // clean-up pinit()
 
     CdAuxFunc tinit;  // initialize thread-local plugin data
     CdAuxFunc tterm;  // clean-up tinit()

diff --git a/src/framework/inspector.h b/src/framework/inspector.h
index f24561ec9f8886af15cc4049ddde5e9a35d45093..d977ef0207aaf59a31290948c6912fe53bb6d87d 100644 (file)
--- a/src/framework/inspector.h
+++ b/src/framework/inspector.h
@@ -67,8 +67,8 @@ public:
     virtual void show(SnortConfig*) { };
 
     // packet thread functions
-    virtual void pinit() { };
-    virtual void pterm() { };
+    virtual void tinit() { };
+    virtual void tterm() { };
 
     virtual void eval(Packet*) = 0;
     virtual void meta(int, const uint8_t*) { };
@@ -150,15 +150,12 @@ struct InspectApi
     const char** buffers;  // null terminated list of exported buffers
     const char* service;   // nullptr when type != IT_SERVICE
 
-    // main thread funcs - parse time data only
-    InspectFunc init;      // allocate process static data
-    InspectFunc term;      // release init() data
+    InspectFunc pinit;     // plugin init
+    InspectFunc pterm;     // cleanup pinit()
+    InspectFunc tinit;     // thread local init
+    InspectFunc tterm;     // cleanup tinit()
     InspectNew ctor;       // instantiate inspector from Module data
     InspectDelFunc dtor;   // release inspector instance
-
-    // packet thread funcs - runtime data only
-    InspectFunc pinit;     // plugin thread local allocation
-    InspectFunc pterm;     // plugin thread local cleanup
     InspectSsnFunc ssn;    // purge caches
     InspectFunc reset;     // clear stats
 };

diff --git a/src/framework/ips_option.h b/src/framework/ips_option.h
index d4d53f491cb00bdf8f34506d16c437cc3c3289b5..d0f5d8b2bc4004aeaaac8db89b67b7f8e38a5c49 100644 (file)
--- a/src/framework/ips_option.h
+++ b/src/framework/ips_option.h
@@ -120,8 +120,8 @@ struct IpsApi
     unsigned max_per_rule;
     unsigned protos;
 
-    IpsOptFunc ginit;
-    IpsOptFunc gterm;
+    IpsOptFunc pinit;
+    IpsOptFunc pterm;
     IpsOptFunc tinit;
     IpsOptFunc tterm;
     IpsNewFunc ctor;

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index df524868c8ef312468ba53e8f67b1f7655b2eafd..40af1353392b2e59af05d158db4f434df644d955 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -230,8 +230,8 @@ void InspectorManager::release_plugins ()
 
     for ( auto* p : s_handlers )
     {
-        if ( !p->init && p->api.term )
-            p->api.term();
+        if ( !p->init && p->api.pterm )
+            p->api.pterm();
 
         delete p;
     }
@@ -365,8 +365,8 @@ static PHClass* GetClass(const char* keyword, FrameworkConfig* fc)
         {
             if ( p->init )
             {
-                if ( p->api.init )
-                    p->api.init();
+                if ( p->api.pinit )
+                    p->api.pinit();
                 p->init = false;
             }
             PHClass* ppc = new PHClass(p->api);
@@ -383,8 +383,8 @@ void InspectorManager::thread_init(SnortConfig* sc)
     Inspector::slot = get_instance_id();
 
     for ( auto* p : sc->framework_config->clist )
-        if ( p->api.pinit )
-            p->api.pinit();
+        if ( p->api.tinit )
+            p->api.tinit();
 
     InspectionPolicy* pi = get_inspection_policy();
 
@@ -392,7 +392,7 @@ void InspectorManager::thread_init(SnortConfig* sc)
         return;
 
     for ( auto* p : pi->framework_policy->ilist )
-        p->handler->pinit();
+        p->handler->tinit();
 }
 
 void InspectorManager::thread_term(SnortConfig* sc)
@@ -403,11 +403,11 @@ void InspectorManager::thread_term(SnortConfig* sc)
         return;
 
     for ( auto* p : pi->framework_policy->ilist )
-        p->handler->pterm();
+        p->handler->tterm();
 
     for ( auto* p : sc->framework_config->clist )
-        if ( p->api.pterm )
-            p->api.pterm();
+        if ( p->api.tterm )
+            p->api.tterm();
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/managers/ips_manager.cc b/src/managers/ips_manager.cc
index 9afbfc762419ef17d2579b00530609be4cad128a..b5ec1bc1d5553474e752892d00cd91794fa90774 100644 (file)
--- a/src/managers/ips_manager.cc
+++ b/src/managers/ips_manager.cc
@@ -322,8 +322,8 @@ bool IpsManager::get_option(
 
     if ( !opt->init )
     {
-        if ( opt->api->ginit )
-            opt->api->ginit(sc);
+        if ( opt->api->pinit )
+            opt->api->pinit(sc);
         opt->init = true;
     }
     // FIXIT verify api->protos and api->max_per_rule
@@ -365,9 +365,9 @@ void IpsManager::global_init(SnortConfig*)
 void IpsManager::global_term(SnortConfig* sc)
 {
     for ( auto* p : s_options )
-        if ( p->init && p->api->gterm )
+        if ( p->init && p->api->pterm )
         {
-            p->api->gterm(sc);
+            p->api->pterm(sc);
             p->init = false;
         }
 }

diff --git a/src/managers/packet_manager.cc b/src/managers/packet_manager.cc
index df750f9770c8ac81dd9695be5fccf9f60085e849..bfc23e705dfc43be0adf385bfbc326fa5b04212d 100644 (file)
--- a/src/managers/packet_manager.cc
+++ b/src/managers/packet_manager.cc
@@ -275,8 +275,8 @@ void PacketManager::release_plugins()
 {
     for ( auto* p : s_codecs )
     {
-        if(p->gterm)
-            p->gterm();
+        if(p->pterm)
+            p->pterm();
 
         uint8_t index = get_codec(p->base.name);
         if( index != 0)
@@ -301,8 +301,8 @@ void PacketManager::instantiate(const CodecApi* cd_api , Module* m, SnortConfig*
         FatalError("A maximum of 256 codecs can be registered\n");
 
     // global init here to ensure the global policy has already been configured
-    if (cd_api->ginit)
-        cd_api->ginit();
+    if (cd_api->pinit)
+        cd_api->pinit();
 
     Codec *cd = cd_api->ctor(m);
     cd->get_protocol_ids(ids);

diff --git a/src/managers/script_manager.cc b/src/managers/script_manager.cc
index 8f75b68202b5f5513e3c880120105c3385e4b379..26f49a965924d2256304fa770967f6bc1e14f3f4 100644 (file)
--- a/src/managers/script_manager.cc
+++ b/src/managers/script_manager.cc
@@ -96,7 +96,7 @@ LuaIpsApi::LuaIpsApi(string& s, unsigned ver, string& c)
     api.base.version = ver;
     api.base.api_version = IPSAPI_VERSION;
 
-    api.ginit = api.gterm = nullptr;
+    api.pinit = api.pterm = nullptr;
     api.tinit = api.tterm = nullptr;
 
     api.ctor = ctor;

diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index f45e7a2569189b28b750e4462ca17cff11f2bdf3..1c9d9ee7feee212921f5b506579cd2d15a7e99dc 100644 (file)
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -310,12 +310,12 @@ static const InspectApi as_api =
     PROTO_BIT__ARP,
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    as_ctor,
-    as_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    as_ctor,
+    as_dtor,
     nullptr, // ssn
     nullptr, // reset
 };

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index 358ad8a835e2308e087318c1d4db8bbe638e36ee..fd5eb84043b1097aebe2cc832c7dbb04ba950c4f 100644 (file)
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -269,12 +269,12 @@ static const InspectApi bind_api =
     PROTO_BIT__ALL,
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    bind_ctor,
-    bind_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    bind_ctor,
+    bind_dtor,
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index f54050173f00201a4ba336240c22dcb279745e49..9c0adbb48641d0c90239d61d7544cbc92b9574c8 100644 (file)
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -256,12 +256,12 @@ static const InspectApi no_api =
     PROTO_BITS,
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    no_ctor,
-    no_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    no_ctor,
+    no_dtor,
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index dd51fe49a6dd135f2d60e9ec85a6a0753dd43d3b..757672da00f7559a1d029402a85619d23472b8a2 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -207,8 +207,8 @@ public:
 
     void eval(Packet*);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
     void reset();
 
 private:
@@ -271,11 +271,26 @@ bool PerfMonitor::configure(SnortConfig*)
     return true;
 }
 
-void PerfMonitor::pinit()
+void PerfMonitor::tinit()
 {
     InitPerfStats(&config);
 }
 
+void PerfMonitor::tterm()
+{
+    if ( config.perf_flags & SFPERF_SUMMARY )
+        sfPerfStatsSummary(&config);
+
+    sfCloseBaseStatsFile(&config);
+    sfCloseFlowStatsFile(&config);
+    sfCloseFlowIPStatsFile(&config);
+
+    FreeFlowStats(&sfFlow);
+#ifdef LINUX_SMP
+    FreeProcPidStats(&sfBase.sfProcPidStats);
+#endif
+}
+
 void PerfMonitor::eval(Packet *p)
 {
     static THREAD_LOCAL bool first = true;
@@ -314,21 +329,6 @@ void PerfMonitor::eval(Packet *p)
     MODULE_PROFILE_END(perfmonStats);
 }
 
-void PerfMonitor::pterm()
-{
-    if ( config.perf_flags & SFPERF_SUMMARY )
-        sfPerfStatsSummary(&config);
-
-    sfCloseBaseStatsFile(&config);
-    sfCloseFlowStatsFile(&config);
-    sfCloseFlowIPStatsFile(&config);
-
-    FreeFlowStats(&sfFlow);
-#ifdef LINUX_SMP
-    FreeProcPidStats(&sfBase.sfProcPidStats);
-#endif
-}
-
 void PerfMonitor::reset()
 {
     InitPerfStats(&config);
@@ -373,12 +373,12 @@ static const InspectApi pm_api =
     PROTO_BIT__ALL,
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    pm_ctor,
-    pm_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    pm_ctor,
+    pm_dtor,
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index 12de843091cafb35975746d621cd9fbc5b0702c2..7b6a858005c3f0f93b7fb074ef9b4d3a34cc5c28 100644 (file)
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -870,7 +870,7 @@ bool PortScan::configure(SnortConfig*)
     return true;
 }
 
-void PortScan::pinit()
+void PortScan::tinit()
 {
     g_tmp_pkt = PacketManager::encode_new();
 
@@ -886,7 +886,7 @@ void PortScan::pinit()
     ps_init_hash(config->common->memcap);
 }
 
-void PortScan::pterm()
+void PortScan::tterm()
 {
     fclose(g_logfile);
     ps_cleanup();
@@ -1002,12 +1002,12 @@ static const InspectApi sp_api =
     PROTO_BIT__IP|PROTO_BIT__ICMP|PROTO_BIT__TCP|PROTO_BIT__UDP,  // FIXIT dynamic assign
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    sp_ctor,
-    sp_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    sp_ctor,
+    sp_dtor,
     nullptr, // ssn
     sp_reset
 };

diff --git a/src/network_inspectors/port_scan/ps_inspect.h b/src/network_inspectors/port_scan/ps_inspect.h
index ac004874aaf5959dc109e79a333378cff4f0de19..5a3093056276c51a61cc66ad4f4374667b6e6c24 100644 (file)
--- a/src/network_inspectors/port_scan/ps_inspect.h
+++ b/src/network_inspectors/port_scan/ps_inspect.h
@@ -46,8 +46,8 @@ public:
 
     void eval(Packet*);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
 
 private:
     void ps_parse(SnortConfig*, char *);

diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index ec9426ad0094b7b090c47ad522be45a9dd06bc53..97c70e30a6b0178875c6d3b98380c22d82a88a91 100644 (file)
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -606,11 +606,11 @@ static const InspectApi bo_api =
     nullptr, // buffers
     nullptr, // service
     bo_init,
-    nullptr, // term
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     bo_ctor,
     bo_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index e4275b53d80eb4454800e3a492d412ce5aab9fc6..17d3f7cb6d94d81c7af0bef07825df236941becb 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -516,11 +516,11 @@ static const InspectApi fs_api =
     nullptr, // buffers
     "ftp",
     fs_init,
-    nullptr, // term
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     fs_ctor,
     fs_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index 9459f644287134586a2a0f731776ce228b3bd8f9..f164d471e07e0965f10e8abfde64a00720508f88 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -295,11 +295,11 @@ const InspectApi fd_api =
     nullptr, // buffers
     "ftp-data",
     fd_init,
-    nullptr, // term
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     fd_ctor,
     fd_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc
index 5a7eaba94f61b540d479ab6bedeaaf5b7e999f2c..f8de365951f31dfbf53e0c3d27228c861d4ce6d5 100644 (file)
--- a/src/service_inspectors/ftp_telnet/telnet.cc
+++ b/src/service_inspectors/ftp_telnet/telnet.cc
@@ -314,11 +314,11 @@ const InspectApi tn_api =
     nullptr, // buffers
     "telnet",
     tn_init,
-    nullptr, // term
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     tn_ctor,
     tn_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 857920212d19fe723025331e7fc79a7530872407..8c9536fa47bccdd6042064793051b667fac430cf 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -243,8 +243,8 @@ public:
     bool get_buf(InspectionBuffer::Type, Packet*, InspectionBuffer&);
     bool get_buf(unsigned, Packet*, InspectionBuffer&);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
 
 private:
     HTTPINSPECT_CONF* config;
@@ -312,7 +312,7 @@ bool HttpInspect::configure (SnortConfig* sc)
     return !HttpInspectVerifyPolicy(sc, config);
 }
 
-void HttpInspect::pinit()
+void HttpInspect::tinit()
 {
     memset(&hi_stats, 0, sizeof(HIStats));
 
@@ -329,7 +329,7 @@ void HttpInspect::pinit()
     }
 }
 
-void HttpInspect::pterm()
+void HttpInspect::tterm()
 {
 }
 
@@ -477,10 +477,10 @@ static const InspectApi hs_api =
     "http",
     hs_init,
     hs_term,
+    nullptr, // tinit
+    nullptr, // tterm
     hs_ctor,
     hs_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_api.cc b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
index ee63a7e237022e70eed9cc5370403c44cc12edc9..8194705c5f2a76d38b182da289698f2aa407b936 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
@@ -81,10 +81,10 @@ const InspectApi NHttpApi::nhttp_api =
     "http",
     NHttpApi::nhttp_init,
     NHttpApi::nhttp_term,
+    NHttpApi::nhttp_tinit,
+    NHttpApi::nhttp_tterm,
     NHttpApi::nhttp_ctor,
     NHttpApi::nhttp_dtor,
-    NHttpApi::nhttp_pinit,
-    NHttpApi::nhttp_pterm,
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_api.h b/src/service_inspectors/nhttp_inspect/nhttp_api.h
index 3d4df3cd5856e9d43ba96eeb02c9eaf418ee6a19..23902083d5aaa7741975e98cbc616a77d497ee8c 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.h
@@ -47,8 +47,8 @@ private:
     static void nhttp_term() {};
     static Inspector* nhttp_ctor(Module* mod);
     static void nhttp_dtor(Inspector* p) { delete p; };
-    static void nhttp_pinit() {};
-    static void nhttp_pterm() {};
+    static void nhttp_tinit() {};
+    static void nhttp_tterm() {};
 };
 
 #endif

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_inspect.cc b/src/service_inspectors/nhttp_inspect/nhttp_inspect.cc
index 476d540a93f6353ffb3e0b6c33af4bbac5d1d897..c97ba6f9dcee77132cad46d7a687d126fe8397ee 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_inspect.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_inspect.cc
@@ -104,11 +104,11 @@ int NHttpInspect::verify(SnortConfig*)
     return 0; // 0 = good, -1 = bad
 }
 
-void NHttpInspect::pinit()
+void NHttpInspect::tinit()
 {
 }
 
-void NHttpInspect::pterm()
+void NHttpInspect::tterm()
 {
 }
 

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_inspect.h b/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
index 30c3df024e3f0780aea30eab25973cc7b780c21f..1d33aaf037292d9d571fa45f9e3ce00f71f50da4 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_inspect.h
@@ -52,8 +52,8 @@ public:
     void show(SnortConfig*);
     void eval(Packet*);
     bool enabled();
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
     NHttpStreamSplitter* get_splitter(bool isClientToServer) { return new NHttpStreamSplitter(isClientToServer); };
 
 private:

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index c883cefb17817b100cc98cd22f00d7bd8df9aea4..31772e008dfb18e6918cffd00ce8ee9300aa0c41 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -1113,11 +1113,11 @@ static const InspectApi rd_api =
     nullptr, // buffers
     "sunrpc",
     rd_init,
-    nullptr, // term
+    nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
     rd_ctor,
     rd_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index d625f6fd47ef02bd64ee9f8f2041d7a13ac86d9b..bd7889bf22540c4cea6d7531b5617a9f6838865f 100644 (file)
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -253,10 +253,10 @@ static const InspectApi wiz_api =
     nullptr, // service
     nullptr, // init
     nullptr, // term
+    nullptr, // tinit
+    nullptr, // tterm
     wiz_ctor,
     wiz_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 0c7fd5e4227263200574cff613e1cb1cd491eb19..c37c55a1c4f8ad444cde795a7b94c224bb731856 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -137,8 +137,8 @@ public:
 
     void show(SnortConfig*);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
 
     void eval(Packet*);
 
@@ -151,7 +151,7 @@ StreamBase::StreamBase(const StreamConfig* c)
     config = c;
 }
 
-void StreamBase::pinit()
+void StreamBase::tinit()
 {
     assert(!flow_con);
     Inspector* pi = InspectorManager::get_inspector("binder");
@@ -184,7 +184,7 @@ void StreamBase::pinit()
     }
 }
 
-void StreamBase::pterm()
+void StreamBase::tterm()
 {
     flow_con->purge_flows(IPPROTO_TCP);
     flow_con->purge_flows(IPPROTO_UDP);
@@ -285,10 +285,10 @@ static const InspectApi base_api =
     nullptr, // service
     nullptr, // init
     nullptr, // term
+    nullptr, // tinit
+    nullptr, // tterm
     base_ctor,
     base_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     nullptr, // ssn
     nullptr  // reset
 };

diff --git a/src/stream/icmp/stream_icmp.cc b/src/stream/icmp/stream_icmp.cc
index b66a681b77032f1f5c9c77f859c858da3d65d086..1fa9ff990ced448ef9e3f7c4029cb38e389f18c3 100644 (file)
--- a/src/stream/icmp/stream_icmp.cc
+++ b/src/stream/icmp/stream_icmp.cc
@@ -126,10 +126,10 @@ static const InspectApi icmp_api =
     nullptr, // service
     nullptr, // init
     nullptr, // term
+    nullptr, // tinit
+    nullptr, // tterm
     icmp_ctor,
     icmp_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     icmp_ssn,
     icmp_reset
 };

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index 6ccd77b0c58ad807673c8859dfe264ff9c3b8b31..ea451a3d068992307bdeeeec9ea2b625264abf8b 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -1291,14 +1291,14 @@ bool Defrag::configure(SnortConfig*)
     return true;
 }
 
-void Defrag::pinit()
+void Defrag::tinit()
 {
     defrag_pkt = PacketManager::encode_new();
     encap_defrag_pkt = PacketManager::encode_new();
     pkt_snaplen = DAQ_GetSnapLen();
 }
 
-void Defrag::pterm()
+void Defrag::tterm()
 {
     PacketManager::encode_delete(defrag_pkt);
     defrag_pkt = NULL;

diff --git a/src/stream/ip/ip_defrag.h b/src/stream/ip/ip_defrag.h
index 8831b58447ad6fd1d6e57e5cc75b018c45b8eba7..355302e2027d4a3d057872b8288a98c5be604447 100644 (file)
--- a/src/stream/ip/ip_defrag.h
+++ b/src/stream/ip/ip_defrag.h
@@ -45,8 +45,8 @@ public:
     void process(Packet*, FragTracker*);
     void cleanup(FragTracker*);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
 
     static void init();
     static void sum();

diff --git a/src/stream/ip/stream_ip.cc b/src/stream/ip/stream_ip.cc
index 09a667d9b05aa757d0fafa3a4b0ff58594f55a77..c5de4be4124998b495e2d68fe089ce49d845ba33 100644 (file)
--- a/src/stream/ip/stream_ip.cc
+++ b/src/stream/ip/stream_ip.cc
@@ -63,8 +63,8 @@ public:
     int verify_config(SnortConfig*);
     void show(SnortConfig*);
 
-    void pinit();
-    void pterm();
+    void tinit();
+    void tterm();
 
     void eval(Packet*);
 
@@ -97,14 +97,14 @@ int StreamIp::verify_config(SnortConfig*)
     return 0;
 }
 
-void StreamIp::pinit()
+void StreamIp::tinit()
 {
-    defrag->pinit();
+    defrag->tinit();
 }
 
-void StreamIp::pterm()
+void StreamIp::tterm()
 {
-    defrag->pterm();
+    defrag->tterm();
 }
 
 void StreamIp::show(SnortConfig* sc)
@@ -171,12 +171,12 @@ static const InspectApi ip_api =
     PROTO_BIT__IP,
     nullptr, // buffers
     nullptr, // service
-    nullptr, // init
-    nullptr, // term
-    ip_ctor,
-    ip_dtor,
     nullptr, // pinit
     nullptr, // pterm
+    nullptr, // tinit
+    nullptr, // tterm
+    ip_ctor,
+    ip_dtor,
     ip_ssn,
     nullptr  // reset
 };

diff --git a/src/stream/tcp/stream_tcp.cc b/src/stream/tcp/stream_tcp.cc
index e77f3f5bdd5b890d8cddcd1caa0012e9f8eff89d..43c43b4ce54b5196023d0841d33064004c34fc59 100644 (file)
--- a/src/stream/tcp/stream_tcp.cc
+++ b/src/stream/tcp/stream_tcp.cc
@@ -107,12 +107,12 @@ Session* tcp_ssn(Flow* lws)
     return new TcpSession(lws);
 }
 
-void tcp_pinit()
+void tcp_tinit()
 {
     tcp_sinit();
 }
 
-void tcp_pterm()
+void tcp_tterm()
 {
     tcp_sterm();
 }
@@ -133,10 +133,10 @@ static const InspectApi tcp_api =
     nullptr, // service
     nullptr, // init
     nullptr, // term
+    tcp_tinit,
+    tcp_tterm,
     tcp_ctor,
     tcp_dtor,
-    tcp_pinit,
-    tcp_pterm,
     tcp_ssn,
     tcp_reset
 };

diff --git a/src/stream/udp/stream_udp.cc b/src/stream/udp/stream_udp.cc
index bbc4b96ddbba5a2a1757b5361ce03a7bbf8ea438..3ed75164960a65e4f512fadd97ff3f61b9996d6e 100644 (file)
--- a/src/stream/udp/stream_udp.cc
+++ b/src/stream/udp/stream_udp.cc
@@ -141,10 +141,10 @@ static const InspectApi udp_api =
     nullptr, // service
     nullptr, // init
     nullptr, // term
+    nullptr, // tinit
+    nullptr, // tterm
     udp_ctor,
     udp_dtor,
-    nullptr, // pinit
-    nullptr, // pterm
     udp_ssn,
     udp_reset
 };