From: Russ Combs Date: Thu, 31 Jul 2014 17:53:01 +0000 (-0400) Subject: refactored various api for consistency wrt *init() and *term() naming (p* for plugin... X-Git-Tag: 3.0.0-233~1430^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=661bfa9d3676f778cb09a79acced96437b696917;p=thirdparty%2Fsnort3.git refactored various api for consistency wrt *init() and *term() naming (p* for plugin (global) and t* for thread local) --- diff --git a/extra/src/codecs/pim.cc b/extra/src/codecs/pim.cc index 1ffd1db6c..349f3e92e 100644 --- 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 f71ec604e..759bd991d 100644 --- 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 6867ddf4f..2bd25c811 100644 --- 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 18baf3d9c..5994b9813 100644 --- 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 36c463044..9c99b39cd 100644 --- 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 ff3582179..515e05431 100644 --- 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 f24561ec9..d977ef020 100644 --- 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 d4d53f491..d0f5d8b2b 100644 --- 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 df524868c..40af13533 100644 --- 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 9afbfc762..b5ec1bc1d 100644 --- 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 df750f977..bfc23e705 100644 --- 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 8f75b6820..26f49a965 100644 --- 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 f45e7a256..1c9d9ee7f 100644 --- 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 358ad8a83..fd5eb8404 100644 --- 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 f54050173..9c0adbb48 100644 --- 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 dd51fe49a..757672da0 100644 --- 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 12de84309..7b6a85800 100644 --- 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 ac004874a..5a3093056 100644 --- 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 ec9426ad0..97c70e30a 100644 --- 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 e4275b53d..17d3f7cb6 100644 --- 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 9459f6442..f164d471e 100644 --- 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 5a7eaba94..f8de36595 100644 --- 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 857920212..8c9536fa4 100644 --- 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 ee63a7e23..8194705c5 100644 --- 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 3d4df3cd5..23902083d 100644 --- 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 476d540a9..c97ba6f9d 100644 --- 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 30c3df024..1d33aaf03 100644 --- 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 c883cefb1..31772e008 100644 --- 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 d625f6fd4..bd7889bf2 100644 --- 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 0c7fd5e42..c37c55a1c 100644 --- 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 b66a681b7..1fa9ff990 100644 --- 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 6ccd77b0c..ea451a3d0 100644 --- 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 8831b5844..355302e20 100644 --- 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 09a667d9b..c5de4be41 100644 --- 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 e77f3f5bd..43c43b4ce 100644 --- 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 bbc4b96dd..3ed751649 100644 --- 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 };