From a8d28df5690750417a2a450058e0a3f9c5fce26a Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 21 Jan 2021 10:38:39 -0700 Subject: [PATCH 01/11] Update bifcl submodule to remove deprecations from generated code --- auxil/bifcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auxil/bifcl b/auxil/bifcl index 4cfb846536..5b4cae24b2 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit 4cfb8465360992f02d6227fff7d7cddc98a0446e +Subproject commit 5b4cae24b21079a6282e68acf3a6afbba6ded084 From 7e9d89db0a59a6b1985bdc7b045346ae9ff492b7 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 21 Jan 2021 10:47:54 -0700 Subject: [PATCH 02/11] Remove all fully-deprecated files --- src/BroList.h | 2 - src/BroString.h | 2 - src/CMakeLists.txt | 1 - src/Continuation.h | 56 ------------------- src/Net.h | 4 -- src/PacketDumper.cc | 43 -------------- src/PacketDumper.h | 26 --------- src/binpac_bro.h | 4 -- src/bro.pac | 11 ---- .../btest/plugins/bifs-and-scripts-install.sh | 3 +- .../src/foo.pac | 4 +- .../btest/plugins/protocol-plugin/src/foo.pac | 4 +- 12 files changed, 5 insertions(+), 155 deletions(-) delete mode 100644 src/BroList.h delete mode 100644 src/BroString.h delete mode 100644 src/Continuation.h delete mode 100644 src/Net.h delete mode 100644 src/PacketDumper.cc delete mode 100644 src/PacketDumper.h delete mode 100644 src/binpac_bro.h delete mode 100644 src/bro.pac diff --git a/src/BroList.h b/src/BroList.h deleted file mode 100644 index 770e300917..0000000000 --- a/src/BroList.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning "BroList.h is deprecated and will be removed in v4.1. Use ZeekList.h instead." -#include "zeek/ZeekList.h" diff --git a/src/BroString.h b/src/BroString.h deleted file mode 100644 index 3bf8b27b53..0000000000 --- a/src/BroString.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning "BroString.h is deprecated and will be removed in v4.1. Use ZeekString.h instead." -#include "zeek/ZeekString.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 05822ff342..854e57fc64 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,7 +130,6 @@ include(BinPAC) set(BINPAC_AUXSRC ${CMAKE_SOURCE_DIR}/src/binpac.pac ${CMAKE_SOURCE_DIR}/src/zeek.pac - ${CMAKE_SOURCE_DIR}/src/bro.pac ${CMAKE_SOURCE_DIR}/src/binpac_zeek.h ) diff --git a/src/Continuation.h b/src/Continuation.h deleted file mode 100644 index 6ae5427f0e..0000000000 --- a/src/Continuation.h +++ /dev/null @@ -1,56 +0,0 @@ -#warning "This file will be removed in v4.1. The code here is unused by Zeek. Notify a Zeek team member if your plugins are using this code." - -// Helper class to implement continuation-like mechanisms for -// suspending/resuming tasks for incremental operation. -// -// TODO: - Document how to use this. -// - Find some nice macro-based interface? - -#pragma once - -#include "zeek/List.h" - -class Continuation { -public: - Continuation() { current_level = 0; suspend_level = -1; } - - // Returns true if we're called for the first time. - bool NewInstance() const - { return suspend_level < current_level; } - - // Returns true if a function called by us has suspended itself. - bool ChildSuspended() const - { return suspend_level > current_level; } - - // Returns true if we have suspended before and are now called again to - // resume our operation. - bool Resuming() const - { return suspend_level == current_level; } - - // To be called just before we suspend operation for the time being. - void Suspend() - { suspend_level = current_level; } - - // To be called right after we resumed operation. - void Resume() - { suspend_level = -1; } - - // If we call a function which may suspend itself, we need to - // enclose the call with calls to SaveContext() and RestoreContext(). - void SaveContext() { ++current_level; } - void RestoreContext() { --current_level; } - - // We can store some user state which can be retrieved later. - void SaveState(void* user_ptr) - { states.replace(current_level, user_ptr); } - - void* RestoreState() const - { return states[current_level]; } - -private: - int current_level; - int suspend_level; - - using voidp_list = zeek::PList; - voidp_list states; -}; diff --git a/src/Net.h b/src/Net.h deleted file mode 100644 index f61aeb01d8..0000000000 --- a/src/Net.h +++ /dev/null @@ -1,4 +0,0 @@ -#warning "Net.h is deprecated and will be removed in v4.1. Use RunState.h and/or ScannedFile.h instead." - -#include "zeek/RunState.h" -#include "zeek/ScannedFile.h" diff --git a/src/PacketDumper.cc b/src/PacketDumper.cc deleted file mode 100644 index a553b2613b..0000000000 --- a/src/PacketDumper.cc +++ /dev/null @@ -1,43 +0,0 @@ -// See the file "COPYING" in the main distribution directory for copyright. - -#include "zeek-config.h" -#include "zeek/PacketDumper.h" - -#include "zeek/Reporter.h" -#include "zeek/util.h" -#include "zeek/iosource/PktDumper.h" - -namespace zeek::detail { - -PacketDumper::PacketDumper(pcap_dumper_t* arg_pkt_dump) - { - last_timestamp.tv_sec = last_timestamp.tv_usec = 0; - - pkt_dump = arg_pkt_dump; - if ( ! pkt_dump ) - reporter->InternalError("PacketDumper: nil dump file"); - } - -void PacketDumper::DumpPacket(const struct pcap_pkthdr* hdr, - const u_char* pkt, int len) - { - if ( pkt_dump ) - { - struct pcap_pkthdr h = *hdr; - h.caplen = len; - if ( h.caplen > hdr->caplen ) - reporter->InternalError("bad modified caplen"); - - pcap_dump((u_char*) pkt_dump, &h, pkt); - } - } - -void PacketDumper::SortTimeStamp(struct timeval* timestamp) - { - if ( util::time_compare(&last_timestamp, timestamp) > 0 ) - *timestamp = last_timestamp; - else - last_timestamp = *timestamp; - } - -} // namespace zeek::detail diff --git a/src/PacketDumper.h b/src/PacketDumper.h deleted file mode 100644 index edf0eb834c..0000000000 --- a/src/PacketDumper.h +++ /dev/null @@ -1,26 +0,0 @@ -#warning "This file will be removed in v4.1. The code here is unused by Zeek. Notify a Zeek team member if your plugins are using this code." - -// See the file "COPYING" in the main distribution directory for copyright. - -#pragma once - -#include // for u_char -#include - -namespace zeek::detail { - -class PacketDumper { -public: - explicit PacketDumper(pcap_dumper_t* pkt_dump); - - void DumpPacket(const struct pcap_pkthdr* hdr, - const u_char* pkt, int len); - -protected: - pcap_dumper_t* pkt_dump; - struct timeval last_timestamp; - - void SortTimeStamp(struct timeval* timestamp); -}; - -} // namespace zeek::detail diff --git a/src/binpac_bro.h b/src/binpac_bro.h deleted file mode 100644 index 41c27eae77..0000000000 --- a/src/binpac_bro.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#warning "binpac_bro.h is deprecated and will be removed in v4.1. Use binpac_zeek.h instead." -#include "zeek/binpac_zeek.h" diff --git a/src/bro.pac b/src/bro.pac deleted file mode 100644 index 7bfe202d79..0000000000 --- a/src/bro.pac +++ /dev/null @@ -1,11 +0,0 @@ -%extern{ -#warning "bro.pac is deprecated and will be removed in v4.1. Use zeek.pac instead." -#include "zeek/binpac_bro.h" -%} - -extern type BroAnalyzer; -extern type BroVal; -extern type BroPortVal; -extern type BroStringVal; - -function network_time(): double; diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh index 1c8e4a28b9..c93edfaa29 100644 --- a/testing/btest/plugins/bifs-and-scripts-install.sh +++ b/testing/btest/plugins/bifs-and-scripts-install.sh @@ -35,7 +35,7 @@ EOF cat >src/foo.bif <("Hello from the plugin!"); %} event plugin_event%(foo: count%); @@ -44,4 +44,3 @@ EOF cat >activate.zeek < Date: Thu, 21 Jan 2021 11:49:36 -0700 Subject: [PATCH 03/11] Remove all of the random single-file deprecations These are the changes that don't require a ton of changes to other files outside of the original removal. --- src/Attr.cc | 44 ---- src/Attr.h | 62 ----- src/Base64.cc | 10 - src/Base64.h | 10 - src/BifReturnVal.cc | 4 - src/BifReturnVal.h | 5 - src/CCL.h | 3 - src/CMakeLists.txt | 4 - src/CompHash.h | 10 - src/Conn.cc | 72 +----- src/Conn.h | 48 ---- src/DFA.h | 5 - src/DNS_Mgr.h | 9 - src/DbgBreakpoint.h | 10 - src/DbgDisplay.h | 2 - src/DbgWatch.h | 3 - src/Debug.cc | 7 - src/Debug.h | 29 --- src/DebugCmds.h | 18 -- src/DebugLogger.h | 23 -- src/Desc.h | 13 - src/Dict.h | 3 - src/Event.cc | 28 --- src/Event.h | 40 --- src/EventHandler.cc | 3 - src/EventHandler.h | 13 - src/EventRegistry.h | 3 - src/Expr.h | 63 +---- src/File.h | 10 - src/Frame.cc | 3 - src/Frame.h | 16 +- src/Func.cc | 21 -- src/Func.h | 28 +-- src/Hash.h | 16 -- src/ID.cc | 5 - src/ID.h | 44 ---- src/IP.cc | 25 -- src/IP.h | 23 -- src/IPAddr.cc | 6 - src/IPAddr.h | 22 +- src/IntSet.h | 2 - src/List.h | 2 - src/NFA.h | 10 - src/NetVar.cc | 70 ------ src/NetVar.h | 235 ----------------- src/Notifier.cc | 1 - src/Notifier.h | 10 - src/Obj.cc | 5 - src/Obj.h | 19 -- src/OpaqueVal.cc | 6 - src/OpaqueVal.h | 15 -- src/PacketFilter.h | 2 - src/PrefixTable.h | 2 - src/PriorityQueue.h | 3 - src/Queue.h | 3 - src/RE.cc | 4 - src/RE.h | 28 +-- src/Reassem.h | 12 - src/Reporter.h | 6 - src/Rule.h | 4 - src/RuleAction.h | 7 - src/RuleCondition.h | 7 - src/RuleMatcher.h | 16 -- src/RunState.cc | 22 -- src/RunState.h | 31 --- src/ScannedFile.cc | 3 - src/ScannedFile.h | 4 - src/Scope.cc | 9 - src/Scope.h | 30 --- src/ScriptCoverageManager.h | 3 - src/SerializationFormat.h | 3 - src/Sessions.cc | 5 - src/Sessions.h | 15 +- src/SmithWaterman.h | 8 - src/Stats.h | 20 -- src/Stmt.h | 20 -- src/StmtBase.h | 2 - src/StmtEnums.h | 31 --- src/Tag.cc | 13 - src/Tag.h | 11 - src/Timer.h | 40 --- src/Traverse.h | 3 - src/TraverseTypes.h | 5 - src/Trigger.h | 9 - src/TunnelEncapsulation.h | 8 - src/Type.cc | 27 -- src/Type.h | 218 +--------------- src/UID.h | 4 - src/Val.cc | 76 ------ src/Val.h | 202 --------------- src/Var.cc | 103 -------- src/Var.h | 50 ---- src/ZeekList.h | 12 +- src/ZeekString.h | 5 - src/analyzer/Analyzer.cc | 37 --- src/analyzer/Analyzer.h | 51 ---- src/analyzer/Component.h | 4 - src/analyzer/Manager.h | 8 +- src/analyzer/Tag.cc | 9 - src/analyzer/Tag.h | 18 -- src/analyzer/protocol/ayiya/AYIYA.h | 6 - src/analyzer/protocol/bittorrent/BitTorrent.h | 6 - .../protocol/bittorrent/BitTorrentTracker.h | 30 --- src/analyzer/protocol/conn-size/ConnSize.h | 6 - src/analyzer/protocol/dce-rpc/DCE_RPC.h | 6 - src/analyzer/protocol/dhcp/DHCP.h | 6 - src/analyzer/protocol/dnp3/DNP3.h | 8 - src/analyzer/protocol/dns/DNS.h | 128 +--------- src/analyzer/protocol/file/File.h | 8 - src/analyzer/protocol/finger/Finger.h | 6 - src/analyzer/protocol/ftp/FTP.h | 7 - src/analyzer/protocol/gnutella/Gnutella.h | 7 - src/analyzer/protocol/gssapi/GSSAPI.h | 6 - src/analyzer/protocol/gtpv1/GTPv1.h | 6 - src/analyzer/protocol/http/HTTP.h | 22 -- src/analyzer/protocol/icmp/ICMP.h | 13 - src/analyzer/protocol/ident/Ident.h | 6 - src/analyzer/protocol/imap/IMAP.h | 6 - src/analyzer/protocol/irc/IRC.h | 6 - src/analyzer/protocol/krb/KRB.h | 6 - src/analyzer/protocol/krb/KRB_TCP.h | 6 - src/analyzer/protocol/login/Login.h | 12 - src/analyzer/protocol/login/NVT.h | 12 - src/analyzer/protocol/login/RSH.h | 16 -- src/analyzer/protocol/login/Rlogin.h | 21 -- src/analyzer/protocol/login/Telnet.h | 6 - src/analyzer/protocol/mime/MIME.cc | 34 --- src/analyzer/protocol/mime/MIME.h | 65 ----- src/analyzer/protocol/modbus/Modbus.h | 6 - src/analyzer/protocol/mqtt/MQTT.h | 6 - src/analyzer/protocol/mysql/MySQL.h | 6 - src/analyzer/protocol/ncp/NCP.h | 10 - src/analyzer/protocol/netbios/NetbiosSSN.h | 33 --- src/analyzer/protocol/ntlm/NTLM.h | 6 - src/analyzer/protocol/ntp/NTP.h | 6 - src/analyzer/protocol/pia/PIA.h | 8 - src/analyzer/protocol/pop3/POP3.h | 41 --- src/analyzer/protocol/radius/RADIUS.h | 6 - src/analyzer/protocol/rdp/RDP.h | 6 - src/analyzer/protocol/rdp/RDPEUDP.h | 6 - src/analyzer/protocol/rfb/RFB.h | 6 - src/analyzer/protocol/rpc/MOUNT.h | 7 - src/analyzer/protocol/rpc/NFS.h | 7 - src/analyzer/protocol/rpc/Portmap.h | 7 - src/analyzer/protocol/rpc/RPC.h | 32 --- src/analyzer/protocol/rpc/XDR.h | 11 - src/analyzer/protocol/sip/SIP.h | 6 - src/analyzer/protocol/sip/SIP_TCP.h | 6 - src/analyzer/protocol/smb/SMB.h | 6 - src/analyzer/protocol/smtp/SMTP.h | 23 -- src/analyzer/protocol/snmp/SNMP.h | 6 - src/analyzer/protocol/socks/SOCKS.h | 6 - src/analyzer/protocol/ssh/SSH.h | 6 - src/analyzer/protocol/ssl/DTLS.h | 6 - src/analyzer/protocol/ssl/SSL.h | 6 - .../protocol/stepping-stone/SteppingStone.h | 8 - src/analyzer/protocol/syslog/Syslog.h | 6 - src/analyzer/protocol/tcp/ContentLine.h | 6 - src/analyzer/protocol/tcp/Stats.h | 6 - src/analyzer/protocol/tcp/TCP.h | 10 - src/analyzer/protocol/tcp/TCP_Endpoint.h | 15 -- src/analyzer/protocol/tcp/TCP_Flags.h | 6 - src/analyzer/protocol/tcp/TCP_Reassembler.h | 6 - src/analyzer/protocol/teredo/Teredo.h | 7 - src/analyzer/protocol/udp/UDP.h | 10 - src/analyzer/protocol/vxlan/VXLAN.h | 6 - src/analyzer/protocol/xmpp/XMPP.h | 6 - src/analyzer/protocol/zip/ZIP.h | 6 - src/binpac_zeek-lib.pac | 5 - src/binpac_zeek.h | 21 -- src/broker/Data.cc | 5 - src/broker/Data.h | 51 ---- src/broker/Manager.h | 9 - src/broker/Store.cc | 1 - src/broker/Store.h | 25 -- src/digest.h | 18 -- src/file_analysis/Analyzer.cc | 10 - src/file_analysis/Analyzer.h | 17 -- src/file_analysis/AnalyzerSet.h | 6 - src/file_analysis/Component.cc | 11 +- src/file_analysis/Component.h | 14 -- src/file_analysis/File.cc | 20 -- src/file_analysis/File.h | 35 --- src/file_analysis/FileReassembler.h | 7 - src/file_analysis/FileTimer.h | 6 - src/file_analysis/Manager.cc | 19 +- src/file_analysis/Manager.h | 23 -- src/file_analysis/Tag.cc | 11 +- src/file_analysis/Tag.h | 20 -- .../analyzer/data_event/DataEvent.h | 6 - src/file_analysis/analyzer/entropy/Entropy.h | 6 - src/file_analysis/analyzer/extract/Extract.h | 6 - src/file_analysis/analyzer/hash/Hash.h | 9 - src/file_analysis/analyzer/pe/PE.h | 6 - .../analyzer/unified2/Unified2.h | 6 - src/file_analysis/analyzer/x509/OCSP.h | 6 - src/file_analysis/analyzer/x509/X509.h | 7 - src/file_analysis/analyzer/x509/X509Common.h | 6 - src/input.h | 10 - src/input/Component.h | 6 - src/input/Manager.h | 8 - src/input/ReaderBackend.h | 12 - src/input/ReaderFrontend.h | 6 - src/input/Tag.cc | 9 - src/input/Tag.h | 20 -- src/input/readers/ascii/Ascii.h | 7 - src/input/readers/benchmark/Benchmark.cc | 4 +- src/input/readers/benchmark/Benchmark.h | 6 - src/input/readers/binary/Binary.h | 6 - src/input/readers/config/Config.h | 6 - src/input/readers/raw/Raw.h | 6 - src/input/readers/sqlite/SQLite.h | 6 - src/iosource/BPF_Program.h | 2 - src/iosource/Component.h | 8 - src/iosource/IOSource.h | 6 - src/iosource/Manager.h | 8 - src/iosource/Packet.cc | 5 - src/iosource/Packet.h | 11 - src/iosource/PktDumper.h | 6 - src/iosource/PktSrc.cc | 10 - src/iosource/PktSrc.h | 21 -- src/iosource/pcap/Dumper.h | 6 - src/iosource/pcap/Source.h | 6 - src/legacy-netvar-init.cc | 97 ------- src/logging/Manager.h | 8 - src/logging/Tag.cc | 9 - src/logging/Tag.h | 20 -- src/logging/WriterBackend.h | 6 - src/logging/WriterFrontend.h | 6 - src/module_util.h | 6 - src/net_util.h | 38 --- src/plugin/Component.h | 26 -- src/plugin/ComponentManager.h | 26 -- src/plugin/Manager.h | 11 - src/plugin/Plugin.h | 46 ---- src/plugin/TaggedComponent.h | 8 - src/probabilistic/BitVector.h | 6 - src/probabilistic/BloomFilter.h | 12 - src/probabilistic/CardinalityCounter.h | 6 - src/probabilistic/CounterVector.h | 6 - src/probabilistic/Hasher.h | 13 - src/probabilistic/Topk.h | 8 - src/probabilistic/bloom-filter.bif | 2 +- src/probabilistic/cardinality-counter.bif | 2 +- src/re-scan.l | 1 - src/threading/BasicThread.h | 6 - src/threading/Formatter.h | 6 - src/threading/Manager.h | 13 - src/threading/MsgThread.cc | 2 +- src/threading/MsgThread.h | 22 +- src/threading/Queue.h | 6 - src/threading/SerialTypes.h | 7 - src/threading/formatters/Ascii.h | 6 - src/threading/formatters/JSON.h | 6 - src/util.cc | 81 ------ src/util.h | 237 ------------------ src/zeek-setup.cc | 27 -- src/zeekygen/Configuration.h | 7 - src/zeekygen/IdentifierInfo.h | 7 - src/zeekygen/Info.h | 6 - src/zeekygen/Manager.h | 8 - src/zeekygen/PackageInfo.h | 6 - src/zeekygen/ReStructuredTextTable.h | 6 - src/zeekygen/ScriptInfo.h | 9 - src/zeekygen/Target.h | 17 -- src/zeekygen/utils.h | 12 - .../legacy-func-hook-plugin/src/Plugin.cc | 2 +- .../btest/plugins/reader-plugin/src/Foo.cc | 4 +- zeek-config.h.in | 9 +- zeek-config.in | 3 +- 270 files changed, 36 insertions(+), 4632 deletions(-) delete mode 100644 src/legacy-netvar-init.cc diff --git a/src/Attr.cc b/src/Attr.cc index 6e80a923a1..e90f090c55 100644 --- a/src/Attr.cc +++ b/src/Attr.cc @@ -150,25 +150,6 @@ void Attr::AddTag(ODesc* d) const d->Add(attr_name(Tag())); } -Attributes::Attributes(AttrPList* a, TypePtr t, bool arg_in_record, bool is_global) - { - attrs_list.resize(a->length()); - attrs.reserve(a->length()); - in_record = arg_in_record; - global_var = is_global; - - SetLocationInfo(&start_location, &end_location); - - // We loop through 'a' and add each attribute individually, - // rather than just taking over 'a' for ourselves, so that - // the necessary checking gets done. - - for ( const auto& attr : *a ) - AddAttr({NewRef{}, attr}); - - delete a; - } - Attributes::Attributes(TypePtr t, bool arg_in_record, bool is_global) : Attributes(std::vector{}, std::move(t), arg_in_record, is_global) @@ -178,7 +159,6 @@ Attributes::Attributes(std::vector a, TypePtr t, bool arg_in_record, bool is_global) : type(std::move(t)) { - attrs_list.resize(a.size()); attrs.reserve(a.size()); in_record = arg_in_record; global_var = is_global; @@ -224,7 +204,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef) // We overwrite old attributes by deleting them first. RemoveAttr(attr->Tag()); - attrs_list.push_back(attr.get()); attrs.emplace_back(attr); // We only check the attribute after we've added it, to facilitate @@ -237,7 +216,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef) ! Find(ATTR_REDEF) ) { auto a = make_intrusive(ATTR_REDEF); - attrs_list.push_back(a.get()); attrs.emplace_back(std::move(a)); } @@ -246,7 +224,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef) ! Find(ATTR_OPTIONAL) ) { auto a = make_intrusive(ATTR_OPTIONAL); - attrs_list.push_back(a.get()); attrs.emplace_back(std::move(a)); } } @@ -257,23 +234,6 @@ void Attributes::AddAttrs(const AttributesPtr& a, bool is_redef) AddAttr(attr, is_redef); } -void Attributes::AddAttrs(Attributes* a, bool is_redef) - { - for ( const auto& attr : a->GetAttrs() ) - AddAttr(attr, is_redef); - - Unref(a); - } - -Attr* Attributes::FindAttr(AttrTag t) const - { - for ( const auto& a : attrs ) - if ( a->Tag() == t ) - return a.get(); - - return nullptr; - } - const AttrPtr& Attributes::Find(AttrTag t) const { for ( const auto& a : attrs ) @@ -285,10 +245,6 @@ const AttrPtr& Attributes::Find(AttrTag t) const void Attributes::RemoveAttr(AttrTag t) { - for ( int i = 0; i < attrs_list.length(); i++ ) - if ( attrs_list[i]->Tag() == t ) - attrs_list.remove_nth(i--); - for ( auto it = attrs.begin(); it != attrs.end(); ) { if ( (*it)->Tag() == t ) diff --git a/src/Attr.h b/src/Attr.h index ab0197057b..cc3d67413b 100644 --- a/src/Attr.h +++ b/src/Attr.h @@ -65,9 +65,6 @@ public: AttrTag Tag() const { return tag; } - [[deprecated("Remove in v4.1. Use GetExpr().")]] - Expr* AttrExpr() const { return expr.get(); } - const ExprPtr& GetExpr() const { return expr; } @@ -106,9 +103,6 @@ protected: // Manages a collection of attributes. class Attributes final : public Obj { public: - [[deprecated("Remove in v4.1. Construct using IntrusivePtrs instead.")]] - Attributes(AttrPList* a, TypePtr t, bool in_record, bool is_global); - Attributes(std::vector a, TypePtr t, bool in_record, bool is_global); Attributes(TypePtr t, bool in_record, bool is_global); @@ -119,12 +113,6 @@ public: void AddAttrs(const AttributesPtr& a, bool is_redef = false); - [[deprecated("Remove in v4.1. Pass IntrusivePtr instead.")]] - void AddAttrs(Attributes* a, bool is_redef = false); // Unref's 'a' when done - - [[deprecated("Remove in v4.1. Use Find().")]] - Attr* FindAttr(AttrTag t) const; - const AttrPtr& Find(AttrTag t) const; void RemoveAttr(AttrTag t); @@ -132,10 +120,6 @@ public: void Describe(ODesc* d) const override; void DescribeReST(ODesc* d, bool shorten = false) const; - [[deprecated("Remove in v4.1. Use GetAttrs().")]] - const AttrPList* Attrs() const - { return &attrs_list; } - const std::vector& GetAttrs() const { return attrs; } @@ -147,55 +131,9 @@ protected: TypePtr type; std::vector attrs; - // Remove in v4.1. This is used by Attrs(), which is deprecated. - AttrPList attrs_list; bool in_record; bool global_var; }; } // namespace detail } // namespace zeek - -using Attr [[deprecated("Remove in v4.1. Use zeek::detail::Attr instead.")]] = zeek::detail::Attr; -using Attributes [[deprecated("Remove in v4.1. Use zeek::detail::Attr instead.")]] = zeek::detail::Attributes; - -using AttrTag [[deprecated("Remove in v4.1. Use zeek::detail::AttrTag instead.")]] = zeek::detail::AttrTag; - -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_OPTIONAL instead.")]] -constexpr auto ATTR_OPTIONAL = zeek::detail::ATTR_OPTIONAL; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEFAULT instead.")]] -constexpr auto ATTR_DEFAULT = zeek::detail::ATTR_DEFAULT; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_REDEF instead.")]] -constexpr auto ATTR_REDEF = zeek::detail::ATTR_REDEF; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ADD_FUNC instead.")]] -constexpr auto ATTR_ADD_FUNC = zeek::detail::ATTR_ADD_FUNC; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEL_FUNC instead.")]] -constexpr auto ATTR_DEL_FUNC = zeek::detail::ATTR_DEL_FUNC; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_FUNC instead.")]] -constexpr auto ATTR_EXPIRE_FUNC = zeek::detail::ATTR_EXPIRE_FUNC; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_READ instead.")]] -constexpr auto ATTR_EXPIRE_READ = zeek::detail::ATTR_EXPIRE_READ; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_WRITE instead.")]] -constexpr auto ATTR_EXPIRE_WRITE = zeek::detail::ATTR_EXPIRE_WRITE; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_CREATE instead.")]] -constexpr auto ATTR_EXPIRE_CREATE = zeek::detail::ATTR_EXPIRE_CREATE; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_RAW_OUTPUT instead.")]] -constexpr auto ATTR_RAW_OUTPUT = zeek::detail::ATTR_RAW_OUTPUT; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_PRIORITY instead.")]] -constexpr auto ATTR_PRIORITY = zeek::detail::ATTR_PRIORITY; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_GROUP instead.")]] -constexpr auto ATTR_GROUP = zeek::detail::ATTR_GROUP; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_LOG instead.")]] -constexpr auto ATTR_LOG = zeek::detail::ATTR_LOG; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ERROR_HANDLER instead.")]] -constexpr auto ATTR_ERROR_HANDLER = zeek::detail::ATTR_ERROR_HANDLER; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_TYPE_COLUMN instead.")]] -constexpr auto ATTR_TYPE_COLUMN = zeek::detail::ATTR_TYPE_COLUMN; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_TRACKED instead.")]] -constexpr auto ATTR_TRACKED = zeek::detail::ATTR_TRACKED; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ON_CHANGE instead.")]] -constexpr auto ATTR_ON_CHANGE = zeek::detail::ATTR_ON_CHANGE; -[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEPRECATED instead.")]] -constexpr auto ATTR_DEPRECATED = zeek::detail::ATTR_DEPRECATED; -[[deprecated("Remove in v4.1. Use zeek::detail::NUM_ATTRS instead.")]] -constexpr auto NUM_ATTRS = zeek::detail::NUM_ATTRS; diff --git a/src/Base64.cc b/src/Base64.cc index 87edaf2cb5..f76ca6ef9f 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -284,13 +284,3 @@ String* encode_base64(const String* s, const String* a, Connection* conn) } } // namespace zeek::detail - -zeek::String* decode_base64(const zeek::String* s, const zeek::String* a, zeek::Connection* conn) - { - return zeek::detail::decode_base64(s, a, conn); - } - -zeek::String* encode_base64(const zeek::String* s, const zeek::String* a, zeek::Connection* conn) - { - return zeek::detail::encode_base64(s ,a ,conn); - } diff --git a/src/Base64.h b/src/Base64.h index 28a7adb7d1..029baa364f 100644 --- a/src/Base64.h +++ b/src/Base64.h @@ -4,8 +4,6 @@ #include namespace zeek { class String; } -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; - ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek); namespace zeek::detail { @@ -66,11 +64,3 @@ String* decode_base64(const String* s, const String* a = nullptr, Connection* co String* encode_base64(const String* s, const String* a = nullptr, Connection* conn = nullptr); } // namespace zeek::detail - -using Base64Converter [[deprecated("Remove in v4.1. Use zeek::detail::Base64Converter.")]] = zeek::detail::Base64Converter; - -// These can't be constexpr auto definitions due to the default parameters. -[[deprecated("Remove in v4.1. Use zeek::detail::decode_base64.")]] -zeek::String* decode_base64(const zeek::String* s, const zeek::String* a = nullptr, zeek::Connection* conn = nullptr); -[[deprecated("Remove in v4.1. Use zeek::detail::encode_base64.")]] -zeek::String* encode_base64(const zeek::String* s, const zeek::String* a = nullptr, zeek::Connection* conn = nullptr); diff --git a/src/BifReturnVal.cc b/src/BifReturnVal.cc index 597991ea44..fe03be2770 100644 --- a/src/BifReturnVal.cc +++ b/src/BifReturnVal.cc @@ -8,8 +8,4 @@ namespace zeek::detail { BifReturnVal::BifReturnVal(std::nullptr_t) noexcept {} -BifReturnVal::BifReturnVal(Val* v) noexcept - : rval(AdoptRef{}, v) - {} - } // namespace zeek::detail diff --git a/src/BifReturnVal.h b/src/BifReturnVal.h index fb4d02ff57..3a09603554 100644 --- a/src/BifReturnVal.h +++ b/src/BifReturnVal.h @@ -27,12 +27,7 @@ public: BifReturnVal(std::nullptr_t) noexcept; - [[deprecated("Remove in v4.1. Return an IntrusivePtr instead.")]] - BifReturnVal(Val* v) noexcept; - ValPtr rval; }; } // namespace zeek::detail - -using BifReturnVal [[deprecated("Remove in v4.1. Use zeek::detail::BifReturnVal.")]] = zeek::detail::BifReturnVal; diff --git a/src/CCL.h b/src/CCL.h index 9e5cc30bb0..09f2c03b18 100644 --- a/src/CCL.h +++ b/src/CCL.h @@ -35,6 +35,3 @@ protected: }; } // namespace zeek::detail - -using int_list [[deprecated("Remove in v4.1. Use zeek::detail::int_list.")]] = zeek::detail::int_list; -using CCL [[deprecated("Remove in v4.1. Use zeek::detail::CCL.")]] = zeek::detail::CCL; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 854e57fc64..0bc5ceac2b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -210,9 +210,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DebugCmdConstants.h set_source_files_properties(nb_dns.c PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) -set_source_files_properties(legacy-netvar-init.cc PROPERTIES COMPILE_FLAGS - -Wno-deprecated-declarations) - set(MAIN_SRCS digest.cc net_util.cc @@ -296,7 +293,6 @@ set(MAIN_SRCS WeirdState.cc ZeekArgs.cc ZeekString.cc - legacy-netvar-init.cc bsd-getopt-long.c bro_inet_ntop.c in_cksum.cc diff --git a/src/CompHash.h b/src/CompHash.h index 2288133db3..455a2edb7b 100644 --- a/src/CompHash.h +++ b/src/CompHash.h @@ -25,17 +25,9 @@ public: // or nullptr if it fails to typecheck. std::unique_ptr MakeHashKey(const Val& v, bool type_check) const; - [[deprecated("Remove in v4.1. Use MakeHashKey().")]] - HashKey* ComputeHash(const Val* v, bool type_check) const - { return MakeHashKey(*v, type_check).release(); } - // Given a hash key, recover the values used to create it. ListValPtr RecoverVals(const HashKey& k) const; - [[deprecated("Remove in v4.1. Pass in HashKey& instead.")]] - ListValPtr RecoverVals(const HashKey* k) const - { return RecoverVals(*k); } - unsigned int MemoryAllocation() const { return padded_sizeof(*this) + util::pad_size(size); } protected: @@ -107,5 +99,3 @@ protected: }; } // namespace zeek::detail - -using CompositeHash [[deprecated("Remove in v4.1. Use zeek::detail::CompositeHash.")]] = zeek::detail::CompositeHash; diff --git a/src/Conn.cc b/src/Conn.cc index 0579243244..731465dcfc 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -62,8 +62,7 @@ uint64_t Connection::total_connections = 0; uint64_t Connection::current_connections = 0; Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t, - const ConnID* id, uint32_t flow, const Packet* pkt, - const EncapsulationStack* arg_encap) + const ConnID* id, uint32_t flow, const Packet* pkt) { sessions = s; key = k; @@ -117,22 +116,9 @@ Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t, ++current_connections; ++total_connections; - if ( arg_encap ) - encapsulation = std::make_unique(*arg_encap); - else - encapsulation = nullptr; + encapsulation = pkt->encap; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t, - const ConnID* id, uint32_t flow, const Packet* pkt) - : Connection(s, k, t, id, flow, pkt, pkt->encap.get()) - { - } -#pragma GCC diagnostic pop - - Connection::~Connection() { if ( ! finished ) @@ -342,11 +328,6 @@ void Connection::StatusUpdateTimer(double t) detail::TIMER_CONN_STATUS_UPDATE); } -RecordVal* Connection::BuildConnVal() - { - return ConnVal()->Ref()->AsRecordVal(); - } - const RecordValPtr& Connection::ConnVal() { if ( ! conn_val ) @@ -477,55 +458,6 @@ void Connection::Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, const ch EnqueueEvent(f, analyzer, ConnVal()); } -void Connection::Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, Val* v1, Val* v2) - { - if ( ! f ) - { - Unref(v1); - Unref(v2); - return; - } - - if ( v2 ) - EnqueueEvent(f, analyzer, - ConnVal(), - IntrusivePtr{AdoptRef{}, v1}, - IntrusivePtr{AdoptRef{}, v2}); - else - EnqueueEvent(f, analyzer, - ConnVal(), - IntrusivePtr{AdoptRef{}, v1}); - } - -void Connection::ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* a, ValPList vl) - { - auto args = val_list_to_args(vl); - - if ( ! f ) - // This may actually happen if there is no local handler - // and a previously existing remote handler went away. - return; - - // "this" is passed as a cookie for the event - event_mgr.Enqueue(f, std::move(args), util::detail::SOURCE_LOCAL, a ? a->GetID() : 0, this); - } - -void Connection::ConnectionEventFast(EventHandlerPtr f, analyzer::Analyzer* a, ValPList vl) - { - // "this" is passed as a cookie for the event - event_mgr.Enqueue(f, val_list_to_args(vl), util::detail::SOURCE_LOCAL, - a ? a->GetID() : 0, this); - } - -void Connection::ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* a, ValPList* vl) - { - auto args = val_list_to_args(*vl); - delete vl; - - if ( f ) - EnqueueEvent(f, a, std::move(args)); - } - void Connection::EnqueueEvent(EventHandlerPtr f, analyzer::Analyzer* a, Args args) { diff --git a/src/Conn.h b/src/Conn.h index d3f75fcac4..f09c49ed3c 100644 --- a/src/Conn.h +++ b/src/Conn.h @@ -64,9 +64,6 @@ static inline int addr_port_canon_lt(const IPAddr& addr1, uint32_t p1, class Connection final : public Obj { public: - [[deprecated("Remove in v4.1. Store encapsulation in the packet and use the other version of the constructor instead.")]] - Connection(NetSessions* s, const detail::ConnIDKey& k, double t, const ConnID* id, - uint32_t flow, const Packet* pkt, const EncapsulationStack* arg_encap); Connection(NetSessions* s, const detail::ConnIDKey& k, double t, const ConnID* id, uint32_t flow, const Packet* pkt); ~Connection() override; @@ -166,9 +163,6 @@ public: // Activate connection_status_update timer. void EnableStatusUpdateTimer(); - [[deprecated("Remove in v4.1. Use ConnVal() instead.")]] - RecordVal* BuildConnVal(); - /** * Returns the associated "connection" record. */ @@ -190,38 +184,6 @@ public: // argument is the connection value. void Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, const char* name = nullptr); - // If a handler exists for 'f', an event will be generated. In any case, - // 'v1' and 'v2' reference counts get decremented. The event's first - // argument is the connection value, second argument is 'v1', and if 'v2' - // is given that will be it's third argument. - [[deprecated("Remove in v4.1. Use EnqueueEvent() instead (note it doesn't automatically add the connection argument).")]] - void Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, Val* v1, Val* v2 = nullptr); - - // If a handler exists for 'f', an event will be generated. In any case, - // reference count for each element in the 'vl' list are decremented. The - // arguments used for the event are whatevever is provided in 'vl'. - [[deprecated("Remove in v4.1. Use EnqueueEvent() instead.")]] - void ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* analyzer, ValPList vl); - - // Same as ConnectionEvent, except taking the event's argument list via a - // pointer instead of by value. This function takes ownership of the - // memory pointed to by 'vl' and also for decrementing the reference count - // of each of its elements. - [[deprecated("Remove in v4.1. Use EnqueueEvent() instead.")]] - void ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* analyzer, ValPList* vl); - - // Queues an event without first checking if there's any available event - // handlers (or remote consumes). If it turns out there's actually nothing - // that will consume the event, then this may leak memory due to failing to - // decrement the reference count of each element in 'vl'. i.e. use this - // function instead of ConnectionEvent() if you've already guarded against - // the case where there's no handlers (one usually also does that because - // it would be a waste of effort to construct all the event arguments when - // there's no handlers to consume them). - [[deprecated("Remove in v4.1. Use EnqueueEvent() instead.")]] - void ConnectionEventFast(zeek::EventHandlerPtr f, zeek::analyzer::Analyzer* analyzer, - ValPList vl); - /** * Enqueues an event associated with this connection and given analyzer. */ @@ -406,15 +368,5 @@ protected: } // namespace detail } // namespace zeek -using ConnEventToFlag [[deprecated("Remove in v4.1. Use zeek::ConnEventToFlag.")]] = zeek::ConnEventToFlag; -constexpr auto NUL_IN_LINE [[deprecated("Remove in v4.1. Use zeek::NUL_IN_LINE.")]] = zeek::NUL_IN_LINE; -constexpr auto SINGULAR_CR [[deprecated("Remove in v4.1. Use zeek::SINGULAR_CR.")]] = zeek::SINGULAR_CR; -constexpr auto SINGULAR_LF [[deprecated("Remove in v4.1. Use zeek::SINGULAR_LF.")]] = zeek::SINGULAR_LF; -constexpr auto NUM_EVENTS_TO_FLAG [[deprecated("Remove in v4.1. Use zeek::NUM_EVENTS_TO_FLAG.")]] = zeek::NUM_EVENTS_TO_FLAG; - -using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID; -using Connection [[deprecated("Remove in v4.1. Use zeek::Connection.")]] = zeek::Connection; -using ConnectionTimer [[deprecated("Remove in v4.1. Use zeek::detail::ConnectionTimer.")]] = zeek::detail::ConnectionTimer; - #define ADD_TIMER(timer, t, do_expire, type) \ AddTimer(timer_func(timer), (t), (do_expire), (type)) diff --git a/src/DFA.h b/src/DFA.h index c2fd7555f1..53c3e2ab68 100644 --- a/src/DFA.h +++ b/src/DFA.h @@ -152,8 +152,3 @@ inline DFA_State* DFA_State::Xtion(int sym, DFA_Machine* machine) } } // namespace zeek::detail - -using DFA_State [[deprecated("Remove in v4.1. Use zeek::detail::DFA_State.")]] = zeek::detail::DFA_State; -using DigestStr [[deprecated("Remove in v4.1. Use zeek::detail::DigestStr.")]] = zeek::detail::DigestStr; -using DFA_State_Cache [[deprecated("Remove in v4.1. Use zeek::detail::DFA_State_Cache.")]] = zeek::detail::DFA_State_Cache; -using DFA_Machine [[deprecated("Remove in v4.1. Use zeek::detail::DFA_Machine.")]] = zeek::detail::DFA_Machine; diff --git a/src/DNS_Mgr.h b/src/DNS_Mgr.h index 226c2edc1e..6903fc57f6 100644 --- a/src/DNS_Mgr.h +++ b/src/DNS_Mgr.h @@ -244,12 +244,3 @@ protected: extern DNS_Mgr* dns_mgr; } // namespace zeek::detail - -using DNS_Mgr [[deprecated("Remove in v4.1. Use zeek::detail::DNS_Mgr.")]] = zeek::detail::DNS_Mgr; -extern zeek::detail::DNS_Mgr*& dns_mgr [[deprecated("Remove in v4.1. Use zeek::detail::dns_mgr.")]]; - -using DNS_MgrMode [[deprecated("Remove in v4.1. Use zeek::detail::DNS_MgrMode.")]] = zeek::detail::DNS_MgrMode; -constexpr auto DNS_PRIME [[deprecated("Remove in v4.1. Use zeek::detail::DNS_PRIME.")]] = zeek::detail::DNS_PRIME; -constexpr auto DNS_FORCE [[deprecated("Remove in v4.1. Use zeek::detail::DNS_FORCE.")]] = zeek::detail::DNS_FORCE; -constexpr auto DNS_DEFAULT [[deprecated("Remove in v4.1. Use zeek::detail::DNS_DEFAULT.")]] = zeek::detail::DNS_DEFAULT; -constexpr auto DNS_FAKE [[deprecated("Remove in v4.1. Use zeek::detail::DNS_FAKE.")]] = zeek::detail::DNS_FAKE; diff --git a/src/DbgBreakpoint.h b/src/DbgBreakpoint.h index 6e1024c9ca..0fec02dba3 100644 --- a/src/DbgBreakpoint.h +++ b/src/DbgBreakpoint.h @@ -84,13 +84,3 @@ protected: }; } // namespace zeek::detail - -using DbgBreakPoint [[deprecated("Remove in v4.1. Use zeek::detail::DbgBreakpoint.")]] = zeek::detail::DbgBreakpoint; - -using BreakCode [[deprecated("Remove in v4.1. Use zeek::detail::BreakCode.")]] = zeek::detail::BreakCode; -[[deprecated("Remove in v4.1. Use zeek::detail::BC_NO_HIT.")]] -constexpr auto bcNoHit = zeek::detail::BC_NO_HIT; -[[deprecated("Remove in v4.1. Use zeek::detail::BC_HIT.")]] -constexpr auto bcHit = zeek::detail::BC_HIT; -[[deprecated("Remove in v4.1. Use zeek::detail::BC_HIT_AND_DELETE.")]] -constexpr auto bcHitAndDelete = zeek::detail::BC_HIT_AND_DELETE; diff --git a/src/DbgDisplay.h b/src/DbgDisplay.h index 0c7150ac53..988d15adef 100644 --- a/src/DbgDisplay.h +++ b/src/DbgDisplay.h @@ -27,5 +27,3 @@ protected: }; } // namespace zeek::detail - -using DbgDisplay [[deprecated("Remove in v4.1. Use zeek::detail::DbgDisplay.")]] = zeek::detail::DbgDisplay; diff --git a/src/DbgWatch.h b/src/DbgWatch.h index 83b113a764..a26f1b8500 100644 --- a/src/DbgWatch.h +++ b/src/DbgWatch.h @@ -6,7 +6,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail); namespace zeek { class Obj; } -using BroObj [[deprecated("Remove in v4.1. Use zeek:Obj instead.")]] = zeek::Obj; namespace zeek::detail { @@ -22,5 +21,3 @@ protected: }; } // namespace zeek::detail - -using DbgWatch [[deprecated("Remove in v4.1. Using zeek::detail::DbgWatch.")]] = zeek::detail::DbgWatch; diff --git a/src/Debug.cc b/src/Debug.cc index f11cb5b652..fe4b863e26 100644 --- a/src/Debug.cc +++ b/src/Debug.cc @@ -41,16 +41,9 @@ extern "C" { using namespace std; bool zeek::detail::g_policy_debug = false; -bool& g_policy_debug = zeek::detail::g_policy_debug; - zeek::detail::DebuggerState zeek::detail::g_debugger_state; -zeek::detail::DebuggerState& g_debugger_state = zeek::detail::g_debugger_state; - zeek::detail::TraceState zeek::detail::g_trace_state; -zeek::detail::TraceState& g_trace_state = zeek::detail::g_trace_state; - std::map zeek::detail::g_dbgfilemaps; -std::map& g_dbgfilemaps = zeek::detail::g_dbgfilemaps; // These variables are used only to decide whether or not to print the // current context; you don't want to do it after a step or next diff --git a/src/Debug.h b/src/Debug.h index 4b742348ac..9fe60047b6 100644 --- a/src/Debug.h +++ b/src/Debug.h @@ -178,32 +178,3 @@ int debug_msg(const char* fmt, ...) __attribute__ ((format (printf, 1, 2))); } // namespace detail } // namespace zeek - -constexpr auto plrUnknown [[deprecated("Remove in v4.1. Use zeek::detail::PLR_UNKNOWN.")]] = zeek::detail::PLR_UNKNOWN; -constexpr auto plrFileAndLine [[deprecated("Remove in v4.1. Use zeek::detail::PLR_FILE_AND_LINE.")]] = zeek::detail::PLR_FILE_AND_LINE; -constexpr auto plrFunction [[deprecated("Remove in v4.1. Use zeek::detail::PLR_FUNCTION.")]] = zeek::detail::PLR_FUNCTION; -using ParseLocationRec [[deprecated("Remove in v4.1. Use zeek::detail::ParseLocationRec.")]] = zeek::detail::ParseLocationRec; -using Filemap [[deprecated("Remove in v4.1. Use zeek::detail::Filemap.")]] = zeek::detail::Filemap; -using BPIDMapType [[deprecated("Remove in v4.1. Use zeek::detail::BPIDMapType.")]] = zeek::detail::BPIDMapType; -using BPMapType [[deprecated("Remove in v4.1. Use zeek::detail::BPMapType.")]] = zeek::detail::BPMapType; -using TraceState [[deprecated("Remove in v4.1. Use zeek::detail::TraceState.")]] = zeek::detail::TraceState; -using DebuggerState [[deprecated("Remove in v4.1. Use zeek::detail::DebuggerState.")]] = zeek::detail::DebuggerState; -using StmtLocMapping [[deprecated("Remove in v4.1. Use zeek::detail::StmtLocMapping.")]] = zeek::detail::StmtLocMapping; - -constexpr auto parse_location_string [[deprecated("Remove in v4.1. Use zeek::detail::parse_location_string.")]] = zeek::detail::parse_location_string; -constexpr auto pre_execute_stmt [[deprecated("Remove in v4.1. Use zeek::detail::pre_execute_stmt.")]] = zeek::detail::pre_execute_stmt; -constexpr auto post_execute_stmt [[deprecated("Remove in v4.1. Use zeek::detail::post_execute_stmt.")]] = zeek::detail::post_execute_stmt; -constexpr auto dbg_init_debugger [[deprecated("Remove in v4.1. Use zeek::detail::dbg_init_debugger.")]] = zeek::detail::dbg_init_debugger; -constexpr auto dbg_shutdown_debugger [[deprecated("Remove in v4.1. Use zeek::detail::dbg_shutdown_debugger.")]] = zeek::detail::dbg_shutdown_debugger; -constexpr auto dbg_handle_debug_input [[deprecated("Remove in v4.1. Use zeek::detail::dbg_handle_debug_input.")]] = zeek::detail::dbg_handle_debug_input; -constexpr auto dbg_execute_command [[deprecated("Remove in v4.1. Use zeek::detail::dbg_execute_command.")]] = zeek::detail::dbg_execute_command; -constexpr auto dbg_eval_expr [[deprecated("Remove in v4.1. Use zeek::detail::dbg_eval_expr.")]] = zeek::detail::dbg_eval_expr; -constexpr auto get_context_description [[deprecated("Remove in v4.1. Use zeek::detail::get_context_description.")]] = zeek::detail::get_context_description; -constexpr auto debug_msg [[deprecated("Remove in v4.1. Use zeek::detail::debug_msg.")]] = zeek::detail::debug_msg; - -extern bool& g_policy_debug [[deprecated("Remove in v4.1. Use zeek::detail:g_policy_debug")]]; -extern zeek::detail::DebuggerState& g_debugger_state [[deprecated("Remove in v4.1. Use zeek::detail:g_debugger_state")]]; -extern std::string& current_module [[deprecated("Remove in v4.1. Use zeek::current_module.")]]; -extern zeek::detail::TraceState& g_trace_state [[deprecated("Remove in v4.1. Use zeek::detail::g_trace_state.")]]; -extern zeek::detail::Frame*& g_dbg_locals [[deprecated("Remove in v4.1. Use zeek::detail::g_dbg_locals.")]]; -extern std::map& g_dbgfilemaps [[deprecated("Remove in v4.1. Use zeek::detail::g_dbgfilemaps.")]]; diff --git a/src/DebugCmds.h b/src/DebugCmds.h index 4051a121ef..e97e503a6f 100644 --- a/src/DebugCmds.h +++ b/src/DebugCmds.h @@ -80,21 +80,3 @@ DbgCmdFn dbg_cmd_list; DbgCmdFn dbg_cmd_trace; } // namespace zeek::detail - -using DebugCmdInfo [[deprecated("Remove in v4.1. Use zeek::detail::DebugCmdInfo.")]] = zeek::detail::DebugCmdInfo; -constexpr auto init_global_dbg_constants [[deprecated("Remove in v4.1. Use zeek::detail::init_global_dbg_constants.")]] = zeek::detail::init_global_dbg_constants; -constexpr auto get_debug_cmd_info [[deprecated("Remove in v4.1. Use zeek::detail::get_debug_cmd_info.")]] = zeek::detail::get_debug_cmd_info; -constexpr auto find_all_matching_cmds [[deprecated("Remove in v4.1. Use zeek::detail::find_all_matching_cmds.")]] = zeek::detail::find_all_matching_cmds; - -constexpr auto dbg_cmd_backtrace [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_backtrace")]] = zeek::detail::dbg_cmd_backtrace; -constexpr auto dbg_cmd_frame [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_frame")]] = zeek::detail::dbg_cmd_frame; -constexpr auto dbg_cmd_help [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_help")]] = zeek::detail::dbg_cmd_help; -constexpr auto dbg_cmd_break [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break")]] = zeek::detail::dbg_cmd_break; -constexpr auto dbg_cmd_break_condition [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break_condition")]] = zeek::detail::dbg_cmd_break_condition; -constexpr auto dbg_cmd_break_set_state [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break_set_state")]] = zeek::detail::dbg_cmd_break_set_state; -constexpr auto dbg_cmd_print [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_print")]] = zeek::detail::dbg_cmd_print; -constexpr auto dbg_cmd_info [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_info")]] = zeek::detail::dbg_cmd_info; -constexpr auto dbg_cmd_list [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_list")]] = zeek::detail::dbg_cmd_list; -constexpr auto dbg_cmd_trace [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_trace")]] = zeek::detail::dbg_cmd_trace; - -extern zeek::PQueue& g_DebugCmdInfos [[deprecated("Remove in v4.1. Use zeek::detail::g_DebugCmdInfos.")]]; diff --git a/src/DebugLogger.h b/src/DebugLogger.h index 736ade5aac..dd5d7e8ad1 100644 --- a/src/DebugLogger.h +++ b/src/DebugLogger.h @@ -106,29 +106,6 @@ extern DebugLogger debug_logger; } // namespace detail } // namespace zeek -using DebugLogger [[deprecated("Remove in v4.1. Use zeek::detail::DebugLogger.")]] = zeek::detail::DebugLogger; - -using DebugStream [[deprecated("Remove in v4.1. Use zeek::DebugStream.")]] = zeek::DebugStream; -constexpr auto DBG_SERIAL [[deprecated("Remove in v4.1. Use zeek::DBG_SERIAL.")]] = zeek::DBG_SERIAL; -constexpr auto DBG_RULES [[deprecated("Remove in v4.1. Use zeek::DBG_RULES.")]] = zeek::DBG_RULES; -constexpr auto DBG_STRING [[deprecated("Remove in v4.1. Use zeek::DBG_STRING.")]] = zeek::DBG_STRING; -constexpr auto DBG_NOTIFIERS [[deprecated("Remove in v4.1. Use zeek::DBG_NOTIFIERS.")]] = zeek::DBG_NOTIFIERS; -constexpr auto DBG_MAINLOOP [[deprecated("Remove in v4.1. Use zeek::DBG_MAINLOOP.")]] = zeek::DBG_MAINLOOP; -constexpr auto DBG_ANALYZER [[deprecated("Remove in v4.1. Use zeek::DBG_ANALYZER.")]] = zeek::DBG_ANALYZER; -constexpr auto DBG_TM [[deprecated("Remove in v4.1. Use zeek::DBG_TM.")]] = zeek::DBG_TM; -constexpr auto DBG_LOGGING [[deprecated("Remove in v4.1. Use zeek::DBG_LOGGING.")]] = zeek::DBG_LOGGING; -constexpr auto DBG_INPUT [[deprecated("Remove in v4.1. Use zeek::DBG_INPUT.")]] = zeek::DBG_INPUT; -constexpr auto DBG_THREADING [[deprecated("Remove in v4.1. Use zeek::DBG_THREADING.")]] = zeek::DBG_THREADING; -constexpr auto DBG_FILE_ANALYSIS [[deprecated("Remove in v4.1. Use zeek::DBG_FILE_ANALYSIS.")]] = zeek::DBG_FILE_ANALYSIS; -constexpr auto DBG_PLUGINS [[deprecated("Remove in v4.1. Use zeek::DBG_PLUGINS.")]] = zeek::DBG_PLUGINS; -constexpr auto DBG_ZEEKYGEN [[deprecated("Remove in v4.1. Use zeek::DBG_ZEEKYGEN.")]] = zeek::DBG_ZEEKYGEN; -constexpr auto DBG_PKTIO [[deprecated("Remove in v4.1. Use zeek::DBG_PKTIO.")]] = zeek::DBG_PKTIO; -constexpr auto DBG_BROKER [[deprecated("Remove in v4.1. Use zeek::DBG_BROKER.")]] = zeek::DBG_BROKER; -constexpr auto DBG_SCRIPTS [[deprecated("Remove in v4.1. Use zeek::DBG_SCRIPTS.")]] = zeek::DBG_SCRIPTS; -constexpr auto DBG_SUPERVISOR [[deprecated("Remove in v4.1. Use zeek::DBG_SUPERVISOR.")]] = zeek::DBG_SUPERVISOR; - -extern zeek::detail::DebugLogger& debug_logger; - #else #define DBG_LOG(args...) #define DBG_LOG_VERBOSE(args...) diff --git a/src/Desc.h b/src/Desc.h index 54cf79e60d..524a310eeb 100644 --- a/src/Desc.h +++ b/src/Desc.h @@ -218,16 +218,3 @@ class Obj; extern std::string obj_desc(const Obj* o); } // namespace zeek - -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; - -using ODesc [[deprecated("Remove in v4.1. Use zeek::ODesc.")]] = zeek::ODesc; -using desc_type [[deprecated("Remove in v4.1. Use zeek::DescType.")]] = zeek::DescType; -constexpr auto DESC_READABLE [[deprecated("Remove in v4.1. Use zeek::DESC_READABLE.")]] = zeek::DESC_READABLE; -constexpr auto DESC_PORTABLE [[deprecated("Remove in v4.1. Use zeek::DESC_PORTABLE.")]] = zeek::DESC_PORTABLE; -constexpr auto DESC_BINARY [[deprecated("Remove in v4.1. Use zeek::DESC_BINARY.")]] = zeek::DESC_BINARY; - -using desc_style [[deprecated("Remove in v4.1. Use zeek::DescStyle.")]] = zeek::DescStyle; -constexpr auto STANDARD_STYLE [[deprecated("Remove in v4.1. Use zeek::STANDARD_STYLE.")]] = zeek::STANDARD_STYLE; -constexpr auto RAW_STYLE [[deprecated("Remove in v4.1. Use zeek::RAW_STYLE.")]] = zeek::RAW_STYLE; diff --git a/src/Dict.h b/src/Dict.h index 5f18e98228..edbcde7a8b 100644 --- a/src/Dict.h +++ b/src/Dict.h @@ -551,6 +551,3 @@ public: }; } // namespace zeek - -using Dictionary [[deprecated("Remove in v4.1. Use zeek::Dictionary instead.")]] = zeek::Dictionary; -template using PDict [[deprecated("Remove in v4.1. Use zeek::PDict instead.")]] = zeek::PDict; diff --git a/src/Event.cc b/src/Event.cc index 93e49b7f89..f7e10db50d 100644 --- a/src/Event.cc +++ b/src/Event.cc @@ -94,34 +94,6 @@ EventMgr::~EventMgr() Unref(src_val); } -void EventMgr::QueueEventFast(const EventHandlerPtr &h, ValPList vl, - util::detail::SourceID src, analyzer::ID aid, detail::TimerMgr* mgr, - Obj* obj) - { - QueueEvent(new Event(h, val_list_to_args(vl), src, aid, obj)); - } - -void EventMgr::QueueEvent(const EventHandlerPtr &h, ValPList vl, - util::detail::SourceID src, analyzer::ID aid, - detail::TimerMgr* mgr, Obj* obj) - { - auto args = val_list_to_args(vl); - - if ( h ) - Enqueue(h, std::move(args), src, aid, obj); - } - -void EventMgr::QueueEvent(const EventHandlerPtr &h, ValPList* vl, - util::detail::SourceID src, analyzer::ID aid, - detail::TimerMgr* mgr, Obj* obj) - { - auto args = val_list_to_args(*vl); - delete vl; - - if ( h ) - Enqueue(h, std::move(args), src, aid, obj); - } - void EventMgr::Enqueue(const EventHandlerPtr& h, Args vl, util::detail::SourceID src, analyzer::ID aid, Obj* obj) diff --git a/src/Event.h b/src/Event.h index e9b3ab203e..3f953efd29 100644 --- a/src/Event.h +++ b/src/Event.h @@ -52,39 +52,6 @@ public: EventMgr(); ~EventMgr() override; - // Queues an event without first checking if there's any available event - // handlers (or remote consumers). If it turns out there's actually - // nothing that will consume the event, then this may leak memory due to - // failing to decrement the reference count of each element in 'vl'. i.e. - // use this function instead of QueueEvent() if you've already guarded - // against the case where there's no handlers (one usually also does that - // because it would be a waste of effort to construct all the event - // arguments when there's no handlers to consume them). - [[deprecated("Remove in v4.1. Use Enqueue() instead.")]] - void QueueEventFast(const EventHandlerPtr &h, ValPList vl, - util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0, - detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr); - - // Queues an event if there's an event handler (or remote consumer). This - // function always takes ownership of decrementing the reference count of - // each element of 'vl', even if there's no event handler. If you've - // checked for event handler existence, you may wish to call - // QueueEventFast() instead of this function to prevent the redundant - // existence check. - [[deprecated("Remove in v4.1. Use Enqueue() instead.")]] - void QueueEvent(const EventHandlerPtr &h, ValPList vl, - util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0, - detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr); - - // Same as QueueEvent, except taking the event's argument list via a - // pointer instead of by value. This function takes ownership of the - // memory pointed to by 'vl' as well as decrementing the reference count of - // each of its elements. - [[deprecated("Remove in v4.1. Use Enqueue() instead.")]] - void QueueEvent(const EventHandlerPtr &h, ValPList* vl, - util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0, - detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr); - /** * Adds an event to the queue. If no handler is found for the event * when later going to call it, nothing happens except for having @@ -153,10 +120,3 @@ protected: extern EventMgr event_mgr; } // namespace zeek - -using Event [[deprecated("Remove in v4.1. Use zeek::Event.")]] = zeek::Event; -using EventMgr [[deprecated("Remove in v4.1. Use zeek::EventMgr.")]] = zeek::EventMgr; -extern zeek::EventMgr& mgr [[deprecated("Remove in v4.1. Use zeek::event_mgr")]]; - -extern uint64_t& num_events_queued [[deprecated("Remove in v4.1. Use zeek::event_mgr.num_events_queued")]]; -extern uint64_t& num_events_dispatched [[deprecated("Remove in v4.1. Use zeek::event_mgr.num_events_dispatched")]]; diff --git a/src/EventHandler.cc b/src/EventHandler.cc index a7a904f4a7..e60d54fb90 100644 --- a/src/EventHandler.cc +++ b/src/EventHandler.cc @@ -50,9 +50,6 @@ const FuncTypePtr& EventHandler::GetType(bool check_export) void EventHandler::SetFunc(FuncPtr f) { local = std::move(f); } -void EventHandler::SetLocalHandler(Func* f) - { SetFunc({NewRef{}, f}); } - void EventHandler::Call(Args* vl, bool no_remote) { #ifdef PROFILE_BRO_FUNCTIONS diff --git a/src/EventHandler.h b/src/EventHandler.h index 0f7813ef37..f27edf2e80 100644 --- a/src/EventHandler.h +++ b/src/EventHandler.h @@ -23,20 +23,10 @@ public: const FuncPtr& GetFunc() { return local; } - [[deprecated("Remove in v4.1. Use GetFunc().")]] - Func* LocalHandler() { return local.get(); } - const FuncTypePtr& GetType(bool check_export = true); - [[deprecated("Remove in v4.1. Use GetType().")]] - FuncType* FType(bool check_export = true) - { return GetType().get(); } - void SetFunc(FuncPtr f); - [[deprecated("Remove in v4.1. Use SetFunc().")]] - void SetLocalHandler(Func* f); - void AutoPublish(std::string topic) { auto_publish.insert(std::move(topic)); @@ -106,6 +96,3 @@ private: }; } // namespace zeek - -using EventHandler [[deprecated("Remove in v4.1. Use zeek::EventHandler.")]] = zeek::EventHandler; -using EventHandlerPtr [[deprecated("Remove in v4.1. Use zeek::EventHandlerPtr.")]] = zeek::EventHandlerPtr; diff --git a/src/EventRegistry.h b/src/EventRegistry.h index 88365a1e18..2d7f49da10 100644 --- a/src/EventRegistry.h +++ b/src/EventRegistry.h @@ -58,6 +58,3 @@ private: extern EventRegistry* event_registry; } // namespace zeek - -using EventRegistry [[deprecated("Remove in v4.1. Use zeek::EventRegistry.")]] = zeek::EventRegistry; -extern zeek::EventRegistry*& event_registry; diff --git a/src/Expr.h b/src/Expr.h index 688fb97c32..d0d15feb75 100644 --- a/src/Expr.h +++ b/src/Expr.h @@ -21,14 +21,12 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail); -namespace zeek::detail { struct function_ingredients; } -using function_ingredients [[deprecated("Remove in v4.1. Use zeek::detail::function_ingredients.")]] = zeek::detail::function_ingredients; - namespace zeek { template class IntrusivePtr; namespace detail { +struct function_ingredients; using IDPtr = IntrusivePtr; enum BroExprTag : int { @@ -109,9 +107,6 @@ using StmtPtr = IntrusivePtr; class Expr : public Obj { public: - [[deprecated("Remove in v4.1. Use GetType().")]] - zeek::Type* Type() const { return type.get(); } - const TypePtr& GetType() const { return type; } @@ -1053,9 +1048,6 @@ public: TypePtr arg_type = nullptr, AttributesPtr arg_attrs = nullptr); - [[deprecated("Remove in v4.1. Use GetAttrs().")]] - Attributes* Attrs() { return attrs.get(); } - const AttributesPtr& GetAttrs() const { return attrs; } @@ -1083,9 +1075,6 @@ public: TypePtr arg_type = nullptr, AttributesPtr arg_attrs = nullptr); - [[deprecated("Remove in v4.1. Use GetAttrs().")]] - Attributes* Attrs() { return attrs.get(); } - const AttributesPtr& GetAttrs() const { return attrs; } @@ -1641,53 +1630,3 @@ inline bool is_vector(const ExprPtr& e) { return is_vector(e.get()); } } // namespace detail } // namespace zeek - -using Expr [[deprecated("Remove in v4.1. Use zeek::detail::Expr instead.")]] = zeek::detail::Expr; -using NameExpr [[deprecated("Remove in v4.1. Use zeek::detail::NameExpr instead.")]] = zeek::detail::NameExpr; -using ConstExpr [[deprecated("Remove in v4.1. Use zeek::detail::ConstExpr instead.")]] = zeek::detail::ConstExpr; -using UnaryExpr [[deprecated("Remove in v4.1. Use zeek::detail::UnaryExpr instead.")]] = zeek::detail::UnaryExpr; -using BinaryExpr [[deprecated("Remove in v4.1. Use zeek::detail::BinaryExpr instead.")]] = zeek::detail::BinaryExpr; -using CloneExpr [[deprecated("Remove in v4.1. Use zeek::detail::CloneExpr instead.")]] = zeek::detail::CloneExpr; -using IncrExpr [[deprecated("Remove in v4.1. Use zeek::detail::IncrExpr instead.")]] = zeek::detail::IncrExpr; -using ComplementExpr [[deprecated("Remove in v4.1. Use zeek::detail::ComplementExpr instead.")]] = zeek::detail::ComplementExpr; -using NotExpr [[deprecated("Remove in v4.1. Use zeek::detail::NotExpr instead.")]] = zeek::detail::NotExpr; -using PosExpr [[deprecated("Remove in v4.1. Use zeek::detail::PosExpr instead.")]] = zeek::detail::PosExpr; -using NegExpr [[deprecated("Remove in v4.1. Use zeek::detail::NegExpr instead.")]] = zeek::detail::NegExpr; -using SizeExpr [[deprecated("Remove in v4.1. Use zeek::detail::SizeExpr instead.")]] = zeek::detail::SizeExpr; -using AddExpr [[deprecated("Remove in v4.1. Use zeek::detail::AddExpr instead.")]] = zeek::detail::AddExpr; -using AddToExpr [[deprecated("Remove in v4.1. Use zeek::detail::AddToExpr instead.")]] = zeek::detail::AddToExpr; -using RemoveFromExpr [[deprecated("Remove in v4.1. Use zeek::detail::RemoveFromExpr instead.")]] = zeek::detail::RemoveFromExpr; -using SubExpr [[deprecated("Remove in v4.1. Use zeek::detail::SubExpr instead.")]] = zeek::detail::SubExpr; -using TimesExpr [[deprecated("Remove in v4.1. Use zeek::detail::TimesExpr instead.")]] = zeek::detail::TimesExpr; -using DivideExpr [[deprecated("Remove in v4.1. Use zeek::detail::DivideExpr instead.")]] = zeek::detail::DivideExpr; -using ModExpr [[deprecated("Remove in v4.1. Use zeek::detail::ModExpr instead.")]] = zeek::detail::ModExpr; -using BoolExpr [[deprecated("Remove in v4.1. Use zeek::detail::BoolExpr instead.")]] = zeek::detail::BoolExpr; -using BitExpr [[deprecated("Remove in v4.1. Use zeek::detail::BitExpr instead.")]] = zeek::detail::BitExpr; -using EqExpr [[deprecated("Remove in v4.1. Use zeek::detail::EqExpr instead.")]] = zeek::detail::EqExpr; -using RelExpr [[deprecated("Remove in v4.1. Use zeek::detail::RelExpr instead.")]] = zeek::detail::RelExpr; -using CondExpr [[deprecated("Remove in v4.1. Use zeek::detail::CondExpr instead.")]] = zeek::detail::CondExpr; -using RefExpr [[deprecated("Remove in v4.1. Use zeek::detail::RefExpr instead.")]] = zeek::detail::RefExpr; -using AssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::AssignExpr instead.")]] = zeek::detail::AssignExpr; -using IndexSliceAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::IndexSliceAssignExpr instead.")]] = zeek::detail::IndexSliceAssignExpr; -using IndexExpr [[deprecated("Remove in v4.1. Use zeek::detail::IndexExpr instead.")]] = zeek::detail::IndexExpr; -using FieldExpr [[deprecated("Remove in v4.1. Use zeek::detail::FieldExpr instead.")]] = zeek::detail::FieldExpr; -using HasFieldExpr [[deprecated("Remove in v4.1. Use zeek::detail::HasFieldExpr instead.")]] = zeek::detail::HasFieldExpr; -using RecordConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordConstructorExpr instead.")]] = zeek::detail::RecordConstructorExpr; -using TableConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::TableConstructorExpr instead.")]] = zeek::detail::TableConstructorExpr; -using SetConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::SetConstructorExpr instead.")]] = zeek::detail::SetConstructorExpr; -using VectorConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::VectorConstructorExpr instead.")]] = zeek::detail::VectorConstructorExpr; -using FieldAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::FieldAssignExpr instead.")]] = zeek::detail::FieldAssignExpr; -using ArithCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::ArithCoerceExpr instead.")]] = zeek::detail::ArithCoerceExpr; -using RecordCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordCoerceExpr instead.")]] = zeek::detail::RecordCoerceExpr; -using TableCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::TableCoerceExpr instead.")]] = zeek::detail::TableCoerceExpr; -using VectorCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::VectorCoerceExpr instead.")]] = zeek::detail::VectorCoerceExpr; -using ScheduleTimer [[deprecated("Remove in v4.1. Use zeek::detail::ScheduleTimer instead.")]] = zeek::detail::ScheduleTimer; -using ScheduleExpr [[deprecated("Remove in v4.1. Use zeek::detail::ScheduleExpr instead.")]] = zeek::detail::ScheduleExpr; -using InExpr [[deprecated("Remove in v4.1. Use zeek::detail::InExpr instead.")]] = zeek::detail::InExpr; -using CallExpr [[deprecated("Remove in v4.1. Use zeek::detail::CallExpr instead.")]] = zeek::detail::CallExpr; -using LambdaExpr [[deprecated("Remove in v4.1. Use zeek::detail::LambdaExpr instead.")]] = zeek::detail::LambdaExpr; -using EventExpr [[deprecated("Remove in v4.1. Use zeek::detail::EventExpr instead.")]] = zeek::detail::EventExpr; -using ListExpr [[deprecated("Remove in v4.1. Use zeek::detail::ListExpr instead.")]] = zeek::detail::ListExpr; -using RecordAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordAssignExpr instead.")]] = zeek::detail::RecordAssignExpr; -using CastExpr [[deprecated("Remove in v4.1. Use zeek::detail::CastExpr instead.")]] = zeek::detail::CastExpr; -using IsExpr [[deprecated("Remove in v4.1. Use zeek::detail::IsExpr instead.")]] = zeek::detail::IsExpr; diff --git a/src/File.h b/src/File.h index a19d1f2aa1..a496f2ebf7 100644 --- a/src/File.h +++ b/src/File.h @@ -45,9 +45,6 @@ public: void SetBuf(bool buffered); // false=line buffered, true=fully buffered - [[deprecated("Remove in v4.1. Use GetType().")]] - Type* FType() const { return t.get(); } - const TypePtr& GetType() const { return t; } @@ -76,9 +73,6 @@ public: // Get the file with the given name, opening it if it doesn't yet exist. static FilePtr Get(const char* name); - [[deprecated("Remove in v4.1. Use File::Get().")]] - static File* GetFile(const char* name) - { return Get(name).release(); } void EnableRawOutput() { raw_output = true; } bool IsRawOutput() const { return raw_output; } @@ -125,7 +119,3 @@ private: }; } // namespace zeek - -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; -using BroFile [[deprecated("Remove in v4.1. Use zeek::File instead.")]] = zeek::File; -using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr instead.")]] = zeek::FilePtr; diff --git a/src/Frame.cc b/src/Frame.cc index d4aa13e13b..c58d830d89 100644 --- a/src/Frame.cc +++ b/src/Frame.cc @@ -73,9 +73,6 @@ void Frame::AddFunctionWithClosureRef(ScriptFunc* func) functions_with_closure_frame_reference->emplace_back(func); } -void Frame::SetElement(int n, Val* v) - { SetElement(n, {AdoptRef{}, v}); } - void Frame::SetElement(int n, ValPtr v) { n += current_offset; diff --git a/src/Frame.h b/src/Frame.h index 7413beacec..53a4d6efc8 100644 --- a/src/Frame.h +++ b/src/Frame.h @@ -21,13 +21,11 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Trigger, zeek::detail::trigger); -namespace zeek::detail { class ScriptFunc; } -using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc instead.")]] = zeek::detail::ScriptFunc; - namespace zeek { using ValPtr = IntrusivePtr; namespace detail { +class ScriptFunc; using IDPtr = IntrusivePtr; namespace trigger { @@ -67,9 +65,6 @@ public: return frame[n].val; } - [[deprecated("Remove in v4.1. Use GetElement(int).")]] - Val* NthElement(int n) const { return frame[n].val.get(); } - /** * Sets the element at index *n* of the underlying array to *v*. * @param n the index to set @@ -77,9 +72,6 @@ public: */ void SetElement(int n, ValPtr v); - [[deprecated("Remove in v4.1. Pass IntrusivePtr instead.")]] - void SetElement(int n, Val* v); - /** * Associates *id* and *v* in the frame. Future lookups of * *id* will return *v*. @@ -101,10 +93,6 @@ public: const ValPtr& GetElementByID(const IDPtr& id) const { return GetElementByID(id.get()); } - [[deprecated("Remove in v4.1. Use GetElementByID().")]] - Val* GetElement(const ID* id) const - { return GetElementByID(id).get(); } - /** * Adjusts the current offset being used for frame accesses. * This is in support of inlined functions. @@ -405,8 +393,6 @@ private: } // namespace detail } // namespace zeek -using Frame [[deprecated("Remove in v4.1. Use zeek::detail::Frame instead.")]] = zeek::detail::Frame; - /** * If we stopped using this and instead just made a struct of the information * that the debugger actually uses we could make the Frame a class a template. diff --git a/src/Func.cc b/src/Func.cc index 4610e47f08..dfd3ec0110 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -289,12 +289,6 @@ void Func::CheckPluginResult(bool handled, const ValPtr& hook_result, } } -Val* Func::Call(ValPList* args, detail::Frame* parent) const - { - auto zargs = val_list_to_args(*args); - return Invoke(&zargs, parent).release(); - }; - namespace detail { ScriptFunc::ScriptFunc(const IDPtr& arg_id, StmtPtr arg_body, @@ -1048,18 +1042,3 @@ void emit_builtin_error(const char* msg, Obj* arg) } } // namespace zeek - -void builtin_error(const char* msg) - { - zeek::emit_builtin_error(msg); - } - -void builtin_error(const char* msg, const zeek::ValPtr& arg) - { - zeek::emit_builtin_error(msg, arg); - } - -void builtin_error(const char* msg, zeek::Obj* arg) - { - zeek::emit_builtin_error(msg, arg); - } diff --git a/src/Func.h b/src/Func.h index f73cd091d5..730dad339c 100644 --- a/src/Func.h +++ b/src/Func.h @@ -57,7 +57,6 @@ public: static inline const FuncPtr nil; enum Kind { SCRIPT_FUNC, BUILTIN_FUNC }; - static constexpr auto BRO_FUNC [[deprecated("Remove in v4.1. Use Func::SCRIPT_FUNC instead.")]] = SCRIPT_FUNC; explicit Func(Kind arg_kind); @@ -76,9 +75,6 @@ public: const std::vector& GetBodies() const { return bodies; } bool HasBodies() const { return bodies.size(); } - [[deprecated("Remove in v4.1. Use Invoke() instead.")]] - Val* Call(ValPList* args, detail::Frame* parent = nullptr) const; - /** * Calls a Zeek function. * @param args the list of arguments to the function call. @@ -109,9 +105,6 @@ public: virtual void SetScope(detail::ScopePtr newscope); virtual detail::Scope* GetScope() const { return scope.get(); } - [[deprecated("Remove in v4.1. Use GetType().")]] - virtual FuncType* FType() const { return type.get(); } - const FuncTypePtr& GetType() const { return type; } @@ -251,7 +244,7 @@ public: /** * Changes the function's frame size to a new size - used for * script optimization/compilation. - * + * * @param new_size The frame size the function should use. */ void SetFrameSize(int new_size) { frame_size = new_size; } @@ -385,22 +378,3 @@ extern void emit_builtin_error(const char* msg, const ValPtr&); extern void emit_builtin_error(const char* msg, Obj* arg); } // namespace zeek - -using Func [[deprecated("Remove in v4.1. Use zeek::Func.")]] = zeek::Func; -using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc.")]] = zeek::detail::ScriptFunc; -using BuiltinFunc [[deprecated("Remove in v4.1. Use zeek::detail::BuiltinFunc.")]] = zeek::detail::BuiltinFunc; -using CallInfo [[deprecated("Remove in v4.1. Use zeek::detail::CallInfo.")]] = zeek::detail::CallInfo; -using function_ingredients [[deprecated("Remove in v4.1. Use zeek::detail::function_ingredients.")]] = zeek::detail::function_ingredients; - -constexpr auto check_built_in_call [[deprecated("Remove in v4.1. Use zeek::detail::check_built_in_call.")]] = zeek::detail::check_built_in_call; -constexpr auto render_call_stack [[deprecated("Remove in v4.1. Use zeek::render_call_stack.")]] = zeek::render_call_stack; - -// TODO: do call_stack and did_builtin_init need to be aliased? - -// These have to be implemented as actual methods due to function overloading breaking the use of aliases. -[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]] -extern void builtin_error(const char* msg); -[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]] -extern void builtin_error(const char* msg, zeek::ValPtr); -[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]] -extern void builtin_error(const char* msg, zeek::Obj* arg); diff --git a/src/Hash.h b/src/Hash.h index 91f2bcf874..775ae0c7e7 100644 --- a/src/Hash.h +++ b/src/Hash.h @@ -30,7 +30,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(BifReturnVal, zeek::detail); namespace zeek { class String; } -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; namespace zeek::BifFunc { extern zeek::detail::BifReturnVal md5_hmac_bif(zeek::detail::Frame* frame, const zeek::Args*); @@ -281,18 +280,3 @@ protected: extern void init_hash_function(); } // namespace zeek::detail - -using hash_t [[deprecated("Remove in v4.1. Use zeek::detail::hash_t.")]] = zeek::detail::hash_t; -using hash64_t [[deprecated("Remove in v4.1. Use zeek::detail::hash64_t.")]] = zeek::detail::hash64_t; -using hash128_t [[deprecated("Remove in v4.1. Use zeek::detail::hash128_t.")]] = zeek::detail::hash128_t; -using hash256_t [[deprecated("Remove in v4.1. Use zeek::detail::hash256_t.")]] = zeek::detail::hash256_t; - -using KeyedHash [[deprecated("Remove in v4.1. Use zeek::detail::KeyedHash.")]] = zeek::detail::KeyedHash; -using HashKeyTag [[deprecated("Remove in v4.1. Use zeek::detail::HashKeyTag.")]] = zeek::detail::HashKeyTag; -using HashKey [[deprecated("Remove in v4.1. Use zeek::detail::HashKey.")]] = zeek::detail::HashKey; - -constexpr auto HASH_KEY_INT [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_INT.")]] = zeek::detail::HASH_KEY_INT; -constexpr auto HASH_KEY_DOUBLE [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_DOUBLE.")]] = zeek::detail::HASH_KEY_DOUBLE; -constexpr auto HASH_KEY_STRING [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_STRING.")]] = zeek::detail::HASH_KEY_STRING; - -constexpr auto init_hash_function [[deprecated("Remove in v4.1. Use zeek::detail::init_hash_function.")]] = zeek::detail::init_hash_function; diff --git a/src/ID.cc b/src/ID.cc index 9fa665f0de..4b67cff16d 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -138,11 +138,6 @@ void ID::SetType(TypePtr t) type = std::move(t); } -void ID::SetType(zeek::Type* t) - { - SetType({AdoptRef(), t}); - } - void ID::ClearVal() { val = nullptr; diff --git a/src/ID.h b/src/ID.h index 21fbff3773..5fc6f990d7 100644 --- a/src/ID.h +++ b/src/ID.h @@ -31,8 +31,6 @@ using ValPtr = IntrusivePtr; using FuncPtr = IntrusivePtr; } -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; - namespace zeek::detail { class Attributes; @@ -64,13 +62,6 @@ public: std::string ModuleName() const; void SetType(TypePtr t); - [[deprecated("Remove in v4.1. Use version that takes IntrusivePtr.")]] - void SetType(zeek::Type* t); - - [[deprecated("Remove in v4.1. Use GetType().")]] - zeek::Type* Type() { return type.get(); } - [[deprecated("Remove in v4.1. Use GetType().")]] - const zeek::Type* Type() const { return type.get(); } const TypePtr& GetType() const { return type; } @@ -79,11 +70,6 @@ public: IntrusivePtr GetType() const { return cast_intrusive(type); } - [[deprecated("Remove in v4.1. Use IsType() and GetType().")]] - zeek::Type* AsType() { return is_type ? GetType().get() : nullptr; } - [[deprecated("Remove in v4.1. Use IsType() and GetType().")]] - const zeek::Type* AsType() const { return is_type ? GetType().get() : nullptr; } - bool IsType() const { return is_type; } @@ -96,11 +82,6 @@ public: bool HasVal() const { return val != nullptr; } - [[deprecated("Remove in v4.1. Use GetVal().")]] - Val* ID_Val() { return val.get(); } - [[deprecated("Remove in v4.1. Use GetVal().")]] - const Val* ID_Val() const { return val.get(); } - const ValPtr& GetVal() const { return val; } @@ -128,9 +109,6 @@ public: const AttributesPtr& GetAttrs() const { return attrs; } - [[deprecated("Remove in 4.1. Use GetAttrs().")]] - Attributes* Attrs() const { return attrs.get(); } - const AttrPtr& GetAttr(AttrTag t) const; bool IsDeprecated() const; @@ -184,8 +162,6 @@ protected: } // namespace zeek::detail -using ID [[deprecated("Remove in v4.1. Use zeek::detail::ID instead.")]] = zeek::detail::ID; - namespace zeek::id { /** @@ -276,23 +252,3 @@ void init_types(); } // namespace detail } // namespace zeek::id - -using ID [[deprecated("Remove in v4.1 Use zeek::detail::ID instead.")]] = zeek::detail::ID; - -using init_class [[deprecated("Remove in v4.1. Use zeek::detail::InitClass instead.")]] = zeek::detail::InitClass; -[[deprecated("Remove in v4.1. Use zeek::detail::INIT_NONE instead.")]] -constexpr auto INIT_NONE = zeek::detail::INIT_NONE; -[[deprecated("Remove in v4.1. Use zeek::detail::INIT_FULL instead.")]] -constexpr auto INIT_FULL = zeek::detail::INIT_FULL; -[[deprecated("Remove in v4.1. Use zeek::detail::INIT_EXTRA instead.")]] -constexpr auto INIT_EXTRA = zeek::detail::INIT_EXTRA; -[[deprecated("Remove in v4.1. Use zeek::detail::INIT_REMOVE instead.")]] -constexpr auto INIT_REMOVE = zeek::detail::INIT_REMOVE; - -using IDScope [[deprecated("Remove in v4.1. Use zeek::detail::IDScope instead.")]] = zeek::detail::IDScope; -[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_FUNCTION instead.")]] -constexpr auto SCOPE_FUNCTION = zeek::detail::SCOPE_FUNCTION; -[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_MODULE instead.")]] -constexpr auto SCOPE_MODULE = zeek::detail::SCOPE_MODULE; -[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_GLOBAL instead.")]] -constexpr auto SCOPE_GLOBAL = zeek::detail::SCOPE_GLOBAL; diff --git a/src/IP.cc b/src/IP.cc index e6fa9ad9a8..67473c8532 100644 --- a/src/IP.cc +++ b/src/IP.cc @@ -303,11 +303,6 @@ RecordValPtr IPv6_Hdr::ToVal(VectorValPtr chain) const RecordValPtr IPv6_Hdr::ToVal() const { return ToVal(nullptr); } -RecordVal* IPv6_Hdr::BuildRecordVal(VectorVal* chain) const - { - return ToVal({AdoptRef{}, chain}).release(); - } - IPAddr IP_Hdr::IPHeaderSrcAddr() const { return ip4 ? IPAddr(ip4->ip_src) : IPAddr(ip6->ip6_src); @@ -353,22 +348,12 @@ RecordValPtr IP_Hdr::ToIPHdrVal() const return rval; } -RecordVal* IP_Hdr::BuildIPHdrVal() const - { - return ToIPHdrVal().release(); - } - RecordValPtr IP_Hdr::ToPktHdrVal() const { static auto pkt_hdr_type = id::find_type("pkt_hdr"); return ToPktHdrVal(make_intrusive(pkt_hdr_type), 0); } -RecordVal* IP_Hdr::BuildPktHdrVal() const - { - return ToPktHdrVal().release(); - } - RecordValPtr IP_Hdr::ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const { static auto tcp_hdr_type = id::find_type("tcp_hdr"); @@ -452,11 +437,6 @@ RecordValPtr IP_Hdr::ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const return pkt_hdr; } -RecordVal* IP_Hdr::BuildPktHdrVal(RecordVal* pkt_hdr, int sindex) const - { - return ToPktHdrVal({AdoptRef{}, pkt_hdr}, sindex).release(); - } - static inline bool isIPv6ExtHeader(uint8_t type) { switch (type) { @@ -732,11 +712,6 @@ VectorValPtr IPv6_Hdr_Chain::ToVal() const return rval; } -VectorVal* IPv6_Hdr_Chain::BuildVal() const - { - return ToVal().release(); - } - IP_Hdr* IP_Hdr::Copy() const { char* new_hdr = new char[HdrLen()]; diff --git a/src/IP.h b/src/IP.h index 12704d3241..117f82aa1d 100644 --- a/src/IP.h +++ b/src/IP.h @@ -144,9 +144,6 @@ public: RecordValPtr ToVal(VectorValPtr chain) const; RecordValPtr ToVal() const; - [[deprecated("Remove in v4.1. Use ToVal() instead.")]] - RecordVal* BuildRecordVal(VectorVal* chain = nullptr) const; - protected: uint8_t type; const u_char* data; @@ -236,9 +233,6 @@ public: */ VectorValPtr ToVal() const; - [[deprecated("Remove in v4.1. Use ToVal() instead.")]] - VectorVal* BuildVal() const; - protected: // for access to protected ctor that changes next header values that // point to a fragment @@ -533,27 +527,18 @@ public: */ RecordValPtr ToIPHdrVal() const; - [[deprecated("Remove in v4.1. Use ToIPHdrVal() instead.")]] - RecordVal* BuildIPHdrVal() const; - /** * Returns a pkt_hdr RecordVal, which includes not only the IP header, but * also upper-layer (tcp/udp/icmp) headers. */ RecordValPtr ToPktHdrVal() const; - [[deprecated("Remove in v4.1. Use ToPktHdrVal() instead.")]] - RecordVal* BuildPktHdrVal() const; - /** * Same as above, but simply add our values into the record at the * specified starting index. */ RecordValPtr ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const; - [[deprecated("Remove in v4.1. Use ToPktHdrVal() instead.")]] - RecordVal* BuildPktHdrVal(RecordVal* pkt_hdr, int sindex) const; - /** * Denotes whether this header is from a set of packet fragments. */ @@ -567,11 +552,3 @@ private: }; } // namespace zeek - -#ifdef ENABLE_MOBILE_IPV6 -using ip6_mobility [[deprecated("Remove in v4.1. Use zeek::ip6_mobility.")]] = zeek::ip6_mobility; -#endif - -using IPv6_Hdr [[deprecated("Remove in v4.1. Use zeek::IPv6_Hdr.")]] = zeek::IPv6_Hdr; -using IPv6_Hdr_Chain [[deprecated("Remove in v4.1. Use zeek::IPv6_Hdr_Chain.")]] = zeek::IPv6_Hdr_Chain; -using IP_Hdr [[deprecated("Remove in v4.1. Use zeek::IP_Hdr.")]] = zeek::IP_Hdr; diff --git a/src/IPAddr.cc b/src/IPAddr.cc index d269ccf944..06135eb73c 100644 --- a/src/IPAddr.cc +++ b/src/IPAddr.cc @@ -50,9 +50,6 @@ IPAddr::IPAddr(const String& s) Init(s.CheckString()); } -detail::HashKey* IPAddr::GetHashKey() const - { return MakeHashKey().release(); } - std::unique_ptr IPAddr::MakeHashKey() const { return std::make_unique((void*)in6.s6_addr, sizeof(in6.s6_addr)); @@ -303,9 +300,6 @@ std::string IPPrefix::AsString() const return prefix.AsString() +"/" + l; } -detail::HashKey* IPPrefix::GetHashKey() const - { return MakeHashKey().release(); } - std::unique_ptr IPPrefix::MakeHashKey() const { struct { diff --git a/src/IPAddr.h b/src/IPAddr.h index 01f6a5c847..a85f5e15b7 100644 --- a/src/IPAddr.h +++ b/src/IPAddr.h @@ -10,18 +10,16 @@ #include "zeek/threading/SerialTypes.h" -namespace zeek { class String; } -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; - -namespace zeek { struct ConnID; } -using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID; - ZEEK_FORWARD_DECLARE_NAMESPACED(HashKey, zeek::detail); namespace analyzer { class ExpectedConn; } typedef in_addr in4_addr; namespace zeek { + +class String; +struct ConnID; + namespace detail { struct ConnIDKey { @@ -264,9 +262,6 @@ public: */ std::unique_ptr MakeHashKey() const; - [[deprecated("Remove in v4.1. Use MakeHashKey().")]] - detail::HashKey* GetHashKey() const; - /** * Masks out lower bits of the address. * @@ -646,9 +641,6 @@ public: */ std::unique_ptr MakeHashKey() const; - [[deprecated("Remove in v4.1. Use MakeHashKey().")]] - detail::HashKey* GetHashKey() const; - /** Converts the prefix into the type used internally by the * inter-thread communication. */ @@ -733,9 +725,3 @@ private: }; } // namespace zeek - -using ConnIDKey [[deprecated("Remove in v4.1. Use zeek::detail::ConnIDKey.")]] = zeek::detail::ConnIDKey; -using IPAddr [[deprecated("Remove in v4.1. Use zeek::IPAddr.")]] = zeek::IPAddr; -using IPPrefix [[deprecated("Remove in v4.1. Use zeek::IPPrefix.")]] = zeek::IPPrefix; - -constexpr auto BuildConnIDKey [[deprecated("Remove in v4.1. Use zeek::detail::BuildConnIDKey.")]] = zeek::detail::BuildConnIDKey; diff --git a/src/IntSet.h b/src/IntSet.h index 43e91e0d65..d59951e2ba 100644 --- a/src/IntSet.h +++ b/src/IntSet.h @@ -68,5 +68,3 @@ inline void IntSet::Clear() } } // namespace zeek::detail - -using IntSet [[deprecated("Remove in v4.1. Use zeek::detail::IntSet.")]] = zeek::detail::IntSet; diff --git a/src/List.h b/src/List.h index d8a9ec2f1b..a1e8752769 100644 --- a/src/List.h +++ b/src/List.h @@ -337,8 +337,6 @@ using name_list = PList; } // namespace zeek -using ListOrder [[deprecated("Remove in v4.1. Use zeek::ListOrder instead.")]] = zeek::ListOrder; - // Macro to visit each list element in turn. #define loop_over_list(list, iterator) \ int iterator; \ diff --git a/src/NFA.h b/src/NFA.h index d51cf60c1a..838ec08cc2 100644 --- a/src/NFA.h +++ b/src/NFA.h @@ -137,13 +137,3 @@ extern NFA_state_list* epsilon_closure(NFA_state_list* states); extern bool NFA_state_cmp_neg(const NFA_State* v1, const NFA_State* v2); } // namespace zeek::detail - -using NFA_state_list [[deprecated("Remove in v4.1. Use zeek::detail::NFA_state_list.")]] = zeek::detail::NFA_state_list; -using NFA_State [[deprecated("Remove in v4.1. Use zeek::detail::NFA_State.")]] = zeek::detail::NFA_State; -using EpsilonState [[deprecated("Remove in v4.1. Use zeek::detail::EpsilonState.")]] = zeek::detail::EpsilonState; -using NFA_Machine [[deprecated("Remove in v4.1. Use zeek::detail::NFA_Machine.")]] = zeek::detail::NFA_Machine; - -// TODO: could at least the first two of these methods be made static methods in NFA_Machine and NFA_State to remove them from the namespace? -constexpr auto make_alternate [[deprecated("Remove in v4.1. Use zeek::detail::make_alternate.")]] = zeek::detail::make_alternate; -constexpr auto epsilon_closure [[deprecated("Remove in v4.1. Use zeek::detail::epsilon_closure.")]] = zeek::detail::epsilon_closure; -constexpr auto NFA_state_cmp_neg [[deprecated("Remove in v4.1. Use zeek::detail::NFA_state_cmp_neg.")]] = zeek::detail::NFA_state_cmp_neg; diff --git a/src/NetVar.cc b/src/NetVar.cc index ff0bcf57cd..23a0ea5bd0 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -245,8 +245,6 @@ void init_general_global_var() bits_per_uid = id::find_val("bits_per_uid")->AsCount(); } -extern void zeek_legacy_netvar_init(); - void init_builtin_types() { init_bif_types(); @@ -257,8 +255,6 @@ void init_net_var() { bif_init_net_var(); - zeek_legacy_netvar_init(); - ignore_checksums = id::find_val("ignore_checksums")->AsBool(); partial_connection_ok = id::find_val("partial_connection_ok")->AsBool(); tcp_SYN_ack_ok = id::find_val("tcp_SYN_ack_ok")->AsBool(); @@ -358,69 +354,3 @@ void init_net_var() } } // namespace zeek::detail - -// Remove in v4.1. -int& watchdog_interval = zeek::detail::watchdog_interval; -int& max_timer_expires = zeek::detail::max_timer_expires; -int& ignore_checksums = zeek::detail::ignore_checksums; -int& partial_connection_ok = zeek::detail::partial_connection_ok; -int& tcp_SYN_ack_ok = zeek::detail::tcp_SYN_ack_ok; -int& tcp_match_undelivered = zeek::detail::tcp_match_undelivered; -double& frag_timeout = zeek::detail::frag_timeout; -double& tcp_SYN_timeout = zeek::detail::tcp_SYN_timeout; -double& tcp_session_timer = zeek::detail::tcp_session_timer; -double& tcp_connection_linger = zeek::detail::tcp_connection_linger; -double& tcp_attempt_delay = zeek::detail::tcp_attempt_delay; -double& tcp_close_delay = zeek::detail::tcp_close_delay; -double& tcp_partial_close_delay = zeek::detail::tcp_partial_close_delay; -double& tcp_reset_delay = zeek::detail::tcp_reset_delay; -int& tcp_max_initial_window = zeek::detail::tcp_max_initial_window; -int& tcp_max_above_hole_without_any_acks = zeek::detail::tcp_max_above_hole_without_any_acks; -int& tcp_excessive_data_without_further_acks = zeek::detail::tcp_excessive_data_without_further_acks; -int& tcp_max_old_segments = zeek::detail::tcp_max_old_segments; -double& non_analyzed_lifetime = zeek::detail::non_analyzed_lifetime; -double& tcp_inactivity_timeout = zeek::detail::tcp_inactivity_timeout; -double& udp_inactivity_timeout = zeek::detail::udp_inactivity_timeout; -double& icmp_inactivity_timeout = zeek::detail::icmp_inactivity_timeout; -int& tcp_storm_thresh = zeek::detail::tcp_storm_thresh; -double& tcp_storm_interarrival_thresh = zeek::detail::tcp_storm_interarrival_thresh; -bool& tcp_content_deliver_all_orig = zeek::detail::tcp_content_deliver_all_orig; -bool& tcp_content_deliver_all_resp = zeek::detail::tcp_content_deliver_all_resp; -bool& udp_content_deliver_all_orig = zeek::detail::udp_content_deliver_all_orig; -bool& udp_content_deliver_all_resp = zeek::detail::udp_content_deliver_all_resp; -bool& udp_content_delivery_ports_use_resp = zeek::detail::udp_content_delivery_ports_use_resp; -double& dns_session_timeout = zeek::detail::dns_session_timeout; -double& rpc_timeout = zeek::detail::rpc_timeout; -int& mime_segment_length = zeek::detail::mime_segment_length; -int& mime_segment_overlap_length = zeek::detail::mime_segment_overlap_length; -int& http_entity_data_delivery_size = zeek::detail::http_entity_data_delivery_size; -int& truncate_http_URI = zeek::detail::truncate_http_URI; -int& dns_skip_all_auth = zeek::detail::dns_skip_all_auth; -int& dns_skip_all_addl = zeek::detail::dns_skip_all_addl; -int& dns_max_queries = zeek::detail::dns_max_queries; -double& stp_delta = zeek::detail::stp_delta; -double& stp_idle_min = zeek::detail::stp_idle_min; -double& table_expire_interval = zeek::detail::table_expire_interval; -double& table_expire_delay = zeek::detail::table_expire_delay; -int& table_incremental_step = zeek::detail::table_incremental_step; -int& orig_addr_anonymization = zeek::detail::orig_addr_anonymization; -int& resp_addr_anonymization = zeek::detail::resp_addr_anonymization; -int& other_addr_anonymization = zeek::detail::other_addr_anonymization; -double& connection_status_update_interval = zeek::detail::connection_status_update_interval; -double& profiling_interval = zeek::detail::profiling_interval; -int& expensive_profiling_multiple = zeek::detail::expensive_profiling_multiple; -int& segment_profiling = zeek::detail::segment_profiling; -int& pkt_profile_mode = zeek::detail::pkt_profile_mode; -double& pkt_profile_freq = zeek::detail::pkt_profile_freq; -int& load_sample_freq = zeek::detail::load_sample_freq; -int& packet_filter_default = zeek::detail::packet_filter_default; -int& sig_max_group_size = zeek::detail::sig_max_group_size; -int& dpd_reassemble_first_packets = zeek::detail::dpd_reassemble_first_packets; -int& dpd_buffer_size = zeek::detail::dpd_buffer_size; -int& dpd_match_only_beginning = zeek::detail::dpd_match_only_beginning; -int& dpd_late_match_stop = zeek::detail::dpd_late_match_stop; -int& dpd_ignore_ports = zeek::detail::dpd_ignore_ports; -int& check_for_unused_event_handlers = zeek::detail::check_for_unused_event_handlers; -double& timer_mgr_inactivity_timeout = zeek::detail::timer_mgr_inactivity_timeout; -int& record_all_packets = zeek::detail::record_all_packets; -bro_uint_t& bits_per_uid = zeek::detail::bits_per_uid; diff --git a/src/NetVar.h b/src/NetVar.h index 19527fcc60..0da196d547 100644 --- a/src/NetVar.h +++ b/src/NetVar.h @@ -105,241 +105,6 @@ extern void init_builtin_types(); } // namespace zeek::detail -constexpr auto init_general_global_var [[deprecated("Remove in v4.1. Use zeek::detail::init_general_global_var.")]] = zeek::detail::init_general_global_var; -constexpr auto init_event_handlers [[deprecated("Remove in v4.1. Use zeek::detail::init_event_handlers.")]] = zeek::detail::init_event_handlers; -constexpr auto init_net_var [[deprecated("Remove in v4.1. Use zeek::detail::init_net_var.")]] = zeek::detail::init_net_var; - -extern int& watchdog_interval [[deprecated("Remove in v4.1. Use zeek::detail::watchdog_interval.")]]; -extern int& max_timer_expires [[deprecated("Remove in v4.1. Use zeek::detail::max_timer_expires.")]]; -extern int& ignore_checksums [[deprecated("Remove in v4.1. Use zeek::detail::ignore_checksums.")]]; -extern int& partial_connection_ok [[deprecated("Remove in v4.1. Use zeek::detail::partial_connection_ok.")]]; -extern int& tcp_SYN_ack_ok [[deprecated("Remove in v4.1. Use zeek::detail::tcp_SYN_ack_ok.")]]; -extern int& tcp_match_undelivered [[deprecated("Remove in v4.1. Use zeek::detail::tcp_match_undelivered.")]]; -extern double& frag_timeout [[deprecated("Remove in v4.1. Use zeek::detail::frag_timeout.")]]; -extern double& tcp_SYN_timeout [[deprecated("Remove in v4.1. Use zeek::detail::tcp_SYN_timeout.")]]; -extern double& tcp_session_timer [[deprecated("Remove in v4.1. Use zeek::detail::tcp_session_timer.")]]; -extern double& tcp_connection_linger [[deprecated("Remove in v4.1. Use zeek::detail::tcp_connection_linger.")]]; -extern double& tcp_attempt_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_attempt_delay.")]]; -extern double& tcp_close_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_close_delay.")]]; -extern double& tcp_partial_close_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_partial_close_delay.")]]; -extern double& tcp_reset_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_reset_delay.")]]; -extern int& tcp_max_initial_window [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_initial_window.")]]; -extern int& tcp_max_above_hole_without_any_acks [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_above_hole_without_any_acks.")]]; -extern int& tcp_excessive_data_without_further_acks [[deprecated("Remove in v4.1. Use zeek::detail::tcp_excessive_data_without_further_acks.")]]; -extern int& tcp_max_old_segments [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_old_segments.")]]; -extern double& non_analyzed_lifetime [[deprecated("Remove in v4.1. Use zeek::detail::non_analyzed_lifetime.")]]; -extern double& tcp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::tcp_inactivity_timeout.")]]; -extern double& udp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::udp_inactivity_timeout.")]]; -extern double& icmp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::icmp_inactivity_timeout.")]]; -extern int& tcp_storm_thresh [[deprecated("Remove in v4.1. Use zeek::detail::tcp_storm_thresh.")]]; -extern double& tcp_storm_interarrival_thresh [[deprecated("Remove in v4.1. Use zeek::detail::tcp_storm_interarrival_thresh.")]]; -extern bool& tcp_content_deliver_all_orig [[deprecated("Remove in v4.1. Use zeek::detail::tcp_content_deliver_all_orig.")]]; -extern bool& tcp_content_deliver_all_resp [[deprecated("Remove in v4.1. Use zeek::detail::tcp_content_deliver_all_resp.")]]; -extern bool& udp_content_deliver_all_orig [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_deliver_all_orig.")]]; -extern bool& udp_content_deliver_all_resp [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_deliver_all_resp.")]]; -extern bool& udp_content_delivery_ports_use_resp [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_delivery_ports_use_resp.")]]; -extern double& dns_session_timeout [[deprecated("Remove in v4.1. Use zeek::detail::dns_session_timeout.")]]; -extern double& rpc_timeout [[deprecated("Remove in v4.1. Use zeek::detail::rpc_timeout.")]]; -extern int& mime_segment_length [[deprecated("Remove in v4.1. Use zeek::detail::mime_segment_length.")]]; -extern int& mime_segment_overlap_length [[deprecated("Remove in v4.1. Use zeek::detail::mime_segment_overlap_length.")]]; -extern int& http_entity_data_delivery_size [[deprecated("Remove in v4.1. Use zeek::detail::http_entity_data_delivery_size.")]]; -extern int& truncate_http_URI [[deprecated("Remove in v4.1. Use zeek::detail::truncate_http_URI.")]]; -extern int& dns_skip_all_auth [[deprecated("Remove in v4.1. Use zeek::detail::dns_skip_all_auth.")]]; -extern int& dns_skip_all_addl [[deprecated("Remove in v4.1. Use zeek::detail::dns_skip_all_addl.")]]; -extern int& dns_max_queries [[deprecated("Remove in v4.1. Use zeek::detail::dns_max_queries.")]]; -extern double& stp_delta [[deprecated("Remove in v4.1. Use zeek::detail::stp_delta.")]]; -extern double& stp_idle_min [[deprecated("Remove in v4.1. Use zeek::detail::stp_idle_min.")]]; -extern double& table_expire_interval [[deprecated("Remove in v4.1. Use zeek::detail::table_expire_interval.")]]; -extern double& table_expire_delay [[deprecated("Remove in v4.1. Use zeek::detail::table_expire_delay.")]]; -extern int& table_incremental_step [[deprecated("Remove in v4.1. Use zeek::detail::table_incremental_step.")]]; -extern int& orig_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::orig_addr_anonymization.")]]; -extern int& resp_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::resp_addr_anonymization.")]]; -extern int& other_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::other_addr_anonymization.")]]; -extern double& connection_status_update_interval [[deprecated("Remove in v4.1. Use zeek::detail::connection_status_update_interval.")]]; -extern double& profiling_interval [[deprecated("Remove in v4.1. Use zeek::detail::profiling_interval.")]]; -extern int& expensive_profiling_multiple [[deprecated("Remove in v4.1. Use zeek::detail::expensive_profiling_multiple.")]]; -extern int& segment_profiling [[deprecated("Remove in v4.1. Use zeek::detail::segment_profiling.")]]; -extern int& pkt_profile_mode [[deprecated("Remove in v4.1. Use zeek::detail::pkt_profile_mode.")]]; -extern double& pkt_profile_freq [[deprecated("Remove in v4.1. Use zeek::detail::pkt_profile_freq.")]]; -extern int& load_sample_freq [[deprecated("Remove in v4.1. Use zeek::detail::load_sample_freq.")]]; -extern int& packet_filter_default [[deprecated("Remove in v4.1. Use zeek::detail::packet_filter_default.")]]; -extern int& sig_max_group_size [[deprecated("Remove in v4.1. Use zeek::detail::sig_max_group_size.")]]; -extern int& dpd_reassemble_first_packets [[deprecated("Remove in v4.1. Use zeek::detail::dpd_reassemble_first_packets.")]]; -extern int& dpd_buffer_size [[deprecated("Remove in v4.1. Use zeek::detail::dpd_buffer_size.")]]; -extern int& dpd_match_only_beginning [[deprecated("Remove in v4.1. Use zeek::detail::dpd_match_only_beginning.")]]; -extern int& dpd_late_match_stop [[deprecated("Remove in v4.1. Use zeek::detail::dpd_late_match_stop.")]]; -extern int& dpd_ignore_ports [[deprecated("Remove in v4.1. Use zeek::detail::dpd_ignore_ports.")]]; -extern int& check_for_unused_event_handlers [[deprecated("Remove in v4.1. Use zeek::detail::check_for_unused_event_handlers.")]]; -extern double& timer_mgr_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::timer_mgr_inactivity_timeout.")]]; -extern int& record_all_packets [[deprecated("Remove in v4.1. Use zeek::detail::record_all_packets.")]]; -extern bro_uint_t& bits_per_uid [[deprecated("Remove in v4.1. Use zeek::detail::bits_per_uid.")]]; - -[[deprecated("Remove in v4.1. Use zeek::id::conn_id.")]] -extern zeek::RecordType* conn_id; -[[deprecated("Remove in v4.1. Use zeek::id::endpoint.")]] -extern zeek::RecordType* endpoint; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* endpoint_stats; -[[deprecated("Remove in v4.1. Use zeek::id::connection.")]] -extern zeek::RecordType* connection_type; -[[deprecated("Remove in v4.1. Use zeek::id::fa_file.")]] -extern zeek::RecordType* fa_file_type; -[[deprecated("Remove in v4.1. Use zeek::id::fa_metadata.")]] -extern zeek::RecordType* fa_metadata_type; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* icmp_conn; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* icmp_context; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* signature_state; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* SYN_packet; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* pcap_packet; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* raw_pkt_hdr_type; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* l2_hdr_type; -[[deprecated("Remove in v4.1. Use zeek::id::transport_proto.")]] -extern zeek::EnumType* transport_proto; -[[deprecated("Remove in v4.1. Use zeek::id::string_set.")]] -extern zeek::TableType* string_set; -[[deprecated("Remove in v4.1. Use zeek::id::string_array.")]] -extern zeek::TableType* string_array; -[[deprecated("Remove in v4.1. Use zeek::id::count_set.")]] -extern zeek::TableType* count_set; -[[deprecated("Remove in v4.1. Use zeek::id::string_vec.")]] -extern zeek::VectorType* string_vec; -[[deprecated("Remove in v4.1. Use zeek::id::index_vec.")]] -extern zeek::VectorType* index_vec; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::VectorType* mime_matches; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* mime_match; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* socks_address; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* tcp_reassembler_ports_orig; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* tcp_reassembler_ports_resp; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* tcp_content_delivery_ports_orig; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* tcp_content_delivery_ports_resp; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* udp_content_delivery_ports_orig; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* udp_content_delivery_ports_resp; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* udp_content_ports; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* mime_header_rec; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableType* mime_header_list; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* http_stats_rec; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* http_message_stat; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* pm_mapping; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableType* pm_mappings; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* pm_port_request; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* pm_callit_request; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* geo_location; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* entropy_test_result; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_msg; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_answer; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_soa; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_edns_additional; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_edns_ecs; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_tsig_additional; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_rrsig_rr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_dnskey_rr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_nsec3_rr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* dns_ds_rr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* dns_skip_auth; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* dns_skip_addl; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* stp_skip_src; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* preserve_orig_addr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* preserve_resp_addr; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* preserve_other_addr; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* rotate_info; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::StringVal* log_rotate_base_time; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::StringVal* peer_description; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::Val* profiling_file; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::Val* pkt_profile_file; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableType* irc_join_list; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* irc_join_info; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableVal* likely_server_ports; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::StringVal* trace_output_file; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* script_id; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableType* id_table; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* record_field; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::TableType* record_field_table; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::RecordType* call_argument; -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::VectorType* call_argument_vector; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::StringVal* cmd_line_bpf_filter; - -[[deprecated("Remove in v4.1. Perform your own lookup.")]] -extern zeek::StringVal* global_hash_seed; - #include "const.bif.netvar_h" #include "types.bif.netvar_h" #include "event.bif.netvar_h" diff --git a/src/Notifier.cc b/src/Notifier.cc index c225fbd451..190d8d20ec 100644 --- a/src/Notifier.cc +++ b/src/Notifier.cc @@ -6,7 +6,6 @@ #include "zeek/DebugLogger.h" zeek::notifier::detail::Registry zeek::notifier::detail::registry; -zeek::notifier::detail::Registry& notifier::registry = zeek::notifier::detail::registry; namespace zeek::notifier::detail { diff --git a/src/Notifier.h b/src/Notifier.h index 65748105ca..596830ca27 100644 --- a/src/Notifier.h +++ b/src/Notifier.h @@ -119,13 +119,3 @@ protected: }; } // namespace zeek::notifier::detail - -namespace notifier { - -using Receiver [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Receiver.")]] = zeek::notifier::detail::Receiver; -using Registry [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Registry.")]] = zeek::notifier::detail::Registry; -using Modifiable [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Modifiable.")]] = zeek::notifier::detail::Modifiable; - -extern zeek::notifier::detail::Registry& registry [[deprecated("Remove from v4.1. Use zeek::notifier::detail::registry.")]]; - -} // namespace notifier diff --git a/src/Obj.cc b/src/Obj.cc index 70bdebb3a0..a4e178b592 100644 --- a/src/Obj.cc +++ b/src/Obj.cc @@ -213,8 +213,3 @@ void obj_delete_func(void* v) } } // namespace zeek - -void print(const zeek::Obj* obj) - { - obj->Print(); - } diff --git a/src/Obj.h b/src/Obj.h index 6039621944..bd9ad00cb8 100644 --- a/src/Obj.h +++ b/src/Obj.h @@ -194,22 +194,3 @@ inline void Unref(Obj* o) extern void obj_delete_func(void* v); } // namespace zeek - -using Location [[deprecated("Remove in v4.1. Use zeek::detail::Location instead.")]] = zeek::detail::Location; -using yyltype [[deprecated("Remove in v4.1. Use zeek::detail::yyltype instead.")]] = zeek::detail::yyltype; -using BroObj [[deprecated("Remove in v4.1. Use zeek::Obj instead.")]] = zeek::Obj; - -[[deprecated("Remove in v4.1. Use zeek::Obj::Print instead.")]] -extern void print(const zeek::Obj* obj); - -[[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]] -inline void set_location(const zeek::detail::Location loc) - { - zeek::detail::set_location(loc); - } - -[[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]] -inline void set_location(const zeek::detail::Location start, const zeek::detail::Location end) - { - zeek::detail::set_location(start, end); - } diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc index 8650235645..f4439e39eb 100644 --- a/src/OpaqueVal.cc +++ b/src/OpaqueVal.cc @@ -40,9 +40,6 @@ OpaqueMgr* OpaqueMgr::mgr() return &mgr; } -OpaqueVal::OpaqueVal(OpaqueType* t) : OpaqueVal({NewRef{}, t}) - {} - OpaqueVal::OpaqueVal(OpaqueTypePtr t) : Val(std::move(t)) {} @@ -214,9 +211,6 @@ HashVal::HashVal(OpaqueTypePtr t) : OpaqueVal(std::move(t)) valid = false; } -HashVal::HashVal(OpaqueType* t) : HashVal({NewRef{}, t}) - {} - MD5Val::MD5Val() : HashVal(md5_type) { } diff --git a/src/OpaqueVal.h b/src/OpaqueVal.h index 77e79be045..6d2f8d73d8 100644 --- a/src/OpaqueVal.h +++ b/src/OpaqueVal.h @@ -96,8 +96,6 @@ private: */ class OpaqueVal : public Val { public: - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit OpaqueVal(OpaqueType* t); explicit OpaqueVal(OpaqueTypePtr t); ~OpaqueVal() override; @@ -187,8 +185,6 @@ protected: static void digest_one(EVP_MD_CTX* h, const Val* v); static void digest_one(EVP_MD_CTX* h, const ValPtr& v); - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit HashVal(OpaqueType* t); explicit HashVal(OpaqueTypePtr t); virtual bool DoInit(); @@ -378,14 +374,3 @@ private: }; } // namespace zeek - -using OpaqueMgr [[deprecated("Remove in v4.1. Use zeek::OpaqueMgr instead.")]] = zeek::OpaqueMgr; -using OpaqueVal [[deprecated("Remove in v4.1. Use zeek::OpaqueVal instead.")]] = zeek::OpaqueVal; -using HashVal [[deprecated("Remove in v4.1. Use zeek::HashVal instead.")]] = zeek::HashVal; -using MD5Val [[deprecated("Remove in v4.1. Use zeek::MD5Val instead.")]] = zeek::MD5Val; -using SHA1Val [[deprecated("Remove in v4.1. Use zeek::SHA1Val instead.")]] = zeek::SHA1Val; -using SHA256Val [[deprecated("Remove in v4.1. Use zeek::SHA256Val instead.")]] = zeek::SHA256Val; -using EntropyVal [[deprecated("Remove in v4.1. Use zeek::EntropyVal instead.")]] = zeek::EntropyVal; -using BloomFilterVal [[deprecated("Remove in v4.1. Use zeek::BloomFilterVal instead.")]] = zeek::BloomFilterVal; -using CardinalityVal [[deprecated("Remove in v4.1. Use zeek::CardinalityVal instead.")]] = zeek::CardinalityVal; -using ParaglobVal [[deprecated("Remove in v4.1. Use zeek::ParaglobVal instead.")]] = zeek::ParaglobVal; diff --git a/src/PacketFilter.h b/src/PacketFilter.h index 04c31fe71e..2d8803924c 100644 --- a/src/PacketFilter.h +++ b/src/PacketFilter.h @@ -51,5 +51,3 @@ private: }; } // namespace zeek::detail - -using PacketFilter [[deprecated("Remove in v4.1. Use zeek::detail::PacketFilter.")]] = zeek::detail::PacketFilter; diff --git a/src/PrefixTable.h b/src/PrefixTable.h index 50f134dbe0..33dee2ab69 100644 --- a/src/PrefixTable.h +++ b/src/PrefixTable.h @@ -65,5 +65,3 @@ private: }; } // namespace zeek::detail - -using PrefixTable [[deprecated("Remove in v4.1. Use zeek::detail::PrefixTable.")]] = zeek::detail::PrefixTable; diff --git a/src/PriorityQueue.h b/src/PriorityQueue.h index 35e281ce04..39283f7d66 100644 --- a/src/PriorityQueue.h +++ b/src/PriorityQueue.h @@ -101,6 +101,3 @@ protected: }; } // namespace zeek::detail - -using PQ_Element [[deprecated("Remove in v4.1. Use zeek::detail::PQ_Element.")]] = zeek::detail::PQ_Element; -using PriorityQueue [[deprecated("Remove in v4.1. Use zeek::detail::PriorityQueue.")]] = zeek::detail::PriorityQueue; diff --git a/src/Queue.h b/src/Queue.h index 5d92e9b29c..d164481dc8 100644 --- a/src/Queue.h +++ b/src/Queue.h @@ -200,6 +200,3 @@ template using PQueue = Queue; } // namespace zeek - -template using Queue [[deprecated("Remove in v4.1. Use zeek::Queue instead.")]] = zeek::Queue; -template using PQueue [[deprecated("Remove in v4.1. Use zeek::Queue instead.")]] = zeek::PQueue; diff --git a/src/RE.cc b/src/RE.cc index 50d8a72f11..6f10873642 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -13,13 +13,9 @@ #include "zeek/ZeekString.h" zeek::detail::CCL* zeek::detail::curr_ccl = nullptr; -zeek::detail::CCL*& curr_ccl = zeek::detail::curr_ccl; zeek::detail::Specific_RE_Matcher* zeek::detail::rem = nullptr; -zeek::detail::Specific_RE_Matcher*& rem = zeek::detail::rem; zeek::detail::NFA_Machine* zeek::detail::nfa = nullptr; -zeek::detail::NFA_Machine*& nfa = zeek::detail::nfa; int zeek::detail::case_insensitive = 0; -int& case_insensitive = zeek::detail::case_insensitive; extern int RE_parse(void); extern void RE_set_input(const char* str); diff --git a/src/RE.h b/src/RE.h index ebc6dc6b76..d39eaaffec 100644 --- a/src/RE.h +++ b/src/RE.h @@ -14,9 +14,6 @@ typedef int (*cce_func)(int); -namespace zeek { class String; } -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; - ZEEK_FORWARD_DECLARE_NAMESPACED(NFA_Machine, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(DFA_Machine, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(DFA_State, zeek::detail); @@ -28,6 +25,9 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(CCL, zeek::detail); extern int re_lex(void); namespace zeek { + +class String; + namespace detail { extern int case_insensitive; @@ -240,25 +240,3 @@ protected: }; } // namespace zeek - -constexpr auto clower [[deprecated("Remove in v4.1. Use zeek::detail::clower.")]] = zeek::detail::clower; -constexpr auto synerr [[deprecated("Remove in v4.1. Use zeek::detail::synerr.")]] = zeek::detail::synerr; - -using AcceptIdx [[deprecated("Remove in v4.1. Use zeek::detail::AcceptIdx.")]] = zeek::detail::AcceptIdx; -using AcceptingSet [[deprecated("Remove in v4.1. Use zeek::detail::AcceptingSet.")]] = zeek::detail::AcceptingSet; -using MatchPos [[deprecated("Remove in v4.1. Use zeek::detail::MatchPos.")]] = zeek::detail::MatchPos; -using AcceptingMatchSet [[deprecated("Remove in v4.1. Use zeek::detail::AcceptingMatchSet.")]] = zeek::detail::AcceptingMatchSet; -using string_list [[deprecated("Remove in v4.1. Use zeek::detail::string_list.")]] = zeek::detail::string_list; - -constexpr auto MATCH_ANYWHERE [[deprecated("Remove in v4.1. Use zeek::detail::MATCH_ANYWHERE.")]] = zeek::detail::MATCH_ANYWHERE; -constexpr auto MATCH_EXACTLY [[deprecated("Remove in v4.1. Use zeek::detail::MATCH_EXACTLY.")]] = zeek::detail::MATCH_EXACTLY; - -using Specific_RE_Matcher [[deprecated("Remove in v4.1. Use zeek::detail::Specific_RE_Matcher.")]] = zeek::detail::Specific_RE_Matcher; -using RE_Match_State [[deprecated("Remove in v4.1. Use zeek::detail::RE_Match_State.")]] = zeek::detail::RE_Match_State; -using RE_Matcher [[deprecated("Remove in v4.1. Use zeek::RE_Matcher.")]] = zeek::RE_Matcher; - -extern int& case_insensitive [[deprecated("Remove in v4.1. Use zeek::detail::case_insensitive")]]; -extern zeek::detail::CCL*& curr_ccl [[deprecated("Remove in v4.1. Use zeek::detail::curr_ccl")]];; -extern zeek::detail::NFA_Machine*& nfa [[deprecated("Remove in v4.1. Use zeek::detail::nfa")]];; -extern zeek::detail::Specific_RE_Matcher*& rem [[deprecated("Remove in v4.1. Use zeek::detail::rem")]];; -extern const char*& RE_parse_input [[deprecated("Remove in v4.1. Use zeek::detail::RE_parse_input")]];; diff --git a/src/Reassem.h b/src/Reassem.h index c318ec4888..510992b8fe 100644 --- a/src/Reassem.h +++ b/src/Reassem.h @@ -315,15 +315,3 @@ protected: }; } // namespace zeek - -using ReassemblerType [[deprecated("Remove in v4.1. Use zeek::ReassemblerType.")]] = zeek::ReassemblerType; -constexpr auto REASSEM_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::REASSEM_UNKNOWN.")]] = zeek::REASSEM_UNKNOWN; -constexpr auto REASSEM_TCP [[deprecated("Remove in v4.1. Use zeek::REASSEM_TCP.")]] = zeek::REASSEM_TCP; -constexpr auto REASSEM_FRAG [[deprecated("Remove in v4.1. Use zeek::REASSEM_FRAG.")]] = zeek::REASSEM_FRAG; -constexpr auto REASSEM_FILE [[deprecated("Remove in v4.1. Use zeek::REASSEM_FILE.")]] = zeek::REASSEM_FILE; -constexpr auto REASSEM_NUM [[deprecated("Remove in v4.1. Use zeek::REASSEM_NUM.")]] = zeek::REASSEM_NUM; - -using DataBlock [[deprecated("Remove in v4.1. Use zeek::DataBlock.")]] = zeek::DataBlock; -using DataBlockMap [[deprecated("Remove in v4.1. Use zeek::DataBlockMap.")]] = zeek::DataBlockMap; -using DataBlockList [[deprecated("Remove in v4.1. Use zeek::DataBlockList.")]] = zeek::DataBlockList; -using Reassembler [[deprecated("Remove in v4.1. Use zeek::Reassembler.")]] = zeek::Reassembler; diff --git a/src/Reporter.h b/src/Reporter.h index a3036d4a85..cb925bcaa1 100644 --- a/src/Reporter.h +++ b/src/Reporter.h @@ -321,9 +321,3 @@ private: extern Reporter* reporter; } // namespace zeek - -using Reporter [[deprecated("Remove in v4.1. Use zeek::Reporter.")]] = zeek::Reporter; -using ReporterException [[deprecated("Remove in v4.1. Use zeek::ReporterException.")]] = zeek::ReporterException; -using InterpreterException [[deprecated("Remove in v4.1. Use zeek::InterpreterException.")]] = zeek::InterpreterException; - -extern zeek::Reporter*& reporter [[deprecated("Remove v4.1. Use zeek::reporter.")]]; diff --git a/src/Rule.h b/src/Rule.h index 37b6e4be18..314420c4e5 100644 --- a/src/Rule.h +++ b/src/Rule.h @@ -111,7 +111,3 @@ private: }; } // namespace zeek::detail - -using Rule [[deprecated("Remove in v4.1. Use zeek::detail::Rule.")]] = zeek::detail::Rule; -using rule_list [[deprecated("Remove in v4.1. Use zeek::detail::rule_list.")]] = zeek::detail::rule_list; -using rule_dict [[deprecated("Remove in v4.1. Use zeek::detail::rule_dict.")]] = zeek::detail::rule_dict; diff --git a/src/RuleAction.h b/src/RuleAction.h index 40008e1aad..7f59ef40b9 100644 --- a/src/RuleAction.h +++ b/src/RuleAction.h @@ -99,10 +99,3 @@ public: }; } // namespace zeek::detail - -using RuleAction [[deprecated("Remove in v4.1. Use zeek::detail::RuleAction.")]] = zeek::detail::RuleAction; -using RuleActionEvent [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionEvent.")]] = zeek::detail::RuleActionEvent; -using RuleActionMIME [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionMIME.")]] = zeek::detail::RuleActionMIME; -using RuleActionAnalyzer [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionAnalyzer.")]] = zeek::detail::RuleActionAnalyzer; -using RuleActionEnable [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionEnable.")]] = zeek::detail::RuleActionEnable; -using RuleActionDisable [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionDisable.")]] = zeek::detail::RuleActionDisable; diff --git a/src/RuleCondition.h b/src/RuleCondition.h index 966573d27d..63b108fc61 100644 --- a/src/RuleCondition.h +++ b/src/RuleCondition.h @@ -124,10 +124,3 @@ private: }; } // namespace zeek::detail - -using RuleCondition [[deprecated("Remove in v4.1. Use zeek::detail::RuleCondition.")]] = zeek::detail::RuleCondition; -using RuleConditionTCPState [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionTCPState.")]] = zeek::detail::RuleConditionTCPState; -using RuleConditionIPOptions [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionIPOptions.")]] = zeek::detail::RuleConditionIPOptions; -using RuleConditionSameIP [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionSameIP.")]] = zeek::detail::RuleConditionSameIP; -using RuleConditionPayloadSize [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionPayloadSize.")]] = zeek::detail::RuleConditionPayloadSize; -using RuleConditionEval [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionEval.")]] = zeek::detail::RuleConditionEval; diff --git a/src/RuleMatcher.h b/src/RuleMatcher.h index 2d8564f7aa..d327d89cff 100644 --- a/src/RuleMatcher.h +++ b/src/RuleMatcher.h @@ -28,7 +28,6 @@ extern int rules_line_number; extern const char* current_rule_file; namespace zeek { class File; } -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; ZEEK_FORWARD_DECLARE_NAMESPACED(RE_Match_State, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Specific_RE_Matcher, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(RuleMatcher, zeek::detail); @@ -392,18 +391,3 @@ private: }; } // namespace zeek::detail - -using Range [[deprecated("Remove in v4.1. Use zeek::detail::Range.")]] = zeek::detail::Range; -using MaskedValue [[deprecated("Remove in v4.1. Use zeek::detail::MaskedValue.")]] = zeek::detail::MaskedValue; -using RuleHdrTest [[deprecated("Remove in v4.1. Use zeek::detail::RuleHdrTest.")]] = zeek::detail::RuleHdrTest; -using RuleEndpointState [[deprecated("Remove in v4.1. Use zeek::detail::RuleEndpointState.")]] = zeek::detail::RuleEndpointState; -using RuleFileMagicState [[deprecated("Remove in v4.1. Use zeek::detail::RuleFileMagicState.")]] = zeek::detail::RuleFileMagicState; -using RuleMatcher [[deprecated("Remove in v4.1. Use zeek::detail::RuleMatcher.")]] = zeek::detail::RuleMatcher; -using RuleMatcherState [[deprecated("Remove in v4.1. Use zeek::detail::RuleMatcherState.")]] = zeek::detail::RuleMatcherState; - -using maskedvalue_list [[deprecated("Remove in v4.1. Use zeek::detail::maskedvalue_list.")]] = zeek::detail::maskedvalue_list; -using string_list [[deprecated("Remove in v4.1. Use zeek::detail::string_list.")]] = zeek::detail::string_list; -using bstr_list [[deprecated("Remove in v4.1. Use zeek::detail::bstr_list.")]] = zeek::detail::bstr_list; -using rule_hdr_test_list [[deprecated("Remove in v4.1. Use zeek::detail::rule_hdr_test_list.")]] = zeek::detail::rule_hdr_test_list; - -extern zeek::detail::RuleMatcher*& rule_matcher [[deprecated("Remove in v4.1. Use zeek::detail::rule_matcher.")]]; diff --git a/src/RunState.cc b/src/RunState.cc index 50f7300d70..71807cfaa4 100644 --- a/src/RunState.cc +++ b/src/RunState.cc @@ -482,25 +482,3 @@ void continue_processing() bool is_processing_suspended() { return _processing_suspended; } } // namespace zeek::run_state - -// Remove all of these in v4.1. -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -zeek::iosource::PktSrc*& current_pktsrc = zeek::run_state::detail::current_pktsrc; -#pragma GCC diagnostic pop -zeek::iosource::IOSource*& current_iosrc = zeek::run_state::detail::current_iosrc; -zeek::iosource::PktDumper*& pkt_dumper = zeek::run_state::detail::pkt_dumper; -bool& have_pending_timers = zeek::run_state::detail::have_pending_timers; - -bool& reading_live = zeek::run_state::reading_live; -bool& reading_traces = zeek::run_state::reading_traces; -double& pseudo_realtime = zeek::run_state::pseudo_realtime; -double& processing_start_time = zeek::run_state::processing_start_time; -double& bro_start_time = zeek::run_state::zeek_start_time; -double& bro_start_network_time = zeek::run_state::zeek_start_network_time; -bool& terminating = zeek::run_state::terminating; -bool& is_parsing = zeek::run_state::is_parsing; - -const zeek::Packet*& current_pkt = zeek::run_state::current_pkt; -int& current_dispatched = zeek::run_state::current_dispatched; -double& current_timestamp = zeek::run_state::current_timestamp; diff --git a/src/RunState.h b/src/RunState.h index eba77ff413..8e201c34fc 100644 --- a/src/RunState.h +++ b/src/RunState.h @@ -36,7 +36,6 @@ extern zeek::iosource::PktSrc* current_packet_source(); extern double check_pseudo_time(const Packet *pkt); -extern zeek::iosource::PktSrc* current_pktsrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_current_pktsrc().")]]; extern zeek::iosource::IOSource* current_iosrc; extern zeek::iosource::PktDumper* pkt_dumper; // where to save packets @@ -105,33 +104,3 @@ extern int current_dispatched; extern double current_timestamp; } // namespace zeek::run_state - -constexpr auto net_init [[deprecated("Remove in v4.1. Use zeek::run_state::detail::init_run.")]] = zeek::run_state::detail::init_run; -constexpr auto net_run [[deprecated("Remove in v4.1. Use zeek::run_state::detail::run_run.")]] = zeek::run_state::detail::run_loop; -constexpr auto net_get_final_stats [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_final_stats.")]] = zeek::run_state::detail::get_final_stats; -constexpr auto net_finish [[deprecated("Remove in v4.1. Use zeek::run_state::detail::finish_run.")]] = zeek::run_state::detail::finish_run; -constexpr auto net_delete [[deprecated("Remove in v4.1. Use zeek::run_state::detail::delete_run.")]] = zeek::run_state::detail::delete_run; -constexpr auto net_update_time [[deprecated("Remove in v4.1. Use zeek::run_state::detail::update_network_time.")]] = zeek::run_state::detail::update_network_time; -constexpr auto net_packet_dispatch [[deprecated("Remove in v4.1. Use zeek::run_state::detail::dispatch_packet.")]] = zeek::run_state::detail::dispatch_packet; -constexpr auto expire_timers [[deprecated("Remove in v4.1. Use zeek::run_state::detail::expire_timers.")]] = zeek::run_state::detail::expire_timers; -constexpr auto zeek_terminate_loop [[deprecated("Remove in v4.1. Use zeek::run_state::detail::zeek_terminate_loop.")]] = zeek::run_state::detail::zeek_terminate_loop; -extern zeek::iosource::PktSrc*& current_pktsrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_current_pktsrc().")]]; -extern zeek::iosource::IOSource*& current_iosrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::current_iosrc.")]]; -extern zeek::iosource::PktDumper*& pkt_dumper [[deprecated("Remove in v4.1. Use zeek::run_state::detail::pkt_dumper.")]]; -extern bool& have_pending_timers [[deprecated("Remove in v4.1. Use zeek::run_state::detail::have_pending_timers.")]]; - -constexpr auto net_suspend_processing [[deprecated("Remove in v4.1. Use zeek::run_state::suspend_processing.")]] = zeek::run_state::suspend_processing; -constexpr auto net_continue_processing [[deprecated("Remove in v4.1. Use zeek::run_state::continue_processing.")]] = zeek::run_state::continue_processing; -constexpr auto net_is_processing_suspended [[deprecated("Remove in v4.1. Use zeek::run_state::is_processing_suspended.")]] = zeek::run_state::is_processing_suspended; - -extern bool& reading_live [[deprecated("Remove in v4.1. Use zeek::run_state::reading_live.")]]; -extern bool& reading_traces [[deprecated("Remove in v4.1. Use zeek::run_state::reading_traces.")]]; -extern double& pseudo_realtime [[deprecated("Remove in v4.1. Use zeek::run_state::pseudo_realtime.")]]; -extern double& processing_start_time [[deprecated("Remove in v4.1. Use zeek::run_state::processing_start_time.")]]; -extern double& bro_start_time [[deprecated("Remove in v4.1. Use zeek::run_state::zeek_start_time.")]]; -extern double& bro_start_network_time [[deprecated("Remove in v4.1. Use zeek::run_state::zeek_start_network_time.")]]; -extern bool& terminating [[deprecated("Remove in v4.1. Use zeek::run_state::terminating.")]]; -extern bool& is_parsing [[deprecated("Remove in v4.1. Use zeek::run_state::is_parsing.")]]; -extern const zeek::Packet*& current_pkt [[deprecated("Remove in v4.1. Use zeek::run_state::current_pkt.")]]; -extern int& current_dispatched [[deprecated("Remove in v4.1. Use zeek::run_state::current_dispatched.")]]; -extern double& current_timestamp [[deprecated("Remove in v4.1. Use zeek::run_state::current_timestamp.")]]; diff --git a/src/ScannedFile.cc b/src/ScannedFile.cc index 6d50747888..77a6f1cb60 100644 --- a/src/ScannedFile.cc +++ b/src/ScannedFile.cc @@ -51,6 +51,3 @@ bool ScannedFile::AlreadyScanned() const } } // namespace zeek::detail - -std::list& files_scanned = zeek::detail::files_scanned; -std::vector& sig_files = zeek::detail::sig_files; diff --git a/src/ScannedFile.h b/src/ScannedFile.h index 2f641e9384..65b6e3b4ce 100644 --- a/src/ScannedFile.h +++ b/src/ScannedFile.h @@ -37,7 +37,3 @@ extern std::list files_scanned; extern std::vector sig_files; } // namespace zeek::detail - -using ScannedFile [[deprecated("Remove in v4.1. Use zeek::detail::ScannedFile.")]] = zeek::detail::ScannedFile; -extern std::list& files_scanned [[deprecated("Remove in v4.1. Use zeek::detail::files_scanned.")]]; -extern std::vector& sig_files [[deprecated("Remove in v4.1. Use zeek::detail::sig_files.")]]; diff --git a/src/Scope.cc b/src/Scope.cc index a533da113e..5886edbab3 100644 --- a/src/Scope.cc +++ b/src/Scope.cc @@ -209,12 +209,3 @@ Scope* global_scope() } } // namespace zeek::detail - -zeek::detail::ID* lookup_ID( - const char* name, const char* module, - bool no_global, - bool same_module_only, - bool check_export) - { - return zeek::detail::lookup_ID(name, module, no_global, same_module_only, check_export).get(); - } diff --git a/src/Scope.h b/src/Scope.h index 9587ba6626..3ed9d089a5 100644 --- a/src/Scope.h +++ b/src/Scope.h @@ -13,7 +13,6 @@ #include "zeek/TraverseTypes.h" ZEEK_FORWARD_DECLARE_NAMESPACED(Type, zeek); -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail); @@ -38,11 +37,6 @@ public: const IDPtr& Find(std::string_view name) const; - template - [[deprecated("Remove in v4.1. Use Find().")]] - ID* Lookup(N&& name) const - { return Find(name).get(); } - template void Insert(N&& name, I&& id) { @@ -50,18 +44,12 @@ public: ordered_vars.push_back(std::forward(id)); } - [[deprecated("Remove in v4.1. Use GetID().")]] - ID* ScopeID() const { return scope_id.get(); } - const IDPtr& GetID() const { return scope_id; } const std::unique_ptr>& Attrs() const { return attrs; } - [[deprecated("Remove in v4.1. Use GetReturnTrype().")]] - Type* ReturnType() const { return return_type.get(); } - const TypePtr& GetReturnType() const { return return_type; } @@ -124,21 +112,3 @@ extern std::string current_module; } // namespace zeek extern bool in_debug; - -using Scope [[deprecated("Remove in v4.1. Use zeek::detail::Scope instead.")]] = zeek::detail::Scope; -extern std::string& current_module [[deprecated("Remove in v4.1. Use zeek::detail::current_module.")]]; - -constexpr auto install_ID [[deprecated("Remove in v4.1 Use zeek::detail::install_ID instead.")]] = zeek::detail::install_ID; -constexpr auto push_scope [[deprecated("Remove in v4.1 Use zeek::detail::push_scope instead.")]] = zeek::detail::push_scope; -constexpr auto push_existing_scope[[deprecated("Remove in v4.1 Use zeek::detail::push_existing_scope instead.")]] = zeek::detail::push_existing_scope; -constexpr auto pop_scope [[deprecated("Remove in v4.1 Use zeek::detail::pop_scope instead.")]] = zeek::detail::pop_scope; -constexpr auto current_scope [[deprecated("Remove in v4.1 Use zeek::detail::current_scope instead.")]] = zeek::detail::current_scope; -constexpr auto global_scope [[deprecated("Remove in v4.1 Use zeek::detail::global_scope instead.")]] = zeek::detail::global_scope; - -// Because of the use of default arguments, this function can't be aliased like the rest. -[[deprecated("Remove in v4.1 Use zeek::detail::lookup_ID instead.")]] -extern zeek::detail::ID* lookup_ID( - const char* name, const char* module, - bool no_global = false, - bool same_module_only = false, - bool check_export = true); diff --git a/src/ScriptCoverageManager.h b/src/ScriptCoverageManager.h index 9a30d80469..faa168917d 100644 --- a/src/ScriptCoverageManager.h +++ b/src/ScriptCoverageManager.h @@ -87,6 +87,3 @@ private: extern ScriptCoverageManager script_coverage_mgr; } // namespace zeek::detail - -using Brofiler [[deprecated("Remove in v4.1. Use zeek::detail::ScriptCoverageManager.")]] = zeek::detail::ScriptCoverageManager; -extern zeek::detail::ScriptCoverageManager& brofiler [[deprecated("Remove in v4.1. Use zeek::detail::brofiler.")]]; diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h index 84ac2be6be..4f50de1716 100644 --- a/src/SerializationFormat.h +++ b/src/SerializationFormat.h @@ -138,6 +138,3 @@ public: }; } // namespace zeek::detail - -using SerializationFormat [[deprecated("Remove in v4.1. Use zeek::detail::SerializationFormat.")]] = zeek::detail::SerializationFormat; -using BinarySerializationFormat [[deprecated("Remove in v4.1. Use zeek::detail::BinarySerializationFormat.")]] = zeek::detail::BinarySerializationFormat; diff --git a/src/Sessions.cc b/src/Sessions.cc index 2f6f07b1fe..7cb82c9cf8 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -74,11 +74,6 @@ void NetSessions::Done() { } -void NetSessions::NextPacket(double t, Packet* pkt) - { - packet_mgr->ProcessPacket(pkt); - } - void NetSessions::ProcessTransportLayer(double t, const Packet* pkt, size_t remaining) { const std::unique_ptr& ip_hdr = pkt->ip_hdr; diff --git a/src/Sessions.h b/src/Sessions.h index 634e1f549c..0a81c11e81 100644 --- a/src/Sessions.h +++ b/src/Sessions.h @@ -16,13 +16,12 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Packet, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek); class ConnCompressor; -namespace zeek { struct ConnID; } -using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID; - ZEEK_FORWARD_DECLARE_NAMESPACED(SteppingStoneManager, zeek, analyzer::stepping_stone); namespace zeek { +struct ConnID; + struct SessionStats { size_t num_TCP_conns; size_t max_TCP_conns; @@ -46,10 +45,6 @@ public: NetSessions(); ~NetSessions(); - // Main entry point for packet processing. - [[deprecated("Remove in v4.1. Do not call this method directly. Packet processing should start with a call to packet_mgr->ProcessPacket().")]] - void NextPacket(double t, Packet* pkt); - void Done(); // call to drain events before destructing // Looks up the connection referred to by the given Val, @@ -184,9 +179,3 @@ protected: extern NetSessions* sessions; } // namespace zeek - -using SessionStats [[deprecated("Remove in v4.1. Use zeek::SessionStats.")]] = zeek::SessionStats; -using NetSessions [[deprecated("Remove in v4.1. Use zeek::NetSessions.")]] = zeek::NetSessions; -using FragReassemblerTracker [[deprecated("Remove in v4.1. Use zeek::detail::FragReassemblerTracker.")]] = zeek::detail::FragReassemblerTracker; - -extern zeek::NetSessions*& sessions [[deprecated("Remove in v4.1. Use zeek:sessions.")]]; diff --git a/src/SmithWaterman.h b/src/SmithWaterman.h index 60b524f938..095ad435a6 100644 --- a/src/SmithWaterman.h +++ b/src/SmithWaterman.h @@ -151,11 +151,3 @@ extern Substring::Vec* smith_waterman(const String* s1, SWParams& params); } // namespace zeek::detail - -using BroSubstring [[deprecated("Remove in v4.1. Use zeek::detail::Substring.")]] = zeek::detail::Substring; -using BroSubstringCmp [[deprecated("Remove in v4.1 Use zeel::detail::SubstringCmp.")]] = zeek::detail::SubstringCmp; -using SWParams [[deprecated("Remove in v4.1. Use zeek::detail::SWParams.")]] = zeek::detail::SWParams; - -constexpr auto SW_SINGLE [[deprecated("Remove in v4.1. Use zeek::detai::SW_SINGLE.")]] = zeek::detail::SW_SINGLE; -constexpr auto SW_MULTIPLE [[deprecated("Remove in v4.1. Use zeek::detai::SW_MULTIPLE.")]] = zeek::detail::SW_MULTIPLE; -constexpr auto smith_waterman [[deprecated("Remove in v4.1. Use zeek::detail::smith_waterman.")]] = zeek::detail::smith_waterman; diff --git a/src/Stats.h b/src/Stats.h index cc971af47c..04f9641c0c 100644 --- a/src/Stats.h +++ b/src/Stats.h @@ -10,7 +10,6 @@ #include namespace zeek { class File; } -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(TableVal, zeek); @@ -144,22 +143,3 @@ protected: }; } // namespace zeek::detail - -using SegmentStatsReporter [[deprecated("Remove in v4.1. Use zeek::detail::SegmentStatsReporter.")]] = zeek::detail::SegmentStatsReporter; -using SegmentProfiler [[deprecated("Remove in v4.1. Use zeek::detail::SegmentProfiler.")]] = zeek::detail::SegmentProfiler; -using ProfileLogger [[deprecated("Remove in v4.1. Use zeek::detail::ProfileLogger.")]] = zeek::detail::ProfileLogger; -using SampleLogger [[deprecated("Remove in v4.1. Use zeek::detail::SampleLogger.")]] = zeek::detail::SampleLogger; -using PacketProfiler [[deprecated("Remove in v4.1. Use zeek::detail::PacketProfiler.")]] = zeek::detail::PacketProfiler; - -extern zeek::detail::ProfileLogger*& profiling_logger [[deprecated("Remove in v4.1. Use zeek::detail::profiling_logger.")]]; -extern zeek::detail::ProfileLogger*& segment_logger [[deprecated("Remove in v4.1. Use zeek::detail::segment_logger.")]]; -extern zeek::detail::SampleLogger*& sample_logger [[deprecated("Remove in v4.1. Use zeek::detail::sample_logger.")]]; - -// Connection statistics. -extern uint64_t& killed_by_inactivity [[deprecated("Remove in v4.1. Use zeek::detail::killed_by_inactivity.")]]; - -// Content gap statistics. -extern uint64_t& tot_ack_events [[deprecated("Remove in v4.1. Use zeek::detail::tot_ack_events.")]]; -extern uint64_t& tot_ack_bytes [[deprecated("Remove in v4.1. Use zeek::detail::tot_ack_bytes.")]]; -extern uint64_t& tot_gap_events [[deprecated("Remove in v4.1. Use zeek::detail::tot_gap_events.")]]; -extern uint64_t& tot_gap_bytes [[deprecated("Remove in v4.1. Use zeek::detail::tot_gap_bytes.")]]; diff --git a/src/Stmt.h b/src/Stmt.h index 99856f4a62..2d85a89c6c 100644 --- a/src/Stmt.h +++ b/src/Stmt.h @@ -611,23 +611,3 @@ protected: }; } // namespace zeek::detail - -using ExprListStmt [[deprecated("Remove in v4.1. Use zeek::detail::ExprListStmt instead.")]] = zeek::detail::ExprListStmt; -using PrintStmt [[deprecated("Remove in v4.1. Use zeek::detail::PrintStmt instead.")]] = zeek::detail::PrintStmt; -using ExprStmt [[deprecated("Remove in v4.1. Use zeek::detail::ExprStmt instead.")]] = zeek::detail::ExprStmt; -using IfStmt [[deprecated("Remove in v4.1. Use zeek::detail::IfStmt instead.")]] = zeek::detail::IfStmt; -using Case [[deprecated("Remove in v4.1. Use zeek::detail::Case instead.")]] = zeek::detail::Case; -using SwitchStmt [[deprecated("Remove in v4.1. Use zeek::detail::SwitchStmt instead.")]] = zeek::detail::SwitchStmt; -using AddStmt [[deprecated("Remove in v4.1. Use zeek::detail::AddStmt instead.")]] = zeek::detail::AddStmt; -using DelStmt [[deprecated("Remove in v4.1. Use zeek::detail::DelStmt instead.")]] = zeek::detail::DelStmt; -using EventStmt [[deprecated("Remove in v4.1. Use zeek::detail::EventStmt instead.")]] = zeek::detail::EventStmt; -using WhileStmt [[deprecated("Remove in v4.1. Use zeek::detail::WhileStmt instead.")]] = zeek::detail::WhileStmt; -using ForStmt [[deprecated("Remove in v4.1. Use zeek::detail::ForStmt instead.")]] = zeek::detail::ForStmt; -using NextStmt [[deprecated("Remove in v4.1. Use zeek::detail::NextStmt instead.")]] = zeek::detail::NextStmt; -using BreakStmt [[deprecated("Remove in v4.1. Use zeek::detail::BreakStmt instead.")]] = zeek::detail::BreakStmt; -using FallthroughStmt [[deprecated("Remove in v4.1. Use zeek::detail::FallthroughStmt instead.")]] = zeek::detail::FallthroughStmt; -using ReturnStmt [[deprecated("Remove in v4.1. Use zeek::detail::ReturnStmt instead.")]] = zeek::detail::ReturnStmt; -using StmtList [[deprecated("Remove in v4.1. Use zeek::detail::StmtList instead.")]] = zeek::detail::StmtList; -using InitStmt [[deprecated("Remove in v4.1. Use zeek::detail::InitStmt instead.")]] = zeek::detail::InitStmt; -using NullStmt [[deprecated("Remove in v4.1. Use zeek::detail::NullStmt instead.")]] = zeek::detail::NullStmt; -using WhenStmt [[deprecated("Remove in v4.1. Use zeek::detail::WhenStmt instead.")]] = zeek::detail::WhenStmt; diff --git a/src/StmtBase.h b/src/StmtBase.h index c87a466f59..e48679288b 100644 --- a/src/StmtBase.h +++ b/src/StmtBase.h @@ -177,5 +177,3 @@ protected: }; } // namespace zeek::detail - -using Stmt [[deprecated("Remove in v4.1. Use zeek::detail::Stmt instead.")]] = zeek::detail::Stmt; diff --git a/src/StmtEnums.h b/src/StmtEnums.h index 70a3983718..195597c4cc 100644 --- a/src/StmtEnums.h +++ b/src/StmtEnums.h @@ -35,34 +35,3 @@ enum StmtFlowType { extern const char* stmt_name(StmtTag t); } // namespace zeek::detail - -using BroStmtTag [[deprecated("Remove in v4.1. Use zeek::detail::StmtTag.")]] = zeek::detail::StmtTag; -constexpr auto STMT_ANY [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ANY.")]] = zeek::detail::STMT_ANY; -constexpr auto STMT_ALARM [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ALARM.")]] = zeek::detail::STMT_ALARM; -constexpr auto STMT_PRINT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_PRINT.")]] = zeek::detail::STMT_PRINT; -constexpr auto STMT_EVENT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EVENT.")]] = zeek::detail::STMT_EVENT; -constexpr auto STMT_EXPR [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EXPR.")]] = zeek::detail::STMT_EXPR; -constexpr auto STMT_IF [[deprecated("Remove in v4.1. Use zeek::detail::STMT_IF.")]] = zeek::detail::STMT_IF; -constexpr auto STMT_WHEN [[deprecated("Remove in v4.1. Use zeek::detail::STMT_WHEN.")]] = zeek::detail::STMT_WHEN; -constexpr auto STMT_SWITCH [[deprecated("Remove in v4.1. Use zeek::detail::STMT_SWITCH.")]] = zeek::detail::STMT_SWITCH; -constexpr auto STMT_FOR [[deprecated("Remove in v4.1. Use zeek::detail::STMT_FOR.")]] = zeek::detail::STMT_FOR; -constexpr auto STMT_NEXT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_NEXT.")]] = zeek::detail::STMT_NEXT; -constexpr auto STMT_BREAK [[deprecated("Remove in v4.1. Use zeek::detail::STMT_BREAK.")]] = zeek::detail::STMT_BREAK; -constexpr auto STMT_RETURN [[deprecated("Remove in v4.1. Use zeek::detail::STMT_RETURN.")]] = zeek::detail::STMT_RETURN; -constexpr auto STMT_ADD [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ADD.")]] = zeek::detail::STMT_ADD; -constexpr auto STMT_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::STMT_DELETE.")]] = zeek::detail::STMT_DELETE; -constexpr auto STMT_LIST [[deprecated("Remove in v4.1. Use zeek::detail::STMT_LIST.")]] = zeek::detail::STMT_LIST; -constexpr auto STMT_EVENT_BODY_LIST [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EVENT_BODY_LIST.")]] = zeek::detail::STMT_EVENT_BODY_LIST; -constexpr auto STMT_INIT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_INIT.")]] = zeek::detail::STMT_INIT; -constexpr auto STMT_FALLTHROUGH [[deprecated("Remove in v4.1. Use zeek::detail::STMT_FALLTHROUGH.")]] = zeek::detail::STMT_FALLTHROUGH; -constexpr auto STMT_WHILE [[deprecated("Remove in v4.1. Use zeek::detail::STMT_WHILE.")]] = zeek::detail::STMT_WHILE; -constexpr auto STMT_NULL [[deprecated("Remove in v4.1. Use zeek::detail::STMT_NULL.")]] = zeek::detail::STMT_NULL; - -using stmt_flow_type [[deprecated("Remove in v4.1. Use zeek::detail::StmtFlowType.")]] = zeek::detail::StmtFlowType; -constexpr auto FLOW_NEXT [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_NEXT.")]] = zeek::detail::FLOW_NEXT; -constexpr auto FLOW_LOOP [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_LOOP.")]] = zeek::detail::FLOW_LOOP; -constexpr auto FLOW_BREAK [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_BREAK.")]] = zeek::detail::FLOW_BREAK; -constexpr auto FLOW_RETURN [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_RETURN.")]] = zeek::detail::FLOW_RETURN; -constexpr auto FLOW_FALLTHROUGH [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_FALLTHROUGH.")]] = zeek::detail::FLOW_FALLTHROUGH; - -constexpr auto stmt_name [[deprecated("Remove in v4.1. Use zeek::detail::stmt_name.")]] = zeek::detail::stmt_name; diff --git a/src/Tag.cc b/src/Tag.cc index bec564c2ed..3f77f053c9 100644 --- a/src/Tag.cc +++ b/src/Tag.cc @@ -15,10 +15,6 @@ Tag::Tag(const EnumTypePtr& etype, type_t arg_type, subtype_t arg_subtype) val = etype->GetEnumVal(i); } -Tag::Tag(EnumType* etype, type_t arg_type, subtype_t arg_subtype) - : Tag({NewRef{}, etype}, arg_type, arg_subtype) - { } - Tag::Tag(EnumValPtr arg_val) { assert(arg_val); @@ -30,10 +26,6 @@ Tag::Tag(EnumValPtr arg_val) subtype = (i >> 31) & 0xffffffff; } -Tag::Tag(EnumVal* arg_val) - : Tag({NewRef{}, arg_val}) - { } - Tag::Tag(const Tag& other) { type = other.type; @@ -85,11 +77,6 @@ const EnumValPtr& Tag::AsVal(const EnumTypePtr& etype) const return val; } -EnumVal* Tag::AsEnumVal(EnumType* etype) const - { - return AsVal({NewRef{}, etype}).get(); - } - std::string Tag::AsString() const { return util::fmt("%" PRIu32 "/%" PRIu32, type, subtype); diff --git a/src/Tag.h b/src/Tag.h index 0f11349dc3..11dbdf0dab 100644 --- a/src/Tag.h +++ b/src/Tag.h @@ -123,9 +123,6 @@ protected: */ const EnumValPtr& AsVal(const EnumTypePtr& etype) const; - [[deprecated("Remove in v4.1. Use AsVal() instead.")]] - EnumVal* AsEnumVal(EnumType* etype) const; - /** * Constructor. * @@ -139,9 +136,6 @@ protected: */ Tag(const EnumTypePtr& etype, type_t type, subtype_t subtype = 0); - [[deprecated("Remove in v4.1. Construct from IntrusivePtr& instead.")]] - Tag(EnumType* etype, type_t type, subtype_t subtype = 0); - /** * Constructor. * @@ -149,9 +143,6 @@ protected: */ explicit Tag(EnumValPtr val); - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit Tag(EnumVal* val); - private: type_t type; // Main type. subtype_t subtype; // Subtype. @@ -159,5 +150,3 @@ private: }; } // namespace zeek - -using Tag [[deprecated("Remove in v4.1. Use zeek::Tag instead")]] = zeek::Tag; diff --git a/src/Timer.h b/src/Timer.h index 4c5739bed0..a91753c19f 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -174,43 +174,3 @@ protected: extern TimerMgr* timer_mgr; } // namespace zeek::detail - -using TimerType [[deprecated("Remove in v4.1. Use zeek::detail::TimerType.")]] = zeek::detail::TimerType; -using Timer [[deprecated("Remove in v4.1. Use zeek::detail::Timer.")]] = zeek::detail::Timer; -using TimerMgr [[deprecated("Remove in v4.1. Use zeek::detail::TimerMgr.")]] = zeek::detail::TimerMgr; -using PQ_TimerMgr [[deprecated("Remove in v4.1. Use zeek::detail::PQ_TimerMgr.")]] = zeek::detail::PQ_TimerMgr; -extern zeek::detail::TimerMgr*& timer_mgr [[deprecated("Remove in v4.1. Use zeek::detail::timer_mgr.")]]; - -constexpr auto TIMER_BACKDOOR [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_BACKDOOR.")]] = zeek::detail::TIMER_BACKDOOR; -constexpr auto TIMER_BREAKPOINT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_BREAKPOINT.")]] = zeek::detail::TIMER_BREAKPOINT; -constexpr auto TIMER_CONN_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_DELETE.")]] = zeek::detail::TIMER_CONN_DELETE; -constexpr auto TIMER_CONN_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_EXPIRE.")]] = zeek::detail::TIMER_CONN_EXPIRE; -constexpr auto TIMER_CONN_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_INACTIVITY.")]] = zeek::detail::TIMER_CONN_INACTIVITY; -constexpr auto TIMER_CONN_STATUS_UPDATE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_STATUS_UPDATE.")]] = zeek::detail::TIMER_CONN_STATUS_UPDATE; -constexpr auto TIMER_CONN_TUPLE_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_TUPLE_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_CONN_TUPLE_WEIRD_EXPIRE; -constexpr auto TIMER_DNS_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_DNS_EXPIRE.")]] = zeek::detail::TIMER_DNS_EXPIRE; -constexpr auto TIMER_FILE_ANALYSIS_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FILE_ANALYSIS_INACTIVITY.")]] = zeek::detail::TIMER_FILE_ANALYSIS_INACTIVITY; -constexpr auto TIMER_FLOW_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FLOW_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_FLOW_WEIRD_EXPIRE; -constexpr auto TIMER_FRAG [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FRAG.")]] = zeek::detail::TIMER_FRAG; -constexpr auto TIMER_INTERCONN [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_INTERCONN.")]] = zeek::detail::TIMER_INTERCONN; -constexpr auto TIMER_IP_TUNNEL_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_IP_TUNNEL_INACTIVITY.")]] = zeek::detail::TIMER_IP_TUNNEL_INACTIVITY; -constexpr auto TIMER_NB_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NB_EXPIRE.")]] = zeek::detail::TIMER_NB_EXPIRE; -constexpr auto TIMER_NET_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NET_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_NET_WEIRD_EXPIRE; -constexpr auto TIMER_NETWORK [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NETWORK.")]] = zeek::detail::TIMER_NETWORK; -constexpr auto TIMER_NTP_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NTP_EXPIRE.")]] = zeek::detail::TIMER_NTP_EXPIRE; -constexpr auto TIMER_PROFILE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_PROFILE.")]] = zeek::detail::TIMER_PROFILE; -constexpr auto TIMER_ROTATE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_ROTATE.")]] = zeek::detail::TIMER_ROTATE; -constexpr auto TIMER_REMOVE_CONNECTION [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_REMOVE_CONNECTION.")]] = zeek::detail::TIMER_REMOVE_CONNECTION; -constexpr auto TIMER_RPC_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_RPC_EXPIRE.")]] = zeek::detail::TIMER_RPC_EXPIRE; -constexpr auto TIMER_SCHEDULE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_SCHEDULE.")]] = zeek::detail::TIMER_SCHEDULE; -constexpr auto TIMER_TABLE_VAL [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TABLE_VAL.")]] = zeek::detail::TIMER_TABLE_VAL; -constexpr auto TIMER_TCP_ATTEMPT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_ATTEMPT.")]] = zeek::detail::TIMER_TCP_ATTEMPT; -constexpr auto TIMER_TCP_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_DELETE.")]] = zeek::detail::TIMER_TCP_DELETE; -constexpr auto TIMER_TCP_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_EXPIRE.")]] = zeek::detail::TIMER_TCP_EXPIRE; -constexpr auto TIMER_TCP_PARTIAL_CLOSE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_PARTIAL_CLOSE.")]] = zeek::detail::TIMER_TCP_PARTIAL_CLOSE; -constexpr auto TIMER_TCP_RESET [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_RESET.")]] = zeek::detail::TIMER_TCP_RESET; -constexpr auto TIMER_TRIGGER [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TRIGGER.")]] = zeek::detail::TIMER_TRIGGER; -constexpr auto TIMER_PPID_CHECK [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_PPID_CHECK.")]] = zeek::detail::TIMER_PPID_CHECK; -constexpr auto TIMER_TIMERMGR_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TIMERMGR_EXPIRE.")]] = zeek::detail::TIMER_TIMERMGR_EXPIRE; -constexpr auto TIMER_THREAD_HEARTBEAT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_THREAD_HEARTBEAT.")]] = zeek::detail::TIMER_THREAD_HEARTBEAT; -constexpr auto NUM_TIMER_TYPES [[deprecated("Remove in v4.1. Use zeek::detail::NUM_TIMER_TYPES.")]] = zeek::detail::NUM_TIMER_TYPES; diff --git a/src/Traverse.h b/src/Traverse.h index e2cff0f701..9a0565b8b8 100644 --- a/src/Traverse.h +++ b/src/Traverse.h @@ -41,6 +41,3 @@ public: TraversalCode traverse_all(TraversalCallback* cb); } // namespace zeek::detail - -using TraversalCallback [[deprecated("Remove in v4.1. Use zeek::detail::TraversalCallback.")]] = zeek::detail::TraversalCallback; -constexpr auto traverse_all [[deprecated("Remove in v4.1. Use zeek::detail::traverse_all.")]] = zeek::detail::traverse_all; diff --git a/src/TraverseTypes.h b/src/TraverseTypes.h index 8915a275f3..239cdcc78d 100644 --- a/src/TraverseTypes.h +++ b/src/TraverseTypes.h @@ -44,8 +44,3 @@ enum TraversalCode { return (code); } // namespace zeek::detail - -using TraversalCode [[deprecated("Remove in v4.1. Use zeek::detail::TraversalCode.")]] = zeek::detail::TraversalCode; -constexpr auto TC_CONTINUE [[deprecated("Remove in v4.1. Use zeek::detail::TC_CONTINUE.")]] = zeek::detail::TC_CONTINUE; -constexpr auto TC_ABORTALL [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTALL.")]] = zeek::detail::TC_ABORTALL; -constexpr auto TC_ABORTSTMT [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTSTMT.")]] = zeek::detail::TC_ABORTSTMT; diff --git a/src/Trigger.h b/src/Trigger.h index 255865658b..abd505b08a 100644 --- a/src/Trigger.h +++ b/src/Trigger.h @@ -150,12 +150,3 @@ private: extern trigger::Manager* trigger_mgr; } // namespace zeek::detail - -namespace trigger { - -using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger.")]] = zeek::detail::trigger::Trigger; -using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager.")]] = zeek::detail::trigger::Manager; - -} // namespace trigger - -extern zeek::detail::trigger::Manager*& trigger_mgr [[deprecated("Remove in v4.1. Use zeek::detail::trigger_mgr.")]]; diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h index ae7bbed3d2..a994f4c0c4 100644 --- a/src/TunnelEncapsulation.h +++ b/src/TunnelEncapsulation.h @@ -84,10 +84,6 @@ public: */ RecordValPtr ToVal() const; - [[deprecated("Remove in v4.1. Use ToVal() instead.")]] - RecordVal* GetRecordVal() const - { return ToVal().release(); } - friend bool operator==(const EncapsulatingConn& ec1, const EncapsulatingConn& ec2) { @@ -211,10 +207,6 @@ public: return vv; } - [[deprecated("Remove in v4.1. Use ToVal() instead.")]] - VectorVal* GetVectorVal() const - { return ToVal().release(); } - friend bool operator==(const EncapsulationStack& e1, const EncapsulationStack& e2); diff --git a/src/Type.cc b/src/Type.cc index b88ebc58b5..322413ee6a 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -240,16 +240,6 @@ const TypePtr& Type::Yield() const return Type::nil; } -bool Type::HasField(const char* /* field */) const - { - return false; - } - -Type* Type::FieldType(const char* /* field */) const - { - return nullptr; - } - void Type::Describe(ODesc* d) const { if ( d->IsBinary() ) @@ -292,7 +282,6 @@ void TypeList::Append(TypePtr t) if ( pure_type && ! same_type(t, pure_type) ) reporter->InternalError("pure type-list violation"); - types_list.push_back(t.get()); types.emplace_back(std::move(t)); } @@ -301,7 +290,6 @@ void TypeList::AppendEvenIfNotPure(TypePtr t) if ( pure_type && ! same_type(t, pure_type) ) pure_type = nullptr; - types_list.push_back(t.get()); types.emplace_back(std::move(t)); } @@ -1410,13 +1398,6 @@ const EnumValPtr& EnumType::GetEnumVal(bro_int_t i) return it->second; } -EnumVal* EnumType::GetVal(bro_int_t i) - { - auto rval = GetEnumVal(i).get(); - zeek::Ref(rval); - return rval; - } - void EnumType::DescribeReST(ODesc* d, bool roles_only) const { d->Add(":zeek:type:`enum`"); @@ -1606,10 +1587,6 @@ bool same_type(const Type& arg_t1, const Type& arg_t2, case TYPE_BOOL: case TYPE_INT: case TYPE_COUNT: -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - case TYPE_COUNTER: -#pragma GCC diagnostic pop case TYPE_DOUBLE: case TYPE_TIME: case TYPE_INTERVAL: @@ -1814,10 +1791,6 @@ bool is_assignable(TypeTag t) case TYPE_BOOL: case TYPE_INT: case TYPE_COUNT: -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - case TYPE_COUNTER: -#pragma GCC diagnostic pop case TYPE_DOUBLE: case TYPE_TIME: case TYPE_INTERVAL: diff --git a/src/Type.h b/src/Type.h index cae2429719..79d9ddb9f2 100644 --- a/src/Type.h +++ b/src/Type.h @@ -96,10 +96,6 @@ constexpr InternalTypeTag to_internal_type_tag(TypeTag tag) noexcept return TYPE_INTERNAL_INT; case TYPE_COUNT: -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - case TYPE_COUNTER: -#pragma GCC diagnostic pop case TYPE_PORT: return TYPE_INTERNAL_UNSIGNED; @@ -205,22 +201,6 @@ public: // type. Returns nil if this is not an index type. virtual const TypePtr& Yield() const; - [[deprecated("Remove in v4.1. Use Yield() instead.")]] - virtual Type* YieldType() - { return Yield().get(); } - [[deprecated("Remove in v4.1. Use Yield() instead.")]] - virtual const Type* YieldType() const - { return Yield().get(); } - - // Returns true if this type is a record and contains the - // given field, false otherwise. - [[deprecated("Remove in v4.1. Use RecordType::HasField() directly.")]] - virtual bool HasField(const char* field) const; - - // Returns the type of the given field, or nil if no such field. - [[deprecated("Remove in v4.1. Use RecordType::GetFieldType() directly.")]] - virtual Type* FieldType(const char* field) const; - const TypeList* AsTypeList() const; TypeList* AsTypeList(); @@ -302,15 +282,6 @@ public: return it == Type::type_aliases.end() ? empty : it->second; } - [[deprecated("Remove in v4.1. Use zeek::Type::Aliases() instead.")]] - static std::set GetAliases(const std::string& type_name) - { - std::set rval; - for ( const auto& t : Type::type_aliases[type_name] ) - rval.emplace(t.get()); - return rval; - } - /** * Registers a new type alias. * @param type_name the name of the type to register a new alias for. @@ -326,10 +297,6 @@ public: return it->second.emplace(std::move(type)).second; } - [[deprecated("Remove in v4.1. Use zeek::Type::RegisterAlias().")]] - static void AddAlias(const std::string &type_name, Type* type) - { Type::type_aliases[type_name].insert({NewRef{}, type}); } - protected: Type() = default; @@ -354,10 +321,6 @@ public: ~TypeList() override = default; - [[deprecated("Remove in v4.1. Use GetTypes() instead.")]] - const TypePList* Types() const - { return &types_list; } - const std::vector& GetTypes() const { return types; } @@ -368,11 +331,6 @@ public: const TypePtr& GetPureType() const { return pure_type; } - [[deprecated("Remove in v4.1. Use GetPureType() instead.")]] - Type* PureType() { return pure_type.get(); } - [[deprecated("Remove in v4.1. Use GetPureType() instead.")]] - const Type* PureType() const { return pure_type.get(); } - // True if all of the types match t, false otherwise. If // is_init is true, then the matching is done in the context // of an initialization. @@ -390,9 +348,6 @@ public: protected: TypePtr pure_type; std::vector types; - - // Remove in v4.1. This is used by Types(), which is deprecated. - TypePList types_list; }; class IndexType : public Type { @@ -403,18 +358,6 @@ public: const TypeListPtr& GetIndices() const { return indices; } - [[deprecated("Remove in v4.1. Use GetIndices().")]] - TypeList* Indices() const { return indices.get(); } - - [[deprecated("Remove in v4.1. Use GetIndexTypes().")]] - const TypePList* IndexTypes() const - { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return indices->Types(); -#pragma GCC diagnostic pop - } - const std::vector& GetIndexTypes() const { return indices->GetTypes(); } @@ -459,9 +402,6 @@ public: TypePtr ShallowClone() override; - [[deprecated("Remove in v4.1. Use Elements() instead.")]] - detail::ListExpr* SetElements() const { return elements.get(); } - const detail::ListExprPtr& Elements() const { return elements; } @@ -492,9 +432,6 @@ public: TypePtr ShallowClone() override; - [[deprecated("Remove in v4.1. Use Params().")]] - RecordType* Args() const { return args.get(); } - const RecordTypePtr& Params() const { return args; } @@ -514,9 +451,6 @@ public: bool CheckArgs(const std::vector& args, bool is_init = false) const; - [[deprecated("Remove in v4.1. Use ParamList().")]] - TypeList* ArgTypes() const { return arg_types.get(); } - const TypeListPtr& ParamList() const { return arg_types; } @@ -589,11 +523,6 @@ public: IntrusivePtr GetType() const { return cast_intrusive(type); } - [[deprecated("Remove in v4.1. Use GetType().")]] - zeek::Type* Type() { return type.get(); } - [[deprecated("Remove in v4.1. Use GetType().")]] - const zeek::Type* Type() const { return type.get(); } - protected: TypePtr type; }; @@ -624,18 +553,7 @@ public: ~RecordType() override; - bool HasField(const char* field) const override; - - [[deprecated("Remove in v4.1. Use GetFieldType() instead (note it doesn't check for invalid names).")]] - Type* FieldType(const char* field) const override - { - auto offset = FieldOffset(field); - return offset >= 0 ? GetFieldType(offset).get() : nullptr; - } - - [[deprecated("Remove in v4.1. Use GetFieldType() instead.")]] - Type* FieldType(int field) const - { return GetFieldType(field).get(); } + bool HasField(const char* field) const; /** * Looks up a field by name and returns its type. No check for invalid @@ -789,9 +707,6 @@ public: const EnumValPtr& GetEnumVal(bro_int_t i); - [[deprecated("Remove in v4.1. Use GetEnumVal() instead.")]] - EnumVal* GetVal(bro_int_t i); - protected: void AddNameInternal(const std::string& module_name, const char* name, bro_int_t val, bool is_export); @@ -952,12 +867,6 @@ inline const TypePtr& error_type() { return base_type(TYPE_ERROR); } } // namespace zeek -// Returns the basic (non-parameterized) type with the given type. -// The reference count of the type is not increased. -[[deprecated("Remove in v4.1. Use zeek::base_type() instead")]] -inline zeek::Type* base_type_no_ref(zeek::TypeTag tag) - { return zeek::base_type(tag).get(); } - extern zeek::OpaqueTypePtr md5_type; extern zeek::OpaqueTypePtr sha1_type; extern zeek::OpaqueTypePtr sha256_type; @@ -968,128 +877,3 @@ extern zeek::OpaqueTypePtr bloomfilter_type; extern zeek::OpaqueTypePtr x509_opaque_type; extern zeek::OpaqueTypePtr ocsp_resp_opaque_type; extern zeek::OpaqueTypePtr paraglob_type; - -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; -using TypeList [[deprecated("Remove in v4.1. Use zeek::TypeList instead.")]] = zeek::TypeList; -using IndexType [[deprecated("Remove in v4.1. Use zeek::IndexType instead.")]] = zeek::IndexType; -using TableType [[deprecated("Remove in v4.1. Use zeek::TableType instead.")]] = zeek::TableType; -using SetType [[deprecated("Remove in v4.1. Use zeek::SetType instead.")]] = zeek::SetType; -using FuncType [[deprecated("Remove in v4.1. Use zeek::FuncType instead.")]] = zeek::FuncType; -using TypeType [[deprecated("Remove in v4.1. Use zeek::TypeType instead.")]] = zeek::TypeType; -using TypeDecl [[deprecated("Remove in v4.1. Use zeek::TypeDecl instead.")]] = zeek::TypeDecl; -using RecordType [[deprecated("Remove in v4.1. Use zeek::RecordType instead.")]] = zeek::RecordType; -using SubNetType [[deprecated("Remove in v4.1. Use zeek::SubNetType instead.")]] = zeek::SubNetType; -using FileType [[deprecated("Remove in v4.1. Use zeek::FileType instead.")]] = zeek::FileType; -using OpaqueType [[deprecated("Remove in v4.1. Use zeek::OpaqueType instead.")]] = zeek::OpaqueType; -using EnumType [[deprecated("Remove in v4.1. Use zeek::EnumType instead.")]] = zeek::EnumType; -using VectorType [[deprecated("Remove in v4.1. Use zeek::VectorType instead.")]] = zeek::VectorType; -using type_decl_list [[deprecated("Remove in v4.1. Use zeek::type_decl_list instead.")]] = zeek::type_decl_list; - -constexpr auto IsIntegral [[deprecated("Remove in v4.1. Use zeek::IsIntegral instead.")]] = zeek::IsIntegral; -constexpr auto IsArithmetic [[deprecated("Remove in v4.1. Use zeek::IsArithmetic instead.")]] = zeek::IsArithmetic; -constexpr auto IsBool [[deprecated("Remove in v4.1. Use zeek::IsBool instead.")]] = zeek::IsBool; -constexpr auto IsInterval [[deprecated("Remove in v4.1. Use zeek::IsInterval instead.")]] = zeek::IsInterval; -constexpr auto IsRecord [[deprecated("Remove in v4.1. Use zeek::IsRecord instead.")]] = zeek::IsRecord; -constexpr auto IsFunc [[deprecated("Remove in v4.1. Use zeek::IsFunc instead.")]] = zeek::IsFunc; -constexpr auto IsVector [[deprecated("Remove in v4.1. Use zeek::IsVector instead.")]] = zeek::IsVector; -constexpr auto IsString [[deprecated("Remove in v4.1. Use zeek::IsString instead.")]] = zeek::IsString; -constexpr auto IsErrorType [[deprecated("Remove in v4.1. Use zeek::IsErrorType instead.")]] = zeek::IsErrorType; -constexpr auto BothIntegral [[deprecated("Remove in v4.1. Use zeek::BothIntegral instead.")]] = zeek::BothIntegral; -constexpr auto BothArithmetic [[deprecated("Remove in v4.1. Use zeek::BothArithmetic instead.")]] = zeek::BothArithmetic; -constexpr auto EitherArithmetic [[deprecated("Remove in v4.1. Use zeek::EitherArithmetic instead.")]] = zeek::EitherArithmetic; -constexpr auto BothBool [[deprecated("Remove in v4.1. Use zeek::BothBool instead.")]] = zeek::BothBool; -constexpr auto BothInterval [[deprecated("Remove in v4.1. Use zeek::BothInterval instead.")]] = zeek::BothInterval; -constexpr auto BothString [[deprecated("Remove in v4.1. Use zeek::BothString instead.")]] = zeek::BothString; -constexpr auto EitherError [[deprecated("Remove in v4.1. Use zeek::EitherError instead.")]] = zeek::EitherError; -constexpr auto base_type [[deprecated("Remove in v4.1. Use zeek::base_type instead.")]] = zeek::base_type; -constexpr auto error_type [[deprecated("Remove in v4.1. Use zeek::error_type instead.")]] = zeek::error_type; -constexpr auto type_name [[deprecated("Remove in v4.1. Use zeek::type_name instead.")]] = zeek::type_name; -constexpr auto is_network_order [[deprecated("Remove in v4.1. Use zeek::is_network_order instead.")]] = zeek::is_network_order; - -using TypeTag [[deprecated("Remove in v4.1. Use zeek::TypeTag instead.")]] = zeek::TypeTag; - -[[deprecated("Remove in v4.1. Use zeek::TYPE_VOID instead.")]] -constexpr auto TYPE_VOID = zeek::TYPE_VOID; -[[deprecated("Remove in v4.1. Use zeek::TYPE_BOOL instead.")]] -constexpr auto TYPE_BOOL = zeek::TYPE_BOOL; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INT instead.")]] -constexpr auto TYPE_INT = zeek::TYPE_INT; -[[deprecated("Remove in v4.1. Use zeek::TYPE_COUNT instead.")]] -constexpr auto TYPE_COUNT = zeek::TYPE_COUNT; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -[[deprecated("Remove in v4.1. TYPE_COUNTER was removed. Use zeek::TYPE_COUNT instead.")]] -constexpr auto TYPE_COUNTER = zeek::TYPE_COUNTER; -#pragma GCC diagnostic pop -[[deprecated("Remove in v4.1. Use zeek::TYPE_DOUBLE instead.")]] -constexpr auto TYPE_DOUBLE = zeek::TYPE_DOUBLE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_TIME instead.")]] -constexpr auto TYPE_TIME = zeek::TYPE_TIME; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERVAL instead.")]] -constexpr auto TYPE_INTERVAL = zeek::TYPE_INTERVAL; -[[deprecated("Remove in v4.1. Use zeek::TYPE_STRING instead.")]] -constexpr auto TYPE_STRING = zeek::TYPE_STRING; -[[deprecated("Remove in v4.1. Use zeek::TYPE_PATTERN instead.")]] -constexpr auto TYPE_PATTERN = zeek::TYPE_PATTERN; -[[deprecated("Remove in v4.1. Use zeek::TYPE_ENUM instead.")]] -constexpr auto TYPE_ENUM = zeek::TYPE_ENUM; -[[deprecated("Remove in v4.1. Use zeek::TYPE_TIMER instead.")]] -constexpr auto TYPE_TIMER = zeek::TYPE_TIMER; -[[deprecated("Remove in v4.1. Use zeek::TYPE_PORT instead.")]] -constexpr auto TYPE_PORT = zeek::TYPE_PORT; -[[deprecated("Remove in v4.1. Use zeek::TYPE_ADDR instead.")]] -constexpr auto TYPE_ADDR = zeek::TYPE_ADDR; -[[deprecated("Remove in v4.1. Use zeek::TYPE_SUBNET instead.")]] -constexpr auto TYPE_SUBNET = zeek::TYPE_SUBNET; -[[deprecated("Remove in v4.1. Use zeek::TYPE_ANY instead.")]] -constexpr auto TYPE_ANY = zeek::TYPE_ANY; -[[deprecated("Remove in v4.1. Use zeek::TYPE_TABLE instead.")]] -constexpr auto TYPE_TABLE = zeek::TYPE_TABLE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_UNION instead.")]] -constexpr auto TYPE_UNION = zeek::TYPE_UNION; -[[deprecated("Remove in v4.1. Use zeek::TYPE_RECORD instead.")]] -constexpr auto TYPE_RECORD = zeek::TYPE_RECORD; -[[deprecated("Remove in v4.1. Use zeek::TYPE_LIST instead.")]] -constexpr auto TYPE_LIST = zeek::TYPE_LIST; -[[deprecated("Remove in v4.1. Use zeek::TYPE_FUNC instead.")]] -constexpr auto TYPE_FUNC = zeek::TYPE_FUNC; -[[deprecated("Remove in v4.1. Use zeek::TYPE_FILE instead.")]] -constexpr auto TYPE_FILE = zeek::TYPE_FILE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_VECTOR instead.")]] -constexpr auto TYPE_VECTOR = zeek::TYPE_VECTOR; -[[deprecated("Remove in v4.1. Use zeek::TYPE_OPAQUE instead.")]] -constexpr auto TYPE_OPAQUE = zeek::TYPE_OPAQUE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]] -constexpr auto TYPE_TYPE = zeek::TYPE_TYPE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]] -constexpr auto TYPE_ERROR = zeek::TYPE_ERROR; - -using function_flavor [[deprecated("Remove in v4.1. Use zeek::FunctionFlavor instead.")]] = zeek::FunctionFlavor; - -[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_FUNCTION instead.")]] -constexpr auto FUNC_FLAVOR_FUNCTION = zeek::FUNC_FLAVOR_FUNCTION; -[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_EVENT instead.")]] -constexpr auto FUNC_FLAVOR_EVENT = zeek::FUNC_FLAVOR_EVENT; -[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_HOOK instead.")]] -constexpr auto FUNC_FLAVOR_HOOK = zeek::FUNC_FLAVOR_HOOK; - -using InternalTypeTag [[deprecated("Remove in v4.1. Use zeek::InteralTypeTag instead.")]] = zeek::InternalTypeTag; - -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_VOID instead.")]] -constexpr auto TYPE_INTERNAL_VOID = zeek::TYPE_INTERNAL_VOID; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_INT instead.")]] -constexpr auto TYPE_INTERNAL_INT = zeek::TYPE_INTERNAL_INT; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_UNSIGNED instead.")]] -constexpr auto TYPE_INTERNAL_UNSIGNED = zeek::TYPE_INTERNAL_UNSIGNED; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_DOUBLE instead.")]] -constexpr auto TYPE_INTERNAL_DOUBLE = zeek::TYPE_INTERNAL_DOUBLE; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_STRING instead.")]] -constexpr auto TYPE_INTERNAL_STRING = zeek::TYPE_INTERNAL_STRING; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ADDR instead.")]] -constexpr auto TYPE_INTERNAL_ADDR = zeek::TYPE_INTERNAL_ADDR; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_SUBNET instead.")]] -constexpr auto TYPE_INTERNAL_SUBNET = zeek::TYPE_INTERNAL_SUBNET; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_OTHER instead.")]] -constexpr auto TYPE_INTERNAL_OTHER = zeek::TYPE_INTERNAL_OTHER; -[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ERROR instead.")]] -constexpr auto TYPE_INTERNAL_ERROR = zeek::TYPE_INTERNAL_ERROR; diff --git a/src/UID.h b/src/UID.h index 19a9e408f0..d4dc182eee 100644 --- a/src/UID.h +++ b/src/UID.h @@ -98,7 +98,3 @@ inline UID& UID::operator=(const UID& other) } } // namespace zeek - -namespace Bro { - using UID [[deprecated("Remove in v4.1. Use zeek::UID.")]] = zeek::UID; -} diff --git a/src/Val.cc b/src/Val.cc index 2f5b8e3f94..132d1261d6 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -1269,11 +1269,6 @@ void ListVal::Append(ValPtr v) type->AsTypeList()->Append(vt); } -void ListVal::Append(Val* v) - { - Append({AdoptRef{}, v}); - } - TableValPtr ListVal::ToSetVal() const { if ( tag == TYPE_ANY ) @@ -1291,11 +1286,6 @@ TableValPtr ListVal::ToSetVal() const return t; } -TableVal* ListVal::ConvertToSet() const - { - return ToSetVal().release(); - } - void ListVal::Describe(ODesc* d) const { if ( d->IsBinary() || d->IsPortable() ) @@ -1568,11 +1558,6 @@ bool TableVal::Assign(ValPtr index, ValPtr new_val, bool broker_forward, return Assign(std::move(index), std::move(k), std::move(new_val), broker_forward, iterators_invalidated); } -bool TableVal::Assign(Val* index, Val* new_val) - { - return Assign({NewRef{}, index}, {AdoptRef{}, new_val}); - } - bool TableVal::Assign(ValPtr index, std::unique_ptr k, ValPtr new_val, bool broker_forward, bool* iterators_invalidated) { @@ -1627,11 +1612,6 @@ bool TableVal::Assign(ValPtr index, std::unique_ptr k, return true; } -bool TableVal::Assign(Val* index, detail::HashKey* k, Val* new_val) - { - return Assign({NewRef{}, index}, std::unique_ptr{k}, {AdoptRef{}, new_val}); - } - ValPtr TableVal::SizeVal() const { return val_mgr->Count(Size()); @@ -1985,22 +1965,6 @@ bool TableVal::Contains(const IPAddr& addr) const return (subnets->Lookup(addr, true) != 0); } -Val* TableVal::Lookup(Val* index, bool use_default_val) - { - static ValPtr last_default; - last_default = nullptr; - ValPtr idx{NewRef{}, index}; - - if ( const auto& rval = Find(idx) ) - return rval.get(); - - if ( ! use_default_val ) - return nullptr; - - last_default = Default(idx); - return last_default.get(); - } - VectorValPtr TableVal::LookupSubnets(const SubNetVal* search) { if ( ! subnets ) @@ -2333,11 +2297,6 @@ ListValPtr TableVal::ToListVal(TypeTag t) const return l; } -ListVal* TableVal::ConvertToList(TypeTag t) const - { - return ToListVal().release(); - } - ListValPtr TableVal::ToPureListVal() const { const auto& tl = table_type->GetIndices()->GetTypes(); @@ -2350,11 +2309,6 @@ ListValPtr TableVal::ToPureListVal() const return ToListVal(tl[0]->Tag()); } -ListVal* TableVal::ConvertToPureList() const - { - return ToPureListVal().release(); - } - const detail::AttrPtr& TableVal::GetAttr(detail::AttrTag t) const { return attrs ? attrs->Find(t) : detail::Attr::nil; @@ -2770,9 +2724,6 @@ unsigned int TableVal::MemoryAllocation() const + table_hash->MemoryAllocation(); } -detail::HashKey* TableVal::ComputeHash(const Val* index) const - { return MakeHashKey(*index).release(); } - std::unique_ptr TableVal::MakeHashKey(const Val& index) const { return table_hash->MakeHashKey(index, true); @@ -2834,10 +2785,6 @@ TableVal::TableRecordDependencies TableVal::parse_time_table_record_dependencies RecordVal::RecordTypeValMap RecordVal::parse_time_records; -RecordVal::RecordVal(RecordType* t, bool init_fields) - : RecordVal({NewRef{}, t}, init_fields) - {} - RecordVal::RecordVal(RecordTypePtr t, bool init_fields) : Val(std::move(t)) { origin = nullptr; @@ -2921,11 +2868,6 @@ void RecordVal::Assign(int field, ValPtr new_val) Modified(); } -void RecordVal::Assign(int field, Val* new_val) - { - Assign(field, {AdoptRef{}, new_val}); - } - ValPtr RecordVal::GetFieldOrDefault(int field) const { const auto& val = (*record_val)[field]; @@ -3195,9 +3137,6 @@ ValPtr TypeVal::DoClone(CloneState* state) return {NewRef{}, this}; } -VectorVal::VectorVal(VectorType* t) : VectorVal({NewRef{}, t}) - { } - VectorVal::VectorVal(VectorTypePtr t) : Val(std::move(t)) { vector_val = new vector(); @@ -3682,11 +3621,6 @@ ValManager::ValManager() } } -StringVal* ValManager::GetEmptyString() const - { - return empty_string->Ref()->AsStringVal(); - } - const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type) const { if ( port_num >= 65536 ) @@ -3698,11 +3632,6 @@ const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type) return ports[port_type][port_num]; } -PortVal* ValManager::GetPort(uint32_t port_num, TransportProto port_type) const - { - return Port(port_num, port_type)->Ref()->AsPortVal(); - } - const PortValPtr& ValManager::Port(uint32_t port_num) const { auto mask = port_num & PORT_SPACE_MASK; @@ -3718,9 +3647,4 @@ const PortValPtr& ValManager::Port(uint32_t port_num) const return Port(port_num, TRANSPORT_UNKNOWN); } -PortVal* ValManager::GetPort(uint32_t port_num) const - { - return Port(port_num)->Ref()->AsPortVal(); - } - } diff --git a/src/Val.h b/src/Val.h index 5b9405ecfb..0efe90f3db 100644 --- a/src/Val.h +++ b/src/Val.h @@ -29,7 +29,6 @@ namespace zeek { class String; } -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek); @@ -39,11 +38,8 @@ namespace zeek { class File; using FilePtr = zeek::IntrusivePtr; } -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; -using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr.")]] = zeek::FilePtr; namespace zeek::detail { class ScriptFunc; } -using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc instead.")]] = zeek::detail::ScriptFunc; ZEEK_FORWARD_DECLARE_NAMESPACED(PrefixTable, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(RE_Matcher, zeek); @@ -123,11 +119,6 @@ public: // Remove this value from the given value (if appropriate). virtual bool RemoveFrom(Val* v) const; - [[deprecated("Remove in v4.1. Use GetType().")]] - zeek::Type* Type() { return type.get(); } - [[deprecated("Remove in v4.1. Use GetType().")]] - const zeek::Type* Type() const { return type.get(); } - const TypePtr& GetType() const { return type; } @@ -272,68 +263,32 @@ public: ValManager(); - [[deprecated("Remove in v4.1. Use zeek::val_mgr->True() instead.")]] - inline Val* GetTrue() const - { return b_true->Ref(); } - inline const ValPtr& True() const { return b_true; } - [[deprecated("Remove in v4.1. Use zeek::val_mgr->False() instead.")]] - inline Val* GetFalse() const - { return b_false->Ref(); } - inline const ValPtr& False() const { return b_false; } - [[deprecated("Remove in v4.1. Use zeek::val_mgr->Bool() instead.")]] - inline Val* GetBool(bool b) const - { return b ? b_true->Ref() : b_false->Ref(); } - inline const ValPtr& Bool(bool b) const { return b ? b_true : b_false; } - [[deprecated("Remove in v4.1. Use zeek::val_mgr->Int() instead.")]] - inline Val* GetInt(int64_t i) const - { - return i < PREALLOCATED_INT_LOWEST || i > PREALLOCATED_INT_HIGHEST ? - Val::MakeInt(i).release() : ints[i - PREALLOCATED_INT_LOWEST]->Ref(); - } - inline ValPtr Int(int64_t i) const { return i < PREALLOCATED_INT_LOWEST || i > PREALLOCATED_INT_HIGHEST ? Val::MakeInt(i) : ints[i - PREALLOCATED_INT_LOWEST]; } - [[deprecated("Remove in v4.1. Use zeek::val_mgr->Count() instead.")]] - inline Val* GetCount(uint64_t i) const - { - return i >= PREALLOCATED_COUNTS ? Val::MakeCount(i).release() : counts[i]->Ref(); - } - inline ValPtr Count(uint64_t i) const { return i >= PREALLOCATED_COUNTS ? Val::MakeCount(i) : counts[i]; } - [[deprecated("Remove in v4.1. Use zeek::val_mgr->EmptyString() instead.")]] - StringVal* GetEmptyString() const; - inline const StringValPtr& EmptyString() const { return empty_string; } - // Port number given in host order. - [[deprecated("Remove in v4.1. Use zeek::val_mgr->Port() instead.")]] - PortVal* GetPort(uint32_t port_num, TransportProto port_type) const; - // Port number given in host order. const PortValPtr& Port(uint32_t port_num, TransportProto port_type) const; - // Host-order port number already masked with port space protocol mask. - [[deprecated("Remove in v4.1. Use zeek::val_mgr->Port() instead.")]] - PortVal* GetPort(uint32_t port_num) const; - // Host-order port number already masked with port space protocol mask. const PortValPtr& Port(uint32_t port_num) const; @@ -583,10 +538,6 @@ public: StringValPtr Replace(RE_Matcher* re, const String& repl, bool do_all); - [[deprecated("Remove in v4.1. Use Replace().")]] - Val* Substitute(RE_Matcher* re, StringVal* repl, bool do_all) - { return Replace(re, *repl->AsString(), do_all).release(); } - protected: void ValDescribe(ODesc* d) const override; ValPtr DoClone(CloneState* state) override; @@ -669,11 +620,6 @@ public: const ValPtr& Idx(size_t i) const { return vals[i]; } - [[deprecated("Remove in v4.1. Use Idx() instead")]] - Val* Index(const int n) { return vals[n].get(); } - [[deprecated("Remove in v4.1. Use Idx() instead")]] - const Val* Index(const int n) const { return vals[n].get(); } - // Returns an RE_Matcher() that will match any string that // includes embedded within it one of the patterns listed // (as a string, e.g., "foo|bar") in this ListVal. @@ -690,15 +636,9 @@ public: */ void Append(ValPtr v); - [[deprecated("Remove in v4.1. Use Append(IntrusivePtr) instead.")]] - void Append(Val* v); - // Returns a Set representation of the list (which must be homogeneous). TableValPtr ToSetVal() const; - [[deprecated("Remove in v4.1. Use ToSetVal() instead.")]] - TableVal* ConvertToSet() const; - const std::vector& Vals() const { return vals; } void Describe(ODesc* d) const override; @@ -723,9 +663,6 @@ public: TableEntryVal* Clone(Val::CloneState* state); - [[deprecated("Remove in v4.1. Use GetVal().")]] - Val* Value() { return val.get(); } - const ValPtr& GetVal() const { return val; } @@ -763,11 +700,6 @@ class TableVal final : public Val, public notifier::detail::Modifiable { public: explicit TableVal(TableTypePtr t, detail::AttributesPtr attrs = nullptr); - [[deprecated("Remove in v4.1. Construct from IntrusivePtrs instead.")]] - explicit TableVal(TableType* t, detail::Attributes* attrs = nullptr) - : TableVal({NewRef{}, t}, {NewRef{}, attrs}) - {} - ~TableVal() override; /** @@ -803,17 +735,6 @@ public: ValPtr new_val, bool broker_forward = true, bool* iterators_invalidated = nullptr); - // Returns true if the assignment typechecked, false if not. The - // methods take ownership of new_val, but not of the index. If we're - // a set, new_val has to be nil. - [[deprecated("Remove in v4.1. Use IntrusivePtr overload instead.")]] - bool Assign(Val* index, Val* new_val); - - // Same as other Assign() method, but takes a precomuted detail::HashKey and - // deletes it when done. - [[deprecated("Remove in v4.1. Use IntrusivePtr overload instead.")]] - bool Assign(Val* index, detail::HashKey* k, Val* new_val); - ValPtr SizeVal() const override; // Add the entire contents of the table to the given value, @@ -844,28 +765,16 @@ public: */ TableValPtr Intersection(const TableVal& v) const; - [[deprecated("Remove in v4.1. Use Intersection() instead.")]] - TableVal* Intersect(const TableVal* v) const - { return Intersection(*v).release(); } - // Returns true if this set contains the same members as the // given set. Note that comparisons are done using hash keys, // so errors can arise for compound sets such as sets-of-sets. // See https://bro-tracker.atlassian.net/browse/BIT-1949. bool EqualTo(const TableVal& v) const; - [[deprecated("Remove in v4.1. Pass TableVal& instead.")]] - bool EqualTo(const TableVal* v) const - { return EqualTo(*v); } - // Returns true if this set is a subset (not necessarily proper) // of the given set. bool IsSubsetOf(const TableVal& v) const; - [[deprecated("Remove in v4.1. Pass TableVal& instead.")]] - bool IsSubsetOf(const TableVal* v) const - { return IsSubsetOf(*v); } - // Expands any lists in the index into multiple initializations. // Returns true if the initializations typecheck, false if not. bool ExpandAndInit(ValPtr index, ValPtr new_val); @@ -891,12 +800,6 @@ public: */ ValPtr FindOrDefault(const ValPtr& index); - // Returns the element's value if it exists in the table, - // nil otherwise. Note, "index" is not const because we - // need to Ref/Unref it when calling the default function. - [[deprecated("Remove in v4.1. Use Find() or FindOrDefault().")]] - Val* Lookup(Val* index, bool use_default_val = true); - /** * Returns true if this is a table[subnet]/set[subnet] and the * given address was found in the table. Otherwise returns false. @@ -926,10 +829,6 @@ public: */ ListValPtr RecreateIndex(const detail::HashKey& k) const; - [[deprecated("Remove in v4.1. Use RecreateIndex().")]] - ListVal* RecoverIndex(const detail::HashKey* k) const - { return RecreateIndex(*k).release(); } - /** * Remove an element from the table and return it. * @param index The index to remove. @@ -953,14 +852,6 @@ public: */ ValPtr Remove(const detail::HashKey& k, bool* iterators_invalidated = nullptr); - [[deprecated("Remove in v4.1. Use Remove().")]] - Val* Delete(const Val* index) - { return Remove(*index).release(); } - - [[deprecated("Remove in v4.1. Use Remove().")]] - Val* Delete(const detail::HashKey* k) - { return Remove(*k).release(); } - // Returns a ListVal representation of the table (which must be a set). ListValPtr ToListVal(TypeTag t = TYPE_ANY) const; @@ -968,18 +859,10 @@ public: // with non-composite index type). ListValPtr ToPureListVal() const; - [[deprecated("Remove in v4.1. Use ToListVal() instead.")]] - ListVal* ConvertToList(TypeTag t=TYPE_ANY) const; - [[deprecated("Remove in v4.1. Use ToPureListVal() instead.")]] - ListVal* ConvertToPureList() const; // must be single index type - void SetAttrs(detail::AttributesPtr attrs); const detail::AttrPtr& GetAttr(detail::AttrTag t) const; - [[deprecated("Remove in v4.1. Use GetAttrs().")]] - detail::Attributes* Attrs() { return attrs.get(); } - const detail::AttributesPtr& GetAttrs() const { return attrs; } @@ -1019,9 +902,6 @@ public: */ std::unique_ptr MakeHashKey(const Val& index) const; - [[deprecated("Remove in v4.1. Use MakeHashKey().")]] - detail::HashKey* ComputeHash(const Val* index) const; - notifier::detail::Modifiable* Modifiable() override { return this; } // Retrieves and saves all table state (key-value pairs) for @@ -1117,8 +997,6 @@ private: class RecordVal final : public Val, public notifier::detail::Modifiable { public: - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit RecordVal(RecordType* t, bool init_fields = true); explicit RecordVal(RecordTypePtr t, bool init_fields = true); ~RecordVal() override; @@ -1143,16 +1021,6 @@ public: void Assign(int field, Ts&&... args) { Assign(field, make_intrusive(std::forward(args)...)); } - [[deprecated("Remove in v4.1. Assign an IntrusivePtr instead.")]] - void Assign(int field, Val* new_val); - // Note: the following nullptr method can also go upon removing the above. - void Assign(int field, std::nullptr_t) - { Assign(field, ValPtr{}); } - - [[deprecated("Remove in v4.1. Use GetField().")]] - Val* Lookup(int field) const // Does not Ref() value. - { return (*record_val)[field].get(); } - /** * Appends a value to the record's fields. The caller is responsible * for ensuring that fields are appended in the correct orer and @@ -1204,10 +1072,6 @@ public: */ ValPtr GetFieldOrDefault(int field) const; - [[deprecated("Remove in v4.1. Use GetFieldOrDefault().")]] - Val* LookupWithDefault(int field) const - { return GetFieldOrDefault(field).release(); } - /** * Returns the value of a given field name. * @param field The name of a field to retrieve. @@ -1268,18 +1132,6 @@ public: return field_val_ptr->Get(); } - /** - * Looks up the value of a field by field name. If the field doesn't - * exist in the record type, it's an internal error: abort. - * @param field name of field to lookup. - * @param with_default whether to rely on field's &default attribute when - * the field has yet to be initialized. - * @return the value in field \a field. - */ - [[deprecated("Remove in v4.1. Use GetField() or GetFieldOrDefault().")]] - Val* Lookup(const char* field, bool with_default = false) const - { return with_default ? GetFieldOrDefault(field).release() : GetField(field).get(); } - void Describe(ODesc* d) const override; /** @@ -1372,8 +1224,6 @@ protected: class VectorVal final : public Val, public notifier::detail::Modifiable { public: - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit VectorVal(VectorType* t); explicit VectorVal(VectorTypePtr t); ~VectorVal() override; @@ -1388,22 +1238,10 @@ public: */ bool Assign(unsigned int index, ValPtr element); - // Note: does NOT Ref() the element! Remember to do so unless - // the element was just created and thus has refcount 1. - [[deprecated("Remove in v4.1. Assign an IntrusivePtr instead.")]] - bool Assign(unsigned int index, Val* element) - { return Assign(index, {AdoptRef{}, element}); } // Note: the following nullptr method can also go upon removing the above. void Assign(unsigned int index, std::nullptr_t) { Assign(index, ValPtr{}); } - [[deprecated("Remove in v4.1. Assign using integer index and IntrusivePtr element.")]] - bool Assign(Val* index, Val* element) - { - return Assign(index->AsListVal()->Idx(0)->CoerceToUnsigned(), - {AdoptRef{}, element}); - } - /** * Assigns a given value to multiple indices in the vector. * @param index The starting index to assign to. @@ -1414,10 +1252,6 @@ public: bool AssignRepeat(unsigned int index, unsigned int how_many, ValPtr element); - [[deprecated("Remove in v4.1. Assign an IntrusivePtr instead.")]] - bool AssignRepeat(unsigned int index, unsigned int how_many, Val* element) - { return AssignRepeat(index, how_many, {NewRef{}, element}); } - // Add this value to the given value (if appropriate). // Returns true if succcessful. bool AddTo(Val* v, bool is_first_init) const override; @@ -1440,17 +1274,6 @@ public: bro_uint_t CountAt(unsigned int index) const { return At(index)->AsCount(); } - [[deprecated("Remove in v4.1. Use At().")]] - Val* Lookup(unsigned int index) const - { return At(index).get(); } - - [[deprecated("Remove in v4.1. Use At().")]] - Val* Lookup(Val* index) - { - bro_uint_t i = index->AsListVal()->Idx(0)->CoerceToUnsigned(); - return At(static_cast(i)).get(); - } - unsigned int Size() const { return vector_val->size(); } // Is there any way to reclaim previously-allocated memory when you @@ -1475,10 +1298,6 @@ public: */ bool Insert(unsigned int index, ValPtr element); - [[deprecated("Remove in v4.1. Insert an IntrusivePtr instead.")]] - bool Insert(unsigned int index, Val* element) - { return Insert(index, {AdoptRef{}, element}); } - /** * Inserts an element at the end of the vector. * @param element The value to insert into the vector. @@ -1564,24 +1383,3 @@ extern bool can_cast_value_to_type(const Val* v, Type* t); extern bool can_cast_value_to_type(const Type* s, Type* t); } // namespace zeek - -using Val [[deprecated("Remove in v4.1. Use zeek::Val instead.")]] = zeek::Val; -using PortVal [[deprecated("Remove in v4.1. Use zeek::PortVal instead.")]] = zeek::PortVal; -using AddrVal [[deprecated("Remove in v4.1. Use zeek::AddrVal instead.")]] = zeek::AddrVal; -using SubNetVal [[deprecated("Remove in v4.1. Use zeek::SubNetVal instead.")]] = zeek::SubNetVal; -using PatternVal [[deprecated("Remove in v4.1. Use zeek::PatternVal instead.")]] = zeek::PatternVal; -using TableVal [[deprecated("Remove in v4.1. Use zeek::TableVal instead.")]] = zeek::TableVal; -using TableValTimer [[deprecated("Remove in v4.1. Use zeek::TableVal instead.")]] = zeek::TableValTimer; -using RecordVal [[deprecated("Remove in v4.1. Use zeek::RecordVal instead.")]] = zeek::RecordVal; -using ListVal [[deprecated("Remove in v4.1. Use zeek::ListVal instead.")]] = zeek::ListVal; -using StringVal [[deprecated("Remove in v4.1. Use zeek::StringVal instead.")]] = zeek::StringVal; -using EnumVal [[deprecated("Remove in v4.1. Use zeek::EnumVal instead.")]] = zeek::EnumVal; -using VectorVal [[deprecated("Remove in v4.1. Use zeek::VectorVal instead.")]] = zeek::VectorVal; -using TableEntryVal [[deprecated("Remove in v4.1. Use zeek::TableEntryVal instead.")]] = zeek::TableEntryVal; -using TimeVal [[deprecated("Remove in v4.1. Use zeek::TimeVal instead.")]] = zeek::TimeVal; -using DoubleVal [[deprecated("Remove in v4.1. Use zeek::DoubleVal instead.")]] = zeek::DoubleVal; -using IntervalVal [[deprecated("Remove in v4.1. Use zeek::IntervalVal instead.")]] = zeek::IntervalVal; -using ValManager [[deprecated("Remove in v4.1. Use zeek::ValManager instead.")]] = zeek::ValManager; - -// Alias for zeek::val_mgr. -extern zeek::ValManager*& val_mgr [[deprecated("Remove in v4.1. Use zeek::val_mgr instead.")]]; diff --git a/src/Var.cc b/src/Var.cc index 13679f26aa..bcaa32237e 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -780,106 +780,3 @@ IDPList gather_outer_ids(Scope* scope, Stmt* body) } } // namespace zeek::detail - -zeek::Val* internal_val(const char* name) - { - return zeek::id::find_val(name).get(); - } - -zeek::Val* internal_const_val(const char* name) - { - return zeek::id::find_const(name).get(); - } - -zeek::Val* opt_internal_val(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - return id ? id->GetVal().get() : nullptr; - } - -double opt_internal_double(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) return 0.0; - const auto& v = id->GetVal(); - return v ? v->InternalDouble() : 0.0; - } - -bro_int_t opt_internal_int(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) return 0; - const auto& v = id->GetVal(); - return v ? v->InternalInt() : 0; - } - -bro_uint_t opt_internal_unsigned(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) return 0; - const auto& v = id->GetVal(); - return v ? v->InternalUnsigned() : 0; - } - -zeek::StringVal* opt_internal_string(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) return nullptr; - const auto& v = id->GetVal(); - return v ? v->AsStringVal() : nullptr; - } - -zeek::TableVal* opt_internal_table(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) return nullptr; - const auto& v = id->GetVal(); - return v ? v->AsTableVal() : nullptr; - } - -zeek::ListVal* internal_list_val(const char* name) - { - const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME); - if ( ! id ) - return nullptr; - - zeek::Val* v = id->GetVal().get(); - - if ( v ) - { - if ( v->GetType()->Tag() == zeek::TYPE_LIST ) - return (zeek::ListVal*) v; - - else if ( v->GetType()->IsSet() ) - { - zeek::TableVal* tv = v->AsTableVal(); - auto lv = tv->ToPureListVal(); - return lv.release(); - } - - else - zeek::reporter->InternalError("internal variable %s is not a list", name); - } - - return nullptr; - } - -zeek::Type* internal_type(const char* name) - { - return zeek::id::find_type(name).get(); - } - -zeek::Func* internal_func(const char* name) - { - const auto& v = zeek::id::find_val(name); - - if ( v ) - return v->AsFunc(); - else - return nullptr; - } - -zeek::EventHandlerPtr internal_handler(const char* name) - { - return event_registry->Register(name); - } diff --git a/src/Var.h b/src/Var.h index 4909d3268b..d3bdef5d05 100644 --- a/src/Var.h +++ b/src/Var.h @@ -42,53 +42,3 @@ extern void end_func(StmtPtr body); extern IDPList gather_outer_ids(Scope* scope, Stmt* body); } // namespace zeek::detail - -using decl_type [[deprecated("Remove in v4.1. Use zeek::detail::DeclType.")]] = zeek::detail::DeclType; -constexpr auto VAR_REGULAR [[deprecated("Remove in v4.1. Use zeek::detail::VAR_REGULAR.")]] = zeek::detail::VAR_REGULAR; -constexpr auto VAR_CONST [[deprecated("Remove in v4.1. Use zeek::detail::VAR_CONST.")]] = zeek::detail::VAR_CONST; -constexpr auto VAR_REDEF [[deprecated("Remove in v4.1. Use zeek::detail::VAR_REDEF.")]] = zeek::detail::VAR_REDEF; -constexpr auto VAR_OPTION [[deprecated("Remove in v4.1. Use zeek::detail::VAR_OPTION.")]] = zeek::detail::VAR_OPTION; - -constexpr auto add_global [[deprecated("Remove in v4.1. Use zeek::detail::add_global.")]] = zeek::detail::add_global; -constexpr auto add_local [[deprecated("Remove in v4.1. Use zeek::detail::add_local.")]] = zeek::detail::add_local; -constexpr auto add_and_assign_local [[deprecated("Remove in v4.1. Use zeek::detail::add_and_assign_local.")]] = zeek::detail::add_and_assign_local; -constexpr auto add_type [[deprecated("Remove in v4.1. Use zeek::detail::add_type.")]] = zeek::detail::add_type; -constexpr auto begin_func [[deprecated("Remove in v4.1. Use zeek::detail::begin_func.")]] = zeek::detail::begin_func; -constexpr auto end_func [[deprecated("Remove in v4.1. Use zeek::detail::end_func.")]] = zeek::detail::end_func; -constexpr auto gather_outer_ids [[deprecated("Remove in v4.1. Use zeek::detail::gather_outer_ids.")]] = zeek::detail::gather_outer_ids; - -[[deprecated("Remove in v4.1. Use zeek::id::find_val().")]] -extern zeek::Val* internal_val(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find_const().")]] -extern zeek::Val* internal_const_val(const char* name); // internal error if not const - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern zeek::Val* opt_internal_val(const char* name); // returns nil if not defined - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern double opt_internal_double(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern bro_int_t opt_internal_int(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern bro_uint_t opt_internal_unsigned(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern zeek::StringVal* opt_internal_string(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] -extern zeek::TableVal* opt_internal_table(const char* name); // nil if not defined - -[[deprecated("Remove in v4.1. Use zeek::id::find(), zeek::id::find_val(), and/or TableVal::ToPureListVal().")]] -extern zeek::ListVal* internal_list_val(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find_type().")]] -extern zeek::Type* internal_type(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::id::find_func().")]] -extern zeek::Func* internal_func(const char* name); - -[[deprecated("Remove in v4.1. Use zeek::event_registry->Register().")]] -extern zeek::EventHandlerPtr internal_handler(const char* name); diff --git a/src/ZeekList.h b/src/ZeekList.h index 320a00811b..112bc49560 100644 --- a/src/ZeekList.h +++ b/src/ZeekList.h @@ -8,13 +8,13 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail); -namespace zeek { class Type; } -using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type; ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail); namespace zeek { +class Type; + using ValPList = PList; using ExprPList = PList; using IDPList = PList; @@ -24,11 +24,3 @@ using AttrPList = PList; using TimerPList = PList; } // namespace zeek - -using val_list [[deprecated("Remove in v4.1. Use zeek::ValPList.")]] = zeek::ValPList; -using expr_list [[deprecated("Remove in v4.1. Use zeek::ExprPList.")]] = zeek::ExprPList; -using id_list [[deprecated("Remove in v4.1. Use zeek::IDPList.")]] = zeek::IDPList; -using stmt_list [[deprecated("Remove in v4.1. Use zeek::StmtPList.")]] = zeek::StmtPList; -using type_list [[deprecated("Remove in v4.1. Use zeek::TypePList.")]] = zeek::TypePList; -using attr_list [[deprecated("Remove in v4.1. Use zeek::AttrPList.")]] = zeek::AttrPList; -using timer_list [[deprecated("Remove in v4.1. Use zeek::TimerPList.")]] = zeek::TimerPList; diff --git a/src/ZeekString.h b/src/ZeekString.h index 5392847d1e..792d5cef17 100644 --- a/src/ZeekString.h +++ b/src/ZeekString.h @@ -188,8 +188,3 @@ extern String* concatenate(String::CVec& v); extern void delete_strings(std::vector& v); } // namespace zeek - -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; -using BroStringLenCmp [[deprecated("Remove in v4.1. Use zeek::StringLenCmp instead.")]] = zeek::StringLenCmp; -using byte_vec [[deprecated("Remove in v4.1. Use zeek::byte_vec instead.")]] = zeek::byte_vec; -using data_chunk_t [[deprecated("Remove in v4.1. Use zeek::data_chunk_t instead.")]] = zeek::data_chunk_t; diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 0ff3971aa1..d635f43bfc 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -784,11 +784,6 @@ void Analyzer::UpdateConnVal(RecordVal *conn_val) (*i)->UpdateConnVal(conn_val); } -RecordVal* Analyzer::BuildConnVal() - { - return conn->ConnVal()->Ref()->AsRecordVal(); - } - const RecordValPtr& Analyzer::ConnVal() { return conn->ConnVal(); @@ -799,38 +794,6 @@ void Analyzer::Event(EventHandlerPtr f, const char* name) conn->Event(f, this, name); } -void Analyzer::Event(EventHandlerPtr f, Val* v1, Val* v2) - { - IntrusivePtr val1{AdoptRef{}, v1}; - IntrusivePtr val2{AdoptRef{}, v2}; - - if ( f ) - conn->EnqueueEvent(f, this, conn->ConnVal(), std::move(val1), std::move(val2)); - } - -void Analyzer::ConnectionEvent(EventHandlerPtr f, ValPList* vl) - { - auto args = val_list_to_args(*vl); - delete vl; - - if ( f ) - conn->EnqueueEvent(f, this, std::move(args)); - } - -void Analyzer::ConnectionEvent(EventHandlerPtr f, ValPList vl) - { - auto args = val_list_to_args(vl); - - if ( f ) - conn->EnqueueEvent(f, this, std::move(args)); - } - -void Analyzer::ConnectionEventFast(EventHandlerPtr f, ValPList vl) - { - auto args = val_list_to_args(vl); - conn->EnqueueEvent(f, this, std::move(args)); - } - void Analyzer::EnqueueConnEvent(EventHandlerPtr f, Args args) { conn->EnqueueEvent(f, this, std::move(args)); diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h index 34950aee75..3f35dcb0c0 100644 --- a/src/analyzer/Analyzer.h +++ b/src/analyzer/Analyzer.h @@ -28,9 +28,6 @@ class File; using FilePtr = zeek::IntrusivePtr; } -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; -using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr.")]] = zeek::FilePtr; - namespace zeek::analyzer { class Analyzer; @@ -552,13 +549,6 @@ public: */ virtual void UpdateConnVal(RecordVal *conn_val); - /** - * Convenience function that forwards directly to - * Connection::BuildConnVal(). - */ - [[deprecated("Remove in v4.1. Use ConnVal() instead.")]] - RecordVal* BuildConnVal(); - /** * Convenience function that forwards directly to * Connection::ConnVal(). @@ -571,34 +561,6 @@ public: */ void Event(EventHandlerPtr f, const char* name = nullptr); - /** - * Convenience function that forwards directly to the corresponding - * Connection::Event(). - */ - [[deprecated("Remove in v4.1. Use EnqueueConnEvent() instead (note it doesn't automatically ad the connection argument).")]] - void Event(EventHandlerPtr f, Val* v1, Val* v2 = nullptr); - - /** - * Convenience function that forwards directly to - * Connection::ConnectionEvent(). - */ - [[deprecated("Remove in v4.1. Use EnqueueConnEvent() instead.")]] - void ConnectionEvent(EventHandlerPtr f, ValPList* vl); - - /** - * Convenience function that forwards directly to - * Connection::ConnectionEvent(). - */ - [[deprecated("Remove in v4.1. Use EnqueueConnEvent() instead.")]] - void ConnectionEvent(EventHandlerPtr f, ValPList vl); - - /** - * Convenience function that forwards directly to - * Connection::ConnectionEventFast(). - */ - [[deprecated("Remove in v4.1. Use EnqueueConnEvent() instead.")]] - void ConnectionEventFast(EventHandlerPtr f, ValPList vl); - /** * Convenience function that forwards directly to * Connection::EnqueueEvent(). @@ -957,16 +919,3 @@ private: }; } // namespace zeek::analyzer - -namespace analyzer { - -using Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::Analyzer instead.")]] = zeek::analyzer::Analyzer; -using AnalyzerTimer [[deprecated("Remove in v4.1. Use zeek::analyzer::AnalyzerTimer instead.")]] = zeek::analyzer::AnalyzerTimer; -using SupportAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::SupportAnalyzer instead.")]] = zeek::analyzer::SupportAnalyzer; -using OutputHandler [[deprecated("Remove in v4.1. Use zeek::analyzer::OutputHandler instead.")]] = zeek::analyzer::OutputHandler; -using TransportLayerAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::TransportLayerAnalyzer instead.")]] = zeek::analyzer::TransportLayerAnalyzer; - -using analyzer_list [[deprecated("Remove in v4.1. Use zeek::analyzer::analyzer_list instead.")]] = zeek::analyzer::analyzer_list; -using ID [[deprecated("Remove in v4.1. Use zeek::analyzer::ID instead.")]] = zeek::analyzer::ID; - -} // namespace analyzer diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index 0f5f872374..138dafb222 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -108,7 +108,3 @@ private: }; } // namespace zeek::analyzer - -namespace analyzer { - using Component [[deprecated("Remove in v4.1. Use zeek::analyzer::Component.")]] = zeek::analyzer::Component; -} // namespace analyzer diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h index e2d0a62fe3..aea50ce4d0 100644 --- a/src/analyzer/Manager.h +++ b/src/analyzer/Manager.h @@ -406,13 +406,7 @@ extern analyzer::Manager* analyzer_mgr; } // namespace zeek -namespace analyzer { - using Manager [[deprecated("Remove in v4.1. Use zeek::analyzer::Manager instead.")]] = zeek::analyzer::Manager; -} // namespace analyzer - -extern zeek::analyzer::Manager*& analyzer_mgr [[deprecated("Remove in v4.1. Use zeek::analyzer_mgr instead.")]]; - -// Macros for anayzer debug logging which include the connection id into the +// Macros for analyzer debug logging which include the connection id into the // message. #ifdef DEBUG # define DBG_ANALYZER(conn, txt) \ diff --git a/src/analyzer/Tag.cc b/src/analyzer/Tag.cc index 0f591a28ff..8b0e5c4aa8 100644 --- a/src/analyzer/Tag.cc +++ b/src/analyzer/Tag.cc @@ -23,17 +23,8 @@ const EnumValPtr& Tag::AsVal() const return zeek::Tag::AsVal(analyzer_mgr->GetTagType()); } -EnumVal* Tag::AsEnumVal() const - { - return AsVal().get(); - } - Tag::Tag(EnumValPtr val) : zeek::Tag(std::move(val)) { } -Tag::Tag(EnumVal* val) - : zeek::Tag({NewRef{}, val}) - { } - } // namespace zeek::analyzer diff --git a/src/analyzer/Tag.h b/src/analyzer/Tag.h index 6aa04d0d02..59e74493e5 100644 --- a/src/analyzer/Tag.h +++ b/src/analyzer/Tag.h @@ -12,14 +12,6 @@ namespace zeek::plugin { template class TaggedComponent; template class ComponentManager; } -namespace plugin { - template - using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = - zeek::plugin::TaggedComponent; - template - using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; -} ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, analyzer); ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, analyzer); @@ -92,9 +84,6 @@ public: */ const EnumValPtr& AsVal() const; - [[deprecated("Remove in v4.1. Use AsVal() instead.")]] - EnumVal* AsEnumVal() const; - static const Tag Error; protected: @@ -120,13 +109,6 @@ protected: * @param val An enum value of script type \c Analyzer::Tag. */ explicit Tag(EnumValPtr val); - - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead")]] - explicit Tag(EnumVal* val); }; } // namespace zeek::analyzer - -namespace analyzer { - using Tag [[deprecated("Remove in v4.1. Use zeek::analyzer::Tag")]] = zeek::analyzer::Tag; -} // namespace analyzer diff --git a/src/analyzer/protocol/ayiya/AYIYA.h b/src/analyzer/protocol/ayiya/AYIYA.h index 916a88f504..e7d09347e1 100644 --- a/src/analyzer/protocol/ayiya/AYIYA.h +++ b/src/analyzer/protocol/ayiya/AYIYA.h @@ -31,9 +31,3 @@ protected: }; } // namespace zeek::analyzer::ayiya - -namespace analyzer::ayiya { - -using AYIYA_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ayiya::AYIYA_Analyzer.")]] = zeek::analyzer::ayiya::AYIYA_Analyzer; - -} // namespace analyzer::ayiya diff --git a/src/analyzer/protocol/bittorrent/BitTorrent.h b/src/analyzer/protocol/bittorrent/BitTorrent.h index 9060a62f78..fb791617ba 100644 --- a/src/analyzer/protocol/bittorrent/BitTorrent.h +++ b/src/analyzer/protocol/bittorrent/BitTorrent.h @@ -30,9 +30,3 @@ protected: }; } // namespace zeek::analyzer::bittorrent - -namespace analyzer::bittorrent { - -using BitTorrent_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::BitTorrent_Analyzer.")]] = zeek::analyzer::bittorrent::BitTorrent_Analyzer; - -} // namespace analyzer::bittorrent diff --git a/src/analyzer/protocol/bittorrent/BitTorrentTracker.h b/src/analyzer/protocol/bittorrent/BitTorrentTracker.h index 2375dbcb75..35acaf57d1 100644 --- a/src/analyzer/protocol/bittorrent/BitTorrentTracker.h +++ b/src/analyzer/protocol/bittorrent/BitTorrentTracker.h @@ -134,33 +134,3 @@ protected: }; } // namespace zeek::analyzer::bittorrent - -namespace analyzer::bittorrent { - -using btt_states [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_States.")]] = zeek::analyzer::bittorrent::detail::BTT_States; -constexpr auto BTT_REQ_GET [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_REQ_GET.")]] = zeek::analyzer::bittorrent::detail::BTT_REQ_GET; -constexpr auto BTT_REQ_HEADER [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_REQ_HEADER.")]] = zeek::analyzer::bittorrent::detail::BTT_REQ_HEADER; -constexpr auto BTT_REQ_DONE [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_REQ_DONE.")]] = zeek::analyzer::bittorrent::detail::BTT_REQ_DONE; -constexpr auto BTT_RES_STATUS [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_RES_STATUS.")]] = zeek::analyzer::bittorrent::detail::BTT_RES_STATUS; -constexpr auto BTT_RES_HEADER [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_RES_HEADER.")]] = zeek::analyzer::bittorrent::detail::BTT_RES_HEADER; -constexpr auto BTT_RES_BODY [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_RES_BODY.")]] = zeek::analyzer::bittorrent::detail::BTT_RES_BODY; -constexpr auto BTT_RES_DONE [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_RES_DONE.")]] = zeek::analyzer::bittorrent::detail::BTT_RES_DONE; - -using btt_benc_types [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_BencTypes.")]] = zeek::analyzer::bittorrent::detail::BTT_BencTypes; -constexpr auto BENC_TYPE_INT [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_TYPE_INT.")]] = zeek::analyzer::bittorrent::detail::BENC_TYPE_INT; -constexpr auto BENC_TYPE_STR [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_TYPE_STR.")]] = zeek::analyzer::bittorrent::detail::BENC_TYPE_STR; -constexpr auto BENC_TYPE_DIR [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_TYPE_DIR.")]] = zeek::analyzer::bittorrent::detail::BENC_TYPE_DIR; -constexpr auto BENC_TYPE_LIST [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_TYPE_LIST.")]] = zeek::analyzer::bittorrent::detail::BENC_TYPE_LIST; -constexpr auto BENC_TYPE_NONE [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_TYPE_NONE.")]] = zeek::analyzer::bittorrent::detail::BENC_TYPE_NONE; - -using btt_benc_states [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BTT_BencStates.")]] = zeek::analyzer::bittorrent::detail::BTT_BencStates; -constexpr auto BENC_STATE_EMPTY [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_EMPTY.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_EMPTY; -constexpr auto BENC_STATE_INT1 [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_INT1.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_INT1; -constexpr auto BENC_STATE_INT2 [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_INT2.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_INT2; -constexpr auto BENC_STATE_INT3 [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_INT3.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_INT3; -constexpr auto BENC_STATE_STR1 [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_STR1.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_STR1; -constexpr auto BENC_STATE_STR2 [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::detail::BENC_STATE_STR2.")]] = zeek::analyzer::bittorrent::detail::BENC_STATE_STR2; - -using BitTorrentTracker_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::BitTorrentTracker_Analyzer.")]] = zeek::analyzer::bittorrent::BitTorrentTracker_Analyzer; - -} // namespace analyzer::bittorrent diff --git a/src/analyzer/protocol/conn-size/ConnSize.h b/src/analyzer/protocol/conn-size/ConnSize.h index 93b939f8cf..ef3c0cbf6e 100644 --- a/src/analyzer/protocol/conn-size/ConnSize.h +++ b/src/analyzer/protocol/conn-size/ConnSize.h @@ -50,9 +50,3 @@ protected: }; } // namespace zeek::analyzer::conn_size - -namespace analyzer::conn_size { - -using ConnSize_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::conn_size::ConnSize_Analyzer.")]] = zeek::analyzer::conn_size::ConnSize_Analyzer; - -} // namespace analyzer::conn_size diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h index 500160ac15..ae19d87db0 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.h +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.h @@ -33,9 +33,3 @@ protected: }; } // namespace zeek::analyzer::dce_rpc - -namespace analyzer::dce_rpc { - -using DCE_RPC_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dce_rpc::DCE_RPC_Analyzer.")]] = zeek::analyzer::dce_rpc::DCE_RPC_Analyzer; - -} // namespace analyzer::dce_rpc diff --git a/src/analyzer/protocol/dhcp/DHCP.h b/src/analyzer/protocol/dhcp/DHCP.h index de0d3d59d9..dbe13d4df7 100644 --- a/src/analyzer/protocol/dhcp/DHCP.h +++ b/src/analyzer/protocol/dhcp/DHCP.h @@ -23,9 +23,3 @@ protected: }; } // namespace zeek::analyzer::dhcp - -namespace analyzer::dhcp { - -using DHCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dhcp::DHCP_Analyzer.")]] = zeek::analyzer::dhcp::DHCP_Analyzer; - -} // namespace analyzer::dhcp diff --git a/src/analyzer/protocol/dnp3/DNP3.h b/src/analyzer/protocol/dnp3/DNP3.h index bb94a881bf..3fe5d1e9f0 100644 --- a/src/analyzer/protocol/dnp3/DNP3.h +++ b/src/analyzer/protocol/dnp3/DNP3.h @@ -92,11 +92,3 @@ public: } // namespace zeek::analyzer::dnp3 - -namespace analyzer::dnp3 { - -using DNP3_Base [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::detail::DNP3_Base.")]] = zeek::analyzer::dnp3::detail::DNP3_Base; -using DNP3_TCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::DNP3_TCP_Analyzer.")]] = zeek::analyzer::dnp3::DNP3_TCP_Analyzer; -using DNP3_UDP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::DNP3_UDP_Analyzer.")]] = zeek::analyzer::dnp3::DNP3_UDP_Analyzer; - -} // namespace analyzer::dnp3 diff --git a/src/analyzer/protocol/dns/DNS.h b/src/analyzer/protocol/dns/DNS.h index d98ec6ddfa..0c366dc617 100644 --- a/src/analyzer/protocol/dns/DNS.h +++ b/src/analyzer/protocol/dns/DNS.h @@ -229,7 +229,7 @@ struct DS_DATA { }; struct BINDS_DATA { - unsigned short algorithm; // 8 + unsigned short algorithm; // 8 unsigned short key_id; // 16 : ExtractShort(data, len) unsigned short removal_flag; // 8 String* complete_flag; // 8 @@ -463,129 +463,3 @@ protected: }; } // namespace zeek::analyzer::dns - -namespace analyzer::dns { - -using DNS_Opcode [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_Opcode.")]] = zeek::analyzer::dns::detail::DNS_Opcode; -constexpr auto DNS_OP_QUERY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_OP_QUERY.")]] = zeek::analyzer::dns::detail::DNS_OP_QUERY; -constexpr auto DNS_OP_IQUERY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_OP_IQUERY.")]] = zeek::analyzer::dns::detail::DNS_OP_IQUERY; -constexpr auto DNS_OP_SERVER_STATUS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_OP_SERVER_STATUS.")]] = zeek::analyzer::dns::detail::DNS_OP_SERVER_STATUS; -constexpr auto NETBIOS_REGISTRATION [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::NETBIOS_REGISTRATION.")]] = zeek::analyzer::dns::detail::NETBIOS_REGISTRATION; -constexpr auto NETBIOS_RELEASE [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::NETBIOS_RELEASE.")]] = zeek::analyzer::dns::detail::NETBIOS_RELEASE; -constexpr auto NETBIOS_WACK [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::NETBIOS_WACK.")]] = zeek::analyzer::dns::detail::NETBIOS_WACK; -constexpr auto NETBIOS_REFRESH [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::NETBIOS_REFRESH.")]] = zeek::analyzer::dns::detail::NETBIOS_REFRESH; - -using DNS_Code [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_Code.")]] = zeek::analyzer::dns::detail::DNS_Code; -constexpr auto DNS_CODE_OK [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_OK.")]] = zeek::analyzer::dns::detail::DNS_CODE_OK; -constexpr auto DNS_CODE_FORMAT_ERR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_FORMAT_ERR.")]] = zeek::analyzer::dns::detail::DNS_CODE_FORMAT_ERR; -constexpr auto DNS_CODE_SERVER_FAIL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_SERVER_FAIL.")]] = zeek::analyzer::dns::detail::DNS_CODE_SERVER_FAIL; -constexpr auto DNS_CODE_NAME_ERR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_NAME_ERR.")]] = zeek::analyzer::dns::detail::DNS_CODE_NAME_ERR; -constexpr auto DNS_CODE_NOT_IMPL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_NOT_IMPL.")]] = zeek::analyzer::dns::detail::DNS_CODE_NOT_IMPL; -constexpr auto DNS_CODE_REFUSED [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_CODE_REFUSED.")]] = zeek::analyzer::dns::detail::DNS_CODE_REFUSED; - -using RR_Type [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RR_Type.")]] = zeek::analyzer::dns::detail::RR_Type; -constexpr auto TYPE_A [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_A.")]] = zeek::analyzer::dns::detail::TYPE_A; -constexpr auto TYPE_NS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NS.")]] = zeek::analyzer::dns::detail::TYPE_NS; -constexpr auto TYPE_CNAME [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_CNAME.")]] = zeek::analyzer::dns::detail::TYPE_CNAME; -constexpr auto TYPE_SOA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_SOA.")]] = zeek::analyzer::dns::detail::TYPE_SOA; -constexpr auto TYPE_WKS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_WKS.")]] = zeek::analyzer::dns::detail::TYPE_WKS; -constexpr auto TYPE_PTR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_PTR.")]] = zeek::analyzer::dns::detail::TYPE_PTR; -constexpr auto TYPE_HINFO [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_HINFO.")]] = zeek::analyzer::dns::detail::TYPE_HINFO; -constexpr auto TYPE_MX [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_MX.")]] = zeek::analyzer::dns::detail::TYPE_MX; -constexpr auto TYPE_TXT [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_TXT.")]] = zeek::analyzer::dns::detail::TYPE_TXT; -constexpr auto TYPE_SIG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_SIG.")]] = zeek::analyzer::dns::detail::TYPE_SIG; -constexpr auto TYPE_KEY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_KEY.")]] = zeek::analyzer::dns::detail::TYPE_KEY; -constexpr auto TYPE_PX [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_PX.")]] = zeek::analyzer::dns::detail::TYPE_PX; -constexpr auto TYPE_AAAA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_AAAA.")]] = zeek::analyzer::dns::detail::TYPE_AAAA; -constexpr auto TYPE_NBS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NBS.")]] = zeek::analyzer::dns::detail::TYPE_NBS; -constexpr auto TYPE_SRV [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_SRV.")]] = zeek::analyzer::dns::detail::TYPE_SRV; -constexpr auto TYPE_NAPTR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NAPTR.")]] = zeek::analyzer::dns::detail::TYPE_NAPTR; -constexpr auto TYPE_KX [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_KX.")]] = zeek::analyzer::dns::detail::TYPE_KX; -constexpr auto TYPE_CERT [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_CERT.")]] = zeek::analyzer::dns::detail::TYPE_CERT; -constexpr auto TYPE_A6 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_A6.")]] = zeek::analyzer::dns::detail::TYPE_A6; -constexpr auto TYPE_DNAME [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DNAME.")]] = zeek::analyzer::dns::detail::TYPE_DNAME; -constexpr auto TYPE_EDNS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_EDNS.")]] = zeek::analyzer::dns::detail::TYPE_EDNS; -constexpr auto TYPE_TKEY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_TKEY.")]] = zeek::analyzer::dns::detail::TYPE_TKEY; -constexpr auto TYPE_TSIG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_TSIG.")]] = zeek::analyzer::dns::detail::TYPE_TSIG; -constexpr auto TYPE_CAA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_CAA.")]] = zeek::analyzer::dns::detail::TYPE_CAA; -constexpr auto TYPE_RRSIG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_RRSIG.")]] = zeek::analyzer::dns::detail::TYPE_RRSIG; -constexpr auto TYPE_NSEC [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NSEC.")]] = zeek::analyzer::dns::detail::TYPE_NSEC; -constexpr auto TYPE_DNSKEY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DNSKEY.")]] = zeek::analyzer::dns::detail::TYPE_DNSKEY; -constexpr auto TYPE_DS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DS.")]] = zeek::analyzer::dns::detail::TYPE_DS; -constexpr auto TYPE_NSEC3 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NSEC3.")]] = zeek::analyzer::dns::detail::TYPE_NSEC3; -constexpr auto TYPE_SPF [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_SPF.")]] = zeek::analyzer::dns::detail::TYPE_SPF; -constexpr auto TYPE_AXFR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_AXFR.")]] = zeek::analyzer::dns::detail::TYPE_AXFR; -constexpr auto TYPE_ALL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_ALL.")]] = zeek::analyzer::dns::detail::TYPE_ALL; -constexpr auto TYPE_WINS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_WINS.")]] = zeek::analyzer::dns::detail::TYPE_WINS; -constexpr auto TYPE_WINSR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_WINSR.")]] = zeek::analyzer::dns::detail::TYPE_WINSR; - -using DNS_AnswerType [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_AnswerType.")]] = zeek::analyzer::dns::detail::DNS_AnswerType; -constexpr auto DNS_QUESTION [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_QUESTION.")]] = zeek::analyzer::dns::detail::DNS_QUESTION; -constexpr auto DNS_ANSWER [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_ANSWER.")]] = zeek::analyzer::dns::detail::DNS_ANSWER; -constexpr auto DNS_AUTHORITY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_AUTHORITY.")]] = zeek::analyzer::dns::detail::DNS_AUTHORITY; -constexpr auto DNS_ADDITIONAL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_ADDITIONAL.")]] = zeek::analyzer::dns::detail::DNS_ADDITIONAL; - -using EDNS_OPT_Type [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::EDNS_OPT_Type.")]] = zeek::analyzer::dns::detail::EDNS_OPT_Type; -constexpr auto TYPE_LLQ [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_LLQ.")]] = zeek::analyzer::dns::detail::TYPE_LLQ; -constexpr auto TYPE_UL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_UL.")]] = zeek::analyzer::dns::detail::TYPE_UL; -constexpr auto TYPE_NSID [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_NSID.")]] = zeek::analyzer::dns::detail::TYPE_NSID; -constexpr auto TYPE_DAU [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DAU.")]] = zeek::analyzer::dns::detail::TYPE_DAU; -constexpr auto TYPE_DHU [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DHU.")]] = zeek::analyzer::dns::detail::TYPE_DHU; -constexpr auto TYPE_N3U [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_N3U.")]] = zeek::analyzer::dns::detail::TYPE_N3U; -constexpr auto TYPE_ECS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_ECS.")]] = zeek::analyzer::dns::detail::TYPE_ECS; -constexpr auto TYPE_EXPIRE [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_EXPIRE.")]] = zeek::analyzer::dns::detail::TYPE_EXPIRE; -constexpr auto TYPE_TCP_KA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_TCP_KA.")]] = zeek::analyzer::dns::detail::TYPE_TCP_KA; -constexpr auto TYPE_PAD [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_PAD.")]] = zeek::analyzer::dns::detail::TYPE_PAD; -constexpr auto TYPE_CHAIN [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_CHAIN.")]] = zeek::analyzer::dns::detail::TYPE_CHAIN; -constexpr auto TYPE_KEY_TAG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_KEY_TAG.")]] = zeek::analyzer::dns::detail::TYPE_KEY_TAG; -constexpr auto TYPE_ERROR [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_ERROR.")]] = zeek::analyzer::dns::detail::TYPE_ERROR; -constexpr auto TYPE_CLIENT_TAG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_CLIENT_TAG.")]] = zeek::analyzer::dns::detail::TYPE_CLIENT_TAG; -constexpr auto TYPE_SERVER_TAG [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_SERVER_TAG.")]] = zeek::analyzer::dns::detail::TYPE_SERVER_TAG; -constexpr auto TYPE_DEVICE_ID [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TYPE_DEVICE_ID.")]] = zeek::analyzer::dns::detail::TYPE_DEVICE_ID; - -using DNSSEC_Algo [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNSSEC_Algo.")]] = zeek::analyzer::dns::detail::DNSSEC_Algo; -constexpr auto reserved0 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::reserved0.")]] = zeek::analyzer::dns::detail::reserved0; -constexpr auto RSA_MD5 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RSA_MD5.")]] = zeek::analyzer::dns::detail::RSA_MD5; -constexpr auto Diffie_Hellman [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::Diffie_Hellman.")]] = zeek::analyzer::dns::detail::Diffie_Hellman; -constexpr auto DSA_SHA1 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DSA_SHA1.")]] = zeek::analyzer::dns::detail::DSA_SHA1; -constexpr auto Elliptic_Curve [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::Elliptic_Curve.")]] = zeek::analyzer::dns::detail::Elliptic_Curve; -constexpr auto RSA_SHA1 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RSA_SHA1.")]] = zeek::analyzer::dns::detail::RSA_SHA1; -constexpr auto DSA_NSEC3_SHA1 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DSA_NSEC3_SHA1.")]] = zeek::analyzer::dns::detail::DSA_NSEC3_SHA1; -constexpr auto RSA_SHA1_NSEC3_SHA1 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RSA_SHA1_NSEC3_SHA1.")]] = zeek::analyzer::dns::detail::RSA_SHA1_NSEC3_SHA1; -constexpr auto RSA_SHA256 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RSA_SHA256.")]] = zeek::analyzer::dns::detail::RSA_SHA256; -constexpr auto RSA_SHA512 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RSA_SHA512.")]] = zeek::analyzer::dns::detail::RSA_SHA512; -constexpr auto GOST_R_34_10_2001 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::GOST_R_34_10_2001.")]] = zeek::analyzer::dns::detail::GOST_R_34_10_2001; -constexpr auto ECDSA_curveP256withSHA256 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::ECDSA_curveP256withSHA256.")]] = zeek::analyzer::dns::detail::ECDSA_curveP256withSHA256; -constexpr auto ECDSA_curveP384withSHA384 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::ECDSA_curveP384withSHA384.")]] = zeek::analyzer::dns::detail::ECDSA_curveP384withSHA384; -constexpr auto Indirect [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::Indirect.")]] = zeek::analyzer::dns::detail::Indirect; -constexpr auto PrivateDNS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::PrivateDNS.")]] = zeek::analyzer::dns::detail::PrivateDNS; -constexpr auto PrivateOID [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::PrivateOID.")]] = zeek::analyzer::dns::detail::PrivateOID; -constexpr auto reserved255 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::reserved255.")]] = zeek::analyzer::dns::detail::reserved255; - -using DNSSEC_Digest [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNSSEC_Digest.")]] = zeek::analyzer::dns::detail::DNSSEC_Digest; -constexpr auto reserved [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::reserved.")]] = zeek::analyzer::dns::detail::reserved; -constexpr auto SHA1 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::SHA1.")]] = zeek::analyzer::dns::detail::SHA1; -constexpr auto SHA256 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::SHA256.")]] = zeek::analyzer::dns::detail::SHA256; -constexpr auto GOST_R_34_11_94 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::GOST_R_34_11_94.")]] = zeek::analyzer::dns::detail::GOST_R_34_11_94; -constexpr auto SHA384 [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::SHA384.")]] = zeek::analyzer::dns::detail::SHA384; - -using DNS_RawMsgHdr [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_RawMsgHdr.")]] = zeek::analyzer::dns::detail::DNS_RawMsgHdr; -using EDNS_ADDITIONAL [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::EDNS_ADDITIONAL.")]] = zeek::analyzer::dns::detail::EDNS_ADDITIONAL; -using EDNS_ECS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::EDNS_ECS.")]] = zeek::analyzer::dns::detail::EDNS_ECS; -using TSIG_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TSIG_DATA.")]] = zeek::analyzer::dns::detail::TSIG_DATA; -using RRSIG_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::RRSIG_DATA.")]] = zeek::analyzer::dns::detail::RRSIG_DATA; -using DNSKEY_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNSKEY_DATA.")]] = zeek::analyzer::dns::detail::DNSKEY_DATA; -using NSEC3_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::NSEC3_DATA.")]] = zeek::analyzer::dns::detail::NSEC3_DATA; -using DS_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DS_DATA.")]] = zeek::analyzer::dns::detail::DS_DATA; -using DNS_MsgInfo [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_MsgInfo.")]] = zeek::analyzer::dns::detail::DNS_MsgInfo; - -using TCP_DNS_state [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::TCP_DNS_state.")]] = zeek::analyzer::dns::detail::TCP_DNS_state; -constexpr auto DNS_LEN_HI [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_LEN_HI.")]] = zeek::analyzer::dns::detail::DNS_LEN_HI; -constexpr auto DNS_LEN_LO [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_LEN_LO.")]] = zeek::analyzer::dns::detail::DNS_LEN_LO; -constexpr auto DNS_MESSAGE_BUFFER [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_MESSAGE_BUFFER.")]] = zeek::analyzer::dns::detail::DNS_MESSAGE_BUFFER; - -using DNS_Interpreter [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_Interpreter.")]] = zeek::analyzer::dns::detail::DNS_Interpreter; -using Contents_DNS [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::Contents_DNS.")]] = zeek::analyzer::dns::Contents_DNS; -using DNS_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::DNS_Analyzer.")]] = zeek::analyzer::dns::DNS_Analyzer; - -} // namespace analyzer::dns diff --git a/src/analyzer/protocol/file/File.h b/src/analyzer/protocol/file/File.h index 13b4a98f66..8b092d549a 100644 --- a/src/analyzer/protocol/file/File.h +++ b/src/analyzer/protocol/file/File.h @@ -52,11 +52,3 @@ public: }; } // namespace zeek::analyzer::file - -namespace analyzer::file { - -using File_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::file::File_Analyzer.")]] = zeek::analyzer::file::File_Analyzer; -using IRC_Data [[deprecated("Remove in v4.1. Use zeek::analyzer::file::IRC_Data.")]] = zeek::analyzer::file::IRC_Data; -using FTP_Data [[deprecated("Remove in v4.1. Use zeek::analyzer::file::FTP_Data.")]] = zeek::analyzer::file::FTP_Data; - -} // namespace analyzer::file diff --git a/src/analyzer/protocol/finger/Finger.h b/src/analyzer/protocol/finger/Finger.h index 363e3df2d7..0dc8545389 100644 --- a/src/analyzer/protocol/finger/Finger.h +++ b/src/analyzer/protocol/finger/Finger.h @@ -26,9 +26,3 @@ protected: }; } // namespace zeek::analyzer::finger - -namespace analyzer::finger { - -using Finger_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::finger::Finger_Analyzer.")]] = zeek::analyzer::finger::Finger_Analyzer; - -} // namespace analyzer::finger diff --git a/src/analyzer/protocol/ftp/FTP.h b/src/analyzer/protocol/ftp/FTP.h index 6e972de6e3..a353d7f453 100644 --- a/src/analyzer/protocol/ftp/FTP.h +++ b/src/analyzer/protocol/ftp/FTP.h @@ -50,10 +50,3 @@ protected: }; } // namespace zeek::analyzer::ftp - -namespace analyzer::ftp { - -using FTP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ftp::FTP_Analyzer.")]] = zeek::analyzer::ftp::FTP_Analyzer; -using FTP_ADAT_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ftp::FTP_ADAT_Analyzer.")]] = zeek::analyzer::ftp::FTP_ADAT_Analyzer; - -} // namespace analyzer::ftp diff --git a/src/analyzer/protocol/gnutella/Gnutella.h b/src/analyzer/protocol/gnutella/Gnutella.h index 49307e62f0..bafc923c29 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.h +++ b/src/analyzer/protocol/gnutella/Gnutella.h @@ -72,10 +72,3 @@ private: }; } // namespace zeek::analyzer::gnutella - -namespace analyzer::gnutella { - -using GnutellaMsgState [[deprecated("Remove in v4.1. Use zeek::analyzer::gnutella::detail::GnutellaMsgState.")]] = zeek::analyzer::gnutella::detail::GnutellaMsgState; -using Gnutella_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::gnutella::Gnutella_Analyzer.")]] = zeek::analyzer::gnutella::Gnutella_Analyzer; - -} // namespace analyzer::gnutella diff --git a/src/analyzer/protocol/gssapi/GSSAPI.h b/src/analyzer/protocol/gssapi/GSSAPI.h index e420c3b285..ed64a8ec54 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.h +++ b/src/analyzer/protocol/gssapi/GSSAPI.h @@ -32,9 +32,3 @@ protected: }; } // namespace zeek::analyzer::gssapi - -namespace analyzer::gssapi { - -using GSSAPI_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::gssapi::GSSAPI_Analyzer.")]] = zeek::analyzer::gssapi::GSSAPI_Analyzer; - -} // namespace analyzer::gssapi diff --git a/src/analyzer/protocol/gtpv1/GTPv1.h b/src/analyzer/protocol/gtpv1/GTPv1.h index 0f1edb0ac6..aceb4f24fc 100644 --- a/src/analyzer/protocol/gtpv1/GTPv1.h +++ b/src/analyzer/protocol/gtpv1/GTPv1.h @@ -33,9 +33,3 @@ protected: }; } // namespace zeek::analyzer::gtpv1 - -namespace analyzer::gtpv1 { - -using GTPv1_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::gtpv1::GTPv1_Analyzer.")]] = zeek::analyzer::gtpv1::GTPv1_Analyzer; - -} // namespace analyzer::gtpv1 diff --git a/src/analyzer/protocol/http/HTTP.h b/src/analyzer/protocol/http/HTTP.h index a034310d68..09e6a559ae 100644 --- a/src/analyzer/protocol/http/HTTP.h +++ b/src/analyzer/protocol/http/HTTP.h @@ -286,25 +286,3 @@ extern String* unescape_URI(const u_char* line, const u_char* line_end, analyzer::Analyzer* analyzer); } // namespace zeek::analyzer::http - -namespace analyzer::http { - -using CHUNKED_TRANSFER_STATE [[deprecated("Remove in v4.1. Use zeek::analyzer::http::CHUNKED_TRANSFER_STATE.")]] = zeek::analyzer::http::CHUNKED_TRANSFER_STATE; -constexpr auto NON_CHUNKED_TRANSFER [[deprecated("Remove in v4.1. Use zeek::analyzer::http::NON_CHUNKED_TRANSFER.")]] = zeek::analyzer::http::NON_CHUNKED_TRANSFER; -constexpr auto BEFORE_CHUNK [[deprecated("Remove in v4.1. Use zeek::analyzer::http::BEFORE_CHUNK.")]] = zeek::analyzer::http::BEFORE_CHUNK; -constexpr auto EXPECT_CHUNK_SIZE [[deprecated("Remove in v4.1. Use zeek::analyzer::http::EXPECT_CHUNK_SIZE.")]] = zeek::analyzer::http::EXPECT_CHUNK_SIZE; -constexpr auto EXPECT_CHUNK_DATA [[deprecated("Remove in v4.1. Use zeek::analyzer::http::EXPECT_CHUNK_DATA.")]] = zeek::analyzer::http::EXPECT_CHUNK_DATA; -constexpr auto EXPECT_CHUNK_DATA_CRLF [[deprecated("Remove in v4.1. Use zeek::analyzer::http::EXPECT_CHUNK_DATA_CRLF.")]] = zeek::analyzer::http::EXPECT_CHUNK_DATA_CRLF; -constexpr auto EXPECT_CHUNK_TRAILER [[deprecated("Remove in v4.1. Use zeek::analyzer::http::EXPECT_CHUNK_TRAILER.")]] = zeek::analyzer::http::EXPECT_CHUNK_TRAILER; -constexpr auto EXPECT_NOTHING [[deprecated("Remove in v4.1. Use zeek::analyzer::http::EXPECT_NOTHING.")]] = zeek::analyzer::http::EXPECT_NOTHING; - -using HTTP_Entity [[deprecated("Remove in v4.1. Use zeek::analyzer::http::HTTP_Entity.")]] = zeek::analyzer::http::HTTP_Entity; -using HTTP_Message [[deprecated("Remove in v4.1. Use zeek::analyzer::http::HTTP_Message.")]] = zeek::analyzer::http::HTTP_Message; -using HTTP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::http::HTTP_Analyzer.")]] = zeek::analyzer::http::HTTP_Analyzer; - -constexpr auto is_reserved_URI_char [[deprecated("Remove in v4.1. Use zeek::analyzer::http::is_reserved_URI_char.")]] = zeek::analyzer::http::is_reserved_URI_char; -constexpr auto is_unreserved_URI_char [[deprecated("Remove in v4.1. Use zeek::analyzer::http::is_unreserved_URI_char.")]] = zeek::analyzer::http::is_unreserved_URI_char; -constexpr auto escape_URI_char [[deprecated("Remove in v4.1. Use zeek::analyzer::http::escape_URI_char.")]] = zeek::analyzer::http::escape_URI_char; -constexpr auto unescape_URI [[deprecated("Remove in v4.1. Use zeek::analyzer::http::unescape_URI.")]] = zeek::analyzer::http::unescape_URI; - -} // namespace analyzer::http diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h index ba3e869585..c1c84be59b 100644 --- a/src/analyzer/protocol/icmp/ICMP.h +++ b/src/analyzer/protocol/icmp/ICMP.h @@ -99,16 +99,3 @@ extern int ICMP4_counterpart(int icmp_type, int icmp_code, bool& is_one_way); extern int ICMP6_counterpart(int icmp_type, int icmp_code, bool& is_one_way); } // namespace zeek::analyzer::icmp - -namespace analyzer::icmp { - -using ICMP_EndpointState [[deprecated("Remove in v4.1. Use zeek::analyzer::icmp::ICMP_EndpointState.")]] = zeek::analyzer::icmp::ICMP_EndpointState; -constexpr auto ICMP_INACTIVE [[deprecated("Remove in v4.1. Use zeek::analyzer::icmp::ICMP_INACTIVE.")]] = zeek::analyzer::icmp::ICMP_INACTIVE; -constexpr auto ICMP_ACTIVE [[deprecated("Remove in v4.1. Use zeek::analyzer::icmp::ICMP_ACTIVE.")]] = zeek::analyzer::icmp::ICMP_ACTIVE; - -using ICMP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::icmp::ICMP_Analyzer.")]] = zeek::analyzer::icmp::ICMP_Analyzer; - -constexpr auto ICMP4_counterpart [[deprecated("Remove in v4.1. Use zeek::analyzer::icmp::ICMP4_counterpart.")]] = zeek::analyzer::icmp::ICMP4_counterpart; -constexpr auto ICMP6_counterpart [[deprecated("Remove in v6.1. Use zeek::analyzer::icmp::ICMP6_counterpart.")]] = zeek::analyzer::icmp::ICMP6_counterpart; - -} // namespace analyzer::icmp diff --git a/src/analyzer/protocol/ident/Ident.h b/src/analyzer/protocol/ident/Ident.h index 60deb2a91e..3524936219 100644 --- a/src/analyzer/protocol/ident/Ident.h +++ b/src/analyzer/protocol/ident/Ident.h @@ -34,9 +34,3 @@ protected: }; } // namespace zeek::analyzer::ident - -namespace analyzer::ident { - -using Ident_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ident::Ident_Analyzer.")]] = zeek::analyzer::ident::Ident_Analyzer; - -} // namespace analyzer::ident diff --git a/src/analyzer/protocol/imap/IMAP.h b/src/analyzer/protocol/imap/IMAP.h index 7932b5d410..e38b25a7f4 100644 --- a/src/analyzer/protocol/imap/IMAP.h +++ b/src/analyzer/protocol/imap/IMAP.h @@ -36,9 +36,3 @@ protected: }; } // namespace zeek::analyzer::imap - -namespace analyzer::imap { - -using IMAP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::imap::IMAP_Analyzer.")]] = zeek::analyzer::imap::IMAP_Analyzer; - -} // namespace analyzer::imap diff --git a/src/analyzer/protocol/irc/IRC.h b/src/analyzer/protocol/irc/IRC.h index ecb37b2b68..67138cd450 100644 --- a/src/analyzer/protocol/irc/IRC.h +++ b/src/analyzer/protocol/irc/IRC.h @@ -71,9 +71,3 @@ private: }; } // namespace zeek::analyzer::irc - -namespace analyzer::irc { - -using IRC_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::irc::IRC_Analyzer.")]] = zeek::analyzer::irc::IRC_Analyzer; - -} // namespace analyzer::irc diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h index fe817e5b39..c70d972d1e 100644 --- a/src/analyzer/protocol/krb/KRB.h +++ b/src/analyzer/protocol/krb/KRB.h @@ -45,9 +45,3 @@ private: }; } // namespace zeek::analyzer::krb - -namespace analyzer::krb { - -using KRB_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::krb::KRB_Analyzer.")]] = zeek::analyzer::krb::KRB_Analyzer; - -} // namespace analyzer::krb diff --git a/src/analyzer/protocol/krb/KRB_TCP.h b/src/analyzer/protocol/krb/KRB_TCP.h index d0b7ba61d8..149a6b7b27 100644 --- a/src/analyzer/protocol/krb/KRB_TCP.h +++ b/src/analyzer/protocol/krb/KRB_TCP.h @@ -35,9 +35,3 @@ protected: }; } // namespace zeek::analyzer::krb_tcp - -namespace analyzer::krb_tcp { - -using KRB_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::krb_tcp::KRB_Analyzer.")]] = zeek::analyzer::krb_tcp::KRB_Analyzer; - -} // namespace analyzer::krb_tcp diff --git a/src/analyzer/protocol/login/Login.h b/src/analyzer/protocol/login/Login.h index ab7be8f942..d0a7ae2d5f 100644 --- a/src/analyzer/protocol/login/Login.h +++ b/src/analyzer/protocol/login/Login.h @@ -83,15 +83,3 @@ protected: }; } // namespace zeek::analyzer::login - -namespace analyzer::login { - -using login_state [[deprecated("Remove in v4.1. Use zeek::analyzer::login::login_state.")]] = zeek::analyzer::login::login_state; -constexpr auto LOGIN_STATE_AUTHENTICATE [[deprecated("Remove in v4.1. Use zeek::analyzer::login::LOGIN_STATE_AUTHENTICATE.")]] = zeek::analyzer::login::LOGIN_STATE_AUTHENTICATE; -constexpr auto LOGIN_STATE_LOGGED_IN [[deprecated("Remove in v4.1. Use zeek::analyzer::login::LOGIN_STATE_LOGGED_IN.")]] = zeek::analyzer::login::LOGIN_STATE_LOGGED_IN; -constexpr auto LOGIN_STATE_SKIP [[deprecated("Remove in v4.1. Use zeek::analyzer::login::LOGIN_STATE_SKIP.")]] = zeek::analyzer::login::LOGIN_STATE_SKIP; -constexpr auto LOGIN_STATE_CONFUSED [[deprecated("Remove in v4.1. Use zeek::analyzer::login::LOGIN_STATE_CONFUSED.")]] = zeek::analyzer::login::LOGIN_STATE_CONFUSED; - -using Login_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Login_Analyzer.")]] = zeek::analyzer::login::Login_Analyzer; - -} // namespace analyzer::login diff --git a/src/analyzer/protocol/login/NVT.h b/src/analyzer/protocol/login/NVT.h index 7a02db6210..aa997c16c0 100644 --- a/src/analyzer/protocol/login/NVT.h +++ b/src/analyzer/protocol/login/NVT.h @@ -176,15 +176,3 @@ protected: }; } // namespace zeek::analyzer::login - -namespace analyzer::login { - -using TelnetOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::TelnetOption.")]] = zeek::analyzer::login::TelnetOption; -using TelnetTerminalOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::detail::TelnetTerminalOption.")]] = zeek::analyzer::login::detail::TelnetTerminalOption; -using TelnetEncryptOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::detail::TelnetEncryptOption.")]] = zeek::analyzer::login::detail::TelnetEncryptOption; -using TelnetAuthenticateOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::detail::TelnetAuthenticateOption.")]] = zeek::analyzer::login::detail::TelnetAuthenticateOption; -using TelnetEnvironmentOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::detail::TelnetEnvironmentOption.")]] = zeek::analyzer::login::detail::TelnetEnvironmentOption; -using TelnetBinaryOption [[deprecated("Remove in v4.1. Use zeek::analyzer::login::detail::TelnetBinaryOption.")]] = zeek::analyzer::login::detail::TelnetBinaryOption; -using NVT_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::NVT_Analyzer.")]] = zeek::analyzer::login::NVT_Analyzer; - -} // namespace analyzer::login diff --git a/src/analyzer/protocol/login/RSH.h b/src/analyzer/protocol/login/RSH.h index 570c7a950a..c0f7896c9c 100644 --- a/src/analyzer/protocol/login/RSH.h +++ b/src/analyzer/protocol/login/RSH.h @@ -56,19 +56,3 @@ public: }; } // namespace zeek::analyzer::login - -namespace analyzer::login { - -using rsh_state [[deprecated("Remove in v4.1. Use zeek::analyzer::login::rsh_state.")]] = zeek::analyzer::login::rsh_state; -constexpr auto RSH_FIRST_NULL [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_FIRST_NULL.")]] = zeek::analyzer::login::RSH_FIRST_NULL; -constexpr auto RSH_CLIENT_USER_NAME [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_CLIENT_USER_NAME.")]] = zeek::analyzer::login::RSH_CLIENT_USER_NAME; -constexpr auto RSH_SERVER_USER_NAME [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_SERVER_USER_NAME.")]] = zeek::analyzer::login::RSH_SERVER_USER_NAME; -constexpr auto RSH_INITIAL_CMD [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_INITIAL_CMD.")]] = zeek::analyzer::login::RSH_INITIAL_CMD; -constexpr auto RSH_LINE_MODE [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_LINE_MODE.")]] = zeek::analyzer::login::RSH_LINE_MODE; -constexpr auto RSH_PRESUMED_REJECTED [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_PRESUMED_REJECTED.")]] = zeek::analyzer::login::RSH_PRESUMED_REJECTED; -constexpr auto RSH_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RSH_UNKNOWN.")]] = zeek::analyzer::login::RSH_UNKNOWN; - -using Contents_Rsh_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Contents_Rsh_Analyzer.")]] = zeek::analyzer::login::Contents_Rsh_Analyzer; -using Rsh_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Rsh_Analyzer.")]] = zeek::analyzer::login::Rsh_Analyzer; - -} // namespace analyzer::login diff --git a/src/analyzer/protocol/login/Rlogin.h b/src/analyzer/protocol/login/Rlogin.h index cbeb874e39..8f849402bf 100644 --- a/src/analyzer/protocol/login/Rlogin.h +++ b/src/analyzer/protocol/login/Rlogin.h @@ -66,24 +66,3 @@ public: }; } // namespace zeek::analyzer::login - -namespace analyzer::login { - -using rlogin_state [[deprecated("Remove in v4.1. Use zeek::analyzer::login::rlogin_state.")]] = zeek::analyzer::login::rlogin_state; -constexpr auto RLOGIN_FIRST_NULL [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_FIRST_NULL.")]] = zeek::analyzer::login::RLOGIN_FIRST_NULL; -constexpr auto RLOGIN_CLIENT_USER_NAME [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_CLIENT_USER_NAME.")]] = zeek::analyzer::login::RLOGIN_CLIENT_USER_NAME; -constexpr auto RLOGIN_SERVER_USER_NAME [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_SERVER_USER_NAME.")]] = zeek::analyzer::login::RLOGIN_SERVER_USER_NAME; -constexpr auto RLOGIN_TERMINAL_TYPE [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_TERMINAL_TYPE.")]] = zeek::analyzer::login::RLOGIN_TERMINAL_TYPE; -constexpr auto RLOGIN_SERVER_ACK [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_SERVER_ACK.")]] = zeek::analyzer::login::RLOGIN_SERVER_ACK; -constexpr auto RLOGIN_IN_BAND_CONTROL_FF2 [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_IN_BAND_CONTROL_FF2.")]] = zeek::analyzer::login::RLOGIN_IN_BAND_CONTROL_FF2; -constexpr auto RLOGIN_WINDOW_CHANGE_S1 [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_S1.")]] = zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_S1; -constexpr auto RLOGIN_WINDOW_CHANGE_S2 [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_S2.")]] = zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_S2; -constexpr auto RLOGIN_WINDOW_CHANGE_REMAINDER [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_REMAINDER.")]] = zeek::analyzer::login::RLOGIN_WINDOW_CHANGE_REMAINDER; -constexpr auto RLOGIN_LINE_MODE [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_LINE_MODE.")]] = zeek::analyzer::login::RLOGIN_LINE_MODE; -constexpr auto RLOGIN_PRESUMED_REJECTED [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_PRESUMED_REJECTED.")]] = zeek::analyzer::login::RLOGIN_PRESUMED_REJECTED; -constexpr auto RLOGIN_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::analyzer::login::RLOGIN_UNKNOWN.")]] = zeek::analyzer::login::RLOGIN_UNKNOWN; - -using Contents_Rlogin_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Contents_Rlogin_Analyzer.")]] = zeek::analyzer::login::Contents_Rlogin_Analyzer; -using Rlogin_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Rlogin_Analyzer.")]] = zeek::analyzer::login::Rlogin_Analyzer; - -} // namespace analyzer::login diff --git a/src/analyzer/protocol/login/Telnet.h b/src/analyzer/protocol/login/Telnet.h index f2d851f3ff..84b27932c1 100644 --- a/src/analyzer/protocol/login/Telnet.h +++ b/src/analyzer/protocol/login/Telnet.h @@ -16,9 +16,3 @@ public: }; } // namespace zeek::analyzer::login - -namespace analyzer::login { - -using Telnet_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::login::Telnet_Analyzer.")]] = zeek::analyzer::login::Telnet_Analyzer; - -} // namespace analyzer::login diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index e2c96e3a4e..6a28447ad7 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -108,15 +108,6 @@ bool is_lws(char ch) return ch == 9 || ch == 32; } -StringVal* new_string_val(int length, const char* data) - { return to_string_val(length, data).release(); } - -StringVal* new_string_val(const char* data, const char* end_of_data) - { return to_string_val(data, end_of_data).release(); } - -StringVal* new_string_val(const data_chunk_t buf) - { return to_string_val(buf).release(); } - StringValPtr to_string_val(int length, const char* data) { return make_intrusive(length, data); @@ -1292,9 +1283,6 @@ void MIME_Entity::DebugPrintHeaders() #endif } -RecordVal* MIME_Message::BuildHeaderVal(MIME_Header* h) - { return ToHeaderVal(h).release(); } - RecordValPtr MIME_Message::ToHeaderVal(MIME_Header* h) { static auto mime_header_rec = id::find_type("mime_header_rec"); @@ -1307,9 +1295,6 @@ RecordValPtr MIME_Message::ToHeaderVal(MIME_Header* h) return header_record; } -TableVal* MIME_Message::BuildHeaderTable(MIME_HeaderList& hlist) - { return ToHeaderTable(hlist).release(); } - TableValPtr MIME_Message::ToHeaderTable(MIME_HeaderList& hlist) { static auto mime_header_list = id::find_type("mime_header_list"); @@ -1565,22 +1550,3 @@ void MIME_Mail::SubmitEvent(int event_type, const char* detail) } } // namespace zeek::analyzer::mime - - -namespace analyzer::mime { - -zeek::StringVal* new_string_val(int length, const char* data) - { return zeek::analyzer::mime::to_string_val(length, data).release(); } -zeek::StringVal* new_string_val(const char* data, const char* end_of_data) - { return zeek::analyzer::mime::to_string_val(data, end_of_data).release(); } -zeek::StringVal* new_string_val(const zeek::data_chunk_t buf) - { return zeek::analyzer::mime::to_string_val(buf).release(); } - -zeek::StringValPtr to_string_val(int length, const char* data) - { return zeek::analyzer::mime::to_string_val(length, data); } -zeek::StringValPtr to_string_val(const char* data, const char* end_of_data) - { return zeek::analyzer::mime::to_string_val(data, end_of_data); } -zeek::StringValPtr to_string_val(const zeek::data_chunk_t buf) - { return zeek::analyzer::mime::to_string_val(buf); } - -} // namespace analyzer::mime diff --git a/src/analyzer/protocol/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h index 16c2c1895c..1acf6844c4 100644 --- a/src/analyzer/protocol/mime/MIME.h +++ b/src/analyzer/protocol/mime/MIME.h @@ -101,10 +101,6 @@ public: MIME_Entity* Parent() const { return parent; } int MIMEContentType() const { return content_type; } - [[deprecated("Remove in v4.1. Use GetContentType().")]] - StringVal* ContentType() const { return content_type_str.get(); } - [[deprecated("Remove in v4.1. Use GetContentSubType().")]] - StringVal* ContentSubType() const { return content_subtype_str.get(); } const StringValPtr& GetContentType() const { return content_type_str; } const StringValPtr& GetContentSubType() const { return content_subtype_str; } int ContentTransferEncoding() const { return content_encoding; } @@ -233,11 +229,6 @@ protected: MIME_Entity* top_level; bool finished; - [[deprecated("Remove in v4.1. Use ToHeaderVal().")]] - RecordVal* BuildHeaderVal(MIME_Header* h); - [[deprecated("Remove in v4.1. Use ToHeaderTable().")]] - TableVal* BuildHeaderTable(MIME_HeaderList& hlist); - RecordValPtr ToHeaderVal(MIME_Header* h); TableValPtr ToHeaderTable(MIME_HeaderList& hlist); }; @@ -277,12 +268,6 @@ protected: }; extern bool is_null_data_chunk(data_chunk_t b); -[[deprecated("Remove in v4.1. Use analyzer::mime::to_string_val().")]] -extern StringVal* new_string_val(int length, const char* data); -[[deprecated("Remove in v4.1. Use analyzer::mime::to_string_val().")]] -extern StringVal* new_string_val(const char* data, const char* end_of_data); -[[deprecated("Remove in v4.1. Use analyzer::mime::to_string_val().")]] -extern StringVal* new_string_val(const data_chunk_t buf); extern StringValPtr to_string_val(int length, const char* data); extern StringValPtr to_string_val(const char* data, const char* end_of_data); extern StringValPtr to_string_val(const data_chunk_t buf); @@ -303,53 +288,3 @@ extern int MIME_get_field_name(int len, const char* data, data_chunk_t* name); extern String* MIME_decode_quoted_pairs(data_chunk_t buf); } // namespace zeek::analyzer::mime - -namespace analyzer::mime { - -using MIME_CONTENT_TYPE [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_CONTENT_TYPE.")]] = zeek::analyzer::mime::MIME_CONTENT_TYPE; -constexpr auto CONTENT_TYPE_MULTIPART [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::CONTENT_TYPE_MULTIPART.")]] = zeek::analyzer::mime::CONTENT_TYPE_MULTIPART; -constexpr auto CONTENT_TYPE_MESSAGE [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::CONTENT_TYPE_MESSAGE.")]] = zeek::analyzer::mime::CONTENT_TYPE_MESSAGE; -constexpr auto CONTENT_TYPE_TEXT [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::CONTENT_TYPE_TEXT.")]] = zeek::analyzer::mime::CONTENT_TYPE_TEXT; -constexpr auto CONTENT_TYPE_OTHER [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::CONTENT_TYPE_OTHER.")]] = zeek::analyzer::mime::CONTENT_TYPE_OTHER; - -using MIME_EVENT_TYPE [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_EVENT_TYPE.")]] = zeek::analyzer::mime::MIME_EVENT_TYPE; -constexpr auto MIME_EVENT_ILLEGAL_FORMAT [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::MIME_EVENT_ILLEGAL_FORMAT.")]] = zeek::analyzer::mime::MIME_EVENT_ILLEGAL_FORMAT; -constexpr auto MIME_EVENT_ILLEGAL_ENCODING [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::MIME_EVENT_ILLEGAL_ENCODING.")]] = zeek::analyzer::mime::MIME_EVENT_ILLEGAL_ENCODING; -constexpr auto MIME_EVENT_CONTENT_GAP [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::MIME_EVENT_CONTENT_GAP.")]] = zeek::analyzer::mime::MIME_EVENT_CONTENT_GAP; -constexpr auto MIME_EVENT_OTHER [[deprecated("Remove in v4.1. Uze zeek::analyzer::mime::MIME_EVENT_OTHER.")]] = zeek::analyzer::mime::MIME_EVENT_OTHER; - -using MIME_Multiline [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_Multiline.")]] = zeek::analyzer::mime::MIME_Multiline; -using MIME_Header [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_Header.")]] = zeek::analyzer::mime::MIME_Header; -using MIME_HeaderList [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_HeaderList.")]] = zeek::analyzer::mime::MIME_HeaderList; -using MIME_Entity [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_Entity.")]] = zeek::analyzer::mime::MIME_Entity; -using MIME_Message [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_Message.")]] = zeek::analyzer::mime::MIME_Message; -using MIME_Mail [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_Mail.")]] = zeek::analyzer::mime::MIME_Mail; - -constexpr auto is_null_data_chunk [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::is_null_data_chunk.")]] = zeek::analyzer::mime::is_null_data_chunk; -constexpr auto is_lws [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::is_lws.")]] = zeek::analyzer::mime::is_lws; -constexpr auto MIME_is_field_name_char [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_is_field_name_char.")]] = zeek::analyzer::mime::MIME_is_field_name_char; -constexpr auto MIME_count_leading_lws [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_count_leading_lws.")]] = zeek::analyzer::mime::MIME_count_leading_lws; -constexpr auto MIME_count_trailing_lws [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_count_trailing_lws.")]] = zeek::analyzer::mime::MIME_count_trailing_lws; -constexpr auto MIME_skip_comments [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_skip_comments.")]] = zeek::analyzer::mime::MIME_skip_comments; -constexpr auto MIME_skip_lws_comments [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_skip_lws_comments.")]] = zeek::analyzer::mime::MIME_skip_lws_comments; -constexpr auto MIME_get_token [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_get_token.")]] = zeek::analyzer::mime::MIME_get_token; -constexpr auto MIME_get_slash_token_pair [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_get_slash_token_pair.")]] = zeek::analyzer::mime::MIME_get_slash_token_pair; -constexpr auto MIME_get_value [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_get_value.")]] = zeek::analyzer::mime::MIME_get_value; -constexpr auto MIME_get_field_name [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_get_field_name.")]] = zeek::analyzer::mime::MIME_get_field_name; -constexpr auto MIME_decode_quoted_pairs [[deprecated("Remove in v4.1. Use zeek::analyzer::mime::MIME_decode_quoted_pairs.")]] = zeek::analyzer::mime::MIME_decode_quoted_pairs; - -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringVal* new_string_val(int length, const char* data); -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringVal* new_string_val(const char* data, const char* end_of_data); -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringVal* new_string_val(const zeek::data_chunk_t buf); - -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringValPtr to_string_val(int length, const char* data); -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringValPtr to_string_val(const char* data, const char* end_of_data); -[[deprecated("Remove in v4.1. Use zeek::analyzer::mime::to_string_val().")]] -extern zeek::StringValPtr to_string_val(const zeek::data_chunk_t buf); - -} // namespace analyzer::mime diff --git a/src/analyzer/protocol/modbus/Modbus.h b/src/analyzer/protocol/modbus/Modbus.h index 9415f4ddc5..361e616a8c 100644 --- a/src/analyzer/protocol/modbus/Modbus.h +++ b/src/analyzer/protocol/modbus/Modbus.h @@ -25,9 +25,3 @@ protected: }; } // namespace zeek::analyzer::modbus - -namespace analyzer::modbus { - -using ModbusTCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::modbus::ModbusTCP_Analyzer.")]] = zeek::analyzer::modbus::ModbusTCP_Analyzer; - -} // namespace analyzer::modbus diff --git a/src/analyzer/protocol/mqtt/MQTT.h b/src/analyzer/protocol/mqtt/MQTT.h index c657281b72..4b0853621f 100644 --- a/src/analyzer/protocol/mqtt/MQTT.h +++ b/src/analyzer/protocol/mqtt/MQTT.h @@ -29,9 +29,3 @@ protected: }; } // namespace zeek::analyzer::mqtt - -namespace analyzer::MQTT { - -using MQTT_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::mqtt::MQTT_Analyzer.")]] = zeek::analyzer::mqtt::MQTT_Analyzer; - -} // namespace analyzer::mqtt diff --git a/src/analyzer/protocol/mysql/MySQL.h b/src/analyzer/protocol/mysql/MySQL.h index 4ddb872c08..518613bd68 100644 --- a/src/analyzer/protocol/mysql/MySQL.h +++ b/src/analyzer/protocol/mysql/MySQL.h @@ -33,9 +33,3 @@ protected: }; } // namespace zeek::analyzer::mysql - -namespace analyzer::MySQL { - -using MySQL_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::mysql::MySQL_Analyzer.")]] = zeek::analyzer::mysql::MySQL_Analyzer; - -} // namespace analyzer::MySQL diff --git a/src/analyzer/protocol/ncp/NCP.h b/src/analyzer/protocol/ncp/NCP.h index 4259bba8b4..2f091f9dd2 100644 --- a/src/analyzer/protocol/ncp/NCP.h +++ b/src/analyzer/protocol/ncp/NCP.h @@ -118,13 +118,3 @@ protected: }; } // namespace zeek::analyzer::ncp - -namespace analyzer::ncp { - -using NCP_Session [[deprecated("Remove in v4.1. Use zeek::analyzer::ncp::detail::NCP_Session.")]] = zeek::analyzer::ncp::detail::NCP_Session; -using FrameBuffer [[deprecated("Remove in v4.1. Use zeek::analyzer::ncp::detail::FrameBuffer.")]] = zeek::analyzer::ncp::detail::FrameBuffer; -using NCP_FrameBuffer [[deprecated("Remove in v4.1. Use zeek::analyzer::ncp::detail::NCP_FrameBuffer.")]] = zeek::analyzer::ncp::detail::NCP_FrameBuffer; -using Contents_NCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ncp::Contents_NCP_Analyzer.")]] = zeek::analyzer::ncp::Contents_NCP_Analyzer; -using NCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ncp::NCP_Analyzer.")]] = zeek::analyzer::ncp::NCP_Analyzer; - -} // namespace analyzer::ncp diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.h b/src/analyzer/protocol/netbios/NetbiosSSN.h index 0da1a02c96..f73631f435 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.h +++ b/src/analyzer/protocol/netbios/NetbiosSSN.h @@ -169,36 +169,3 @@ protected: int IsReuse(double t, const u_char* pkt); } // namespace zeek::analyzer::netbios_ssn - -namespace analyzer::netbios_ssn { - -using NetbiosSSN_Opcode [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::detail::NetbiosSSN_Opcode.")]] = zeek::analyzer::netbios_ssn::detail::NetbiosSSN_Opcode; -constexpr auto NETBIOS_SSN_MSG [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_MSG.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_MSG; -constexpr auto NETBIOS_DGM_DIRECT_UNIQUE [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_DIRECT_UNIQUE.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_DIRECT_UNIQUE; -constexpr auto NETBIOS_DGM_DIRECT_GROUP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_DIRECT_GROUP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_DIRECT_GROUP; -constexpr auto NETBIOS_DGM_BROADCAST [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_BROADCAST.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_BROADCAST; -constexpr auto NETBIOS_DGM_ERROR [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_ERROR.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_ERROR; -constexpr auto NETBIOS_DGG_QUERY_REQ [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGG_QUERY_REQ.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGG_QUERY_REQ; -constexpr auto NETBIOS_DGM_POS_RESP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_POS_RESP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_POS_RESP; -constexpr auto NETBIOS_DGM_NEG_RESP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_NEG_RESP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_DGM_NEG_RESP; -constexpr auto NETBIOS_SSN_REQ [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_REQ.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_REQ; -constexpr auto NETBIOS_SSN_POS_RESP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_POS_RESP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_POS_RESP; -constexpr auto NETBIOS_SSN_NEG_RESP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_NEG_RESP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_NEG_RESP; -constexpr auto NETBIOS_SSN_RETARG_RESP [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_RETARG_RESP.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_RETARG_RESP; -constexpr auto NETBIOS_SSN_KEEP_ALIVE [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_KEEP_ALIVE.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_KEEP_ALIVE; - -using NetbiosSSN_RawMsgHdr [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::detail::NetbiosSSN_RawMsgHdr.")]] = zeek::analyzer::netbios_ssn::detail::NetbiosSSN_RawMsgHdr; -using NetbiosDGM_RawMsgHdr [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::detail::NetbiosDGM_RawMsgHdr.")]] = zeek::analyzer::netbios_ssn::detail::NetbiosDGM_RawMsgHdr; - -using NetbiosSSN_State [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::detail::NetbiosSSN_State.")]] = zeek::analyzer::netbios_ssn::detail::NetbiosSSN_State; -constexpr auto NETBIOS_SSN_TYPE [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_TYPE.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_TYPE; -constexpr auto NETBIOS_SSN_FLAGS [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_FLAGS.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_FLAGS; -constexpr auto NETBIOS_SSN_LEN_HI [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_LEN_HI.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_LEN_HI; -constexpr auto NETBIOS_SSN_LEN_LO [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_LEN_LO.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_LEN_LO; -constexpr auto NETBIOS_SSN_BUF [[deprecated("Remove in v4.1. Uze zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_BUF.")]] = zeek::analyzer::netbios_ssn::detail::NETBIOS_SSN_BUF; - -using NetbiosSSN_Interpreter [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::detail::NetbiosSSN_Interpreter.")]] = zeek::analyzer::netbios_ssn::detail::NetbiosSSN_Interpreter; -using Contents_NetbiosSSN [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::Contents_NetbiosSSN.")]] = zeek::analyzer::netbios_ssn::Contents_NetbiosSSN; -using NetbiosSSN_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::netbios_ssn::NetbiosSSN_Analyzer.")]] = zeek::analyzer::netbios_ssn::NetbiosSSN_Analyzer; - -} // namespace analyzer::netbios_ssn diff --git a/src/analyzer/protocol/ntlm/NTLM.h b/src/analyzer/protocol/ntlm/NTLM.h index 79658fec6c..aec0c9b246 100644 --- a/src/analyzer/protocol/ntlm/NTLM.h +++ b/src/analyzer/protocol/ntlm/NTLM.h @@ -32,9 +32,3 @@ protected: }; } // namespace zeek::analyzer::ntlm - -namespace analyzer::ntlm { - -using NTLM_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ntlm::NTLM_Analyzer.")]] = zeek::analyzer::ntlm::NTLM_Analyzer; - -} // namespace analyzer::ntlm diff --git a/src/analyzer/protocol/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h index c737fdff6f..d640bf348f 100644 --- a/src/analyzer/protocol/ntp/NTP.h +++ b/src/analyzer/protocol/ntp/NTP.h @@ -26,9 +26,3 @@ protected: }; } // namespace zeek::analyzer::ntp - -namespace analyzer::NTP { - -using NTP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ntp::NTP_Analyzer.")]] = zeek::analyzer::ntp::NTP_Analyzer; - -} // namespace analyzer::NTP diff --git a/src/analyzer/protocol/pia/PIA.h b/src/analyzer/protocol/pia/PIA.h index 86d0fc18fc..d6bc38a080 100644 --- a/src/analyzer/protocol/pia/PIA.h +++ b/src/analyzer/protocol/pia/PIA.h @@ -173,11 +173,3 @@ private: }; } // namespace zeek::analyzer::pia - -namespace analzyer::pia { - -using PIA [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA.")]] = zeek::analyzer::pia::PIA; -using PIA_TCP [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA_TCP.")]] = zeek::analyzer::pia::PIA_TCP; -using PIA_UDP [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA_UDP.")]] = zeek::analyzer::pia::PIA_UDP; - -} // namespace analyzer::pia diff --git a/src/analyzer/protocol/pop3/POP3.h b/src/analyzer/protocol/pop3/POP3.h index 39e116da9f..25686155b9 100644 --- a/src/analyzer/protocol/pop3/POP3.h +++ b/src/analyzer/protocol/pop3/POP3.h @@ -118,44 +118,3 @@ private: }; } // namespace zeek::analyzer::pop3 - -namespace analyzer::pop3 { - -using POP3_Cmd [[deprecated("Remove in v4.1. Use zeek::analyzer::pop3::detail::POP3_Cmd.")]] = zeek::analyzer::pop3::detail::POP3_Cmd; -// These values are from a #include above - -using POP3_MasterState [[deprecated("Remove in v4.1. Use zeek::analyzer::pop3::detail::POP3_MasterState.")]] = zeek::analyzer::pop3::detail::POP3_MasterState; -constexpr auto POP3_START [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::POP3_START.")]] = zeek::analyzer::pop3::detail::POP3_START; -constexpr auto POP3_AUTHORIZATION [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::POP3_AUTHORIZATION.")]] = zeek::analyzer::pop3::detail::POP3_AUTHORIZATION; -constexpr auto POP3_TRANSACTION [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::POP3_TRANSACTION.")]] = zeek::analyzer::pop3::detail::POP3_TRANSACTION; -constexpr auto POP3_UPDATE [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::POP3_UPDATE.")]] = zeek::analyzer::pop3::detail::POP3_UPDATE; -constexpr auto POP3_FINISHED [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::POP3_FINISHED.")]] = zeek::analyzer::pop3::detail::POP3_FINISHED; - -using POP3_State [[deprecated("Remove in v4.1. Use zeek::analyzer::pop3::detail::POP3_State.")]] = zeek::analyzer::pop3::detail::POP3_State; -constexpr auto START [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::START.")]] = zeek::analyzer::pop3::detail::START; -constexpr auto USER [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::USER.")]] = zeek::analyzer::pop3::detail::USER; -constexpr auto PASS [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::PASS.")]] = zeek::analyzer::pop3::detail::PASS; -constexpr auto APOP [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::APOP.")]] = zeek::analyzer::pop3::detail::APOP; -constexpr auto AUTH [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::AUTH.")]] = zeek::analyzer::pop3::detail::AUTH; -constexpr auto AUTH_PLAIN [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::AUTH_PLAIN.")]] = zeek::analyzer::pop3::detail::AUTH_PLAIN; -constexpr auto AUTH_LOGIN [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::AUTH_LOGIN.")]] = zeek::analyzer::pop3::detail::AUTH_LOGIN; -constexpr auto AUTH_CRAM_MD5 [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::AUTH_CRAM_MD5.")]] = zeek::analyzer::pop3::detail::AUTH_CRAM_MD5; -constexpr auto NOOP [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::NOOP.")]] = zeek::analyzer::pop3::detail::NOOP; -constexpr auto LAST [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::LAST.")]] = zeek::analyzer::pop3::detail::LAST; -constexpr auto STAT [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::STAT.")]] = zeek::analyzer::pop3::detail::STAT; -constexpr auto LIST [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::LIST.")]] = zeek::analyzer::pop3::detail::LIST; -constexpr auto RETR [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::RETR.")]] = zeek::analyzer::pop3::detail::RETR; -constexpr auto DELE [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::DELE.")]] = zeek::analyzer::pop3::detail::DELE; -constexpr auto UIDL [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::UIDL.")]] = zeek::analyzer::pop3::detail::UIDL; -constexpr auto TOP [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::TOP.")]] = zeek::analyzer::pop3::detail::TOP; -constexpr auto QUIT [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::QUIT.")]] = zeek::analyzer::pop3::detail::QUIT; -constexpr auto RSET [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::RSET.")]] = zeek::analyzer::pop3::detail::RSET; -constexpr auto CAPA [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::CAPA.")]] = zeek::analyzer::pop3::detail::CAPA; -constexpr auto STLS [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::STLS.")]] = zeek::analyzer::pop3::detail::STLS; -constexpr auto XSENDER [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::XSENDER.")]] = zeek::analyzer::pop3::detail::XSENDER; -constexpr auto MISC [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::MISC.")]] = zeek::analyzer::pop3::detail::MISC; -constexpr auto END [[deprecated("Remove in v4.1. Uze zeek::analyzer::pop3::detail::END.")]] = zeek::analyzer::pop3::detail::END; - -using POP3_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::pop3::POP3_Analyzer.")]] = zeek::analyzer::pop3::POP3_Analyzer; - -} // namespace analyzer::pop3 diff --git a/src/analyzer/protocol/radius/RADIUS.h b/src/analyzer/protocol/radius/RADIUS.h index 0ce1c14a22..8cb4e39884 100644 --- a/src/analyzer/protocol/radius/RADIUS.h +++ b/src/analyzer/protocol/radius/RADIUS.h @@ -25,9 +25,3 @@ protected: }; } // namespace zeek::analyzer::radius - -namespace analyzer::RADIUS { - -using RADIUS_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::radius::RADIUS_Analyzer.")]] = zeek::analyzer::radius::RADIUS_Analyzer; - -} // namespace analyzer::RADIUS diff --git a/src/analyzer/protocol/rdp/RDP.h b/src/analyzer/protocol/rdp/RDP.h index cedd8729df..1ee55b8a96 100644 --- a/src/analyzer/protocol/rdp/RDP.h +++ b/src/analyzer/protocol/rdp/RDP.h @@ -31,9 +31,3 @@ protected: }; } // namespace zeek::analyzer::rdp - -namespace analyzer::rdp { - -using RDP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rdp::RDP_Analyzer.")]] = zeek::analyzer::rdp::RDP_Analyzer; - -} // namespace analyzer::rdp diff --git a/src/analyzer/protocol/rdp/RDPEUDP.h b/src/analyzer/protocol/rdp/RDPEUDP.h index 5449685847..fa178d5957 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.h +++ b/src/analyzer/protocol/rdp/RDPEUDP.h @@ -24,9 +24,3 @@ protected: }; } // namespace zeek::analyzer::rdpeudp - -namespace analyzer::rdpeudp { - -using RDP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rdpeudp::RDP_Analyzer.")]] = zeek::analyzer::rdpeudp::RDP_Analyzer; - -} // namespace analyzer::rdpeudp diff --git a/src/analyzer/protocol/rfb/RFB.h b/src/analyzer/protocol/rfb/RFB.h index e35c387ceb..e260569b61 100644 --- a/src/analyzer/protocol/rfb/RFB.h +++ b/src/analyzer/protocol/rfb/RFB.h @@ -34,9 +34,3 @@ protected: }; } // namespace zeek::analyzer::rfb - -namespace analyzer::rfb { - -using RFB_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rfb::RFB_Analyzer.")]] = zeek::analyzer::rfb::RFB_Analyzer; - -} // namespace analyzer::rfb diff --git a/src/analyzer/protocol/rpc/MOUNT.h b/src/analyzer/protocol/rpc/MOUNT.h index 6a28e55020..f8b18ead9b 100644 --- a/src/analyzer/protocol/rpc/MOUNT.h +++ b/src/analyzer/protocol/rpc/MOUNT.h @@ -50,10 +50,3 @@ public: }; } // namespace zeek::analyzer::rpc - -namespace analyzer::rpc { - -using MOUNT_Interp [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::MOUNT_Interp.")]] = zeek::analyzer::rpc::detail::MOUNT_Interp; -using MOUNT_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::MOUNT_Analyzer.")]] = zeek::analyzer::rpc::MOUNT_Analyzer; - -} // namespace analyzer::rpc diff --git a/src/analyzer/protocol/rpc/NFS.h b/src/analyzer/protocol/rpc/NFS.h index 74dc984c6c..3082ffffe7 100644 --- a/src/analyzer/protocol/rpc/NFS.h +++ b/src/analyzer/protocol/rpc/NFS.h @@ -92,10 +92,3 @@ public: }; } // namespace zeek::analyzer::rpc - -namespace analyzer::rpc { - -using NFS_Interp [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::NFS_Interp.")]] = zeek::analyzer::rpc::detail::NFS_Interp; -using NFS_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::NFS_Analyzer.")]] = zeek::analyzer::rpc::NFS_Analyzer; - -} // namespace analyzer::rpc diff --git a/src/analyzer/protocol/rpc/Portmap.h b/src/analyzer/protocol/rpc/Portmap.h index f92e60c36d..a146ecb48a 100644 --- a/src/analyzer/protocol/rpc/Portmap.h +++ b/src/analyzer/protocol/rpc/Portmap.h @@ -38,10 +38,3 @@ public: }; } // namespace zeek::analyzer::detail - -namespace analyzer::rpc { - -using PortmapperInterp [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::PortmapperInterp.")]] = zeek::analyzer::rpc::detail::PortmapperInterp; -using Portmapper_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::Portmapper_Analyzer.")]] = zeek::analyzer::rpc::Portmapper_Analyzer; - -} // namespace analyzer::rpc diff --git a/src/analyzer/protocol/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h index ebeb434259..f34517b369 100644 --- a/src/analyzer/protocol/rpc/RPC.h +++ b/src/analyzer/protocol/rpc/RPC.h @@ -254,35 +254,3 @@ protected: }; } // namespace zeek::analyzer::rpc - -namespace analyzer::rpc { - -constexpr auto RPC_CALL [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_CALL.")]] = zeek::analyzer::rpc::detail::RPC_CALL; -constexpr auto RPC_REPLY [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_REPLY.")]] = zeek::analyzer::rpc::detail::RPC_REPLY; -constexpr auto RPC_MSG_ACCEPTED [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_MSG_ACCEPTED.")]] = zeek::analyzer::rpc::detail::RPC_MSG_ACCEPTED; -constexpr auto RPC_MSG_DENIED [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_MSG_DENIED.")]] = zeek::analyzer::rpc::detail::RPC_MSG_DENIED; -constexpr auto RPC_SUCCESS [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_SUCCESS.")]] = zeek::analyzer::rpc::detail::RPC_SUCCESS; -constexpr auto RPC_PROG_UNAVAIL [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_PROG_UNAVAIL.")]] = zeek::analyzer::rpc::detail::RPC_PROG_UNAVAIL; -constexpr auto RPC_PROG_MISMATCH [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_PROG_MISMATCH.")]] = zeek::analyzer::rpc::detail::RPC_PROG_MISMATCH; -constexpr auto RPC_PROC_UNAVAIL [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_PROC_UNAVAIL.")]] = zeek::analyzer::rpc::detail::RPC_PROC_UNAVAIL; -constexpr auto RPC_GARBAGE_ARGS [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_GARBAGE_ARGS.")]] = zeek::analyzer::rpc::detail::RPC_GARBAGE_ARGS; -constexpr auto RPC_SYSTEM_ERR [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_SYSTEM_ERR.")]] = zeek::analyzer::rpc::detail::RPC_SYSTEM_ERR; -constexpr auto RPC_MISMATCH [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_MISMATCH.")]] = zeek::analyzer::rpc::detail::RPC_MISMATCH; -constexpr auto RPC_AUTH_ERROR [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_ERROR.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_ERROR; -constexpr auto RPC_AUTH_BADCRED [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_BADCRED.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_BADCRED; -constexpr auto RPC_AUTH_REJECTEDCRED [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_REJECTEDCRED.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_REJECTEDCRED; -constexpr auto RPC_AUTH_BADVERF [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_BADVERF.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_BADVERF; -constexpr auto RPC_AUTH_REJECTEDVERF [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_REJECTEDVERF.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_REJECTEDVERF; -constexpr auto RPC_AUTH_TOOWEAK [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_TOOWEAK.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_TOOWEAK; -constexpr auto RPC_AUTH_NULL [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_NULL.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_NULL; -constexpr auto RPC_AUTH_UNIX [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_UNIX.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_UNIX; -constexpr auto RPC_AUTH_SHORT [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_SHORT.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_SHORT; -constexpr auto RPC_AUTH_DES [[deprecated("Remove in v4.1. Uze zeek::analyzer::rpc::detail::RPC_AUTH_DES.")]] = zeek::analyzer::rpc::detail::RPC_AUTH_DES; - -using RPC_CallInfo [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::RPC_CallInfo.")]] = zeek::analyzer::rpc::detail::RPC_CallInfo; -using RPC_Interpreter [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::RPC_Interpreter.")]] = zeek::analyzer::rpc::detail::RPC_Interpreter; -using RPC_Reasm_Buffer [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::detail::RPC_Reasm_Buffer.")]] = zeek::analyzer::rpc::detail::RPC_Reasm_Buffer; -using Contents_RPC [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::Contents_RPC.")]] = zeek::analyzer::rpc::Contents_RPC; -using RPC_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::RPC_Analyzer.")]] = zeek::analyzer::rpc::RPC_Analyzer; - -} // namespace analyzer::rpc diff --git a/src/analyzer/protocol/rpc/XDR.h b/src/analyzer/protocol/rpc/XDR.h index 07246802a0..145c815575 100644 --- a/src/analyzer/protocol/rpc/XDR.h +++ b/src/analyzer/protocol/rpc/XDR.h @@ -18,14 +18,3 @@ extern const u_char* extract_XDR_opaque_fixed(const u_char*& buf, int& len, int extern uint32_t skip_XDR_opaque_auth(const u_char*& buf, int& len); } // namespace zeek::analyzer::rpc - -namespace analyzer::rpc { - -constexpr auto extract_XDR_uint32 [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::extract_XDR_uint32.")]] = zeek::analyzer::rpc::extract_XDR_uint32; -constexpr auto extract_XDR_uint64 [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::extract_XDR_uint64.")]] = zeek::analyzer::rpc::extract_XDR_uint64; -constexpr auto extract_XDR_time [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::extract_XDR_time.")]] = zeek::analyzer::rpc::extract_XDR_time; -constexpr auto extract_XDR_opaque [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::extract_XDR_opaque.")]] = zeek::analyzer::rpc::extract_XDR_opaque; -constexpr auto extract_XDR_opaque_fixed [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::extract_XDR_opaque_fixed.")]] = zeek::analyzer::rpc::extract_XDR_opaque_fixed; -constexpr auto skip_XDR_opaque_auth [[deprecated("Remove in v4.1. Use zeek::analyzer::rpc::skip_XDR_opaque_auth.")]] = zeek::analyzer::rpc::skip_XDR_opaque_auth; - -} // namespace analyzer::rpc diff --git a/src/analyzer/protocol/sip/SIP.h b/src/analyzer/protocol/sip/SIP.h index d4a3177b0e..20fbcba69a 100644 --- a/src/analyzer/protocol/sip/SIP.h +++ b/src/analyzer/protocol/sip/SIP.h @@ -26,9 +26,3 @@ protected: }; } // namespace zeek::analyzer::sip - -namespace analyzer::SIP { - -using SIP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::sip::SIP_Analyzer.")]] = zeek::analyzer::sip::SIP_Analyzer; - -} // namespace analyzer::SIP diff --git a/src/analyzer/protocol/sip/SIP_TCP.h b/src/analyzer/protocol/sip/SIP_TCP.h index 8524d0577e..c0cbc12993 100644 --- a/src/analyzer/protocol/sip/SIP_TCP.h +++ b/src/analyzer/protocol/sip/SIP_TCP.h @@ -32,9 +32,3 @@ protected: }; } // namespace zeek::analyzer::sip_tcp - -namespace analyzer::sip_tcp { - -using SIP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::sip_tcp::SIP_Analyzer.")]] = zeek::analyzer::sip_tcp::SIP_Analyzer; - -} // namespace analyzer::sip_tcp diff --git a/src/analyzer/protocol/smb/SMB.h b/src/analyzer/protocol/smb/SMB.h index 86ccaedb1c..005b98614b 100644 --- a/src/analyzer/protocol/smb/SMB.h +++ b/src/analyzer/protocol/smb/SMB.h @@ -32,9 +32,3 @@ protected: }; } // namespace zeek::analyzer::smb - -namespace analyzer::smb { - -using SMB_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::smb::SMB_Analyzer.")]] = zeek::analyzer::smb::SMB_Analyzer; - -} // namespace analyzer::smb diff --git a/src/analyzer/protocol/smtp/SMTP.h b/src/analyzer/protocol/smtp/SMTP.h index 4cd7d3bdb2..0b43e746de 100644 --- a/src/analyzer/protocol/smtp/SMTP.h +++ b/src/analyzer/protocol/smtp/SMTP.h @@ -97,26 +97,3 @@ private: }; } // namespace zeek::analyzer::smtp - -namespace analyzer::smtp { - -using SMTP_Cmd [[deprecated("Remove in v4.1. Use zeek::analyzer::smtp::detail::SMTP_Cmd.")]] = zeek::analyzer::smtp::detail::SMTP_Cmd; -// The values from SMTP_Cmd come from a #include -using SMTP_State [[deprecated("Remove in v4.1. Use zeek::analyzer::smtp::detail::SMTP_State.")]] = zeek::analyzer::smtp::detail::SMTP_State; -constexpr auto SMTP_CONNECTED [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_CONNECTED.")]] = zeek::analyzer::smtp::detail::SMTP_CONNECTED; -constexpr auto SMTP_INITIATED [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_INITIATED.")]] = zeek::analyzer::smtp::detail::SMTP_INITIATED; -constexpr auto SMTP_NOT_AVAILABLE [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_NOT_AVAILABLE.")]] = zeek::analyzer::smtp::detail::SMTP_NOT_AVAILABLE; -constexpr auto SMTP_READY [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_READY.")]] = zeek::analyzer::smtp::detail::SMTP_READY; -constexpr auto SMTP_MAIL_OK [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_MAIL_OK.")]] = zeek::analyzer::smtp::detail::SMTP_MAIL_OK; -constexpr auto SMTP_RCPT_OK [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_RCPT_OK.")]] = zeek::analyzer::smtp::detail::SMTP_RCPT_OK; -constexpr auto SMTP_IN_DATA [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_IN_DATA.")]] = zeek::analyzer::smtp::detail::SMTP_IN_DATA; -constexpr auto SMTP_AFTER_DATA [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_AFTER_DATA.")]] = zeek::analyzer::smtp::detail::SMTP_AFTER_DATA; -constexpr auto SMTP_IN_AUTH [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_IN_AUTH.")]] = zeek::analyzer::smtp::detail::SMTP_IN_AUTH; -constexpr auto SMTP_IN_TLS [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_IN_TLS.")]] = zeek::analyzer::smtp::detail::SMTP_IN_TLS; -constexpr auto SMTP_QUIT [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_QUIT.")]] = zeek::analyzer::smtp::detail::SMTP_QUIT; -constexpr auto SMTP_AFTER_GAP [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_AFTER_GAP.")]] = zeek::analyzer::smtp::detail::SMTP_AFTER_GAP; -constexpr auto SMTP_GAP_RECOVERY [[deprecated("Remove in v4.1. Uze zeek::analyzer::smtp::detail::SMTP_GAP_RECOVERY.")]] = zeek::analyzer::smtp::detail::SMTP_GAP_RECOVERY; - -using SMTP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::smtp::SMTP_Analyzer.")]] = zeek::analyzer::smtp::SMTP_Analyzer; - -} // namespace analyzer::smtp diff --git a/src/analyzer/protocol/snmp/SNMP.h b/src/analyzer/protocol/snmp/SNMP.h index 828b31f490..0642158f51 100644 --- a/src/analyzer/protocol/snmp/SNMP.h +++ b/src/analyzer/protocol/snmp/SNMP.h @@ -26,9 +26,3 @@ protected: }; } // namespace zeek::analyzer::snmp - -namespace analyzer::snmp { - -using SNMP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::snmp::SNMP_Analyzer.")]] = zeek::analyzer::snmp::SNMP_Analyzer; - -} // namespace analyzer::snmp diff --git a/src/analyzer/protocol/socks/SOCKS.h b/src/analyzer/protocol/socks/SOCKS.h index 9e11509a06..507dba2a1c 100644 --- a/src/analyzer/protocol/socks/SOCKS.h +++ b/src/analyzer/protocol/socks/SOCKS.h @@ -38,9 +38,3 @@ protected: }; } // namespace zeek::analyzer::socks - -namespace analyzer::socks { - -using SOCKS_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::socks::SOCKS_Analyzer.")]] = zeek::analyzer::socks::SOCKS_Analyzer; - -} // namespace analyzer::socks diff --git a/src/analyzer/protocol/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h index e68dbec35e..53a07eee3a 100644 --- a/src/analyzer/protocol/ssh/SSH.h +++ b/src/analyzer/protocol/ssh/SSH.h @@ -45,9 +45,3 @@ protected: }; } // namespace zeek::analyzer::ssh - -namespace analyzer::SSH { - -using SSH_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ssh::SSH_Analyzer.")]] = zeek::analyzer::ssh::SSH_Analyzer; - -} // namespace analyzer::SSH diff --git a/src/analyzer/protocol/ssl/DTLS.h b/src/analyzer/protocol/ssl/DTLS.h index adb124e718..64e37f5a0f 100644 --- a/src/analyzer/protocol/ssl/DTLS.h +++ b/src/analyzer/protocol/ssl/DTLS.h @@ -33,9 +33,3 @@ protected: }; } // namespace zeek::analyzer::dtls - -namespace analyzer::dtls { - -using DTLS_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dtls::DTLS_Analyzer.")]] = zeek::analyzer::dtls::DTLS_Analyzer; - -} // namespace analyzer::dtls diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h index fda43d2726..b9ddda8a5b 100644 --- a/src/analyzer/protocol/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -41,9 +41,3 @@ protected: }; } // namespace zeek::analyzer::ssl - -namespace analyzer::ssl { - -using SSL_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ssl::SSL_Analyzer.")]] = zeek::analyzer::ssl::SSL_Analyzer; - -} // namespace analyzer::ssl diff --git a/src/analyzer/protocol/stepping-stone/SteppingStone.h b/src/analyzer/protocol/stepping-stone/SteppingStone.h index df3fbd927d..fbd711768a 100644 --- a/src/analyzer/protocol/stepping-stone/SteppingStone.h +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.h @@ -82,11 +82,3 @@ protected: }; } // namespace zeek::analyzer::stepping_stone - -namespace analyzer::stepping_stone { - -using SteppingStoneEndpoint [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStoneEndpoint.")]] = zeek::analyzer::stepping_stone::SteppingStoneEndpoint; -using SteppingStone_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStone_Analyzer.")]] = zeek::analyzer::stepping_stone::SteppingStone_Analyzer; -using SteppingStoneManager [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStoneManager.")]] = zeek::analyzer::stepping_stone::SteppingStoneManager; - -} // namespace analyzer::stepping_stone diff --git a/src/analyzer/protocol/syslog/Syslog.h b/src/analyzer/protocol/syslog/Syslog.h index b2e01f5cfb..d1aea12d05 100644 --- a/src/analyzer/protocol/syslog/Syslog.h +++ b/src/analyzer/protocol/syslog/Syslog.h @@ -46,9 +46,3 @@ protected: // } // namespace zeek::analyzer::syslog - -namespace analyzer::syslog { - -using Syslog_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::syslog::Syslog_Analyzer.")]] = zeek::analyzer::syslog::Syslog_Analyzer; - -} // namespace analyzer::syslog diff --git a/src/analyzer/protocol/tcp/ContentLine.h b/src/analyzer/protocol/tcp/ContentLine.h index 97b46aeb7a..c69ed7673b 100644 --- a/src/analyzer/protocol/tcp/ContentLine.h +++ b/src/analyzer/protocol/tcp/ContentLine.h @@ -115,9 +115,3 @@ protected: }; } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using ContentLine_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::ContentLine_Analyzer.")]] = zeek::analyzer::tcp::ContentLine_Analyzer; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/tcp/Stats.h b/src/analyzer/protocol/tcp/Stats.h index d69e41e7a4..86b11eea79 100644 --- a/src/analyzer/protocol/tcp/Stats.h +++ b/src/analyzer/protocol/tcp/Stats.h @@ -65,9 +65,3 @@ private: }; } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using TCPStateStats [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStateStats.")]] = zeek::analyzer::tcp::TCPStateStats; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h index 6197afbd1a..d9286568ad 100644 --- a/src/analyzer/protocol/tcp/TCP.h +++ b/src/analyzer/protocol/tcp/TCP.h @@ -306,13 +306,3 @@ protected: }; } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using TCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Analyzer.")]] = zeek::analyzer::tcp::TCP_Analyzer; -using TCP_ApplicationAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ApplicationAnalyzer.")]] = zeek::analyzer::tcp::TCP_ApplicationAnalyzer; -using TCP_SupportAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_SupportAnalyzer.")]] = zeek::analyzer::tcp::TCP_SupportAnalyzer; -using TCPStats_Endpoint [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStats_Endpoint.")]] = zeek::analyzer::tcp::TCPStats_Endpoint; -using TCPStats_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStats_Analyzer.")]] = zeek::analyzer::tcp::TCPStats_Analyzer; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/tcp/TCP_Endpoint.h b/src/analyzer/protocol/tcp/TCP_Endpoint.h index 329d336c14..a66d54a648 100644 --- a/src/analyzer/protocol/tcp/TCP_Endpoint.h +++ b/src/analyzer/protocol/tcp/TCP_Endpoint.h @@ -252,18 +252,3 @@ protected: #define ENDIAN_CONFUSED 3 } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using EndpointState [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::EndpointState.")]] = zeek::analyzer::tcp::EndpointState; -constexpr auto TCP_ENDPOINT_INACTIVE [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_INACTIVE.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_INACTIVE; -constexpr auto TCP_ENDPOINT_SYN_SENT [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_SYN_SENT.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_SYN_SENT; -constexpr auto TCP_ENDPOINT_SYN_ACK_SENT [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_SYN_ACK_SENT.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_SYN_ACK_SENT; -constexpr auto TCP_ENDPOINT_PARTIAL [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_PARTIAL.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_PARTIAL; -constexpr auto TCP_ENDPOINT_ESTABLISHED [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_ESTABLISHED.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_ESTABLISHED; -constexpr auto TCP_ENDPOINT_CLOSED [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_CLOSED.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_CLOSED; -constexpr auto TCP_ENDPOINT_RESET [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ENDPOINT_RESET.")]] = zeek::analyzer::tcp::TCP_ENDPOINT_RESET; - -using TCP_Endpoint [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Endpoint.")]] = zeek::analyzer::tcp::TCP_Endpoint; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/tcp/TCP_Flags.h b/src/analyzer/protocol/tcp/TCP_Flags.h index 248debfc46..327d95c189 100644 --- a/src/analyzer/protocol/tcp/TCP_Flags.h +++ b/src/analyzer/protocol/tcp/TCP_Flags.h @@ -48,9 +48,3 @@ inline std::string TCP_Flags::AsString() const } } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using TCP_Flags [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Flags.")]] = zeek::analyzer::tcp::TCP_Flags; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.h b/src/analyzer/protocol/tcp/TCP_Reassembler.h index d973ff603e..ffb060603c 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.h +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.h @@ -113,9 +113,3 @@ private: }; } // namespace zeek::analyzer::tcp - -namespace analyzer::tcp { - -using TCP_Reassembler [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Reassembler.")]] = zeek::analyzer::tcp::TCP_Reassembler; - -} // namespace analyzer::tcp diff --git a/src/analyzer/protocol/teredo/Teredo.h b/src/analyzer/protocol/teredo/Teredo.h index 8f57f72a9e..d2d87f7319 100644 --- a/src/analyzer/protocol/teredo/Teredo.h +++ b/src/analyzer/protocol/teredo/Teredo.h @@ -91,10 +91,3 @@ protected: } // namespace detail } // namespace zeek::analyzer::teredo - -namespace analyzer::teredo { - -using Teredo_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::teredo::Teredo_Analyzer.")]] = zeek::analyzer::teredo::Teredo_Analyzer; -using TeredoEncapsulation [[deprecated("Remove in v4.1. Use zeek::analyzer::teredo::detail::TeredoEncapsulation.")]] = zeek::analyzer::teredo::detail::TeredoEncapsulation; - -} // namespace analyzer::teredo diff --git a/src/analyzer/protocol/udp/UDP.h b/src/analyzer/protocol/udp/UDP.h index fea70bca61..1a1ef94e62 100644 --- a/src/analyzer/protocol/udp/UDP.h +++ b/src/analyzer/protocol/udp/UDP.h @@ -55,13 +55,3 @@ private: }; } // namespace zeek::analyzer::udp - -namespace analyzer::udp { - -using UDP_EndpointState [[deprecated("Remove in v4.1. Use zeek::analyzer::udp::UDP_EndpointState.")]] = zeek::analyzer::udp::UDP_EndpointState; -constexpr auto UDP_INACTIVE [[deprecated("Remove in v4.1. Use zeek::analyzer::udp::UDP_INACTIVE.")]] = zeek::analyzer::udp::UDP_INACTIVE; -constexpr auto UDP_ACTIVE [[deprecated("Remove in v4.1. Use zeek::analyzer::udp::UDP_ACTIVE.")]] = zeek::analyzer::udp::UDP_ACTIVE; - -using UDP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::udp::UDP_Analyzer.")]] = zeek::analyzer::udp::UDP_Analyzer; - -} // namespace analyzer::udp diff --git a/src/analyzer/protocol/vxlan/VXLAN.h b/src/analyzer/protocol/vxlan/VXLAN.h index 3904cee897..faefd886f5 100644 --- a/src/analyzer/protocol/vxlan/VXLAN.h +++ b/src/analyzer/protocol/vxlan/VXLAN.h @@ -22,9 +22,3 @@ public: }; } // namespace zeek::analyzer::vxlan - -namespace analyzer::vxlan { - -using VXLAN_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::vxlan::VXLAN_Analyzer.")]] = zeek::analyzer::vxlan::VXLAN_Analyzer; - -} // namespace analyzer::vxlan diff --git a/src/analyzer/protocol/xmpp/XMPP.h b/src/analyzer/protocol/xmpp/XMPP.h index 58b1e617ea..d858470c70 100644 --- a/src/analyzer/protocol/xmpp/XMPP.h +++ b/src/analyzer/protocol/xmpp/XMPP.h @@ -33,9 +33,3 @@ protected: }; } // namespace zeek::analyzer::xmpp - -namespace analyzer::xmpp { - -using XMPP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::xmpp::XMPP_Analyzer.")]] = zeek::analyzer::xmpp::XMPP_Analyzer; - -} // namespace analyzer::xmpp diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index c29f7c5a63..bc9dafd252 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -29,9 +29,3 @@ protected: }; } // namespace zeek::analyzer::zip - -namespace analyzer::zip { - -using ZIP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::zip::ZIP_Analyzer.")]] = zeek::analyzer::zip::ZIP_Analyzer; - -} // namespace analyzer::zip diff --git a/src/binpac_zeek-lib.pac b/src/binpac_zeek-lib.pac index 2d76dcf839..d4ed3ba96d 100644 --- a/src/binpac_zeek-lib.pac +++ b/src/binpac_zeek-lib.pac @@ -55,11 +55,6 @@ zeek::StringValPtr utf16_to_utf8_val(zeek::Connection* conn, const bytestring& u //return new StringVal(resultstring.length(), (const char *) resultstring.data()); return zeek::make_intrusive(resultstring.c_str()); } - -zeek::StringVal* utf16_bytestring_to_utf8_val(zeek::Connection* conn, const bytestring& utf16) - { - return utf16_to_utf8_val(conn, utf16).release(); - } %} function network_time(): double diff --git a/src/binpac_zeek.h b/src/binpac_zeek.h index 1659638548..ac595cc6ce 100644 --- a/src/binpac_zeek.h +++ b/src/binpac_zeek.h @@ -17,24 +17,6 @@ using ZeekVal = zeek::Val*; using ZeekPortVal = zeek::PortVal*; using ZeekStringVal = zeek::StringVal*; -using BroAnalyzer [[deprecated("Remove in v4.1. Use ZeekAnalyzer.")]] = ZeekAnalyzer; -using BroFileAnalyzer [[deprecated("Remove in v4.1. Use ZeekFileAnalyzer.")]] = ZeekFileAnalyzer; -using BroVal [[deprecated("Remove in v4.1. Use ZeekVal.")]] = ZeekVal; -using BroPortVal [[deprecated("Remove in v4.1. Use ZeekPortVal.")]] = ZeekPortVal; -using BroStringVal [[deprecated("Remove in v4.1. Use ZeekStringVal.")]] = ZeekStringVal; - -[[deprecated("Remove in v4.1. Use StringVal constructor directly.")]] -inline zeek::StringVal* string_to_val(string const &str) - { - return new zeek::StringVal(str.c_str()); - } - -[[deprecated("Remove in v4.1. Use binpac::to_stringval() instead.")]] -inline zeek::StringVal* bytestring_to_val(const_bytestring const &str) - { - return new zeek::StringVal(str.length(), (const char*) str.begin()); - } - inline zeek::StringValPtr to_stringval(const_bytestring const& str) { return zeek::make_intrusive(str.length(), (const char*) str.begin()); @@ -42,7 +24,4 @@ inline zeek::StringValPtr to_stringval(const_bytestring const& str) zeek::StringValPtr utf16_to_utf8_val(zeek::Connection* conn, const bytestring& utf16); -[[deprecated("Remove in v4.1. Use utf16_to_utf8_val() instead.")]] -zeek::StringVal* utf16_bytestring_to_utf8_val(zeek::Connection* conn, const bytestring& utf16); - } // namespace binpac diff --git a/src/broker/Data.cc b/src/broker/Data.cc index 4d8287f41f..088c0c6ed0 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -16,15 +16,10 @@ using namespace std; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_data_type; -zeek::OpaqueTypePtr& bro_broker::opaque_of_data_type = zeek::Broker::detail::opaque_of_data_type; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_set_iterator; -zeek::OpaqueTypePtr& bro_broker::opaque_of_set_iterator = zeek::Broker::detail::opaque_of_set_iterator; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_table_iterator; -zeek::OpaqueTypePtr& bro_broker::opaque_of_table_iterator = zeek::Broker::detail::opaque_of_table_iterator; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_vector_iterator; -zeek::OpaqueTypePtr& bro_broker::opaque_of_vector_iterator = zeek::Broker::detail::opaque_of_vector_iterator; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_record_iterator; -zeek::OpaqueTypePtr& bro_broker::opaque_of_record_iterator = zeek::Broker::detail::opaque_of_record_iterator; static broker::port::protocol to_broker_port_proto(TransportProto tp) { diff --git a/src/broker/Data.h b/src/broker/Data.h index 3f200e5e05..08215bb5af 100644 --- a/src/broker/Data.h +++ b/src/broker/Data.h @@ -10,10 +10,6 @@ namespace zeek::threading { struct Value; struct Field; } -namespace threading { - using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value; - using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field; -} namespace zeek::Broker::detail { @@ -293,50 +289,3 @@ protected: }; } // namespace zeek::Broker - -namespace bro_broker { - -extern zeek::OpaqueTypePtr& opaque_of_data_type; -extern zeek::OpaqueTypePtr& opaque_of_set_iterator; -extern zeek::OpaqueTypePtr& opaque_of_table_iterator; -extern zeek::OpaqueTypePtr& opaque_of_vector_iterator; -extern zeek::OpaqueTypePtr& opaque_of_record_iterator; - -constexpr auto to_bro_port_proto [[deprecated("Remove in v4.1. Use zeek::Broker::detail::to_zeek_port_proto.")]] = zeek::Broker::detail::to_zeek_port_proto; - -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::make_data_val.")]] -inline zeek::RecordValPtr make_data_val(zeek::Val* v) { return zeek::Broker::detail::make_data_val(v); } -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::make_data_val.")]] -inline zeek::RecordValPtr make_data_val(broker::data d) { return zeek::Broker::detail::make_data_val(d); } - -constexpr auto get_data_type [[deprecated("Remove in v4.1. Use zeek::Broker::detail::get_data_type.")]] = zeek::Broker::detail::get_data_type; -constexpr auto val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::val_to_data.")]] = zeek::Broker::detail::val_to_data; -constexpr auto data_to_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_val.")]] = zeek::Broker::detail::data_to_val; -constexpr auto threading_field_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_field_to_data.")]] = zeek::Broker::detail::threading_field_to_data; -constexpr auto data_to_threading_field [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_field.")]] = zeek::Broker::detail::data_to_threading_field; - -using DataVal [[deprecated("Remove in v4.1. Use zeek::Broker::detail::DataVal.")]] = zeek::Broker::detail::DataVal; -using type_name_getter [[deprecated("Remove in v4.1. Use zeek::Broker::detail::type_name_getter.")]] = zeek::Broker::detail::type_name_getter; - -constexpr auto opaque_field_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::opaque_field_to_data.")]] = zeek::Broker::detail::opaque_field_to_data; - -template -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::require_data_type.")]] -T& require_data_type(broker::data& d, zeek::TypeTag tag, zeek::detail::Frame* f) - { - return zeek::Broker::detail::require_data_type(d, tag, f); - } - -template -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::require_data_type.")]] -inline T& require_data_type(zeek::RecordVal* v, zeek::TypeTag tag, zeek::detail::Frame* f) - { - return zeek::Broker::detail::require_data_type(v, tag, f); - } - -using SetIterator [[deprecated("Remove in v4.1. Use zeek::Broker::detail::SetIterator.")]] = zeek::Broker::detail::SetIterator; -using TableIterator [[deprecated("Remove in v4.1. Use zeek::Broker::detail::TableIterator.")]] = zeek::Broker::detail::TableIterator; -using VectorIterator [[deprecated("Remove in v4.1. Use zeek::Broker::detail::VectorIterator.")]] = zeek::Broker::detail::VectorIterator; -using RecordIterator [[deprecated("Remove in v4.1. Use zeek::Broker::detail::RecordIterator.")]] = zeek::Broker::detail::RecordIterator; - -} // namespace bro_broker diff --git a/src/broker/Manager.h b/src/broker/Manager.h index 493c88aa08..be3606d57e 100644 --- a/src/broker/Manager.h +++ b/src/broker/Manager.h @@ -439,12 +439,3 @@ private: extern Broker::Manager* broker_mgr; } // namespace zeek - -extern zeek::Broker::Manager*& broker_mgr [[deprecated("Remove in v4.1. Use zeek::broker_mgr.")]]; - -namespace bro_broker { - -using Stats [[deprecated("Remove in v4.1. Use zeek::Broker::Stats.")]] = zeek::Broker::Stats; -using Manager [[deprecated("Remove in v4.1. Use zeek::Broker::Manager.")]] = zeek::Broker::Manager; - -} // namespace bro_broker diff --git a/src/broker/Store.cc b/src/broker/Store.cc index da03cf47f7..ea151b08c6 100644 --- a/src/broker/Store.cc +++ b/src/broker/Store.cc @@ -4,7 +4,6 @@ #include "zeek/broker/Manager.h" zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_store_handle; -zeek::OpaqueTypePtr& bro_broker::opaque_of_store_handle = zeek::Broker::detail::opaque_of_store_handle; namespace zeek::Broker::detail { diff --git a/src/broker/Store.h b/src/broker/Store.h index 513010a580..029c84d884 100644 --- a/src/broker/Store.h +++ b/src/broker/Store.h @@ -146,28 +146,3 @@ broker::backend_options to_backend_options(broker::backend backend, RecordVal* options); } // namespace zeek::Broker - -namespace bro_broker { - -extern zeek::OpaqueTypePtr& opaque_of_store_handle [[deprecated("Remove in v4.1. Use zeek::Broker::detail::opaque_of_store_handle.")]]; - -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::query_result.")]] -inline zeek::RecordValPtr query_result() - { - return zeek::Broker::detail::query_result(); - } - -[[deprecated("Remove in v4.1. Use zeek::Broker::detail::query_result.")]] -inline zeek::RecordValPtr query_result(zeek::RecordValPtr data) - { - return zeek::Broker::detail::query_result(); - } - -constexpr auto convert_expiry [[deprecated("Remove in v4.1. Use zeek::Broker::detail::convert_expiry.")]] = zeek::Broker::detail::convert_expiry; -using StoreQueryCallback [[deprecated("Remove in v4.1. Use zeek::Broker::detail::StoreQueryCallback.")]] = zeek::Broker::detail::StoreQueryCallback; -using StoreHandleVal [[deprecated("Remove in v4.1. Use zeek::Broker::detail::StoreHandleVal.")]] = zeek::Broker::detail::StoreHandleVal; - -constexpr auto to_backend_type [[deprecated("Remove in v4.1. Use zeek::Broker::detail::to_backend_type.")]] = zeek::Broker::detail::to_backend_type; -constexpr auto to_backend_options [[deprecated("Remove in v4.1. Use zeek::Broker::detail::to_backend_options.")]] = zeek::Broker::detail::to_backend_options; - -} // namespace bro_broker diff --git a/src/digest.h b/src/digest.h index 7829f4c027..95ef1b2344 100644 --- a/src/digest.h +++ b/src/digest.h @@ -71,21 +71,3 @@ unsigned char* internal_md5(const unsigned char* data, unsigned long len, unsign unsigned char* calculate_digest(HashAlgorithm Alg, const unsigned char* data, uint64_t len, unsigned char* out); } // namespace zeek::detail - -using HashAlgorithm [[deprecated("Remove in v4.1. Use zeek::detail::HashAlgorithm.")]] = zeek::detail::HashAlgorithm; -constexpr auto Hash_MD5 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_MD5.")]] = zeek::detail::Hash_MD5; -constexpr auto Hash_SHA1 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_SHA1.")]] = zeek::detail::Hash_SHA1; -constexpr auto Hash_SHA224 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_SHA224.")]] = zeek::detail::Hash_SHA224; -constexpr auto Hash_SHA256 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_SHA256.")]] = zeek::detail::Hash_SHA256; -constexpr auto Hash_SHA384 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_SHA384.")]] = zeek::detail::Hash_SHA384; -constexpr auto Hash_SHA512 [[deprecated("Remove in v4.1. Use zeek::detail::Hash_SHA512.")]] = zeek::detail::Hash_SHA512; - -constexpr auto digest_print [[deprecated("Remove in v4.1. Use zeek::detail::digest_print.")]] = zeek::detail::digest_print; -constexpr auto md5_digest_print [[deprecated("Remove in v4.1. Use zeek::detail::md5_digest_print.")]] = zeek::detail::md5_digest_print; -constexpr auto sha1_digest_print [[deprecated("Remove in v4.1. Use zeek::detail::sha1_digest_print.")]] = zeek::detail::sha1_digest_print; -constexpr auto sha256_digest_print [[deprecated("Remove in v4.1. Use zeek::detail::sha256_digest_print.")]] = zeek::detail::sha256_digest_print; -constexpr auto hash_init [[deprecated("Remove in v4.1. Use zeek::detail::hash_init.")]] = zeek::detail::hash_init; -constexpr auto hash_update [[deprecated("Remove in v4.1. Use zeek::detail::hash_update.")]] = zeek::detail::hash_update; -constexpr auto hash_final [[deprecated("Remove in v4.1. Use zeek::detail::hash_final.")]] = zeek::detail::hash_final; -constexpr auto internal_md5 [[deprecated("Remove in v4.1. Use zeek::detail::internal_md5.")]] = zeek::detail::internal_md5; -constexpr auto calculate_digest [[deprecated("Remove in v4.1. Use zeek::detail::calculate_digest.")]] = zeek::detail::calculate_digest; diff --git a/src/file_analysis/Analyzer.cc b/src/file_analysis/Analyzer.cc index 7442157b9c..937eade5bb 100644 --- a/src/file_analysis/Analyzer.cc +++ b/src/file_analysis/Analyzer.cc @@ -36,14 +36,4 @@ Analyzer::Analyzer(RecordValPtr arg_args, File* arg_file) : Analyzer({}, std::move(arg_args), arg_file) {} -Analyzer::Analyzer(file_analysis::Tag arg_tag, - RecordVal* arg_args, - File* arg_file) - : Analyzer(arg_tag, {NewRef{}, arg_args}, arg_file) - {} - -Analyzer::Analyzer(RecordVal* arg_args, File* arg_file) - : Analyzer({}, {NewRef{}, arg_args}, arg_file) - {} - } // namespace zeek::file_analysis diff --git a/src/file_analysis/Analyzer.h b/src/file_analysis/Analyzer.h index 0710f05563..b3ff8fb84c 100644 --- a/src/file_analysis/Analyzer.h +++ b/src/file_analysis/Analyzer.h @@ -101,10 +101,6 @@ public: const RecordValPtr& GetArgs() const { return args; } - [[deprecated("Remove in v4.1. Use GetArgs().")]] - RecordVal* Args() const - { return args.get(); } - /** * @return the file_analysis::File object to which the analyzer is attached. */ @@ -156,9 +152,6 @@ protected: */ Analyzer(file_analysis::Tag arg_tag, RecordValPtr arg_args, File* arg_file); - [[deprecated("Remove in v4.1.. Construct using IntrusivePtr instead.")]] - Analyzer(file_analysis::Tag arg_tag, RecordVal* arg_args, File* arg_file); - /** * Constructor. Only derived classes are meant to be instantiated. * As this version of the constructor does not receive a name or tag, @@ -170,9 +163,6 @@ protected: */ Analyzer(RecordValPtr arg_args, File* arg_file); - [[deprecated("Remove in v4.1.. Construct using IntrusivePtr instead.")]] - Analyzer(RecordVal* arg_args, File* arg_file); - private: ID id; /**< Unique instance ID. */ @@ -186,10 +176,3 @@ private: }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using ID [[deprecated("Remove in v4.1. Use zeek::file_analysis::ID.")]] = zeek::file_analysis::ID; -using Analyzer [[deprecated("Remove in v4.1. Use zeek::file_analysis::Analyzer.")]] = zeek::file_analysis::Analyzer; - -} // namespace file_analysis diff --git a/src/file_analysis/AnalyzerSet.h b/src/file_analysis/AnalyzerSet.h index c9990037b6..4e766a807d 100644 --- a/src/file_analysis/AnalyzerSet.h +++ b/src/file_analysis/AnalyzerSet.h @@ -238,9 +238,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using AnalyzerSet [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::AnalyzerSet.")]] = zeek::file_analysis::detail::AnalyzerSet; - -} // namespace file_analysis diff --git a/src/file_analysis/Component.cc b/src/file_analysis/Component.cc index 29fe260c7a..d5d9b8462e 100644 --- a/src/file_analysis/Component.cc +++ b/src/file_analysis/Component.cc @@ -8,19 +8,10 @@ namespace zeek::file_analysis { -Component::Component(const std::string& name, factory_callback arg_factory, Tag::subtype_t subtype) - : plugin::Component(plugin::component::FILE_ANALYZER, name), - plugin::TaggedComponent(subtype) - { - factory = arg_factory; - factory_func = nullptr; - } - Component::Component(const std::string& name, factory_function arg_factory, Tag::subtype_t subtype) : plugin::Component(plugin::component::FILE_ANALYZER, name), plugin::TaggedComponent(subtype) { - factory = nullptr; factory_func = arg_factory; } @@ -36,7 +27,7 @@ Component::~Component() void Component::DoDescribe(ODesc* d) const { - if ( factory || factory_func ) + if ( factory_func ) { d->Add("ANALYZER_"); d->Add(CanonicalName()); diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index c59df0804a..c1ba902405 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -28,7 +28,6 @@ namespace zeek::file_analysis { class Component : public plugin::Component, public plugin::TaggedComponent { public: - typedef Analyzer* (*factory_callback)(RecordVal* args, File* file); using factory_function = Analyzer* (*)(RecordValPtr args, File* file); /** @@ -52,9 +51,6 @@ public: */ Component(const std::string& name, factory_function factory, Tag::subtype_t subtype = 0); - [[deprecated("Remove in v4.1. Use factory_function w/ IntrusivePtr args")]] - Component(const std::string& name, factory_callback factory, Tag::subtype_t subtype = 0); - /** * Destructor. */ @@ -73,9 +69,6 @@ public: factory_function FactoryFunction() const { return factory_func; } - [[deprecated("Remove in v4.1. Use FactoryFunction().")]] - factory_callback Factory() const { return factory; } - protected: /** * Overriden from plugin::Component. @@ -85,14 +78,7 @@ protected: private: friend class Manager; - factory_callback factory; // The analyzer's factory callback (deprecated). factory_function factory_func; // The analyzer's factory callback. }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using Component [[deprecated("Remove in v4.1. Use zeek::file_analysis::Component.")]] = zeek::file_analysis::Component; - -} // namespace file_analysis diff --git a/src/file_analysis/File.cc b/src/file_analysis/File.cc index 1c7511ebbc..69f6e48517 100644 --- a/src/file_analysis/File.cc +++ b/src/file_analysis/File.cc @@ -203,9 +203,6 @@ void File::SetTimeoutInterval(double interval) val->Assign(timeout_interval_idx, make_intrusive(interval)); } -bool File::SetExtractionLimit(RecordVal* args, uint64_t bytes) - { return SetExtractionLimit({NewRef{}, args}, bytes); } - bool File::SetExtractionLimit(RecordValPtr args, uint64_t bytes) { Analyzer* a = analyzers.Find(file_mgr->GetComponentTag("EXTRACT"), @@ -253,9 +250,6 @@ void File::ScheduleInactivityTimer() const zeek::detail::timer_mgr->Add(new detail::FileTimer(run_state::network_time, id, GetTimeoutInterval())); } -bool File::AddAnalyzer(file_analysis::Tag tag, RecordVal* args) - { return AddAnalyzer(tag, {NewRef{}, args}); } - bool File::AddAnalyzer(file_analysis::Tag tag, RecordValPtr args) { DBG_LOG(DBG_FILE_ANALYSIS, "[%s] Queuing addition of %s analyzer", @@ -267,9 +261,6 @@ bool File::AddAnalyzer(file_analysis::Tag tag, RecordValPtr args) return analyzers.QueueAdd(tag, std::move(args)) != nullptr; } -bool File::RemoveAnalyzer(file_analysis::Tag tag, RecordVal* args) - { return RemoveAnalyzer(tag, {NewRef{}, args}); } - bool File::RemoveAnalyzer(file_analysis::Tag tag, RecordValPtr args) { DBG_LOG(DBG_FILE_ANALYSIS, "[%s] Queuing remove of %s analyzer", @@ -621,17 +612,6 @@ void File::FileEvent(EventHandlerPtr h) FileEvent(h, Args{val}); } -void File::FileEvent(EventHandlerPtr h, ValPList* vl) - { - FileEvent(h, val_list_to_args(*vl)); - delete vl; - } - -void File::FileEvent(EventHandlerPtr h, ValPList vl) - { - FileEvent(h, val_list_to_args(vl)); - } - void File::FileEvent(EventHandlerPtr h, Args args) { event_mgr.Enqueue(h, std::move(args)); diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h index 0e569db35b..35ac76cbca 100644 --- a/src/file_analysis/File.h +++ b/src/file_analysis/File.h @@ -45,10 +45,6 @@ public: const RecordValPtr& ToVal() const { return val; } - [[deprecated("Remove in v4.1. Use ToVal().")]] - RecordVal* GetVal() const - { return val.get(); } - /** * @return the value of the "source" field from #val record or an empty * string if it's not initialized. @@ -80,9 +76,6 @@ public: */ bool SetExtractionLimit(RecordValPtr args, uint64_t bytes); - [[deprecated("Remove in v4.1. Pass an IntrusivePtr instead.")]] - bool SetExtractionLimit(RecordVal* args, uint64_t bytes); - /** * @return value of the "id" field from #val record. */ @@ -128,9 +121,6 @@ public: */ bool AddAnalyzer(file_analysis::Tag tag, RecordValPtr args); - [[deprecated("Remove in v4.1. Pass an IntrusivePtr instead.")]] - bool AddAnalyzer(file_analysis::Tag tag, RecordVal* args); - /** * Queues removal of an analyzer. * @param tag the analyzer tag of the file analyzer to remove. @@ -139,9 +129,6 @@ public: */ bool RemoveAnalyzer(file_analysis::Tag tag, RecordValPtr args); - [[deprecated("Remove in v4.1. Pass an IntrusivePtr instead.")]] - bool RemoveAnalyzer(file_analysis::Tag tag, RecordVal* args); - /** * Signal that this analyzer can be deleted once it's safe to do so. */ @@ -187,22 +174,6 @@ public: */ void FileEvent(EventHandlerPtr h); - /** - * Raises an event related to the file's life-cycle. - * @param h pointer to an event handler. - * @param vl list of argument values to pass to event call. - */ - [[deprecated("Remove in v4.1. Use Args overload instead.")]] - void FileEvent(EventHandlerPtr h, ValPList* vl); - - /** - * Raises an event related to the file's life-cycle. - * @param h pointer to an event handler. - * @param vl list of argument values to pass to event call. - */ - [[deprecated("Remove in v4.1. Use Args overload instead.")]] - void FileEvent(EventHandlerPtr h, ValPList vl); - /** * Raises an event related to the file's life-cycle. * @param h pointer to an event handler. @@ -396,9 +367,3 @@ protected: }; } // namespace file_analysis - -namespace file_analysis { - -using File [[deprecated("Remove in v4.1. Use zeek::file_analysis::File.")]] = zeek::file_analysis::File; - -} // namespace zeek::file_analysis diff --git a/src/file_analysis/FileReassembler.h b/src/file_analysis/FileReassembler.h index 54b3d288e0..c121c145d9 100644 --- a/src/file_analysis/FileReassembler.h +++ b/src/file_analysis/FileReassembler.h @@ -5,7 +5,6 @@ #include "zeek/Reassem.h" namespace zeek { class File; } -using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File; ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis); @@ -59,9 +58,3 @@ protected: }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using FileReassembler [[deprecated("Remove in v4.1. Use zeek::file_analysis::FileReassembler.")]] = zeek::file_analysis::FileReassembler; - -} // namespace file_analysis diff --git a/src/file_analysis/FileTimer.h b/src/file_analysis/FileTimer.h index 2aafb6a1a8..fd1fec60a0 100644 --- a/src/file_analysis/FileTimer.h +++ b/src/file_analysis/FileTimer.h @@ -34,9 +34,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using FileTimer [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::FileTimer.")]] = zeek::file_analysis::detail::FileTimer; - -} // namespace file_analysis diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc index fa1ae36425..55fa7cbb5a 100644 --- a/src/file_analysis/Manager.cc +++ b/src/file_analysis/Manager.cc @@ -80,7 +80,7 @@ void Manager::SetHandle(const string& handle) return; #ifdef DEBUG - if ( debug_logger.IsEnabled(DBG_FILE_ANALYSIS) ) + if ( zeek::detail::debug_logger.IsEnabled(DBG_FILE_ANALYSIS) ) { String tmp{handle}; auto rendered = tmp.Render(); @@ -260,10 +260,6 @@ bool Manager::SetReassemblyBuffer(const string& file_id, uint64_t max) return true; } -bool Manager::SetExtractionLimit(const string& file_id, RecordVal* args, - uint64_t n) const - { return SetExtractionLimit(file_id, {NewRef{}, args}, n); } - bool Manager::SetExtractionLimit(const string& file_id, RecordValPtr args, uint64_t n) const { @@ -275,10 +271,6 @@ bool Manager::SetExtractionLimit(const string& file_id, return file->SetExtractionLimit(std::move(args), n); } -bool Manager::AddAnalyzer(const string& file_id, const file_analysis::Tag& tag, - RecordVal* args) const - { return AddAnalyzer(file_id, tag, {NewRef{}, args}); } - bool Manager::AddAnalyzer(const string& file_id, const file_analysis::Tag& tag, RecordValPtr args) const { @@ -290,10 +282,6 @@ bool Manager::AddAnalyzer(const string& file_id, const file_analysis::Tag& tag, return file->AddAnalyzer(tag, std::move(args)); } -bool Manager::RemoveAnalyzer(const string& file_id, const file_analysis::Tag& tag, - RecordVal* args) const - { return RemoveAnalyzer(file_id, tag, {NewRef{}, args}); } - bool Manager::RemoveAnalyzer(const string& file_id, const file_analysis::Tag& tag, RecordValPtr args) const { @@ -456,9 +444,6 @@ bool Manager::IsDisabled(const analyzer::Tag& tag) return yield->AsBool(); } -Analyzer* Manager::InstantiateAnalyzer(const Tag& tag, RecordVal* args, File* f) const - { return InstantiateAnalyzer(tag, {NewRef{}, args}, f); } - Analyzer* Manager::InstantiateAnalyzer(const Tag& tag, RecordValPtr args, File* f) const @@ -480,8 +465,6 @@ Analyzer* Manager::InstantiateAnalyzer(const Tag& tag, if ( c->factory_func ) a = c->factory_func(std::move(args), f); - else if ( c->factory ) - a = c->factory(args.get(), f); else { reporter->InternalWarning("file analyzer %s cannot be instantiated " diff --git a/src/file_analysis/Manager.h b/src/file_analysis/Manager.h index 93480e144f..9460a25a24 100644 --- a/src/file_analysis/Manager.h +++ b/src/file_analysis/Manager.h @@ -253,10 +253,6 @@ public: bool SetExtractionLimit(const std::string& file_id, RecordValPtr args, uint64_t n) const; - [[deprecated("Remove in v4.1. Pass IntrusivePtr args param instead.")]] - bool SetExtractionLimit(const std::string& file_id, RecordVal* args, - uint64_t n) const; - /** * Try to retrieve a file that's being analyzed, using its identifier/hash. * @param file_id the file identifier/hash. @@ -277,10 +273,6 @@ public: bool AddAnalyzer(const std::string& file_id, const file_analysis::Tag& tag, RecordValPtr args) const; - [[deprecated("Remove in v4.1. Pass IntrusivePtr args param instead.")]] - bool AddAnalyzer(const std::string& file_id, const file_analysis::Tag& tag, - RecordVal* args) const; - /** * Queue removal of an analyzer for a given file identifier. * @param file_id the file identifier/hash. @@ -291,10 +283,6 @@ public: bool RemoveAnalyzer(const std::string& file_id, const file_analysis::Tag& tag, RecordValPtr args) const; - [[deprecated("Remove in v4.1. Pass IntrusivePtr args param instead.")]] - bool RemoveAnalyzer(const std::string& file_id, const file_analysis::Tag& tag, - RecordVal* args) const; - /** * Tells whether analysis for a file is active or ignored. * @param file_id the file identifier/hash. @@ -312,9 +300,6 @@ public: Analyzer* InstantiateAnalyzer(const Tag& tag, RecordValPtr args, File* f) const; - [[deprecated("Remove in v4.1. Pass in IntrusivePtr args instead.")]] - Analyzer* InstantiateAnalyzer(const Tag& tag, RecordVal* args, File* f) const; - /** * Returns a set of all matching MIME magic signatures for a given * chunk of data. @@ -443,11 +428,3 @@ VectorValPtr GenMIMEMatchesVal(const zeek::detail::RuleMatcher::MIME_Matches& m) extern file_analysis::Manager* file_mgr; } // namespace zeek - -namespace file_analysis { - -using Manager [[deprecated("Remove in v4.1. Use zeek::file_analysis::Manager.")]] = zeek::file_analysis::Manager; - -} // namespace file_analysis - -extern zeek::file_analysis::Manager*& file_mgr [[deprecated("Remove in v4.1. Use zeek::file_mgr.")]]; diff --git a/src/file_analysis/Tag.cc b/src/file_analysis/Tag.cc index 68a24a3ef9..1966bf3ac7 100644 --- a/src/file_analysis/Tag.cc +++ b/src/file_analysis/Tag.cc @@ -8,7 +8,7 @@ namespace zeek::file_analysis { const Tag Tag::Error; Tag::Tag(type_t type, subtype_t subtype) - : ::Tag(file_mgr->GetTagType(), type, subtype) + : zeek::Tag(file_mgr->GetTagType(), type, subtype) { } @@ -23,17 +23,8 @@ const EnumValPtr& Tag::AsVal() const return zeek::Tag::AsVal(file_mgr->GetTagType()); } -EnumVal* Tag::AsEnumVal() const - { - return AsVal().get(); - } - Tag::Tag(EnumValPtr val) : zeek::Tag(std::move(val)) { } -Tag::Tag(EnumVal* val) - : zeek::Tag({NewRef{}, val}) - { } - } // namespace zeek::file_analysis diff --git a/src/file_analysis/Tag.h b/src/file_analysis/Tag.h index 8c04a998da..963d823ee5 100644 --- a/src/file_analysis/Tag.h +++ b/src/file_analysis/Tag.h @@ -11,14 +11,6 @@ namespace zeek::plugin { template class TaggedComponent; template class ComponentManager; } -namespace plugin { - template - using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = - zeek::plugin::TaggedComponent; - template - using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; -} ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, file_analysis); @@ -90,9 +82,6 @@ public: */ const EnumValPtr& AsVal() const; - [[deprecated("Remove in v4.1. Use AsVal() instead.")]] - EnumVal* AsEnumVal() const; - static const Tag Error; protected: @@ -117,15 +106,6 @@ protected: * @param val An enum value of script type \c Files::Tag. */ explicit Tag(EnumValPtr val); - - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit Tag(EnumVal* val); }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using Tag [[deprecated("Remove in v4.1. Use zeek::file_analysis::Tag.")]] = zeek::file_analysis::Tag; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/data_event/DataEvent.h b/src/file_analysis/analyzer/data_event/DataEvent.h index d48ca6c5a0..2680a2ea03 100644 --- a/src/file_analysis/analyzer/data_event/DataEvent.h +++ b/src/file_analysis/analyzer/data_event/DataEvent.h @@ -66,9 +66,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using DataEvent [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::DataEvent.")]] = zeek::file_analysis::detail::DataEvent; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/entropy/Entropy.h b/src/file_analysis/analyzer/entropy/Entropy.h index c6b3df96f8..01718eb16b 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.h +++ b/src/file_analysis/analyzer/entropy/Entropy.h @@ -80,9 +80,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using Entropy [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::Entropy.")]] = zeek::file_analysis::detail::Entropy; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/extract/Extract.h b/src/file_analysis/analyzer/extract/Extract.h index e9c7138446..0c9a6ed7bf 100644 --- a/src/file_analysis/analyzer/extract/Extract.h +++ b/src/file_analysis/analyzer/extract/Extract.h @@ -78,9 +78,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using Extract [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::Extract.")]] = zeek::file_analysis::detail::Extract; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/hash/Hash.h b/src/file_analysis/analyzer/hash/Hash.h index 927673b2cb..7f869f90f5 100644 --- a/src/file_analysis/analyzer/hash/Hash.h +++ b/src/file_analysis/analyzer/hash/Hash.h @@ -158,12 +158,3 @@ protected: }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using Hash [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::Hash.")]] = zeek::file_analysis::detail::Hash; -using MD5 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::MD5.")]] = zeek::file_analysis::detail::MD5; -using SHA1 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::SHA1.")]] = zeek::file_analysis::detail::SHA1; -using SHA256 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::SHA256.")]] = zeek::file_analysis::detail::SHA256; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/pe/PE.h b/src/file_analysis/analyzer/pe/PE.h index 86d5326a29..ec51cb8d15 100644 --- a/src/file_analysis/analyzer/pe/PE.h +++ b/src/file_analysis/analyzer/pe/PE.h @@ -31,9 +31,3 @@ protected: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using PE [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::PE.")]] = zeek::file_analysis::detail::PE; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/unified2/Unified2.h b/src/file_analysis/analyzer/unified2/Unified2.h index e79302cd36..804d45c716 100644 --- a/src/file_analysis/analyzer/unified2/Unified2.h +++ b/src/file_analysis/analyzer/unified2/Unified2.h @@ -33,9 +33,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using Unified2 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::Unified2.")]] = zeek::file_analysis::detail::Unified2; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/x509/OCSP.h b/src/file_analysis/analyzer/x509/OCSP.h index 8e12228c9c..161968d054 100644 --- a/src/file_analysis/analyzer/x509/OCSP.h +++ b/src/file_analysis/analyzer/x509/OCSP.h @@ -35,9 +35,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using OCSP [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::OCSP.")]] = zeek::file_analysis::detail::OCSP; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/x509/X509.h b/src/file_analysis/analyzer/x509/X509.h index 630df300e0..0bdaa5bf44 100644 --- a/src/file_analysis/analyzer/x509/X509.h +++ b/src/file_analysis/analyzer/x509/X509.h @@ -197,10 +197,3 @@ private: }; } // namespace zeek::file_analysis::detail - -namespace file_analysis { - -using X509 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::X509.")]] = zeek::file_analysis::detail::X509; -using X509Val [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::X509Val.")]] = zeek::file_analysis::detail::X509Val; - -} // namespace file_analysis diff --git a/src/file_analysis/analyzer/x509/X509Common.h b/src/file_analysis/analyzer/x509/X509Common.h index db1f4ea79b..4998cdc44d 100644 --- a/src/file_analysis/analyzer/x509/X509Common.h +++ b/src/file_analysis/analyzer/x509/X509Common.h @@ -54,9 +54,3 @@ protected: }; } // namespace zeek::file_analysis - -namespace file_analysis { - -using X509Common [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::X509Common.")]] = zeek::file_analysis::detail::X509Common; - -} // namespace file_analysis diff --git a/src/input.h b/src/input.h index 3d9f06b53d..0e9ea35eef 100644 --- a/src/input.h +++ b/src/input.h @@ -49,13 +49,3 @@ extern std::vector params; extern Stmt* stmts; // global statements } // namespace zeek::detail - -extern int& bro_argc [[deprecated("Remove in v4.1. Use zeek::detail::zeek_argc.")]]; -extern char**& bro_argv [[deprecated("Remove in v4.1. Use zeek::detail::zeek_argv.")]]; -extern const char*& prog [[deprecated("Remove in v4.1. Use zeek::detail::prog.")]]; - -extern std::vector& zeek_script_prefixes [[deprecated("Remove in v4.1. Use zeek::detail::zeek_script_prefixes.")]]; -extern const char*& command_line_policy [[deprecated("Remove in v4.1. Use zeek::detail::command_line_policy.")]]; -extern std::vector& params [[deprecated("Remove in v4.1. Use zeek::detail::params.")]]; - -extern zeek::detail::Stmt*& stmts [[deprecated("Remove in v4.1. Use zeek::detail::stmts.")]]; diff --git a/src/input/Component.h b/src/input/Component.h index 9fc4041998..8f5939e58a 100644 --- a/src/input/Component.h +++ b/src/input/Component.h @@ -61,9 +61,3 @@ private: }; } // namespace zeek::input - -namespace input { - -using Component [[deprecated("Remove in v4.1. Use zeek::input::Component.")]] = zeek::input::Component; - -} // namespace input diff --git a/src/input/Manager.h b/src/input/Manager.h index 9a7d7ffb68..da0522b654 100644 --- a/src/input/Manager.h +++ b/src/input/Manager.h @@ -261,11 +261,3 @@ private: extern input::Manager* input_mgr; } // namespace zeek - -extern zeek::input::Manager*& input_mgr [[deprecated("Remove in v4.1. Use zeek::input_mgr.")]]; - -namespace input { - -using Manager [[deprecated("Remove in v4.1. Use zeek::input::Manager.")]] = zeek::input::Manager; - -} // namespace input diff --git a/src/input/ReaderBackend.h b/src/input/ReaderBackend.h index e0cc0e4a6d..abb6800492 100644 --- a/src/input/ReaderBackend.h +++ b/src/input/ReaderBackend.h @@ -365,15 +365,3 @@ private: }; } // namespace zeek::input - -namespace input { - -using ReaderMode [[deprecated("Remove in v4.1. Use zeek::input::ReaderMode.")]] = zeek::input::ReaderMode; -constexpr auto MODE_MANUAL [[deprecated("Remove in v4.1. Use zeek::input::MODE_MANUAL.")]] = zeek::input::MODE_MANUAL; -constexpr auto MODE_REREAD [[deprecated("Remove in v4.1. Use zeek::input::MODE_REREAD.")]] = zeek::input::MODE_REREAD; -constexpr auto MODE_STREAM [[deprecated("Remove in v4.1. Use zeek::input::MODE_STREAM.")]] = zeek::input::MODE_STREAM; -constexpr auto MODE_NONE [[deprecated("Remove in v4.1. Use zeek::input::MODE_NONE.")]] = zeek::input::MODE_NONE; - -using ReaderBackend [[deprecated("Remove in v4.1. Use zeek::input::ReaderBackend.")]] = zeek::input::ReaderBackend; - -} // namespace input diff --git a/src/input/ReaderFrontend.h b/src/input/ReaderFrontend.h index a86a0550de..c4ca39d3ba 100644 --- a/src/input/ReaderFrontend.h +++ b/src/input/ReaderFrontend.h @@ -131,9 +131,3 @@ private: }; } // namespace zeek::input - -namespace input { - -using ReaderFrontend [[deprecated("Remove in v4.1. Use zeek::input::ReaderFrontend.")]] = zeek::input::ReaderFrontend; - -} // namespace input diff --git a/src/input/Tag.cc b/src/input/Tag.cc index 63998e1523..dddf7558ca 100644 --- a/src/input/Tag.cc +++ b/src/input/Tag.cc @@ -23,17 +23,8 @@ const EnumValPtr& Tag::AsVal() const return zeek::Tag::AsVal(input_mgr->GetTagType()); } -EnumVal* Tag::AsEnumVal() const - { - return AsVal().get(); - } - Tag::Tag(EnumValPtr val) : zeek::Tag(std::move(val)) { } -Tag::Tag(EnumVal* val) - : zeek::Tag({NewRef{}, val}) - { } - } // namespace zeek::input diff --git a/src/input/Tag.h b/src/input/Tag.h index 60e13d1530..fe4884ea42 100644 --- a/src/input/Tag.h +++ b/src/input/Tag.h @@ -11,14 +11,6 @@ namespace zeek::plugin { template class TaggedComponent; template class ComponentManager; } -namespace plugin { - template - using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = - zeek::plugin::TaggedComponent; - template - using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; -} ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, input); ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, input); @@ -91,9 +83,6 @@ public: */ const EnumValPtr& AsVal() const; - [[deprecated("Remove in v4.1. Use AsVal() instead.")]] - EnumVal* AsEnumVal() const; - static const Tag Error; protected: @@ -118,15 +107,6 @@ protected: * @param val An enum value of script type \c Input::Reader. */ explicit Tag(EnumValPtr val); - - [[deprecated("Remove in v4.1. Construct from IntrusivePtr isntead.")]] - explicit Tag(EnumVal* val); }; } // namespace zeek::input - -namespace input { - -using Tag [[deprecated("Remove in v4.1. Use zeek::input::Tag.")]] = zeek::input::Tag; - -} // namespace input diff --git a/src/input/readers/ascii/Ascii.h b/src/input/readers/ascii/Ascii.h index fb65ee267c..6b681bf2c0 100644 --- a/src/input/readers/ascii/Ascii.h +++ b/src/input/readers/ascii/Ascii.h @@ -86,10 +86,3 @@ private: }; } // namespace zeek::input::reader::detail - -namespace input::reader { - -using FieldMapping [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::FieldMapping.")]] = zeek::input::reader::detail::FieldMapping; -using Ascii [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Ascii.")]] = zeek::input::reader::detail::Ascii; - -} // namespace input::reader diff --git a/src/input/readers/benchmark/Benchmark.cc b/src/input/readers/benchmark/Benchmark.cc index 1cd2b2c6da..adc1f7319a 100644 --- a/src/input/readers/benchmark/Benchmark.cc +++ b/src/input/readers/benchmark/Benchmark.cc @@ -12,8 +12,8 @@ #include "input/readers/benchmark/benchmark.bif.h" -using threading::Value; -using threading::Field; +using zeek::threading::Value; +using zeek::threading::Field; namespace zeek::input::reader::detail { diff --git a/src/input/readers/benchmark/Benchmark.h b/src/input/readers/benchmark/Benchmark.h index 16d4aa0e82..48156e01cd 100644 --- a/src/input/readers/benchmark/Benchmark.h +++ b/src/input/readers/benchmark/Benchmark.h @@ -43,9 +43,3 @@ private: }; } // namespace zeek::input::reader - -namespace input::reader { - -using Benchmark [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Benchmark.")]] = zeek::input::reader::detail::Benchmark; - -} // namespace input::reader diff --git a/src/input/readers/binary/Binary.h b/src/input/readers/binary/Binary.h index 066b1f9ccc..c0e53c8db4 100644 --- a/src/input/readers/binary/Binary.h +++ b/src/input/readers/binary/Binary.h @@ -45,9 +45,3 @@ private: }; } // namespace zeek::input::reader::detail - -namespace input::reader { - -using Binary [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Binary.")]] = zeek::input::reader::detail::Binary; - -} // namespace input::reader diff --git a/src/input/readers/config/Config.h b/src/input/readers/config/Config.h index fe525c66ad..212bed2d0c 100644 --- a/src/input/readers/config/Config.h +++ b/src/input/readers/config/Config.h @@ -56,9 +56,3 @@ private: }; } // namespace zeek::input::reader::detail - -namespace input::reader { - -using Config [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Config.")]] = zeek::input::reader::detail::Config; - -} // namespace input::reader diff --git a/src/input/readers/raw/Raw.h b/src/input/readers/raw/Raw.h index 041be97dbd..11ca355069 100644 --- a/src/input/readers/raw/Raw.h +++ b/src/input/readers/raw/Raw.h @@ -90,9 +90,3 @@ private: }; } // namespace zeek::input::reader::detail - -namespace input::reader { - -using Raw [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Raw.")]] = zeek::input::reader::detail::Raw; - -} // namespace input::reader diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h index 705a9351a2..212e488a2c 100644 --- a/src/input/readers/sqlite/SQLite.h +++ b/src/input/readers/sqlite/SQLite.h @@ -46,9 +46,3 @@ private: }; } // namespace zeek::input::reader - -namespace input::reader { - -using SQLite [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::SQLite.")]] = zeek::input::reader::detail::SQLite; - -} // namespace input::reader diff --git a/src/iosource/BPF_Program.h b/src/iosource/BPF_Program.h index dee7f46918..bb5a8413f9 100644 --- a/src/iosource/BPF_Program.h +++ b/src/iosource/BPF_Program.h @@ -57,5 +57,3 @@ protected: }; } // namespace zeek::iosource::detail - -using BPF_Program [[deprecated("Remove in v4.1. Use zeek::iosource::detail::BPF_Program.")]] = zeek::iosource::detail::BPF_Program; diff --git a/src/iosource/Component.h b/src/iosource/Component.h index 4564488fd3..e8a1e7d9cb 100644 --- a/src/iosource/Component.h +++ b/src/iosource/Component.h @@ -168,11 +168,3 @@ private: }; } // namespace zeek::iosource - -namespace iosource { - -using Component [[deprecated("Remove in v4.1. Use zeek::iosource::Component.")]] = zeek::iosource::Component; -using PktSrcComponent [[deprecated("Remove in v4.1. Use zeek::iosource::PktSrcComponent.")]] = zeek::iosource::PktSrcComponent; -using PktDumperComponent [[deprecated("Remove in v4.1. Use zeek::iosource::PktDumperComponent.")]] = zeek::iosource::PktDumperComponent; - -} // namespace iosource diff --git a/src/iosource/IOSource.h b/src/iosource/IOSource.h index 3645dbec0e..a5e800b51d 100644 --- a/src/iosource/IOSource.h +++ b/src/iosource/IOSource.h @@ -87,9 +87,3 @@ private: }; } // namespace zeek::iosource - -namespace iosource { - -using IOSource [[deprecated("Remove in v4.1. Use zeek::iosource::IOSource.")]] = zeek::iosource::IOSource; - -} // namespace iosource diff --git a/src/iosource/Manager.h b/src/iosource/Manager.h index 2a79399960..2001643898 100644 --- a/src/iosource/Manager.h +++ b/src/iosource/Manager.h @@ -215,11 +215,3 @@ private: extern iosource::Manager* iosource_mgr; } // namespace zeek - -extern zeek::iosource::Manager*& iosource_mgr [[deprecated("Remove in v4.1. Use zeek::iosource_mgr.")]]; - -namespace iosource { - -using Manager [[deprecated("Remove in v4.1. Use zeek::iosource::Manager.")]] = zeek::iosource::Manager; - -} // namespace iosource diff --git a/src/iosource/Packet.cc b/src/iosource/Packet.cc index 129393aee5..f779ae2e79 100644 --- a/src/iosource/Packet.cc +++ b/src/iosource/Packet.cc @@ -146,11 +146,6 @@ RecordValPtr Packet::ToRawPktHdrVal() const return pkt_hdr; } -RecordVal* Packet::BuildPktHdrVal() const - { - return ToRawPktHdrVal().release(); - } - ValPtr Packet::FmtEUI48(const u_char* mac) const { char buf[20]; diff --git a/src/iosource/Packet.h b/src/iosource/Packet.h index 6bf2a506e6..fb8aa2e3e2 100644 --- a/src/iosource/Packet.h +++ b/src/iosource/Packet.h @@ -121,9 +121,6 @@ public: */ RecordValPtr ToRawPktHdrVal() const; - [[deprecated("Remove in v4.1. Use ToRawPktHdrval() instead.")]] - RecordVal* BuildPktHdrVal() const; - /** * Maximal length of a layer 2 address. */ @@ -246,11 +243,3 @@ private: }; } // namespace zeek - -using Layer3Proto [[deprecated("Remove in v4.1. Use zeek::Layer3Proto.")]] = zeek::Layer3Proto; -using Packet [[deprecated("Remove in v4.1. Use zeek::Packet.")]] = zeek::Packet; - -constexpr auto L3_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::L3_UNKNOWN")]] = zeek::L3_UNKNOWN; -constexpr auto L3_IPV4 [[deprecated("Remove in v4.1. Use zeek::L3_IPV4")]] = zeek::L3_IPV4; -constexpr auto L3_IPV6 [[deprecated("Remove in v4.1. Use zeek::L3_IPV6")]] = zeek::L3_IPV6; -constexpr auto L3_ARP [[deprecated("Remove in v4.1. Use zeek::L3_ARP")]] = zeek::L3_ARP; diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h index 5210a3c98f..f948b149ab 100644 --- a/src/iosource/PktDumper.h +++ b/src/iosource/PktDumper.h @@ -134,9 +134,3 @@ private: }; } // namespace zeek::iosource - -namespace iosource { - -using PktDumper [[deprecated("Remove in v4.1. Use zeek::iosource::PktDumper.")]] = zeek::iosource::PktDumper; - -} // namespace iosource diff --git a/src/iosource/PktSrc.cc b/src/iosource/PktSrc.cc index 50fa3b6182..5c182b8dc6 100644 --- a/src/iosource/PktSrc.cc +++ b/src/iosource/PktSrc.cc @@ -70,16 +70,6 @@ bool PktSrc::IsLive() const return props.is_live; } -double PktSrc::CurrentPacketTimestamp() - { - return run_state::current_packet_timestamp(); - } - -double PktSrc::CurrentPacketWallClock() - { - return run_state::current_packet_wallclock(); - } - void PktSrc::Opened(const Properties& arg_props) { props = arg_props; diff --git a/src/iosource/PktSrc.h b/src/iosource/PktSrc.h index c8de9d866b..6da818cb30 100644 --- a/src/iosource/PktSrc.h +++ b/src/iosource/PktSrc.h @@ -91,21 +91,6 @@ public: */ const char* ErrorMsg() const; - /** - * In pseudo-realtime mode, returns the logical timestamp of the - * current packet. Undefined if not running pseudo-realtime mode. - */ - [[deprecated("Remove in v4.1. Use zeek::run_state::current_packet_timestamp().")]] - double CurrentPacketTimestamp(); - - /** - * In pseudo-realtime mode, returns the wall clock time associated - * with current packet. Undefined if not running pseudo-realtime - * mode. - */ - [[deprecated("Remove in v4.1. Use zeek::run_state::current_wallclock().")]] - double CurrentPacketWallClock(); - /** * Precompiles a BPF filter and associates the given index with it. * The compiled filter will be then available via \a GetBPFFilter(). @@ -366,9 +351,3 @@ private: }; } // namespace zeek::iosource - -namespace iosource { - -using PktSrc [[deprecated("Remove in v4.1. Use zeek::iosource::PktSrc.")]] = zeek::iosource::PktSrc; - -} // namespace iosource diff --git a/src/iosource/pcap/Dumper.h b/src/iosource/pcap/Dumper.h index ca0088bc10..b88c32c825 100644 --- a/src/iosource/pcap/Dumper.h +++ b/src/iosource/pcap/Dumper.h @@ -32,9 +32,3 @@ private: }; } // namespace zeek::iosource::pcap - -namespace iosource::pcap { - -using PcapDumper [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapDumper.")]] = zeek::iosource::pcap::PcapDumper; - -} // namespace iosource::pcap diff --git a/src/iosource/pcap/Source.h b/src/iosource/pcap/Source.h index 5340ba36f8..ae43502f3f 100644 --- a/src/iosource/pcap/Source.h +++ b/src/iosource/pcap/Source.h @@ -41,9 +41,3 @@ private: }; } // namespace zeek::iosource::pcap - -namespace iosource::pcap { - -using PcapSource [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapSource.")]] = zeek::iosource::pcap::PcapSource; - -} // namespace iosource::pcap diff --git a/src/legacy-netvar-init.cc b/src/legacy-netvar-init.cc deleted file mode 100644 index e9cc1eaa80..0000000000 --- a/src/legacy-netvar-init.cc +++ /dev/null @@ -1,97 +0,0 @@ -#include "zeek/NetVar.h" -#include "zeek/Var.h" -#include "zeek/ID.h" -#include "zeek/Scope.h" - -namespace zeek::detail { - -// Compiled separately to avoid deprecation warnings at the assignment sites. -void zeek_legacy_netvar_init() - { - ::conn_id = id::conn_id.get(); - ::endpoint = id::endpoint.get(); - ::connection_type = id::connection.get(); - ::fa_file_type = id::fa_file.get(); - ::fa_metadata_type = id::fa_metadata.get(); - ::icmp_conn = id::find_type("icmp_conn")->AsRecordType(); - ::icmp_context = id::find_type("icmp_context")->AsRecordType(); - ::signature_state = id::find_type("signature_state")->AsRecordType(); - ::SYN_packet = id::find_type("SYN_packet")->AsRecordType(); - ::pcap_packet = id::find_type("pcap_packet")->AsRecordType(); - ::raw_pkt_hdr_type = id::find_type("raw_pkt_hdr")->AsRecordType(); - ::l2_hdr_type = id::find_type("l2_hdr")->AsRecordType(); - ::transport_proto = id::transport_proto.get(); - ::string_set = id::string_set.get(); - ::string_array = id::string_array.get(); - ::count_set = id::count_set.get(); - ::string_vec = id::string_vec.get(); - ::index_vec = id::index_vec.get(); - ::mime_matches = id::find_type("mime_matches")->AsVectorType(); - ::mime_match = id::find_type("mime_match")->AsRecordType(); - ::socks_address = id::find_type("SOCKS::Address")->AsRecordType(); - ::mime_header_rec = id::find_type("mime_header_rec")->AsRecordType(); - ::mime_header_list = id::find_type("mime_header_list")->AsTableType(); - ::http_stats_rec = id::find_type("http_stats_rec")->AsRecordType(); - ::http_message_stat = id::find_type("http_message_stat")->AsRecordType(); - ::pm_mapping = id::find_type("pm_mapping")->AsRecordType(); - ::pm_mappings = id::find_type("pm_mappings")->AsTableType(); - ::pm_port_request = id::find_type("pm_port_request")->AsRecordType(); - ::pm_callit_request = id::find_type("pm_callit_request")->AsRecordType(); - ::geo_location = id::find_type("geo_location")->AsRecordType(); - ::entropy_test_result = id::find_type("entropy_test_result")->AsRecordType(); - ::dns_msg = id::find_type("dns_msg")->AsRecordType(); - ::dns_answer = id::find_type("dns_answer")->AsRecordType(); - ::dns_soa = id::find_type("dns_soa")->AsRecordType(); - ::dns_edns_additional = id::find_type("dns_edns_additional")->AsRecordType(); - ::dns_edns_ecs = id::find_type("dns_edns_ecs")->AsRecordType(); - ::dns_tsig_additional = id::find_type("dns_tsig_additional")->AsRecordType(); - ::dns_rrsig_rr = id::find_type("dns_rrsig_rr")->AsRecordType(); - ::dns_dnskey_rr = id::find_type("dns_dnskey_rr")->AsRecordType(); - ::dns_nsec3_rr = id::find_type("dns_nsec3_rr")->AsRecordType(); - ::dns_ds_rr = id::find_type("dns_ds_rr")->AsRecordType(); - ::rotate_info = id::find_type("rotate_info")->AsRecordType(); - ::irc_join_list = id::find_type("irc_join_list")->AsTableType(); - ::irc_join_info = id::find_type("irc_join_info")->AsRecordType(); - ::script_id = id::find_type("script_id")->AsRecordType(); - ::id_table = id::find_type("id_table")->AsTableType(); - ::record_field = id::find_type("record_field")->AsRecordType(); - ::record_field_table = id::find_type("record_field_table")->AsTableType(); - ::call_argument = id::find_type("call_argument")->AsRecordType(); - ::call_argument_vector = id::find_type("call_argument_vector")->AsVectorType(); - - ::log_rotate_base_time = id::find_val("log_rotate_base_time")->AsStringVal(); - ::pkt_profile_file = id::find_val("pkt_profile_file").get(); - ::likely_server_ports = id::find_val("likely_server_ports")->AsTableVal(); - ::tcp_content_delivery_ports_orig = id::find_val("tcp_content_delivery_ports_orig")->AsTableVal(); - ::tcp_content_delivery_ports_resp = id::find_val("tcp_content_delivery_ports_resp")->AsTableVal(); - ::stp_skip_src = id::find_val("stp_skip_src")->AsTableVal(); - ::dns_skip_auth = id::find_val("dns_skip_auth")->AsTableVal(); - ::dns_skip_addl = id::find_val("dns_skip_addl")->AsTableVal(); - ::udp_content_ports = id::find_val("udp_content_ports")->AsTableVal(); - ::udp_content_delivery_ports_orig = id::find_val("udp_content_delivery_ports_orig")->AsTableVal(); - ::udp_content_delivery_ports_resp = id::find_val("udp_content_delivery_ports_resp")->AsTableVal(); - ::profiling_file = id::find_val("profiling_file").get(); - ::global_hash_seed = id::find_val("global_hash_seed")->AsStringVal(); - ::tcp_reassembler_ports_orig = id::find_val("tcp_reassembler_ports_orig")->AsTableVal(); - ::tcp_reassembler_ports_resp = id::find_val("tcp_reassembler_ports_resp")->AsTableVal(); - ::peer_description = id::find_val("peer_description")->AsStringVal(); - ::trace_output_file = id::find_val("trace_output_file")->AsStringVal(); - ::cmd_line_bpf_filter = id::find_val("cmd_line_bpf_filter")->AsStringVal(); - - auto anon_id = global_scope()->Lookup("preserve_orig_addr"); - - if ( anon_id ) - preserve_orig_addr = anon_id->GetVal()->AsTableVal(); - - anon_id = global_scope()->Lookup("preserve_resp_addr"); - - if ( anon_id ) - preserve_resp_addr = anon_id->GetVal()->AsTableVal(); - - anon_id = global_scope()->Lookup("preserve_other_addr"); - - if ( anon_id ) - preserve_other_addr = anon_id->GetVal()->AsTableVal(); - } - -} // namespace zeek::detail diff --git a/src/logging/Manager.h b/src/logging/Manager.h index 615c2284fb..b67179aaed 100644 --- a/src/logging/Manager.h +++ b/src/logging/Manager.h @@ -305,11 +305,3 @@ private: extern logging::Manager* log_mgr; } // namespace zeek - -extern zeek::logging::Manager*& log_mgr [[deprecated("Remove in v4.1. Use zeek::log_mgr.")]]; - -namespace logging { - -using Manager [[deprecated("Remove in v4.1. Use zeek::logging::Manager.")]] = zeek::logging::Manager; - -} // namespace logging diff --git a/src/logging/Tag.cc b/src/logging/Tag.cc index 1e7e5ca336..ffb6d75e6a 100644 --- a/src/logging/Tag.cc +++ b/src/logging/Tag.cc @@ -29,17 +29,8 @@ const EnumValPtr& Tag::AsVal() const return zeek::Tag::AsVal(log_mgr->GetTagType()); } -EnumVal* Tag::AsEnumVal() const - { - return AsVal().get(); - } - Tag::Tag(EnumValPtr val) : zeek::Tag(std::move(val)) { } -Tag::Tag(EnumVal* val) - : zeek::Tag({NewRef{}, val}) - { } - } // namespace zeek::logging diff --git a/src/logging/Tag.h b/src/logging/Tag.h index 8b0bd19403..94b620349c 100644 --- a/src/logging/Tag.h +++ b/src/logging/Tag.h @@ -11,14 +11,6 @@ namespace zeek::plugin { template class TaggedComponent; template class ComponentManager; } -namespace plugin { - template - using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = - zeek::plugin::TaggedComponent; - template - using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; -} ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, logging); ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, logging); @@ -96,9 +88,6 @@ public: */ const EnumValPtr& AsVal() const; - [[deprecated("Remove in v4.1. Use AsVal() instead.")]] - EnumVal* AsEnumVal() const; - static const Tag Error; protected: @@ -123,15 +112,6 @@ protected: * @param val An enum value of script type \c Log::Writer. */ explicit Tag(EnumValPtr val); - - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] - explicit Tag(EnumVal* val); }; } // namespace zeek::logging - -namespace logging { - -using Tag [[deprecated("Remove in v4.1. Use zeek::logging::Tag.")]] = zeek::logging::Tag; - -} // namespace logging diff --git a/src/logging/WriterBackend.h b/src/logging/WriterBackend.h index 19c92aaaed..6888c77312 100644 --- a/src/logging/WriterBackend.h +++ b/src/logging/WriterBackend.h @@ -399,9 +399,3 @@ private: }; } // namespace zeek::logging - -namespace logging { - -using WriterBackend [[deprecated("Remove in v4.1. Use zeek::logging::WriterBackend.")]] = zeek::logging::WriterBackend; - -} // namespace logging diff --git a/src/logging/WriterFrontend.h b/src/logging/WriterFrontend.h index 445235f49e..eda71c1f61 100644 --- a/src/logging/WriterFrontend.h +++ b/src/logging/WriterFrontend.h @@ -210,9 +210,3 @@ protected: }; } // namespace zeek::logging - -namespace logging { - -using WriterFrontend [[deprecated("Remove in v4.1. Use zeek::logging::WriterFrontend.")]] = zeek::logging::WriterFrontend; - -} // namespace logging diff --git a/src/module_util.h b/src/module_util.h index 169b7d4bbc..59b4ccef58 100644 --- a/src/module_util.h +++ b/src/module_util.h @@ -19,9 +19,3 @@ extern std::string normalized_module_name(const char* module_name); // w/o :: extern std::string make_full_var_name(const char* module_name, const char* var_name); } // namespace zeek::detail - -constexpr auto GLOBAL_MODULE_NAME [[deprecated("Remove in v4.1. Use zeek::detail::GLOBAL_MODULE_NAME.")]] = zeek::detail::GLOBAL_MODULE_NAME; -constexpr auto extract_module_name [[deprecated("Remove in v4.1. Use zeek::detail::extract_module_name.")]] = zeek::detail::extract_module_name; -constexpr auto extract_var_name [[deprecated("Remove in v4.1. Use zeek::detail::extract_var_name.")]] = zeek::detail::extract_var_name; -constexpr auto normalized_module_name [[deprecated("Remove in v4.1. Use zeek::detail::normalized_module_name.")]] = zeek::detail::normalized_module_name; -constexpr auto make_full_var_name [[deprecated("Remove in v4.1. Use zeek::detail::make_full_var_name.")]] = zeek::detail::make_full_var_name; diff --git a/src/net_util.h b/src/net_util.h index 3d9e2a9c39..758dbe8109 100644 --- a/src/net_util.h +++ b/src/net_util.h @@ -281,41 +281,3 @@ inline uint64_t htonll(uint64_t i) { return ntohll(i); } #endif } // namespace zeek - -constexpr auto seq_between [[deprecated("Remove in v4.1. Use zeek::seq_between.")]] = zeek::seq_between; -constexpr auto seq_delta [[deprecated("Remove in v4.1. Use zeek::seq_delta.")]] = zeek::seq_delta; -constexpr auto icmp6_checksum [[deprecated("Remove in v4.1. Use zeek::icmp6_checksum.")]] = zeek::icmp6_checksum; -constexpr auto icmp_checksum [[deprecated("Remove in v4.1. Use zeek::icmp_checksum.")]] = zeek::icmp_checksum; - -[[deprecated("Remove in v4.1. Use zeek::ones_complement_checksum.")]] -inline int ones_complement_checksum(const void* p, int b, uint32_t sum) - { return zeek::ones_complement_checksum(p, b, sum); } -[[deprecated("Remove in v4.1. Use zeek::ones_complement_checksum.")]] -inline int ones_complement_checksum(const zeek::IPAddr& a, uint32_t sum) - { return zeek::ones_complement_checksum(a, sum); } - -#ifdef ENABLE_MOBILE_IPV6 -constexpr auto mobility_header_checksum [[deprecated("Remove in v4.1. Use zeek::mobility_header_checksum.")]] = zeek::mobility_header_checksum; -#endif - -constexpr auto addr_to_class [[deprecated("Remove in v4.1. Use zeek::addr_to_class.")]] = zeek::addr_to_class; - -[[deprecated("Remove in v4.1. Use zeek::fmt_conn_id.")]] -inline const char* fmt_conn_id(const zeek::IPAddr& src_addr, uint32_t src_port, - const zeek::IPAddr& dst_addr, uint32_t dst_port) - { return zeek::fmt_conn_id(src_addr, src_port, dst_addr, dst_port); } -[[deprecated("Remove in v4.1. Use zeek::fmt_conn_id.")]] -inline const char* fmt_conn_id(const uint32_t* src_addr, uint32_t src_port, - const uint32_t* dst_addr, uint32_t dst_port) - { return zeek::fmt_conn_id(src_addr, src_port, dst_addr, dst_port); } - -constexpr auto fmt_mac [[deprecated("Remove in v4.1. Use zeek::fmt_mac.")]] = zeek::fmt_mac; -constexpr auto extract_uint32 [[deprecated("Remove in v4.1. Use zeek::extract_uint32.")]] = zeek::extract_uint32; - -constexpr auto ntohd [[deprecated("Remove in v4.1. Use zeek::ntohd.")]] = zeek::ntohd; -constexpr auto htond [[deprecated("Remove in v4.1. Use zeek::htond.")]] = zeek::htond; - -#ifndef HAVE_BYTEORDER_64 -constexpr auto ntohll [[deprecated("Remove in v4.1. Use zeek::ntohll.")]] = zeek::ntohll; -constexpr auto htonll [[deprecated("Remove in v4.1. Use zeek::htonll.")]] = zeek::htonll; -#endif diff --git a/src/plugin/Component.h b/src/plugin/Component.h index 78219f1a67..9d0f424082 100644 --- a/src/plugin/Component.h +++ b/src/plugin/Component.h @@ -106,29 +106,3 @@ private: }; } // namespace zeek::plugin - -namespace plugin -{ -using Component [[deprecated("Remove in v4.1. Use zeek::plugin::Component instead.")]] = zeek::plugin::Component; - -namespace component -{ - -using Type [[deprecated("Remove in v4.1. Use zeek::plugin::component::Type instead.")]] = zeek::plugin::component::Type; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::READER instead.")]] -constexpr auto READER = zeek::plugin::component::READER; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::WRITER instead.")]] -constexpr auto WRITER = zeek::plugin::component::WRITER; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::ANALYZER instead.")]] -constexpr auto ANALYZER = zeek::plugin::component::ANALYZER; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::FILE_ANALYZER instead.")]] -constexpr auto FILE_ANALYZER = zeek::plugin::component::FILE_ANALYZER; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::IOSOURCE instead.")]] -constexpr auto IOSOURCE = zeek::plugin::component::IOSOURCE; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::PKTSRC instead.")]] -constexpr auto PKTSRC = zeek::plugin::component::PKTSRC; -[[deprecated("Remove in v4.1. Use zeek::plugin::component::PKTDUMPER instead.")]] -constexpr auto PKTDUMPER = zeek::plugin::component::PKTDUMPER; - -} // namespace component -} // namespace plugin diff --git a/src/plugin/ComponentManager.h b/src/plugin/ComponentManager.h index ae2cad1adb..3cc7eeb738 100644 --- a/src/plugin/ComponentManager.h +++ b/src/plugin/ComponentManager.h @@ -53,9 +53,6 @@ public: */ const EnumTypePtr& GetTagType() const; - [[deprecated("Remove in v4.1. Use GetTagType() instead.")]] - EnumType* GetTagEnumType() const; - /** * Get a component name from its tag. * @@ -72,9 +69,6 @@ public: */ const std::string& GetComponentName(EnumValPtr val) const; - [[deprecated("Remove in v4.1. Use IntrusivePtr argument instead.")]] - const std::string& GetComponentName(Val* val) const; - /** * Get a component tag from its name. * @@ -167,12 +161,6 @@ const EnumTypePtr& ComponentManager::GetTagType() const return tag_enum_type; } -template -EnumType* ComponentManager::GetTagEnumType() const - { - return tag_enum_type.get(); - } - template const std::string& ComponentManager::GetComponentName(T tag) const { @@ -197,12 +185,6 @@ const std::string& ComponentManager::GetComponentName(EnumValPtr val) cons return GetComponentName(T(std::move(val))); } -template -const std::string& ComponentManager::GetComponentName(Val* val) const - { - return GetComponentName(T({NewRef{}, val->AsEnumVal()})); - } - template T ComponentManager::GetComponentTag(const std::string& name) const { @@ -266,11 +248,3 @@ void ComponentManager::RegisterComponent(C* component, } } // namespace zeek::plugin - -namespace plugin { - -template -using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; - -} // namespace plugin diff --git a/src/plugin/Manager.h b/src/plugin/Manager.h index 2fbb9570c7..5882b018bd 100644 --- a/src/plugin/Manager.h +++ b/src/plugin/Manager.h @@ -501,14 +501,3 @@ public: extern plugin::Manager* plugin_mgr; } // namespace zeek - -namespace plugin { - -using Manager [[deprecated("Remove in v4.1. Use zeek::plugin::Manager.")]] = zeek::plugin::Manager; - -} // namespace plugin - -/** - * The global plugin manager singleton. - */ -extern zeek::plugin::Manager*& plugin_mgr [[deprecated("Remove in v4.1. Use zeek::plugin_mgr.")]]; diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index 1ca2ad1af6..f75154c98e 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -25,9 +25,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); namespace zeek::threading { struct Field; } -namespace threading { - using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field; -} namespace zeek { template class IntrusivePtr; @@ -35,8 +32,6 @@ using ValPtr = IntrusivePtr; class Obj; } -using BroObj [[deprecated("Remove in v4.1. Use zeek::Obj instead.")]] = zeek::Obj; - namespace zeek::plugin { class Manager; @@ -895,44 +890,3 @@ private: }; } // namespace zeek::plugin - -namespace plugin { - -[[deprecated("Remove in v4.1. Use zeek::plugin::hook_name().")]] -constexpr auto hook_name = zeek::plugin::hook_name; - -using VersionNumber [[deprecated("Remove in v4.1. Use zeek::plugin::VersionNumber instead")]] = zeek::plugin::VersionNumber; -using Configuration [[deprecated("Remove in v4.1. Use zeek::plugin::Configuration instead")]] = zeek::plugin::Configuration; -using BifItem [[deprecated("Remove in v4.1. Use zeek::plugin::BifItem instead")]] = zeek::plugin::BifItem; -using HookArgument [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgument instead")]] = zeek::plugin::HookArgument; -using HookArgumentList [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgumentList instead")]] = zeek::plugin::HookArgumentList; -using Plugin [[deprecated("Remove in v4.1. Use zeek::plugin::Plugin instead")]] = zeek::plugin::Plugin; - -using HookType [[deprecated("Remove in v4.1. Use the zeek::plugin::HookType instead.")]] = zeek::plugin::HookType; - -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_LOAD_FILE instead.")]] -constexpr auto HOOK_LOAD_FILE = zeek::plugin::HOOK_LOAD_FILE; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_CALL_FUNCTION instead.")]] -constexpr auto HOOK_CALL_FUNCTION = zeek::plugin::HOOK_CALL_FUNCTION; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_QUEUE_EVENT instead.")]] -constexpr auto HOOK_QUEUE_EVENT = zeek::plugin::HOOK_QUEUE_EVENT; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_DRAIN_EVENTS instead.")]] -constexpr auto HOOK_DRAIN_EVENTS = zeek::plugin::HOOK_DRAIN_EVENTS; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_UPDATE_NETWORK_TIME instead.")]] -constexpr auto HOOK_UPDATE_NETWORK_TIME = zeek::plugin::HOOK_UPDATE_NETWORK_TIME; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_BRO_OBJ_DTOR instead.")]] -constexpr auto HOOK_BRO_OBJ_DTOR = zeek::plugin::HOOK_BRO_OBJ_DTOR; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_SETUP_ANALYZER_TREE instead.")]] -constexpr auto HOOK_SETUP_ANALYZER_TREE = zeek::plugin::HOOK_SETUP_ANALYZER_TREE; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_LOG_INIT instead.")]] -constexpr auto HOOK_LOG_INIT = zeek::plugin::HOOK_LOG_INIT; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_LOG_WRITE instead.")]] -constexpr auto HOOK_LOG_WRITE = zeek::plugin::HOOK_LOG_WRITE; -[[deprecated("Remove in v4.1. Use zeek::plugin::HOOK_REPORTER instead.")]] -constexpr auto HOOK_REPORTER = zeek::plugin::HOOK_REPORTER; -[[deprecated("Remove in v4.1. Use zeek::plugin::META_HOOK_PRE instead.")]] -constexpr auto META_HOOK_PRE = zeek::plugin::META_HOOK_PRE; -[[deprecated("Remove in v4.1. Use zeek::plugin::META_HOOK_POST instead.")]] -constexpr auto META_HOOK_POST = zeek::plugin::META_HOOK_POST; - -} // namespace plugin diff --git a/src/plugin/TaggedComponent.h b/src/plugin/TaggedComponent.h index 3852ffeea6..560de863d5 100644 --- a/src/plugin/TaggedComponent.h +++ b/src/plugin/TaggedComponent.h @@ -71,11 +71,3 @@ T TaggedComponent::Tag() const template typename T::type_t TaggedComponent::type_counter(0); } // namespace zeek::plugin - -namespace plugin { - -template -using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = - zeek::plugin::TaggedComponent; - -} // namespace plugin diff --git a/src/probabilistic/BitVector.h b/src/probabilistic/BitVector.h index 93e9483d2b..a13b2902b0 100644 --- a/src/probabilistic/BitVector.h +++ b/src/probabilistic/BitVector.h @@ -357,9 +357,3 @@ private: }; } // namespace zeek::probabilistic::detail - -namespace probabilistic { - -using BitVector [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::BitVector.")]] = zeek::probabilistic::detail::BitVector; - -} // namespace probabilistic diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h index efd1ff1193..3272081d5d 100644 --- a/src/probabilistic/BloomFilter.h +++ b/src/probabilistic/BloomFilter.h @@ -231,15 +231,3 @@ private: }; } // namespace zeek::probabilistic - -namespace probabilistic { - -using BloomFilterType [[deprecated("Remove in v4.1. Use zeek::probabilistic::BloomFilterType.")]] = zeek::probabilistic::BloomFilterType; -constexpr auto Basic [[deprecated("Remove in v4.1. Use zeek::probabilistic::Basic.")]] = zeek::probabilistic::Basic; -constexpr auto Counting [[deprecated("Remove in v4.1. Use zeek::probabilistic::Counting.")]] = zeek::probabilistic::Counting; - -using BloomFilter [[deprecated("Remove in v4.1. Use zeek::probabilistic::BloomFilter.")]] = zeek::probabilistic::BloomFilter; -using BasicBloomFilter [[deprecated("Remove in v4.1. Use zeek::probabilistic::BasicBloomFilter.")]] = zeek::probabilistic::BasicBloomFilter; -using CountingBloomFilter [[deprecated("Remove in v4.1. Use zeek::probabilistic::CountingBloomFilter.")]] = zeek::probabilistic::CountingBloomFilter; - -} // namespace probabilistic diff --git a/src/probabilistic/CardinalityCounter.h b/src/probabilistic/CardinalityCounter.h index 8f6091cce0..12f7d76521 100644 --- a/src/probabilistic/CardinalityCounter.h +++ b/src/probabilistic/CardinalityCounter.h @@ -187,9 +187,3 @@ private: }; } // namespace zeek::probabilistic::detail - -namespace probabilistic { - -using CardinalityCounter [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::CardinalityCounter.")]] = zeek::probabilistic::detail::CardinalityCounter; - -} // namespace probabilistic diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h index 29da2f0305..c5c7a2f8e2 100644 --- a/src/probabilistic/CounterVector.h +++ b/src/probabilistic/CounterVector.h @@ -157,9 +157,3 @@ private: }; } // namespace zeek::probabilistic::detail - -namespace probabilistic { - -using CounterVector [[deprecated("Remove in v4.1. Use zeek::probabilisitc::detail::CounterVector.")]] = zeek::probabilistic::detail::CounterVector; - -} // namespace probabilistic diff --git a/src/probabilistic/Hasher.h b/src/probabilistic/Hasher.h index 66f0f0c231..bace88fe6b 100644 --- a/src/probabilistic/Hasher.h +++ b/src/probabilistic/Hasher.h @@ -257,16 +257,3 @@ private: }; } // namespace zeek::probabilistic::detail - -namespace probabilistic { - -using HasherType [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::HasherType.")]] = zeek::probabilistic::detail::HasherType; -constexpr auto Default [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Default.")]] = zeek::probabilistic::detail::Default; -constexpr auto Double [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Double.")]] = zeek::probabilistic::detail::Double; - -using Hasher [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Hasher.")]] = zeek::probabilistic::detail::Hasher; -using UHF [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::UHF.")]] = zeek::probabilistic::detail::UHF; -using DefaultHasher [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::DefaultHasher.")]] = zeek::probabilistic::detail::DefaultHasher; -using DoubleHasher [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::DoubleHasher.")]] = zeek::probabilistic::detail::DoubleHasher; - -} // namespace probabilistic diff --git a/src/probabilistic/Topk.h b/src/probabilistic/Topk.h index fca837c4e3..4e67b389c3 100644 --- a/src/probabilistic/Topk.h +++ b/src/probabilistic/Topk.h @@ -173,11 +173,3 @@ private: }; } // namespace zeek::probabilistic::detail - -namespace probabilistic { - -using Element [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Element.")]] = zeek::probabilistic::detail::Element; -using Bucket [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Bucket.")]] = zeek::probabilistic::detail::Bucket; -using TopkVal [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::TopkVal.")]] = zeek::probabilistic::detail::TopkVal; - -} //namespace probabilistic diff --git a/src/probabilistic/bloom-filter.bif b/src/probabilistic/bloom-filter.bif index f38709b5ca..b545e13aa9 100644 --- a/src/probabilistic/bloom-filter.bif +++ b/src/probabilistic/bloom-filter.bif @@ -8,7 +8,7 @@ #include "zeek/probabilistic/BloomFilter.h" #include "zeek/OpaqueVal.h" -using namespace probabilistic; +using namespace zeek::probabilistic; %%} diff --git a/src/probabilistic/cardinality-counter.bif b/src/probabilistic/cardinality-counter.bif index 9b5477f043..ccc4bf29f4 100644 --- a/src/probabilistic/cardinality-counter.bif +++ b/src/probabilistic/cardinality-counter.bif @@ -4,7 +4,7 @@ #include "zeek/probabilistic/CardinalityCounter.h" #include "zeek/OpaqueVal.h" -using namespace probabilistic; +using namespace zeek::probabilistic; %%} module GLOBAL; diff --git a/src/re-scan.l b/src/re-scan.l index b2f17f9aae..9e0397e231 100644 --- a/src/re-scan.l +++ b/src/re-scan.l @@ -15,7 +15,6 @@ #include "re-parse.h" const char* zeek::detail::RE_parse_input = nullptr; -const char*& RE_parse_input = zeek::detail::RE_parse_input; #define RET_CCE(func) \ BEGIN(SC_CCL); \ diff --git a/src/threading/BasicThread.h b/src/threading/BasicThread.h index 3917f627fe..12190bdfde 100644 --- a/src/threading/BasicThread.h +++ b/src/threading/BasicThread.h @@ -214,9 +214,3 @@ private: }; } // namespace zeek::threading - -namespace threading { - -using BasicThread [[deprecated("Remove in v4.1. Use zeek::threading::BasicThread.")]] = zeek::threading::BasicThread; - -} // namespace threading diff --git a/src/threading/Formatter.h b/src/threading/Formatter.h index 66a1ee3224..79ef1f73ba 100644 --- a/src/threading/Formatter.h +++ b/src/threading/Formatter.h @@ -164,9 +164,3 @@ private: }; } // namespace zeek::threading - -namespace threading::formatter { - -using Formatter [[deprecated("Remove in v4.1. Use zeek::threading::Formatter.")]] = zeek::threading::Formatter; - -} // namespace threading::formatter diff --git a/src/threading/Manager.h b/src/threading/Manager.h index 3cee178827..cd0b149975 100644 --- a/src/threading/Manager.h +++ b/src/threading/Manager.h @@ -163,16 +163,3 @@ private: extern threading::Manager* thread_mgr; } // namespace zeek - -extern zeek::threading::Manager*& thread_mgr [[deprecated("Remove in v4.1. Use zeek::thread_mgr.")]]; - -namespace threading { - -using Manager [[deprecated("Remove in v4.1. Use zeek::threading::Manager.")]] = zeek::threading::Manager; - -namespace detail { - -using HeartbeatTimer [[deprecated("Remove in v4.1. Use zeek::threading::detail::HeartbeatTimer.")]] = zeek::threading::detail::HeartbeatTimer; - -} // namespace detail -} // namespace threading diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc index d1b55936b4..0bc3fa3901 100644 --- a/src/threading/MsgThread.cc +++ b/src/threading/MsgThread.cc @@ -118,7 +118,7 @@ public: bool Process() override { - debug_logger.Log(stream, "%s: %s", Object()->Name(), msg); + zeek::detail::debug_logger.Log(stream, "%s: %s", Object()->Name(), msg); return true; } private: diff --git a/src/threading/MsgThread.h b/src/threading/MsgThread.h index 3e57c7ddac..155fbb6ae4 100644 --- a/src/threading/MsgThread.h +++ b/src/threading/MsgThread.h @@ -6,17 +6,10 @@ #include "zeek/iosource/IOSource.h" #include "zeek/Flare.h" -namespace zeek::threading { - struct Value; - struct Field; -} -namespace threading { - using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value; - using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field; -} - namespace zeek::threading { +struct Value; +struct Field; class BasicInputMessage; class BasicOutputMessage; @@ -479,14 +472,3 @@ private: }; } // namespace zeek::threading - -namespace threading { - -using MsgThread [[deprecated("Remove in v4.1. Use zeek::threading::MsgThread.")]] = zeek::threading::MsgThread; -using Message [[deprecated("Remove in v4.1. Use zeek::threading::Message.")]] = zeek::threading::Message; -using BasicInputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicInputMessage.")]] = zeek::threading::BasicInputMessage; -using BasicOutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicOutputMessage.")]] = zeek::threading::BasicOutputMessage; -template using InputMessage [[deprecated("Remove in v4.1. Use zeek::threading::InputMessage.")]] = zeek::threading::InputMessage; -template using OutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::OutputMessage.")]] = zeek::threading::OutputMessage; - -} // namespace threading diff --git a/src/threading/Queue.h b/src/threading/Queue.h index 8ac86320cc..cc0ff119c3 100644 --- a/src/threading/Queue.h +++ b/src/threading/Queue.h @@ -262,9 +262,3 @@ inline void Queue::WakeUp() } } // namespace zeek::threading - -namespace threading { - -template using Queue [[deprecated("Remove in v4.1. Use zeek::threading::Queue.")]] = zeek::threading::Queue; - -} // namespace threading diff --git a/src/threading/SerialTypes.h b/src/threading/SerialTypes.h index e66a913026..51845e6ec6 100644 --- a/src/threading/SerialTypes.h +++ b/src/threading/SerialTypes.h @@ -215,10 +215,3 @@ private: }; } // namespace zeek::threading - -namespace threading { - -using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field; -using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value; - -} // namespace threading diff --git a/src/threading/formatters/Ascii.h b/src/threading/formatters/Ascii.h index c2d6218af2..0ab69bf5ee 100644 --- a/src/threading/formatters/Ascii.h +++ b/src/threading/formatters/Ascii.h @@ -60,9 +60,3 @@ private: }; } // namespace zeek::threading::formatter - -namespace threading::formatter { - -using Ascii [[deprecated("Remove in v4.1. Use zeek::threading::formatter::Ascii.")]] = zeek::threading::formatter::Ascii; - -} // namespace threading::formatter diff --git a/src/threading/formatters/JSON.h b/src/threading/formatters/JSON.h index 630da6b306..500e698d2b 100644 --- a/src/threading/formatters/JSON.h +++ b/src/threading/formatters/JSON.h @@ -45,9 +45,3 @@ private: }; } // namespace zeek::threading::formatter - -namespace threading::formatter { - -using JSON [[deprecated("Remove in v4.1. Use zeek::threading::formatter::JSON.")]] = zeek::threading::formatter::JSON; - -} // namespace threading::formatter diff --git a/src/util.cc b/src/util.cc index dd723492bf..3ae4b3bc16 100644 --- a/src/util.cc +++ b/src/util.cc @@ -2545,87 +2545,6 @@ string json_escape_utf8(const string& val) } // namespace zeek::util -// Remove in v4.1. -double& network_time = zeek::run_state::network_time; - -unsigned int bro_prng(unsigned int state) - { return zeek::util::detail::prng(state); } - -long int bro_random() - { return zeek::util::detail::random_number(); } - -void bro_srandom(unsigned int seed) - { zeek::util::detail::seed_random(seed); } - -zeek::ODesc* get_escaped_string(zeek::ODesc* d, const char* str, size_t len, bool escape_all) - { return zeek::util::get_escaped_string(d, str, len, escape_all); } -std::string get_escaped_string(const char* str, size_t len, bool escape_all) - { return zeek::util::get_escaped_string(str, len, escape_all); } -std::string get_escaped_string(const std::string& str, bool escape_all) - { return zeek::util::get_escaped_string(str, escape_all); } - -std::vector* tokenize_string(std::string_view input, - std::string_view delim, - std::vector* rval, int limit) - { return zeek::util::tokenize_string(input, delim, rval, limit); } -std::vector tokenize_string(std::string_view input, const char delim) noexcept - { return zeek::util::tokenize_string(input, delim); } - -char* skip_whitespace(char* s) - { return zeek::util::skip_whitespace(s); } -const char* skip_whitespace(const char* s) - { return zeek::util::skip_whitespace(s); } -char* skip_whitespace(char* s, char* end_of_s) - { return zeek::util::skip_whitespace(s, end_of_s); } -const char* skip_whitespace(const char* s, const char* end_of_s) - { return zeek::util::skip_whitespace(s, end_of_s); } - -char* get_word(char*& s) - { return zeek::util::get_word(s); } -void get_word(int length, const char* s, int& pwlen, const char*& pw) - { zeek::util::get_word(length, s, pwlen, pw); } -void to_upper(char* s) - { zeek::util::to_upper(s); } -std::string to_upper(const std::string& s) - { return zeek::util::to_upper(s); } - -char* uitoa_n(uint64_t value, char* str, int n, int base, const char* prefix) - { return zeek::util::uitoa_n(value, str, n, base, prefix); } -int fputs(int len, const char* s, FILE* fp) - { return zeek::util::fputs(len, s, fp); } - -std::string implode_string_vector(const std::vector& v, - const std::string& delim) - { return zeek::util::implode_string_vector(v, delim); } -std::string flatten_script_name(const std::string& name, - const std::string& prefix) - { return zeek::util::detail::flatten_script_name(name, prefix); } - -std::string find_file(const std::string& filename, const std::string& path_set, - const std::string& opt_ext) - { return zeek::util::find_file(filename, path_set, opt_ext); } -FILE* open_file(const std::string& path, const std::string& mode) - { return zeek::util::open_file(path, mode); } -FILE* open_package(std::string& path, const std::string& mode) - { return zeek::util::detail::open_package(path, mode); } - -double current_time(bool real) - { return zeek::util::current_time(real); } - -uint64_t calculate_unique_id() - { return zeek::util::calculate_unique_id(); } -uint64_t calculate_unique_id(const size_t pool) - { return zeek::util::calculate_unique_id(pool); } - -const array& script_extensions = zeek::util::detail::script_extensions; - -namespace zeek { - -void set_thread_name(const char* name, pthread_t tid) - { zeek::util::detail::set_thread_name(name, tid); } - -} // namespace zeek - extern "C" void out_of_memory(const char* where) { fprintf(stderr, "out of memory in %s.\n", where); diff --git a/src/util.h b/src/util.h index f70dcc0a3d..6252e0733d 100644 --- a/src/util.h +++ b/src/util.h @@ -61,38 +61,6 @@ extern HeapLeakChecker* heap_checker; #include #endif -[[deprecated("Remove in v4.1. Use uint64_t instead.")]] -typedef uint64_t uint64; -[[deprecated("Remove in v4.1. Use uint32_t instead.")]] -typedef uint32_t uint32; -[[deprecated("Remove in v4.1. Use uint16_t instead.")]] -typedef uint16_t uint16; -[[deprecated("Remove in v4.1. Use uint8_t instead.")]] -typedef uint8_t uint8; - -[[deprecated("Remove in v4.1. Use int64_t instead.")]] -typedef int64_t int64; -[[deprecated("Remove in v4.1. Use int32_t instead.")]] -typedef int32_t int32; -[[deprecated("Remove in v4.1. Use int16_t instead.")]] -typedef int16_t int16; -[[deprecated("Remove in v4.1. Use int8_t instead.")]] -typedef int8_t int8; - -// "ptr_compat_uint" and "ptr_compat_int" are (un)signed integers of -// pointer size. They can be cast safely to a pointer, e.g. in Lists, -// which represent their entities as void* pointers. -// -#if SIZEOF_VOID_P == 8 -typedef uint64_t ptr_compat_uint [[deprecated("Remove in v4.1. Use std::uintptr_t.")]]; -typedef int64_t ptr_compat_int [[deprecated("Remove in v4.1. Use std::intptr_t.")]]; -#elif SIZEOF_VOID_P == 4 -typedef uint32_t ptr_compat_uint [[deprecated("Remove in v4.1. Use std::uintptr_t")]]; -typedef int32_t ptr_compat_int [[deprecated("Remove in v4.1. Use std::intptr_t")]]; -#else -# error "Unsupported pointer size." -#endif - extern "C" { #include "zeek/modp_numtoa.h" @@ -108,32 +76,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek); extern char* strcasestr(const char* s, const char* find); #endif -// Current timestamp, from a networking perspective, not a wall-clock -// perspective. In particular, if we're reading from a savefile this -// is the time of the most recent packet, not the time returned by -// gettimeofday(). -extern double& network_time [[deprecated("Remove in v4.1. Use zeek::run_state::network_time.")]]; - -[[deprecated("Remove in v4.1: Use system snprintf instead")]] -inline int safe_snprintf(char* str, size_t size, const char* format, ...) - { - va_list al; - va_start(al, format); - int result = vsnprintf(str, size, format, al); - va_end(al); - str[size-1] = '\0'; - - return result; - } - -[[deprecated("Remove in v4.1: Use system vsnprintf instead")]] -inline int safe_vsnprintf(char* str, size_t size, const char* format, va_list al) - { - int result = vsnprintf(str, size, format, al); - str[size-1] = '\0'; - return result; - } - // This is used by the patricia code and so it remains outside of hte namespace. extern "C" void out_of_memory(const char* where); @@ -600,182 +542,3 @@ char* zeekenv(const char* name); std::string json_escape_utf8(const std::string& val); } // namespace zeek::util - -// A simple linear congruence PRNG. It takes its state as argument and -// returns a new random value, which can serve as state for subsequent calls. -[[deprecated("Remove in v4.1. Use zeek::util::prng()")]] -unsigned int bro_prng(unsigned int state); - -// Replacement for the system random(), to which is normally falls back -// except when a seed has been given. In that case, the function bro_prng. -[[deprecated("Remove in v4.1. Use zeek::util::random_number()")]] -long int bro_random(); - -// Calls the system srandom() function with the given seed if not running -// in deterministic mode, else it updates the state of the deterministic PRNG. -[[deprecated("Remove in v4.1. Use zeek::util::seed_random()")]] -void bro_srandom(unsigned int seed); - -template -[[ deprecated("Remove in v4.1. Use zeek::util::delete_each.")]] -void delete_each(T* t) { zeek::util::delete_each(t); } - -constexpr auto extract_ip [[deprecated("Remove in v4.1. Use zeek::util::detail::extract_ip.")]] = zeek::util::detail::extract_ip; -constexpr auto extract_ip_and_len [[deprecated("Remove in v4.1. Use zeek::util::detail::extract_ip_and_len.")]] = zeek::util::detail::extract_ip_and_len; -constexpr auto bytetohex [[deprecated("Remove in v4.1. Use zeek::util::bytetohex.")]] = zeek::util::bytetohex; -constexpr auto get_unescaped_string [[deprecated("Remove in v4.1. Use zeek::util::get_unescaped_string.")]] = zeek::util::get_unescaped_string; - -[[deprecated("Remove in v4.1. Use zeek::util::get_escaped_string.")]] -extern zeek::ODesc* get_escaped_string(zeek::ODesc* d, const char* str, size_t len, bool escape_all); -[[deprecated("Remove in v4.1. Use zeek::util::get_escaped_string.")]] -extern std::string get_escaped_string(const char* str, size_t len, bool escape_all); -[[deprecated("Remove in v4.1. Use zeek::util::get_escaped_string.")]] -extern std::string get_escaped_string(const std::string& str, bool escape_all); -[[deprecated("Remove in v4.1. Use zeek::util::tokenize_string.")]] -extern std::vector* tokenize_string(std::string_view input, - std::string_view delim, - std::vector* rval = nullptr, int limit = 0); -[[deprecated("Remove in v4.1. Use zeek::util::tokenize_string.")]] -std::vector tokenize_string(std::string_view input, const char delim) noexcept; - -constexpr auto copy_string [[deprecated("Remove in v4.1. Use zeek::util::copy_string.")]] = zeek::util::copy_string; -constexpr auto streq [[deprecated("Remove in v4.1. Use zeek::util::streq.")]] = zeek::util::streq; -constexpr auto expand_escape [[deprecated("Remove in v4.1. Use zeek::util::detail::expand_escape.")]] = zeek::util::detail::expand_escape; -constexpr auto skip_digits [[deprecated("Remove in v4.1. Use zeek::util::skip_digits.")]] = zeek::util::skip_digits; - -[[deprecated("Remove in v4.1. Use zeek::util::skip_whitespace.")]] -extern char* skip_whitespace(char* s); -[[deprecated("Remove in v4.1. Use zeek::util::skip_whitespace.")]] -extern const char* skip_whitespace(const char* s); -[[deprecated("Remove in v4.1. Use zeek::util::skip_whitespace.")]] -extern char* skip_whitespace(char* s, char* end_of_s); -[[deprecated("Remove in v4.1. Use zeek::util::skip_whitespace.")]] -extern const char* skip_whitespace(const char* s, const char* end_of_s); - -[[deprecated("Remove in v4.1. Use zeek::util::get_word.")]] -extern char* get_word(char*& s); -[[deprecated("Remove in v4.1. Use zeek::util::get_word.")]] -extern void get_word(int length, const char* s, int& pwlen, const char*& pw); -[[deprecated("Remove in v4.1. Use zeek::util::to_upper.")]] -extern void to_upper(char* s); -[[deprecated("Remove in v4.1. Use zeek::util::to_upper.")]] -extern std::string to_upper(const std::string& s); - -constexpr auto decode_hex [[deprecated("Remove in v4.1. Use zeek::util::decode_hex.")]] = zeek::util::decode_hex; -constexpr auto encode_hex [[deprecated("Remove in v4.1. Use zeek::util::encode_hex.")]] = zeek::util::encode_hex; -constexpr auto strpbrk_n [[deprecated("Remove in v4.1. Use zeek::util::strpbrk_n.")]] = zeek::util::strpbrk_n; -constexpr auto strstr_n [[deprecated("Remove in v4.1. Use zeek::util::strstr_n.")]] = zeek::util::strstr_n; -constexpr auto strreplace [[deprecated("Remove in v4.1. Use zeek::util::strreplace.")]] = zeek::util::strreplace; -constexpr auto strstrip [[deprecated("Remove in v4.1. Use zeek::util::strstrip.")]] = zeek::util::strstrip; - -template -[[deprecated("Remove in v4.1. Use zeek::util::atoi_n.")]] -int atoi_n(int len, const char* s, const char** end, int base, T& result) - { return zeek::util::atoi_n(len, s, end, base, result); } - -[[deprecated("Remove in v4.1. Use zeek::util::uitoa_n.")]] -extern char* uitoa_n(uint64_t value, char* str, int n, int base, const char* prefix=nullptr); - -[[deprecated("Remove in v4.1. Use zeek::util::fputs.")]] -extern int fputs(int len, const char* s, FILE* fp); - -constexpr auto is_printable [[deprecated("Remove in v4.1. Use zeek::util::is_printable.")]] = zeek::util::is_printable; -constexpr auto strtolower [[deprecated("Remove in v4.1. Use zeek::util::strtolower.")]] = zeek::util::strtolower; -constexpr auto fmt_bytes [[deprecated("Remove in v4.1. Use zeek::util::fmt_bytes.")]] = zeek::util::fmt_bytes; -constexpr auto vfmt [[deprecated("Remove in v4.1. Use zeek::util::vfmt.")]] = zeek::util::vfmt; -constexpr auto fmt [[deprecated("Remove in v4.1. Use zeek::util::fmt.")]] = zeek::util::fmt; -constexpr auto fmt_access_time [[deprecated("Remove in v4.1. Use zeek::util::detail::fmt_access_time.")]] = zeek::util::detail::fmt_access_time; -constexpr auto ensure_intermediate_dirs [[deprecated("Remove in v4.1. Use zeek::util::detail::ensure_intermediate_dirs.")]] = zeek::util::detail::ensure_intermediate_dirs; -constexpr auto ensure_dir [[deprecated("Remove in v4.1. Use zeek::util::detail::ensure_dir.")]] = zeek::util::detail::ensure_dir; -constexpr auto is_dir [[deprecated("Remove in v4.1. Use zeek::util::is_dir.")]] = zeek::util::is_dir; -constexpr auto is_file [[deprecated("Remove in v4.1. Use zeek::util::is_file.")]] = zeek::util::is_file; -constexpr auto hmac_md5 [[deprecated("Remove in v4.1. Use zeek::util::detail::hmac_md5.")]] = zeek::util::detail::hmac_md5; -constexpr auto init_random_seed [[deprecated("Remove in v4.1. Use zeek::util::detail::init_random_seed.")]] = zeek::util::detail::init_random_seed; -constexpr auto initial_seed [[deprecated("Remove in v4.1. Use zeek::util::detail::initial_seed.")]] = zeek::util::detail::initial_seed; -constexpr auto have_random_seed [[deprecated("Remove in v4.1. Use zeek::util::detail::have_random_seed.")]] = zeek::util::detail::have_random_seed; -constexpr auto rand64bit [[deprecated("Remove in v4.1. Use zeek::util::detail::rand64bit.")]] = zeek::util::detail::rand64bit; - -using SourceID [[deprecated("Remove in v4.1. Use zeek::util::detail::SourceID.")]] = zeek::util::detail::SourceID; -static const zeek::util::detail::SourceID SOURCE_LOCAL [[deprecated("Remove in v4.1. Use zeek::util::detail::SOURCE_LOCAL.")]] = zeek::util::detail::SOURCE_LOCAL; -static const zeek::util::detail::SourceID SOURCE_BROKER [[deprecated("Remove in v4.1. Use zeek::util::detail::SOURCE_BROKER.")]] = zeek::util::detail::SOURCE_BROKER; - -constexpr auto int_list_cmp [[deprecated("Remove in v4.1. Use zeek::util::int_list_cmp.")]] = zeek::util::int_list_cmp; -constexpr auto bro_path [[deprecated("Remove in v4.1. Use zeek::util::zeek_path.")]] = zeek::util::zeek_path; -constexpr auto bro_plugin_path [[deprecated("Remove in v4.1. Use zeek::util::zeek_plugin_path.")]] = zeek::util::zeek_plugin_path; -constexpr auto bro_plugin_activate [[deprecated("Remove in v4.1. Use zeek::util::zeek_plugin_activate.")]] = zeek::util::zeek_plugin_activate; -constexpr auto bro_prefixes [[deprecated("Remove in v4.1. Use zeek::util::zeek_prefixes.")]] = zeek::util::zeek_prefixes; - -extern const std::array& script_extensions [[deprecated("Remove in v4.1. Use zeek::util::detail::script_extensions.")]]; - -constexpr auto warn_if_legacy_script [[deprecated("Remove in v4.1. Use zeek::util::detail::warn_if_legacy_script.")]] = zeek::util::detail::warn_if_legacy_script; -constexpr auto is_package_loader [[deprecated("Remove in v4.1. Use zeek::util::detail::is_package_loader.")]] = zeek::util::detail::is_package_loader; -constexpr auto add_to_bro_path [[deprecated("Remove in v4.1. Use zeek::util::detail::add_to_zeek_path.")]] = zeek::util::detail::add_to_zeek_path; - -using SafePathOp [[deprecated("Remove in v4.1. Use zeek::util::detail::SafePathOp.")]] = zeek::util::detail::SafePathOp; -using SafeDirname [[deprecated("Remove in v4.1. Use zeek::util::SafeDirname.")]] = zeek::util::SafeDirname; -using SafeBasename [[deprecated("Remove in v4.1. Use zeek::util::SafeBasename.")]] = zeek::util::SafeBasename; - -[[deprecated("Remove in v4.1. Use zeek::util::implode_string_vector.")]] -std::string implode_string_vector(const std::vector& v, - const std::string& delim = "\n"); -[[deprecated("Remove in v4.1. Use zeek::util::flatten_script_name.")]] -std::string flatten_script_name(const std::string& name, - const std::string& prefix = ""); - -constexpr auto normalize_path [[deprecated("Remove in v4.1. Use zeek::util::detail::normalize_path.")]] = zeek::util::detail::normalize_path; -constexpr auto without_bropath_component [[deprecated("Remove in v4.1. Use zeek::util::detail::without_zeekpath_component.")]] = zeek::util::detail::without_zeekpath_component; -constexpr auto get_exe_path [[deprecated("Remove in v4.1. Use zeek::util::detail::get_exe_path.")]] = zeek::util::detail::get_exe_path; -constexpr auto find_script_file [[deprecated("Remove in v4.1. Use zeek::util::find_script_file.")]] = zeek::util::find_script_file; - -[[deprecated("Remove in v4.1. Use zeek::util::find_file.")]] -std::string find_file(const std::string& filename, const std::string& path_set, - const std::string& opt_ext = ""); -[[deprecated("Remove in v4.1. Use zeek::util::open_file.")]] -FILE* open_file(const std::string& path, const std::string& mode = "r"); -[[deprecated("Remove in v4.1. Use zeek::util::open_package.")]] -FILE* open_package(std::string& path, const std::string& mode = "r"); - -constexpr auto rotate_file [[deprecated("Remove in v4.1. Use zeek::util::detail::rotate_file.")]] = zeek::util::detail::rotate_file; -constexpr auto log_file_name [[deprecated("Remove in v4.1. Use zeek::util::detail::log_file_name.")]] = zeek::util::detail::log_file_name; -constexpr auto parse_rotate_base_time [[deprecated("Remove in v4.1. Use zeek::util::detail::parse_rotate_base_time.")]] = zeek::util::detail::parse_rotate_base_time; -constexpr auto calc_next_rotate [[deprecated("Remove in v4.1. Use zeek::util::detail::calc_next_rotate.")]] = zeek::util::detail::calc_next_rotate; -constexpr auto terminate_processing [[deprecated("Remove in v4.1. Use zeek::util::detail::terminate_processing.")]] = zeek::util::detail::terminate_processing; -constexpr auto set_processing_status [[deprecated("Remove in v4.1. Use zeek::util::detail::set_processing_status.")]] = zeek::util::detail::set_processing_status; - -[[deprecated("Remove in v4.1. Use zeek::util::current_time.")]] -extern double current_time(bool real=false); - -constexpr auto double_to_timeval [[deprecated("Remove in v4.1. Use zeek::util::double_to_timeval.")]] = zeek::util::double_to_timeval; -constexpr auto time_compare [[deprecated("Remove in v4.1. Use zeek::util::time_compare.")]] = zeek::util::time_compare; - -[[deprecated("Remove in v4.1. Use zeek::util::calculate_unique_id.")]] -extern uint64_t calculate_unique_id(); -[[deprecated("Remove in v4.1. Use zeek::util::calculate_unique_id.")]] -extern uint64_t calculate_unique_id(const size_t pool); - -using ltstr [[deprecated("Remove in v4.1. Use zeek::util::ltstr.")]] = zeek::util::ltstr; -constexpr auto pad_size [[deprecated("Remove in v4.1. Use zeek::util::pad_size.")]] = zeek::util::pad_size; -constexpr auto safe_write [[deprecated("Remove in v4.1. Use zeek::util::safe_write.")]] = zeek::util::safe_write; -constexpr auto safe_pwrite [[deprecated("Remove in v4.1. Use zeek::util::safe_pwrite.")]] = zeek::util::safe_pwrite; -constexpr auto safe_close [[deprecated("Remove in v4.1. Use zeek::util::safe_close.")]] = zeek::util::safe_close; -constexpr auto safe_realloc [[deprecated("Remove in v4.1. Use zeek::util::safe_realloc.")]] = zeek::util::safe_realloc; -constexpr auto safe_malloc [[deprecated("Remove in v4.1. Use zeek::util::safe_malloc.")]] = zeek::util::safe_malloc; -constexpr auto safe_strncpy [[deprecated("Remove in v4.1. Use zeek::util::safe_strncpy.")]] = zeek::util::safe_strncpy; -constexpr auto get_memory_usage [[deprecated("Remove in v4.1. Use zeek::util::get_memory_usage.")]] = zeek::util::get_memory_usage; -using CompareString [[deprecated("Remove in v4.1. Use zeek::util::CompareString.")]] = zeek::util::CompareString; -constexpr auto canonify_name [[deprecated("Remove in v4.1. Use zeek::util::canonify_name.")]] = zeek::util::canonify_name; -constexpr auto bro_strerror_r [[deprecated("Remove in v4.1. Use zeek::util::zeek_strerror_r.")]] = zeek::util::zeek_strerror_r; -constexpr auto zeekenv [[deprecated("Remove in v4.1. Use zeek::util::zeekenv.")]] = zeek::util::zeekenv; -constexpr auto json_escape_utf8 [[deprecated("Remove in v4.1. Use zeek::util::json_escape_utf8.")]] = zeek::util::json_escape_utf8; - -namespace zeek { - -[[deprecated("Remove in v4.1. Use zeek::util::set_thread_name.")]] -void set_thread_name(const char* name, pthread_t tid = pthread_self()); - -constexpr auto prng [[deprecated("Remove in v4.1. Use zeek::util::detail::prng.")]] = zeek::util::detail::prng; -constexpr auto random_number [[deprecated("Remove in v4.1. Use zeek::util::detail::random_number.")]] = zeek::util::detail::random_number; -constexpr auto max_random [[deprecated("Remove in v4.1. Use zeek::util::detail::max_random.")]] = zeek::util::detail::max_random; -constexpr auto seed_random [[deprecated("Remove in v4.1. Use zeek::util::detail::seed_random.")]] = zeek::util::detail::seed_random; - -} // namespace zeek diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index b241219bc2..44f1dbc70e 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -78,7 +78,6 @@ extern "C" { }; zeek::detail::ScriptCoverageManager zeek::detail::script_coverage_mgr; -zeek::detail::ScriptCoverageManager& brofiler = zeek::detail::script_coverage_mgr; #ifndef HAVE_STRSEP extern "C" { @@ -93,61 +92,37 @@ int perftools_profile = 0; #endif zeek::ValManager* zeek::val_mgr = nullptr; -zeek::ValManager*& val_mgr = zeek::val_mgr; zeek::analyzer::Manager* zeek::analyzer_mgr = nullptr; -zeek::analyzer::Manager*& analyzer_mgr = zeek::analyzer_mgr; zeek::packet_analysis::Manager* zeek::packet_mgr = nullptr; zeek::plugin::Manager* zeek::plugin_mgr = nullptr; -zeek::plugin::Manager*& plugin_mgr = zeek::plugin_mgr; zeek::detail::RuleMatcher* zeek::detail::rule_matcher = nullptr; -zeek::detail::RuleMatcher*& rule_matcher = zeek::detail::rule_matcher; - zeek::detail::DNS_Mgr* zeek::detail::dns_mgr = nullptr; -zeek::detail::DNS_Mgr*& dns_mgr = zeek::detail::dns_mgr; - zeek::detail::TimerMgr* zeek::detail::timer_mgr = nullptr; -zeek::detail::TimerMgr*& timer_mgr = zeek::detail::timer_mgr; zeek::logging::Manager* zeek::log_mgr = nullptr; -zeek::logging::Manager*& log_mgr = zeek::log_mgr; zeek::threading::Manager* zeek::thread_mgr = nullptr; -zeek::threading::Manager*& thread_mgr = zeek::thread_mgr; zeek::input::Manager* zeek::input_mgr = nullptr; -zeek::input::Manager*& input_mgr = zeek::input_mgr; zeek::file_analysis::Manager* zeek::file_mgr = nullptr; -zeek::file_analysis::Manager*& file_mgr = zeek::file_mgr; zeek::zeekygen::detail::Manager* zeek::detail::zeekygen_mgr = nullptr; -zeek::zeekygen::detail::Manager*& zeekygen_mgr = zeek::detail::zeekygen_mgr; zeek::iosource::Manager* zeek::iosource_mgr = nullptr; -zeek::iosource::Manager*& iosource_mgr = zeek::iosource_mgr; zeek::Broker::Manager* zeek::broker_mgr = nullptr; -zeek::Broker::Manager*& broker_mgr = zeek::broker_mgr; zeek::Supervisor* zeek::supervisor_mgr = nullptr; zeek::detail::trigger::Manager* zeek::detail::trigger_mgr = nullptr; -zeek::detail::trigger::Manager*& trigger_mgr = zeek::detail::trigger_mgr; std::vector zeek::detail::zeek_script_prefixes; -std::vector& zeek_script_prefixes = zeek::detail::zeek_script_prefixes; zeek::detail::Stmt* zeek::detail::stmts = nullptr; -zeek::detail::Stmt*& stmts = zeek::detail::stmts; zeek::EventRegistry* zeek::event_registry = nullptr; -zeek::EventRegistry*& event_registry = zeek::event_registry; zeek::detail::ProfileLogger* zeek::detail::profiling_logger = nullptr; -zeek::detail::ProfileLogger*& profiling_logger = zeek::detail::profiling_logger; zeek::detail::ProfileLogger* zeek::detail::segment_logger = nullptr; -zeek::detail::ProfileLogger*& segment_logger = zeek::detail::segment_logger; zeek::detail::SampleLogger* zeek::detail::sample_logger = nullptr; -zeek::detail::SampleLogger*& sample_logger = zeek::detail::sample_logger; zeek::detail::FragmentManager* zeek::detail::fragment_mgr = nullptr; int signal_val = 0; extern char version[]; const char* zeek::detail::command_line_policy = nullptr; -const char*& command_line_policy = zeek::detail::command_line_policy; vector zeek::detail::params; -vector& params = zeek::detail::params; set requested_plugins; const char* proc_status_file = nullptr; @@ -164,9 +139,7 @@ zeek::OpaqueTypePtr paraglob_type; // Keep copy of command line int zeek::detail::zeek_argc; -int& bro_argc = zeek::detail::zeek_argc; char** zeek::detail::zeek_argv; -char**& bro_argv = zeek::detail::zeek_argv; namespace zeek { diff --git a/src/zeekygen/Configuration.h b/src/zeekygen/Configuration.h index 7264dc9ed8..bfedeb637c 100644 --- a/src/zeekygen/Configuration.h +++ b/src/zeekygen/Configuration.h @@ -60,10 +60,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using Config [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::Config.")]] = zeek::zeekygen::detail::Config; -using Info [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::Info.")]] = zeek::zeekygen::detail::Info; - -} // namespace zeekygen diff --git a/src/zeekygen/IdentifierInfo.h b/src/zeekygen/IdentifierInfo.h index 5c672f9547..f23bc03018 100644 --- a/src/zeekygen/IdentifierInfo.h +++ b/src/zeekygen/IdentifierInfo.h @@ -202,10 +202,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using IdentifierInfo [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::IdentifierInfo.")]] = zeek::zeekygen::detail::IdentifierInfo; -using ScriptInfo [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ScriptInfo.")]] = zeek::zeekygen::detail::ScriptInfo; - -} // namespace zeekygen diff --git a/src/zeekygen/Info.h b/src/zeekygen/Info.h index e7fda77784..be6d01f429 100644 --- a/src/zeekygen/Info.h +++ b/src/zeekygen/Info.h @@ -68,9 +68,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using Info [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::Info.")]] = zeek::zeekygen::detail::Info; - -} // namespace zeekygen diff --git a/src/zeekygen/Manager.h b/src/zeekygen/Manager.h index d86d1de8cf..c4c9609116 100644 --- a/src/zeekygen/Manager.h +++ b/src/zeekygen/Manager.h @@ -270,11 +270,3 @@ namespace zeek::detail { extern zeekygen::detail::Manager* zeekygen_mgr; } // namespace zeek::detail - -namespace zeekygen { - -using Manager [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::Manager.")]] = zeek::zeekygen::detail::Manager; - -} // namespace zeekygen - -extern zeek::zeekygen::detail::Manager*& zeekygen_mgr [[deprecated("Remove in v4.1. Use zeek::detail::zeekygen_mgr.")]]; diff --git a/src/zeekygen/PackageInfo.h b/src/zeekygen/PackageInfo.h index 91384f14c1..8bdbb5ce6c 100644 --- a/src/zeekygen/PackageInfo.h +++ b/src/zeekygen/PackageInfo.h @@ -46,9 +46,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using PackageInfo [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::PackageInfo.")]] = zeek::zeekygen::detail::PackageInfo; - -} // namespace zeekygen diff --git a/src/zeekygen/ReStructuredTextTable.h b/src/zeekygen/ReStructuredTextTable.h index d5eca86556..75a802a1ab 100644 --- a/src/zeekygen/ReStructuredTextTable.h +++ b/src/zeekygen/ReStructuredTextTable.h @@ -48,9 +48,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using ReStructuredTextTable [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ReStructuredTextTable.")]] = zeek::zeekygen::detail::ReStructuredTextTable; - -} // namespace zeekygen diff --git a/src/zeekygen/ScriptInfo.h b/src/zeekygen/ScriptInfo.h index 4cbaf15766..5a4a925be7 100644 --- a/src/zeekygen/ScriptInfo.h +++ b/src/zeekygen/ScriptInfo.h @@ -121,12 +121,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using ScriptInfo [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ScriptInfo.")]] = zeek::zeekygen::detail::ScriptInfo; -using id_info_set [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::id_info_set.")]] = zeek::zeekygen::detail::id_info_set; -using id_info_list [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::id_info_list.")]] = zeek::zeekygen::detail::id_info_list; -using IdInfoComp [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::IdInfoComp.")]] = zeek::zeekygen::detail::IdInfoComp; - -} // namespace zeekygen diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h index f437c461ff..ac5dc05189 100644 --- a/src/zeekygen/Target.h +++ b/src/zeekygen/Target.h @@ -406,20 +406,3 @@ private: }; } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -using TargetFile [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::TargetFile.")]] = zeek::zeekygen::detail::TargetFile; -using Target [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::Target.")]] = zeek::zeekygen::detail::Target; -using TargetFactory [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::TargetFactory.")]] = zeek::zeekygen::detail::TargetFactory; -using AnalyzerTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::AnalyzerTarget.")]] = zeek::zeekygen::detail::AnalyzerTarget; -using ProtoAnalyzerTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ProtoAnalyzerTarget.")]] = zeek::zeekygen::detail::ProtoAnalyzerTarget; -using FileAnalyzerTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::FileAnalyzerTarget.")]] = zeek::zeekygen::detail::FileAnalyzerTarget; -using PackageTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::PackageTarget.")]] = zeek::zeekygen::detail::PackageTarget; -using PackageIndexTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::PackageIndexTarget.")]] = zeek::zeekygen::detail::PackageIndexTarget; -using ScriptTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ScriptTarget.")]] = zeek::zeekygen::detail::ScriptTarget; -using ScriptSummaryTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ScriptSummaryTarget.")]] = zeek::zeekygen::detail::ScriptSummaryTarget; -using ScriptIndexTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::ScriptIndexTarget.")]] = zeek::zeekygen::detail::ScriptIndexTarget; -using IdentifierTarget [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::IdentifierTarget.")]] = zeek::zeekygen::detail::IdentifierTarget; - -} // namespace zeekygen diff --git a/src/zeekygen/utils.h b/src/zeekygen/utils.h index 4bcf5719b1..4e1ef49809 100644 --- a/src/zeekygen/utils.h +++ b/src/zeekygen/utils.h @@ -65,15 +65,3 @@ bool is_all_whitespace(const std::string& s); std::string redef_indication(const std::string& from_script); } // namespace zeek::zeekygen::detail - -namespace zeekygen { - -constexpr auto prettify_params [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::prettify_params.")]] = zeek::zeekygen::detail::prettify_params; -constexpr auto is_public_api [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::is_public_api.")]] = zeek::zeekygen::detail::is_public_api; -constexpr auto get_mtime [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::get_mtime.")]] = zeek::zeekygen::detail::get_mtime; -constexpr auto make_heading [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::make_heading.")]] = zeek::zeekygen::detail::make_heading; -constexpr auto end_of_first_sentence [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::end_of_first_sentence.")]] = zeek::zeekygen::detail::end_of_first_sentence; -constexpr auto is_all_whitespace [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::is_all_whitespace.")]] = zeek::zeekygen::detail::is_all_whitespace; -constexpr auto redef_indication [[deprecated("Remove in v4.1. Use zeek::zeekygen::detail::redef_indication.")]] = zeek::zeekygen::detail::redef_indication; - -} // namespace zeekygen diff --git a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc index 56dd8048a6..dc6be0b0b2 100644 --- a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc +++ b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc @@ -31,7 +31,7 @@ static void describe_hook_args(const zeek::plugin::HookArgumentList& args, zeek: { bool first = true; - for ( plugin::HookArgumentList::const_iterator i = args.begin(); i != args.end(); i++ ) + for ( zeek::plugin::HookArgumentList::const_iterator i = args.begin(); i != args.end(); i++ ) { if ( ! first ) d->Add(", "); diff --git a/testing/btest/plugins/reader-plugin/src/Foo.cc b/testing/btest/plugins/reader-plugin/src/Foo.cc index 36800e2964..8024373833 100644 --- a/testing/btest/plugins/reader-plugin/src/Foo.cc +++ b/testing/btest/plugins/reader-plugin/src/Foo.cc @@ -48,7 +48,7 @@ std::string Foo::RandomString(const int len) // zeek::random_number() is not thread-safe; as we are only using one simultaneous thread // here, this should not matter in this case. If this test ever starts showing // random errors, this might be the culprit. - s[i] = values[zeek::random_number() / (zeek::max_random() / sizeof(values))]; + s[i] = values[zeek::util::detail::random_number() / (zeek::util::detail::max_random() / sizeof(values))]; return s; } @@ -84,7 +84,7 @@ zeek::threading::Value* Foo::EntryToVal(zeek::TypeTag type, zeek::TypeTag subtyp case zeek::TYPE_STRING: { std::string rnd = RandomString(10); - val->val.string_val.data = copy_string(rnd.c_str()); + val->val.string_val.data = zeek::util::copy_string(rnd.c_str()); val->val.string_val.length = rnd.size(); break; } diff --git a/zeek-config.h.in b/zeek-config.h.in index 8d0db14f1f..4986b054fd 100644 --- a/zeek-config.h.in +++ b/zeek-config.h.in @@ -283,11 +283,8 @@ extern const char* BRO_VERSION_FUNCTION(); #define ZEEK_FDN_0() #define ZEEK_FDN_1(cls) #define ZEEK_FDN_2(cls, ns) \ - namespace ns { class cls; } \ - using cls [[deprecated("Remove in v4.1. Use " #ns "::" #cls " instead.")]] = ns::cls; + namespace ns { class cls; } #define ZEEK_FDN_3(cls, ns1, ns2) \ - namespace ns1::ns2 { class cls; } \ - namespace ns2 { using cls [[deprecated("Remove in v4.1. Use " #ns1 "::" #ns2 "::" #cls " instead.")]] = ns1::ns2::cls; } + namespace ns1::ns2 { class cls; } #define ZEEK_FDN_4(cls, ns1, ns2, ns3) \ - namespace ns1::ns2::ns3 { class cls; } \ - namespace ns2 { using cls [[deprecated("Remove in v4.1. Use " #ns1 "::" #ns2 "::" #ns3 "::" #cls " instead.")]] = ns1::ns2::ns3::cls; } + namespace ns1::ns2::ns3 { class cls; } diff --git a/zeek-config.in b/zeek-config.in index 7c8e58d723..fef957633d 100755 --- a/zeek-config.in +++ b/zeek-config.in @@ -10,8 +10,7 @@ plugin_dir=@BRO_PLUGIN_INSTALL_PATH@ config_dir=@ZEEK_ETC_INSTALL_DIR@ python_dir=@PY_MOD_INSTALL_DIR@ cmake_dir=@CMAKE_INSTALL_PREFIX@/share/zeek/cmake -# Remove in v4.1: don't need @prefix@/include/zeek, just @prefix@/include -include_dir=@CMAKE_INSTALL_PREFIX@/include:@CMAKE_INSTALL_PREFIX@/include/zeek +include_dir=@CMAKE_INSTALL_PREFIX@/include zeekpath=@DEFAULT_ZEEKPATH@ zeek_dist=@ZEEK_DIST@ binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@ From b819c9d18c61f47527316837f9dd3213157ffead Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 22 Jan 2021 14:23:58 -0700 Subject: [PATCH 04/11] Remove TYPE_COUNTER This causes some test changes because of the use of Type::Describe in the fnv1a32 BIF method called by hash_hrw::get_site. Since the enum values change with removal of TYPE_COUNTER, the output from Type::Describe changes slightly. --- src/Type.cc | 1 - src/Type.h | 1 - .../manager-1..stdout | 16 ++++++++-------- .../manager-1..stdout | 16 ++++++++-------- .../proxy-1..stdout | 4 +--- .../proxy-2..stdout | 4 +++- .../Baseline/scripts.base.utils.hash_hrw/output | 16 ++++++++-------- 7 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/Type.cc b/src/Type.cc index 322413ee6a..34b78e820e 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -34,7 +34,6 @@ const char* type_name(TypeTag t) "bool", // 1 "int", // 2 "count", // 3 - "counter", // 4 "double", // 5 "time", // 6 "interval", // 7 diff --git a/src/Type.h b/src/Type.h index 79d9ddb9f2..40ba387620 100644 --- a/src/Type.h +++ b/src/Type.h @@ -38,7 +38,6 @@ enum TypeTag { TYPE_BOOL, // 1 TYPE_INT, // 2 TYPE_COUNT, // 3 - TYPE_COUNTER [[deprecated("Remove in v4.1. TYPE_COUNTER was removed; use TYPE_COUNT instead.")]], // 4 TYPE_DOUBLE, // 5 TYPE_TIME, // 6 TYPE_INTERVAL, // 7 diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout index 8ead7cccb9..a07dae7748 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout @@ -1,19 +1,19 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. 1st stuff hrw, 0, zeek/cluster/node/proxy-1/ -hrw (custom pool), 0, zeek/cluster/node/proxy-1/ +hrw (custom pool), 0, zeek/cluster/node/proxy-2/ hrw, 1, zeek/cluster/node/proxy-1/ -hrw (custom pool), 1, zeek/cluster/node/proxy-1/ +hrw (custom pool), 1, zeek/cluster/node/proxy-2/ hrw, 2, zeek/cluster/node/proxy-1/ hrw (custom pool), 2, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-1/ -hrw (custom pool), 3, zeek/cluster/node/proxy-1/ +hrw (custom pool), 3, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-1/ hrw (custom pool), 13, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-1/ hrw (custom pool), 37, zeek/cluster/node/proxy-2/ hrw, 42, zeek/cluster/node/proxy-1/ -hrw (custom pool), 42, zeek/cluster/node/proxy-2/ +hrw (custom pool), 42, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-1/ hrw (custom pool), 101, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-1/ @@ -33,19 +33,19 @@ rr (custom pool), zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-1/ rr (custom pool), zeek/cluster/node/proxy-2/ hrw, 0, zeek/cluster/node/proxy-1/ -hrw (custom pool), 0, zeek/cluster/node/proxy-1/ +hrw (custom pool), 0, zeek/cluster/node/proxy-2/ hrw, 1, zeek/cluster/node/proxy-1/ -hrw (custom pool), 1, zeek/cluster/node/proxy-1/ +hrw (custom pool), 1, zeek/cluster/node/proxy-2/ hrw, 2, zeek/cluster/node/proxy-1/ hrw (custom pool), 2, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-1/ -hrw (custom pool), 3, zeek/cluster/node/proxy-1/ +hrw (custom pool), 3, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-1/ hrw (custom pool), 13, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-1/ hrw (custom pool), 37, zeek/cluster/node/proxy-2/ hrw, 42, zeek/cluster/node/proxy-1/ -hrw (custom pool), 42, zeek/cluster/node/proxy-2/ +hrw (custom pool), 42, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-1/ hrw (custom pool), 101, zeek/cluster/node/proxy-2/ 2nd stuff diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout index 29557e06da..46f0ead64c 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout @@ -1,12 +1,12 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. 1st stuff -hrw, 0, zeek/cluster/node/proxy-1/ -hrw, 1, zeek/cluster/node/proxy-1/ +hrw, 0, zeek/cluster/node/proxy-2/ +hrw, 1, zeek/cluster/node/proxy-2/ hrw, 2, zeek/cluster/node/proxy-1/ -hrw, 3, zeek/cluster/node/proxy-1/ +hrw, 3, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-2/ -hrw, 42, zeek/cluster/node/proxy-2/ +hrw, 42, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-2/ @@ -16,13 +16,13 @@ rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-2/ -hrw, 0, zeek/cluster/node/proxy-1/ -hrw, 1, zeek/cluster/node/proxy-1/ +hrw, 0, zeek/cluster/node/proxy-2/ +hrw, 1, zeek/cluster/node/proxy-2/ hrw, 2, zeek/cluster/node/proxy-1/ -hrw, 3, zeek/cluster/node/proxy-1/ +hrw, 3, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-2/ -hrw, 42, zeek/cluster/node/proxy-2/ +hrw, 42, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-2/ 2nd stuff hrw, 0, zeek/cluster/node/proxy-2/ diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout index 3de67f73ed..a89373f442 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout @@ -1,8 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -got distributed event hrw, 0 -got distributed event hrw, 1 got distributed event hrw, 2 -got distributed event hrw, 3 +got distributed event hrw, 42 got distributed event rr, 0 got distributed event rr, 2 got distributed event rr, 13 diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout index d9890376c2..e6e28472a9 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout @@ -1,7 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +got distributed event hrw, 0 +got distributed event hrw, 1 +got distributed event hrw, 3 got distributed event hrw, 13 got distributed event hrw, 37 -got distributed event hrw, 42 got distributed event hrw, 101 got distributed event rr, 1 got distributed event rr, 3 diff --git a/testing/btest/Baseline/scripts.base.utils.hash_hrw/output b/testing/btest/Baseline/scripts.base.utils.hash_hrw/output index fe17378e5a..da11e37b36 100644 --- a/testing/btest/Baseline/scripts.base.utils.hash_hrw/output +++ b/testing/btest/Baseline/scripts.base.utils.hash_hrw/output @@ -9,18 +9,18 @@ T F [id=0, user_data=alice] [id=3, user_data=dave] -[id=3, user_data=dave] -[id=0, user_data=alice] -[id=0, user_data=alice] +[id=4, user_data=eve] +[id=4, user_data=eve] [id=4, user_data=eve] [id=0, user_data=alice] +[id=3, user_data=dave] [id=1, user_data=bob] [id=0, user_data=alice] [id=1, user_data=bob] T +[id=4, user_data=eve] [id=3, user_data=dave] -[id=3, user_data=dave] -[id=3, user_data=dave] +[id=4, user_data=eve] [id=4, user_data=eve] [id=4, user_data=eve] [id=4, user_data=eve] @@ -31,11 +31,11 @@ T T [id=0, user_data=alice] [id=3, user_data=dave] -[id=3, user_data=dave] -[id=0, user_data=alice] -[id=0, user_data=alice] +[id=4, user_data=eve] +[id=4, user_data=eve] [id=4, user_data=eve] [id=0, user_data=alice] +[id=3, user_data=dave] [id=1, user_data=bob] [id=0, user_data=alice] [id=1, user_data=bob] From 7292b52f66e0cd22cef65e4e4f458c9dbe8c21b3 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 22 Jan 2021 15:51:39 -0700 Subject: [PATCH 05/11] Remove some deprected methods/events from bif files --- src/analyzer/protocol/ssh/events.bif | 2 - src/analyzer/protocol/ssh/ssh-analyzer.pac | 2 - src/strings.bif | 38 ------------------- testing/btest/Baseline/bifs.split_string/out | 2 - .../btest/Baseline/language.strings/output | 8 ---- testing/btest/bifs/split_string.zeek | 2 - testing/btest/language/strings.zeek | 8 +--- 7 files changed, 1 insertion(+), 61 deletions(-) diff --git a/src/analyzer/protocol/ssh/events.bif b/src/analyzer/protocol/ssh/events.bif index fd1cd776d9..5fb32d67ad 100644 --- a/src/analyzer/protocol/ssh/events.bif +++ b/src/analyzer/protocol/ssh/events.bif @@ -144,9 +144,7 @@ event ssh2_server_host_key%(c: connection, key: string%); ## ssh_auth_attempted ssh_capabilities ssh2_server_host_key ## ssh_server_host_key ssh_encrypted_packet ssh2_dh_server_params ## ssh2_gss_error ssh2_ecc_key -event ssh1_server_host_key%(c: connection, p: string &deprecated="Remove in v4.1", e: string &deprecated="Remove in v4.1", modulus: string, exponent: string%); event ssh1_server_host_key%(c: connection, modulus: string, exponent: string%); -event ssh1_server_host_key%(c: connection, p: string, e: string%) &deprecated="Remove in v4.1. The 'p' and 'e' parameters are misleadingly named don't use them."; ## During the :abbr:`SSH (Secure Shell)` key exchange, the server ## supplies its public host key. This event is generated when the diff --git a/src/analyzer/protocol/ssh/ssh-analyzer.pac b/src/analyzer/protocol/ssh/ssh-analyzer.pac index 901f541ddf..71e8bcd423 100644 --- a/src/analyzer/protocol/ssh/ssh-analyzer.pac +++ b/src/analyzer/protocol/ssh/ssh-analyzer.pac @@ -197,8 +197,6 @@ refine flow SSH_Flow += { { zeek::BifEvent::enqueue_ssh1_server_host_key(connection()->zeek_analyzer(), connection()->zeek_analyzer()->Conn(), - to_stringval(${exp}), - to_stringval(${mod}), to_stringval(${mod}), to_stringval(${exp})); } diff --git a/src/strings.bif b/src/strings.bif index a9e8c05c3b..0d48536777 100644 --- a/src/strings.bif +++ b/src/strings.bif @@ -695,44 +695,6 @@ function str_smith_waterman%(s1: string, s2: string, params: sw_params%) : sw_su return result; %} -## Splits a string into substrings with the help of an index vector of cutting -## points. -## -## s: The string to split. -## -## idx: The index vector (``vector of count``) with the cutting points. -## -## Returns: A one-indexed vector of strings. -## -## .. zeek:see:: split_string split_string1 split_string_all split_string_n -function str_split%(s: string, idx: index_vec%): string_vec &deprecated="Remove in v4.1. Use str_split_indices." - %{ - auto idx_v = idx->As(); - auto n = idx_v->Size(); - zeek::String::IdxVec indices(n); - unsigned int i; - - for ( i = 0; i < n; i++ ) - indices[i] = idx_v->CountAt(i); - - zeek::String::Vec* result = s->AsString()->Split(indices); - auto result_v = zeek::make_intrusive(zeek::id::string_vec); - - if ( result ) - { - i = 1; - - for ( zeek::String::VecIt it = result->begin(); - it != result->end(); ++it, ++i ) - result_v->Assign(i, zeek::make_intrusive(*it)); - // StringVal now possesses string. - - delete result; - } - - return result_v; - %} - ## Splits a string into substrings with the help of an index vector of cutting ## points. This differs from str_split() in that it does not return an empty element ## at the beginning of the result. diff --git a/testing/btest/Baseline/bifs.split_string/out b/testing/btest/Baseline/bifs.split_string/out index 790f38eca4..0f5377c2e2 100644 --- a/testing/btest/Baseline/bifs.split_string/out +++ b/testing/btest/Baseline/bifs.split_string/out @@ -19,8 +19,6 @@ t hi s is a test --------------------- -[, thi, s i, s a tes, t] ---------------------- [thi, s i, s a tes, t] --------------------- X-Mailer diff --git a/testing/btest/Baseline/language.strings/output b/testing/btest/Baseline/language.strings/output index 0011c23ec5..db6b4f5b85 100644 --- a/testing/btest/Baseline/language.strings/output +++ b/testing/btest/Baseline/language.strings/output @@ -1,16 +1,8 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -warning in <...>/strings.zeek, line 26: deprecated (str_split): Remove in v4.1. Use str_split_indices. Input string: broisaveryneatids String splitting ---------------- -Splitting 'broisaveryneatids' at 6 points... -bro -is -a -very -neat -ids Splitting 'broisaveryneatids' at 6 points in zero-indexed mode... bro is diff --git a/testing/btest/bifs/split_string.zeek b/testing/btest/bifs/split_string.zeek index 73fd192d9a..11f0c5e011 100644 --- a/testing/btest/bifs/split_string.zeek +++ b/testing/btest/bifs/split_string.zeek @@ -24,8 +24,6 @@ event zeek_init() print "---------------------"; print_string_vector(split_string_n(a, pat, T, 1)); print "---------------------"; - print str_split(a, idx); - print "---------------------"; print str_split_indices(a, idx); print "---------------------"; a = "X-Mailer: Testing Test (http://www.example.com)"; diff --git a/testing/btest/language/strings.zeek b/testing/btest/language/strings.zeek index b5c9bfe431..f6965e547f 100644 --- a/testing/btest/language/strings.zeek +++ b/testing/btest/language/strings.zeek @@ -22,14 +22,8 @@ event zeek_init() idx1[4] = 10; idx1[5] = 14; - print fmt("Splitting '%s' at %d points...", s1, |idx1|); - local res_split: string_vec = str_split(s1, idx1); - - for ( i in res_split ) - print res_split[i]; - print fmt("Splitting '%s' at %d points in zero-indexed mode...", s1, |idx1|); - res_split = str_split_indices(s1, idx1); + local res_split: string_vec = str_split_indices(s1, idx1); for ( i in res_split ) print res_split[i]; From 44ad614094db3c57fef7fb226c539f6f090a5421 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 25 Jan 2021 13:33:06 -0700 Subject: [PATCH 06/11] Remove deprecated ICMP events --- src/analyzer/protocol/icmp/ICMP.cc | 30 ------------------- src/analyzer/protocol/icmp/ICMP.h | 3 -- src/analyzer/protocol/icmp/events.bif | 28 ----------------- .../really-all-events.log | 28 ++++++++--------- .../scripts/base/protocols/icmp/dnssl.zeek | 2 +- 5 files changed, 13 insertions(+), 78 deletions(-) diff --git a/src/analyzer/protocol/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc index 368d85c616..d24c8d7853 100644 --- a/src/analyzer/protocol/icmp/ICMP.cc +++ b/src/analyzer/protocol/icmp/ICMP.cc @@ -204,7 +204,6 @@ void ICMP_Analyzer::ICMP_Sent(const struct icmp* icmpp, int len, int caplen, if ( icmp_sent ) EnqueueConnEvent(icmp_sent, ConnVal(), - BuildICMPVal(icmpp, len, icmpv6, ip_hdr), BuildInfo(icmpp, len, icmpv6, ip_hdr) ); @@ -214,33 +213,12 @@ void ICMP_Analyzer::ICMP_Sent(const struct icmp* icmpp, int len, int caplen, EnqueueConnEvent(icmp_sent_payload, ConnVal(), - BuildICMPVal(icmpp, len, icmpv6, ip_hdr), BuildInfo(icmpp, len, icmpv6, ip_hdr), make_intrusive(payload) ); } } -RecordValPtr ICMP_Analyzer::BuildICMPVal(const struct icmp* icmpp, int len, - int icmpv6, const IP_Hdr* ip_hdr) - { - if ( ! icmp_conn_val ) - { - static auto icmp_conn = id::find_type("icmp_conn"); - icmp_conn_val = make_intrusive(icmp_conn); - - icmp_conn_val->Assign(0, make_intrusive(Conn()->OrigAddr())); - icmp_conn_val->Assign(1, make_intrusive(Conn()->RespAddr())); - icmp_conn_val->Assign(2, val_mgr->Count(icmpp->icmp_type)); - icmp_conn_val->Assign(3, val_mgr->Count(icmpp->icmp_code)); - icmp_conn_val->Assign(4, val_mgr->Count(len)); - icmp_conn_val->Assign(5, val_mgr->Count(ip_hdr->TTL())); - icmp_conn_val->Assign(6, val_mgr->Bool(icmpv6)); - } - - return icmp_conn_val; - } - RecordValPtr ICMP_Analyzer::BuildInfo(const struct icmp* icmpp, int len, bool icmpv6, const IP_Hdr* ip_hdr) { @@ -536,7 +514,6 @@ void ICMP_Analyzer::Echo(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, ip_hdr->NextProto() != IPPROTO_ICMP, ip_hdr), BuildInfo(icmpp, len, ip_hdr->NextProto() != IPPROTO_ICMP, ip_hdr), val_mgr->Count(iid), val_mgr->Count(iseq), @@ -565,7 +542,6 @@ void ICMP_Analyzer::RouterAdvert(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), val_mgr->Count(icmpp->icmp_num_addrs), // Cur Hop Limit val_mgr->Bool(icmpp->icmp_wpa & 0x80), // Managed @@ -599,7 +575,6 @@ void ICMP_Analyzer::NeighborAdvert(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), val_mgr->Bool(icmpp->icmp_num_addrs & 0x80), // Router val_mgr->Bool(icmpp->icmp_num_addrs & 0x40), // Solicited @@ -627,7 +602,6 @@ void ICMP_Analyzer::NeighborSolicit(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), make_intrusive(tgtaddr), BuildNDOptionsVal(caplen - opt_offset, data + opt_offset) @@ -655,7 +629,6 @@ void ICMP_Analyzer::Redirect(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), make_intrusive(tgtaddr), make_intrusive(dstaddr), @@ -674,7 +647,6 @@ void ICMP_Analyzer::RouterSolicit(double t, const struct icmp* icmpp, int len, EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), BuildNDOptionsVal(caplen, data) ); @@ -700,7 +672,6 @@ void ICMP_Analyzer::Context4(double t, const struct icmp* icmpp, if ( f ) EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 0, ip_hdr), BuildInfo(icmpp, len, 0, ip_hdr), val_mgr->Count(icmpp->icmp_code), ExtractICMP4Context(caplen, data) @@ -739,7 +710,6 @@ void ICMP_Analyzer::Context6(double t, const struct icmp* icmpp, if ( f ) EnqueueConnEvent(f, ConnVal(), - BuildICMPVal(icmpp, len, 1, ip_hdr), BuildInfo(icmpp, len, 1, ip_hdr), val_mgr->Count(icmpp->icmp_code), ExtractICMP6Context(caplen, data) diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h index c1c84be59b..85c35267aa 100644 --- a/src/analyzer/protocol/icmp/ICMP.h +++ b/src/analyzer/protocol/icmp/ICMP.h @@ -54,9 +54,6 @@ protected: void Describe(ODesc* d) const; - RecordValPtr BuildICMPVal(const struct icmp* icmpp, int len, - int icmpv6, const IP_Hdr* ip_hdr); - RecordValPtr BuildInfo(const struct icmp* icmpp, int len, bool icmpv6, const IP_Hdr* ip_hdr); diff --git a/src/analyzer/protocol/icmp/events.bif b/src/analyzer/protocol/icmp/events.bif index 96ac63cc03..a3ad541d89 100644 --- a/src/analyzer/protocol/icmp/events.bif +++ b/src/analyzer/protocol/icmp/events.bif @@ -16,9 +16,7 @@ ## connection record *c*. ## ## .. zeek:see:: icmp_error_message icmp_sent_payload -event icmp_sent%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info%); event icmp_sent%(c: connection, info: icmp_info%); -event icmp_sent%(c: connection, icmp: icmp_conn%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## The same as :zeek:see:`icmp_sent` except containing the ICMP payload. ## @@ -33,9 +31,7 @@ event icmp_sent%(c: connection, icmp: icmp_conn%) &deprecated="Remove in v4.1. ## payload: The payload of the ICMP message. ## ## .. zeek:see:: icmp_error_message icmp_sent_payload -event icmp_sent_payload%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, payload: string%); event icmp_sent_payload%(c: connection, info: icmp_info, payload: string%); -event icmp_sent_payload%(c: connection, icmp: icmp_conn, payload: string%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *echo request* messages. ## @@ -59,9 +55,7 @@ event icmp_sent_payload%(c: connection, icmp: icmp_conn, payload: string%) &depr ## after the first 8 bytes of the ICMP header. ## ## .. zeek:see:: icmp_echo_reply -event icmp_echo_request%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, id: count, seq: count, payload: string%); event icmp_echo_request%(c: connection, info: icmp_info, id: count, seq: count, payload: string%); -event icmp_echo_request%(c: connection, icmp: icmp_conn, id: count, seq: count, payload: string%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn."; ## Generated for ICMP *echo reply* messages. ## @@ -85,9 +79,7 @@ event icmp_echo_request%(c: connection, icmp: icmp_conn, id: count, seq: count, ## after the first 8 bytes of the ICMP header. ## ## .. zeek:see:: icmp_echo_request -event icmp_echo_reply%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, id: count, seq: count, payload: string%); event icmp_echo_reply%(c: connection, info: icmp_info, id: count, seq: count, payload: string%); -event icmp_echo_reply%(c: connection, icmp: icmp_conn, id: count, seq: count, payload: string%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn."; ## Generated for all ICMPv6 error messages that are not handled ## separately with dedicated events. Zeek's ICMP analyzer handles a number @@ -113,9 +105,7 @@ event icmp_echo_reply%(c: connection, icmp: icmp_conn, id: count, seq: count, pa ## ## .. zeek:see:: icmp_unreachable icmp_packet_too_big ## icmp_time_exceeded icmp_parameter_problem -event icmp_error_message%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, code: count, context: icmp_context%); event icmp_error_message%(c: connection, info: icmp_info, code: count, context: icmp_context%); -event icmp_error_message%(c: connection, icmp: icmp_conn, code: count, context: icmp_context%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *destination unreachable* messages. ## @@ -142,9 +132,7 @@ event icmp_error_message%(c: connection, icmp: icmp_conn, code: count, context: ## ## .. zeek:see:: icmp_error_message icmp_packet_too_big ## icmp_time_exceeded icmp_parameter_problem -event icmp_unreachable%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, code: count, context: icmp_context%); event icmp_unreachable%(c: connection, info: icmp_info, code: count, context: icmp_context%); -event icmp_unreachable%(c: connection, icmp: icmp_conn, code: count, context: icmp_context%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMPv6 *packet too big* messages. ## @@ -171,9 +159,7 @@ event icmp_unreachable%(c: connection, icmp: icmp_conn, code: count, context: ic ## ## .. zeek:see:: icmp_error_message icmp_unreachable ## icmp_time_exceeded icmp_parameter_problem -event icmp_packet_too_big%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, code: count, context: icmp_context%); event icmp_packet_too_big%(c: connection, info: icmp_info, code: count, context: icmp_context%); -event icmp_packet_too_big%(c: connection, icmp: icmp_conn, code: count, context: icmp_context%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *time exceeded* messages. ## @@ -200,9 +186,7 @@ event icmp_packet_too_big%(c: connection, icmp: icmp_conn, code: count, context: ## ## .. zeek:see:: icmp_error_message icmp_unreachable icmp_packet_too_big ## icmp_parameter_problem -event icmp_time_exceeded%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, code: count, context: icmp_context%); event icmp_time_exceeded%(c: connection, info: icmp_info, code: count, context: icmp_context%); -event icmp_time_exceeded%(c: connection, icmp: icmp_conn, code: count, context: icmp_context%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMPv6 *parameter problem* messages. ## @@ -229,9 +213,7 @@ event icmp_time_exceeded%(c: connection, icmp: icmp_conn, code: count, context: ## ## .. zeek:see:: icmp_error_message icmp_unreachable icmp_packet_too_big ## icmp_time_exceeded -event icmp_parameter_problem%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, code: count, context: icmp_context%); event icmp_parameter_problem%(c: connection, info: icmp_info, code: count, context: icmp_context%); -event icmp_parameter_problem%(c: connection, icmp: icmp_conn, code: count, context: icmp_context%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *router solicitation* messages. ## @@ -251,9 +233,7 @@ event icmp_parameter_problem%(c: connection, icmp: icmp_conn, code: count, conte ## ## .. zeek:see:: icmp_router_advertisement ## icmp_neighbor_solicitation icmp_neighbor_advertisement icmp_redirect -event icmp_router_solicitation%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, options: icmp6_nd_options%); event icmp_router_solicitation%(c: connection, info: icmp_info, options: icmp6_nd_options%); -event icmp_router_solicitation%(c: connection, icmp: icmp_conn, options: icmp6_nd_options%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *router advertisement* messages. ## @@ -294,9 +274,7 @@ event icmp_router_solicitation%(c: connection, icmp: icmp_conn, options: icmp6_n ## ## .. zeek:see:: icmp_router_solicitation ## icmp_neighbor_solicitation icmp_neighbor_advertisement icmp_redirect -event icmp_router_advertisement%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, cur_hop_limit: count, managed: bool, other: bool, home_agent: bool, pref: count, proxy: bool, rsv: count, router_lifetime: interval, reachable_time: interval, retrans_timer: interval, options: icmp6_nd_options%); event icmp_router_advertisement%(c: connection, info: icmp_info, cur_hop_limit: count, managed: bool, other: bool, home_agent: bool, pref: count, proxy: bool, rsv: count, router_lifetime: interval, reachable_time: interval, retrans_timer: interval, options: icmp6_nd_options%); -event icmp_router_advertisement%(c: connection, icmp: icmp_conn, cur_hop_limit: count, managed: bool, other: bool, home_agent: bool, pref: count, proxy: bool, rsv: count, router_lifetime: interval, reachable_time: interval, retrans_timer: interval, options: icmp6_nd_options%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *neighbor solicitation* messages. ## @@ -318,9 +296,7 @@ event icmp_router_advertisement%(c: connection, icmp: icmp_conn, cur_hop_limit: ## ## .. zeek:see:: icmp_router_solicitation icmp_router_advertisement ## icmp_neighbor_advertisement icmp_redirect -event icmp_neighbor_solicitation%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, tgt: addr, options: icmp6_nd_options%); event icmp_neighbor_solicitation%(c: connection, info: icmp_info, tgt: addr, options: icmp6_nd_options%); -event icmp_neighbor_solicitation%(c: connection, icmp: icmp_conn, tgt: addr, options: icmp6_nd_options%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *neighbor advertisement* messages. ## @@ -349,9 +325,7 @@ event icmp_neighbor_solicitation%(c: connection, icmp: icmp_conn, tgt: addr, opt ## ## .. zeek:see:: icmp_router_solicitation icmp_router_advertisement ## icmp_neighbor_solicitation icmp_redirect -event icmp_neighbor_advertisement%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, router: bool, solicited: bool, override: bool, tgt: addr, options: icmp6_nd_options%); event icmp_neighbor_advertisement%(c: connection, info: icmp_info, router: bool, solicited: bool, override: bool, tgt: addr, options: icmp6_nd_options%); -event icmp_neighbor_advertisement%(c: connection, icmp: icmp_conn, router: bool, solicited: bool, override: bool, tgt: addr, options: icmp6_nd_options%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; ## Generated for ICMP *redirect* messages. ## @@ -376,6 +350,4 @@ event icmp_neighbor_advertisement%(c: connection, icmp: icmp_conn, router: bool, ## ## .. zeek:see:: icmp_router_solicitation icmp_router_advertisement ## icmp_neighbor_solicitation icmp_neighbor_advertisement -event icmp_redirect%(c: connection, icmp: icmp_conn &deprecated="Remove in v4.1", info: icmp_info, tgt: addr, dest: addr, options: icmp6_nd_options%); event icmp_redirect%(c: connection, info: icmp_info, tgt: addr, dest: addr, options: icmp6_nd_options%); -event icmp_redirect%(c: connection, icmp: icmp_conn, tgt: addr, dest: addr, options: icmp6_nd_options%) &deprecated="Remove in v4.1. The icmp_info record is replacing icmp_conn"; diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log index 30e640656d..0d937690c2 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log @@ -2854,10 +2854,9 @@ XXXXXXXXXX.XXXXXX packet_contents XXXXXXXXXX.XXXXXX icmp_unreachable [0] c: connection = [id=[orig_h=192.168.1.1, orig_p=3/icmp, resp_h=10.10.1.4, resp_p=4/icmp], orig=[size=548, state=1, num_pkts=0, num_bytes_ip=0, flow_label=0, l2_addr=00:1f:33:d9:81:60], resp=[size=0, state=0, num_pkts=0, num_bytes_ip=0, flow_label=0, l2_addr=00:e0:1c:3c:17:c2], start_time=XXXXXXXXXX.XXXXXX, duration=0 secs, service={\x0a\x0a}, history=, uid=C4J4Th3PJpwUYZZ6gc, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks=, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=, http_state=, irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=] - [1] icmp: icmp_conn = [orig_h=192.168.1.1, resp_h=10.10.1.4, itype=3, icode=4, len=548, hlim=63, v6=F] - [2] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] - [3] code: count = 4 - [4] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] + [1] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] + [2] code: count = 4 + [3] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] XXXXXXXXXX.XXXXXX raw_packet [0] p: raw_pkt_hdr = [l2=[encap=LINK_ETHERNET, len=590, cap_len=590, src=00:1f:33:d9:81:60, dst=00:e0:1c:3c:17:c2, vlan=, inner_vlan=, eth_type=2048, proto=L3_IPV4], ip=[hl=20, tos=192, len=576, id=17689, ttl=63, p=1, src=192.168.1.1, dst=10.10.1.4], ip6=, tcp=, udp=, icmp=[icmp_type=3]] @@ -2896,10 +2895,9 @@ XXXXXXXXXX.XXXXXX packet_contents XXXXXXXXXX.XXXXXX icmp_unreachable [0] c: connection = [id=[orig_h=192.168.1.1, orig_p=3/icmp, resp_h=10.10.1.4, resp_p=4/icmp], orig=[size=1096, state=1, num_pkts=1, num_bytes_ip=576, flow_label=0, l2_addr=00:1f:33:d9:81:60], resp=[size=0, state=0, num_pkts=0, num_bytes_ip=0, flow_label=0, l2_addr=00:e0:1c:3c:17:c2], start_time=XXXXXXXXXX.XXXXXX, duration=507.831573 usecs, service={\x0a\x0a}, history=, uid=C4J4Th3PJpwUYZZ6gc, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks=, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=, http_state=, irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=] - [1] icmp: icmp_conn = [orig_h=192.168.1.1, resp_h=10.10.1.4, itype=3, icode=4, len=548, hlim=63, v6=F] - [2] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] - [3] code: count = 4 - [4] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] + [1] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] + [2] code: count = 4 + [3] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] XXXXXXXXXX.XXXXXX raw_packet [0] p: raw_pkt_hdr = [l2=[encap=LINK_ETHERNET, len=590, cap_len=590, src=00:1f:33:d9:81:60, dst=00:e0:1c:3c:17:c2, vlan=, inner_vlan=, eth_type=2048, proto=L3_IPV4], ip=[hl=20, tos=192, len=576, id=17690, ttl=63, p=1, src=192.168.1.1, dst=10.10.1.4], ip6=, tcp=, udp=, icmp=[icmp_type=3]] @@ -2916,10 +2914,9 @@ XXXXXXXXXX.XXXXXX packet_contents XXXXXXXXXX.XXXXXX icmp_unreachable [0] c: connection = [id=[orig_h=192.168.1.1, orig_p=3/icmp, resp_h=10.10.1.4, resp_p=4/icmp], orig=[size=1644, state=1, num_pkts=2, num_bytes_ip=1152, flow_label=0, l2_addr=00:1f:33:d9:81:60], resp=[size=0, state=0, num_pkts=0, num_bytes_ip=0, flow_label=0, l2_addr=00:e0:1c:3c:17:c2], start_time=XXXXXXXXXX.XXXXXX, duration=1.0 msec 132.965088 usecs, service={\x0a\x0a}, history=, uid=C4J4Th3PJpwUYZZ6gc, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks=, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=, http_state=, irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=] - [1] icmp: icmp_conn = [orig_h=192.168.1.1, resp_h=10.10.1.4, itype=3, icode=4, len=548, hlim=63, v6=F] - [2] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] - [3] code: count = 4 - [4] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] + [1] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] + [2] code: count = 4 + [3] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] XXXXXXXXXX.XXXXXX raw_packet [0] p: raw_pkt_hdr = [l2=[encap=LINK_ETHERNET, len=590, cap_len=590, src=00:1f:33:d9:81:60, dst=00:e0:1c:3c:17:c2, vlan=, inner_vlan=, eth_type=2048, proto=L3_IPV4], ip=[hl=20, tos=192, len=576, id=17691, ttl=63, p=1, src=192.168.1.1, dst=10.10.1.4], ip6=, tcp=, udp=, icmp=[icmp_type=3]] @@ -2936,10 +2933,9 @@ XXXXXXXXXX.XXXXXX packet_contents XXXXXXXXXX.XXXXXX icmp_unreachable [0] c: connection = [id=[orig_h=192.168.1.1, orig_p=3/icmp, resp_h=10.10.1.4, resp_p=4/icmp], orig=[size=2192, state=1, num_pkts=3, num_bytes_ip=1728, flow_label=0, l2_addr=00:1f:33:d9:81:60], resp=[size=0, state=0, num_pkts=0, num_bytes_ip=0, flow_label=0, l2_addr=00:e0:1c:3c:17:c2], start_time=XXXXXXXXXX.XXXXXX, duration=1.0 msec 518.964767 usecs, service={\x0a\x0a}, history=, uid=C4J4Th3PJpwUYZZ6gc, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks=, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=, http_state=, irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=] - [1] icmp: icmp_conn = [orig_h=192.168.1.1, resp_h=10.10.1.4, itype=3, icode=4, len=548, hlim=63, v6=F] - [2] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] - [3] code: count = 4 - [4] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] + [1] info: icmp_info = [v6=F, itype=3, icode=4, len=548, ttl=63] + [2] code: count = 4 + [3] context: icmp_context = [id=[orig_h=10.10.1.4, orig_p=1470/tcp, resp_h=74.53.140.153, resp_p=25/tcp], len=1500, proto=1, frag_offset=0, bad_hdr_len=F, bad_checksum=F, MF=F, DF=T] XXXXXXXXXX.XXXXXX raw_packet [0] p: raw_pkt_hdr = [l2=[encap=LINK_ETHERNET, len=590, cap_len=590, src=00:1f:33:d9:81:60, dst=00:e0:1c:3c:17:c2, vlan=, inner_vlan=, eth_type=2048, proto=L3_IPV4], ip=[hl=20, tos=192, len=576, id=17692, ttl=63, p=1, src=192.168.1.1, dst=10.10.1.4], ip6=, tcp=, udp=, icmp=[icmp_type=3]] diff --git a/testing/btest/scripts/base/protocols/icmp/dnssl.zeek b/testing/btest/scripts/base/protocols/icmp/dnssl.zeek index 33a77adf67..1523347766 100644 --- a/testing/btest/scripts/base/protocols/icmp/dnssl.zeek +++ b/testing/btest/scripts/base/protocols/icmp/dnssl.zeek @@ -3,7 +3,7 @@ @load base/protocols/conn -event icmp_router_advertisement(c: connection, icmp: icmp_conn, cur_hop_limit: count, managed: bool, other: bool, home_agent: bool, +event icmp_router_advertisement(c: connection, icmp: icmp_info, cur_hop_limit: count, managed: bool, other: bool, home_agent: bool, pref: count, proxy: bool, rsv: count, router_lifetime: interval, reachable_time: interval, retrans_timer: interval, options: icmp6_nd_options ){ for (i in options){ From 725e759560c76ddc7cdb67da9d636da9b66aaf2f Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 25 Jan 2021 14:46:47 -0700 Subject: [PATCH 07/11] Remove support for .bro script extension and BRO_ environment variables --- src/plugin/Manager.cc | 45 +++++-------- src/util.cc | 66 +++---------------- src/util.h | 5 -- src/zeekygen/ScriptInfo.cc | 9 +-- .../btest/Baseline/core.load-prefixes/output | 1 - .../btest/Baseline/core.load-unload/output2 | 1 - .../load-explicit-bro-suffix-fallback.zeek | 12 ---- testing/btest/core/load-file-extension.zeek | 33 +--------- testing/btest/core/load-pkg.zeek | 14 +--- testing/btest/core/load-prefixes.zeek | 7 +- testing/btest/core/load-unload.zeek | 11 +--- 11 files changed, 33 insertions(+), 171 deletions(-) delete mode 100644 testing/btest/core/load-explicit-bro-suffix-fallback.zeek diff --git a/src/plugin/Manager.cc b/src/plugin/Manager.cc index 731c9d9a1c..4d1f35d9e4 100644 --- a/src/plugin/Manager.cc +++ b/src/plugin/Manager.cc @@ -257,44 +257,29 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_ string init; // First load {scripts}/__preload__.zeek automatically. - for (const string& ext : util::detail::script_extensions) - { - init = dir + "scripts/__preload__" + ext; + init = dir + "scripts/__preload__.zeek"; - if ( util::is_file(init) ) - { - DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); - util::detail::warn_if_legacy_script(init); - scripts_to_load.push_back(init); - break; - } + if ( util::is_file(init) ) + { + DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); + scripts_to_load.push_back(init); } // Load {bif,scripts}/__load__.zeek automatically. - for (const string& ext : util::detail::script_extensions) - { - init = dir + "lib/bif/__load__" + ext; + init = dir + "lib/bif/__load__.zeek"; - if ( util::is_file(init) ) - { - DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); - util::detail::warn_if_legacy_script(init); - scripts_to_load.push_back(init); - break; - } + if ( util::is_file(init) ) + { + DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); + scripts_to_load.push_back(init); } - for (const string& ext : util::detail::script_extensions) - { - init = dir + "scripts/__load__" + ext; + init = dir + "scripts/__load__.zeek"; - if ( util::is_file(init) ) - { - DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); - util::detail::warn_if_legacy_script(init); - scripts_to_load.push_back(init); - break; - } + if ( util::is_file(init) ) + { + DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); + scripts_to_load.push_back(init); } // Mark this plugin as activated by clearing the path. diff --git a/src/util.cc b/src/util.cc index 3ae4b3bc16..d045dce92c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -581,17 +581,6 @@ uint64_t rand64bit() return base; } -const array script_extensions = {".zeek", ".bro"}; - -void warn_if_legacy_script(std::string_view filename) - { - if ( ends_with(filename, ".bro") ) - { - std::string x(filename); - reporter->Warning("Loading script '%s' with legacy extension, support for '.bro' will be removed in Zeek v4.1", x.c_str()); - } - } - TEST_CASE("util is_package_loader") { CHECK(is_package_loader("/some/path/__load__.zeek") == true); @@ -601,17 +590,7 @@ TEST_CASE("util is_package_loader") bool is_package_loader(const string& path) { string filename(std::move(SafeBasename(path).result)); - - for ( const string& ext : script_extensions ) - { - if ( filename == "__load__" + ext ) - { - warn_if_legacy_script(filename); - return true; - } - } - - return false; + return ( filename == "__load__.zeek" ); } void add_to_zeek_path(const string& dir) @@ -627,19 +606,15 @@ FILE* open_package(string& path, const string& mode) string arg_path = path; path.append("/__load__"); - for ( const string& ext : script_extensions ) + string p = path + ".zeek"; + if ( can_read(p) ) { - string p = path + ext; - if ( can_read(p) ) - { - warn_if_legacy_script(path); - path.append(ext); - return open_file(path, mode); - } + path.append(".zeek"); + return open_file(path, mode); } - path.append(script_extensions[0]); - string package_loader = "__load__" + script_extensions[0]; + path.append(".zeek"); + string package_loader = "__load__.zeek"; reporter->Error("Failed to open package '%s': missing '%s' file", arg_path.c_str(), package_loader.c_str()); return nullptr; @@ -2008,27 +1983,14 @@ string find_script_file(const string& filename, const string& path_set) vector paths; tokenize_string(path_set, ":", &paths); - vector ext(detail::script_extensions.begin(), detail::script_extensions.end()); + vector ext = {".zeek"}; for ( size_t n = 0; n < paths.size(); ++n ) { string f = find_file_in_path(filename, paths[n], ext); if ( ! f.empty() ) - { - detail::warn_if_legacy_script(f); return f; - } - } - - if ( ends_with(filename, ".bro") ) - { - detail::warn_if_legacy_script(filename); - - // We were looking for a file explicitly ending in .bro and didn't - // find it, so fall back to one ending in .zeek, if it exists. - auto fallback = string(filename.data(), filename.size() - 4) + ".zeek"; - return find_script_file(fallback, path_set); } return string(); @@ -2404,17 +2366,7 @@ char* zeekenv(const char* name) if ( it == legacy_vars.end() ) return rval; - auto val = getenv(it->second); - - if ( val && starts_with(it->second, "BRO_") ) - { - if ( reporter ) - reporter->Warning("Using legacy environment variable %s, support will be removed in Zeek v4.1; use %s instead", it->second, name); - else - fprintf(stderr, "Using legacy environment variable %s, support will be removed in Zeek v4.1; use %s instead\n", it->second, name); - } - - return val; + return getenv(it->second); } static string json_escape_byte(char c) diff --git a/src/util.h b/src/util.h index 6252e0733d..6d74113fa8 100644 --- a/src/util.h +++ b/src/util.h @@ -174,11 +174,6 @@ constexpr SourceID SOURCE_LOCAL = 0; // indicating whether it's a local or remote event. constexpr SourceID SOURCE_BROKER = 0xffffffff; -extern const std::array script_extensions; - -/** Prints a warning if the filename ends in .bro. */ -void warn_if_legacy_script(std::string_view filename); - bool is_package_loader(const std::string& path); extern void add_to_zeek_path(const std::string& dir); diff --git a/src/zeekygen/ScriptInfo.cc b/src/zeekygen/ScriptInfo.cc index e0af67db78..24a943dba5 100644 --- a/src/zeekygen/ScriptInfo.cc +++ b/src/zeekygen/ScriptInfo.cc @@ -468,13 +468,8 @@ time_t ScriptInfo::DoGetModificationTime() const if ( ! info ) { - for (const string& ext : util::detail::script_extensions) - { - string pkg_name = *it + "/__load__" + ext; - info = zeek::detail::zeekygen_mgr->GetScriptInfo(pkg_name); - if ( info ) - break; - } + string pkg_name = *it + "/__load__.zeek"; + info = zeek::detail::zeekygen_mgr->GetScriptInfo(pkg_name); if ( ! info ) reporter->InternalWarning("Zeekygen failed to get mtime of %s", diff --git a/testing/btest/Baseline/core.load-prefixes/output b/testing/btest/Baseline/core.load-prefixes/output index e2505faec0..5a5b4504d3 100644 --- a/testing/btest/Baseline/core.load-prefixes/output +++ b/testing/btest/Baseline/core.load-prefixes/output @@ -1,5 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. loaded lcl2.base.utils.site.zeek loaded lcl.base.utils.site.zeek -loaded lcl2.base.protocols.http.bro loaded lcl.base.protocols.http.zeek diff --git a/testing/btest/Baseline/core.load-unload/output2 b/testing/btest/Baseline/core.load-unload/output2 index 489bcbd54e..49d861c74c 100644 --- a/testing/btest/Baseline/core.load-unload/output2 +++ b/testing/btest/Baseline/core.load-unload/output2 @@ -1,2 +1 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Loaded: dontloadme.bro diff --git a/testing/btest/core/load-explicit-bro-suffix-fallback.zeek b/testing/btest/core/load-explicit-bro-suffix-fallback.zeek deleted file mode 100644 index 4cf890cb09..0000000000 --- a/testing/btest/core/load-explicit-bro-suffix-fallback.zeek +++ /dev/null @@ -1,12 +0,0 @@ -# @TEST-EXEC: zeek -b %INPUT >out 2>&1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out - -# We don't have a foo.bro, but we'll accept foo.zeek. -@load foo.bro - -@TEST-START-FILE foo.zeek -event zeek_init() - { - print "loaded foo.zeek"; - } -@TEST-END-FILE diff --git a/testing/btest/core/load-file-extension.zeek b/testing/btest/core/load-file-extension.zeek index 3a0f4e64c5..42449da455 100644 --- a/testing/btest/core/load-file-extension.zeek +++ b/testing/btest/core/load-file-extension.zeek @@ -1,34 +1,11 @@ # Test loading scripts with different file extensions. # -# Test that either ".zeek" or ".bro" can be loaded without specifying extension -# @TEST-EXEC: cp x/foo.bro . -# @TEST-EXEC: zeek -b load_foo > bro_only -# @TEST-EXEC: btest-diff bro_only -# @TEST-EXEC: rm foo.bro -# +# Test that ".zeek" can be loaded without specifying extension # @TEST-EXEC: cp x/foo.zeek . # @TEST-EXEC: zeek -b load_foo > zeek_only # @TEST-EXEC: btest-diff zeek_only # @TEST-EXEC: rm foo.zeek # -# Test that ".zeek" is the preferred file extension, unless ".bro" is specified -# @TEST-EXEC: cp x/foo.* . -# @TEST-EXEC: cp x2/foo . -# @TEST-EXEC: zeek -b load_foo > zeek_preferred -# @TEST-EXEC: btest-diff zeek_preferred -# -# @TEST-EXEC: zeek -b load_foo_bro > bro_preferred -# @TEST-EXEC: btest-diff bro_preferred -# @TEST-EXEC: rm foo* -# -# Test that ".bro" is preferred over a script with no file extension (when -# there is no ".zeek" script) -# @TEST-EXEC: cp x/foo.bro . -# @TEST-EXEC: cp x2/foo . -# @TEST-EXEC: zeek -b load_foo > bro_preferred_2 -# @TEST-EXEC: btest-diff bro_preferred_2 -# @TEST-EXEC: rm foo* -# # Test that a script with no file extension can be loaded # @TEST-EXEC: cp x2/foo . # @TEST-EXEC: zeek -b load_foo > no_extension @@ -55,19 +32,11 @@ @load foo @TEST-END-FILE -@TEST-START-FILE load_foo_bro -@load foo.bro -@TEST-END-FILE - @TEST-START-FILE load_foo_xyz @load foo.xyz @TEST-END-FILE -@TEST-START-FILE x/foo.bro -print "Bro script loaded"; -@TEST-END-FILE - @TEST-START-FILE x/foo.zeek print "Zeek script loaded"; @TEST-END-FILE diff --git a/testing/btest/core/load-pkg.zeek b/testing/btest/core/load-pkg.zeek index b97211a86a..59cb87c2fa 100644 --- a/testing/btest/core/load-pkg.zeek +++ b/testing/btest/core/load-pkg.zeek @@ -1,23 +1,13 @@ # Test that package loading works when a package loader script is present. # -# Test that ".zeek" is loaded when there is also a ".bro" +# Test that ".zeek" is loaded # @TEST-EXEC: zeek -b foo >output # @TEST-EXEC: btest-diff output # -# Test that ".bro" is loaded when there is no ".zeek" -# @TEST-EXEC: rm foo/__load__.zeek -# @TEST-EXEC: zeek -b foo >output2 -# @TEST-EXEC: btest-diff output2 -# # Test that package cannot be loaded when no package loader script exists. -# @TEST-EXEC: rm foo/__load__.bro +# @TEST-EXEC: rm foo/__load__.zeek # @TEST-EXEC-FAIL: zeek -b foo -@TEST-START-FILE foo/__load__.bro -@load ./test -print "__load__.bro loaded"; -@TEST-END-FILE - @TEST-START-FILE foo/__load__.zeek @load ./test print "__load__.zeek loaded"; diff --git a/testing/btest/core/load-prefixes.zeek b/testing/btest/core/load-prefixes.zeek index ea261112d9..ae16965a87 100644 --- a/testing/btest/core/load-prefixes.zeek +++ b/testing/btest/core/load-prefixes.zeek @@ -18,12 +18,7 @@ print "loaded lcl.base.utils.site.zeek"; print "loaded lcl2.base.utils.site.zeek"; @TEST-END-FILE -# For a script package like base/protocols/http/, either of the recognized -# file extensions can be loaded here. +# For a script package like base/protocols/http/, verify the package can be loaded. @TEST-START-FILE lcl.base.protocols.http.zeek print "loaded lcl.base.protocols.http.zeek"; @TEST-END-FILE - -@TEST-START-FILE lcl2.base.protocols.http.bro -print "loaded lcl2.base.protocols.http.bro"; -@TEST-END-FILE diff --git a/testing/btest/core/load-unload.zeek b/testing/btest/core/load-unload.zeek index 6199f12e8b..6b9ff83cff 100644 --- a/testing/btest/core/load-unload.zeek +++ b/testing/btest/core/load-unload.zeek @@ -1,15 +1,9 @@ # This tests the @unload directive # # Test that @unload works with ".bro" when there is no ".zeek" script -# @TEST-EXEC: zeek -b unloadbro misc/loaded-scripts dontloadmebro > output +# @TEST-EXEC: zeek -b unload misc/loaded-scripts dontloadme > output # @TEST-EXEC: btest-diff output -# @TEST-EXEC: grep dontloadmebro loaded_scripts.log && exit 1 || exit 0 -# -# Test that @unload looks for ".zeek" first (assuming no file extension is -# specified in the @unload) -# @TEST-EXEC: zeek -b unload misc/loaded-scripts dontloadme.zeek dontloadme.bro > output2 -# @TEST-EXEC: btest-diff output2 -# @TEST-EXEC: grep dontloadme.bro loaded_scripts.log +# @TEST-EXEC: grep dontloadme loaded_scripts.log && exit 1 || exit 0 @TEST-START-FILE unloadbro.bro @unload dontloadmebro @@ -30,3 +24,4 @@ print "Loaded: dontloadme.zeek"; @TEST-START-FILE dontloadme.bro print "Loaded: dontloadme.bro"; @TEST-END-FILE +z \ No newline at end of file From 5f09793ce176dec87d162adc1412eb033a2961b0 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 25 Jan 2021 16:36:59 -0700 Subject: [PATCH 08/11] Remove Plugin::HookCallFunction and fix tests related to it --- src/plugin/Plugin.cc | 22 +--- src/plugin/Plugin.h | 3 - .../btest/plugins/hooks-plugin/src/Plugin.cc | 5 +- .../btest/plugins/hooks-plugin/src/Plugin.h | 3 +- .../legacy-func-hook-plugin/.btest-ignore | 0 .../legacy-func-hook-plugin/src/Plugin.cc | 107 ------------------ .../legacy-func-hook-plugin/src/Plugin.h | 29 ----- testing/btest/plugins/legacy-func-hook.zeek | 17 --- 8 files changed, 6 insertions(+), 180 deletions(-) delete mode 100644 testing/btest/plugins/legacy-func-hook-plugin/.btest-ignore delete mode 100644 testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc delete mode 100644 testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h delete mode 100644 testing/btest/plugins/legacy-func-hook.zeek diff --git a/src/plugin/Plugin.cc b/src/plugin/Plugin.cc index dad677f976..8910f26a11 100644 --- a/src/plugin/Plugin.cc +++ b/src/plugin/Plugin.cc @@ -376,27 +376,7 @@ std::pair Plugin::HookFunctionCall(const Func* func, zeek::detail::Frame* parent, Args* args) { - ValPList vlargs(args->size()); - - for ( auto& v : *args ) - vlargs.push_back(v.release()); - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - auto [handled, result] = HookCallFunction(func, parent, &vlargs); -#pragma GCC diagnostic pop - - for ( auto i = 0u; i < args->size(); ++i ) - (*args)[i] = {AdoptRef{}, vlargs[i]}; - - return {handled, {AdoptRef{}, result}}; - } - -std::pair Plugin::HookCallFunction( - const Func* func, zeek::detail::Frame *parent, ValPList* args) - { - std::pair result(false, NULL); - return result; + return {false, nullptr}; } bool Plugin::HookQueueEvent(Event* event) diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index f75154c98e..5393cd0b40 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -677,9 +677,6 @@ protected: virtual std::pair HookFunctionCall(const Func* func, zeek::detail::Frame* parent, Args* args); - [[deprecated("Remove in v4.1. Use HookFunctionCall()")]] - virtual std::pair HookCallFunction(const Func* func, zeek::detail::Frame *parent, ValPList* args); - /** * Hook into raising events. Whenever the script interpreter is about * to queue an event for later execution, it first gives all plugins diff --git a/testing/btest/plugins/hooks-plugin/src/Plugin.cc b/testing/btest/plugins/hooks-plugin/src/Plugin.cc index 377944353d..852d9656bf 100644 --- a/testing/btest/plugins/hooks-plugin/src/Plugin.cc +++ b/testing/btest/plugins/hooks-plugin/src/Plugin.cc @@ -56,7 +56,8 @@ int Plugin::HookLoadFile(const LoadType type, const std::string& file, const std return -1; } -std::pair Plugin::HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, zeek::ValPList* args) +std::pair Plugin::HookFunctionCall(const zeek::Func* func, zeek::detail::Frame* frame, + zeek::Args* args) { zeek::ODesc d; d.SetShort(); @@ -65,7 +66,7 @@ std::pair Plugin::HookCallFunction(const zeek::Func* func, zee fprintf(stderr, "%.6f %-15s %s\n", zeek::run_state::network_time, "| HookCallFunction", d.Description()); - return std::pair(false, NULL); + return {false, nullptr}; } bool Plugin::HookQueueEvent(zeek::Event* event) diff --git a/testing/btest/plugins/hooks-plugin/src/Plugin.h b/testing/btest/plugins/hooks-plugin/src/Plugin.h index a23e363243..94a7f16aee 100644 --- a/testing/btest/plugins/hooks-plugin/src/Plugin.h +++ b/testing/btest/plugins/hooks-plugin/src/Plugin.h @@ -9,7 +9,8 @@ class Plugin : public zeek::plugin::Plugin { protected: int HookLoadFile(const LoadType type, const std::string& file, const std::string& resolved) override; - std::pair HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, zeek::ValPList* args) override; + std::pair HookFunctionCall(const zeek::Func* func, zeek::detail::Frame* parent, + zeek::Args* args) override; bool HookQueueEvent(zeek::Event* event) override; void HookDrainEvents() override; void HookUpdateNetworkTime(double network_time) override; diff --git a/testing/btest/plugins/legacy-func-hook-plugin/.btest-ignore b/testing/btest/plugins/legacy-func-hook-plugin/.btest-ignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc deleted file mode 100644 index dc6be0b0b2..0000000000 --- a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc +++ /dev/null @@ -1,107 +0,0 @@ - -#include "Plugin.h" - -#include -#include -#include -#include -#include -#include - -namespace btest::plugin::Demo_Hooks { Plugin plugin; } - -using namespace btest::plugin::Demo_Hooks; - -zeek::plugin::Configuration Plugin::Configure() - { - EnableHook(zeek::plugin::HOOK_CALL_FUNCTION); - EnableHook(zeek::plugin::META_HOOK_PRE); - EnableHook(zeek::plugin::META_HOOK_POST); - - zeek::plugin::Configuration config; - config.name = "Demo::Hooks"; - config.description = "Exercises all plugin hooks"; - config.version.major = 1; - config.version.minor = 0; - config.version.patch = 0; - return config; - } - -static void describe_hook_args(const zeek::plugin::HookArgumentList& args, zeek::ODesc* d) - { - bool first = true; - - for ( zeek::plugin::HookArgumentList::const_iterator i = args.begin(); i != args.end(); i++ ) - { - if ( ! first ) - d->Add(", "); - - i->Describe(d); - first = false; - } - } - -std::pair Plugin::HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, - zeek::ValPList* args) - { - zeek::ODesc d; - d.SetShort(); - zeek::plugin::HookArgument(func).Describe(&d); - zeek::plugin::HookArgument(args).Describe(&d); - fprintf(stderr, "%.6f %-15s %s\n", zeek::run_state::network_time, "| HookCallFunction", - d.Description()); - - if ( zeek::util::streq(func->Name(), "foo") ) - { - auto& vl = *args; - Unref(vl[0]); - vl[0] = zeek::val_mgr->Count(13).release(); - } - - return {}; - } - -/* std::pair> Plugin::HookFunctionCall(const Func* func, */ -/* Frame* frame, */ -/* zeek::Args* args) */ -/* { */ -/* zeek::ODesc d; */ -/* d.SetShort(); */ -/* HookArgument(func).Describe(&d); */ -/* HookArgument(args).Describe(&d); */ -/* fprintf(stderr, "%.6f %-15s %s\n", zeek::run_state::network_time, "| HookFunctionCall", */ -/* d.Description()); */ - -/* if ( streq(func->Name(), "foo") ) */ -/* { */ -/* auto& vl = *args; */ -/* vl[0] = val_mgr->Count(42); */ -/* } */ - -/* return {}; */ -/* } */ - -void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) - { - zeek::ODesc d; - d.SetShort(); - describe_hook_args(args, &d); - fprintf(stderr, "%.6f %-15s %s(%s)\n", zeek::run_state::network_time, " MetaHookPre", - hook_name(hook), d.Description()); - } - -void Plugin::MetaHookPost(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args, - zeek::plugin::HookArgument result) - { - zeek::ODesc d1; - d1.SetShort(); - describe_hook_args(args, &d1); - - zeek::ODesc d2; - d2.SetShort(); - result.Describe(&d2); - - fprintf(stderr, "%.6f %-15s %s(%s) -> %s\n", zeek::run_state::network_time, " MetaHookPost", - hook_name(hook), d1.Description(), - d2.Description()); - } diff --git a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h deleted file mode 100644 index 39369ab5f9..0000000000 --- a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h +++ /dev/null @@ -1,29 +0,0 @@ - -#pragma once - -#include - -namespace btest::plugin::Demo_Hooks { - -class Plugin : public zeek::plugin::Plugin -{ -protected: - std::pair HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, zeek::ValPList* args) override; - - /* std::pair> HookFunctionCall(const Func* func, */ - /* Frame* frame, */ - /* zeek::Args* args) override; */ - - void MetaHookPre(zeek::plugin::HookType hook, - const zeek::plugin::HookArgumentList& args) override; - void MetaHookPost(zeek::plugin::HookType hook, - const zeek::plugin::HookArgumentList& args, - zeek::plugin::HookArgument result) override; - - // Overridden from plugin::Plugin. - zeek::plugin::Configuration Configure() override; -}; - -extern Plugin plugin; - -} diff --git a/testing/btest/plugins/legacy-func-hook.zeek b/testing/btest/plugins/legacy-func-hook.zeek deleted file mode 100644 index 27ffc77293..0000000000 --- a/testing/btest/plugins/legacy-func-hook.zeek +++ /dev/null @@ -1,17 +0,0 @@ -# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Hooks -# @TEST-EXEC: cp -r %DIR/legacy-func-hook-plugin/* . -# @TEST-EXEC: ./configure --zeek-dist=${DIST} && make -# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Demo::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | grep foo >output -# @TEST-EXEC: btest-diff output - -@unload base/misc/version - -function foo(a: count, b: count, c: count, s: string) - { - print "foo", a, b, c, s; - } - -event zeek_init() - { - foo(1, 2, 3, "yo"); - } From 4ce3bf3cd23684309903be403c4ad2713c03d9e9 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Mon, 25 Jan 2021 17:00:25 -0800 Subject: [PATCH 09/11] Remove deprecated log filter predicates for 4.1 Update the logging framework tests: since hooks operate by name, they cannot be anonymous. I'm also dropping the &optional attribute from the status field, since here know that the values are actually defined, and access to an optional status field should normally be guarded by the existence test operator. Also includes baseline update for plugins.hooks, which picks up the fact that the pred record field is now gone. --- scripts/base/frameworks/logging/main.zeek | 10 - src/logging/Manager.cc | 16 - testing/btest/Baseline/plugins.hooks/output | 564 +++++++++--------- .../scripts/base/frameworks/logging/pred.zeek | 18 +- .../base/frameworks/logging/remove.zeek | 10 +- 5 files changed, 302 insertions(+), 316 deletions(-) diff --git a/scripts/base/frameworks/logging/main.zeek b/scripts/base/frameworks/logging/main.zeek index ca678ef6d2..48b29cf22e 100644 --- a/scripts/base/frameworks/logging/main.zeek +++ b/scripts/base/frameworks/logging/main.zeek @@ -210,16 +210,6 @@ export { ## The logging writer implementation to use. writer: Writer &default=default_writer; - ## Indicates whether a log entry should be recorded. - ## If not given, all entries are recorded. - ## - ## rec: An instance of the stream's ``columns`` type with its - ## fields set to the values to be logged. - ## - ## Returns: True if the entry is to be recorded. - pred: function(rec: any): bool &optional - &deprecated="Remove in 4.1. PolicyHooks will replace the $pred function."; - ## Output path for recording entries matching this ## filter. ## diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index a0594e8265..564f7c95c0 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -37,7 +37,6 @@ struct Manager::Filter { string name; EnumVal* id; Func* policy; - Func* pred; Func* path_func; string path; Val* path_val; @@ -560,7 +559,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval) auto name = fval->GetFieldOrDefault("name"); auto policy = fval->GetFieldOrDefault("policy"); - auto pred = fval->GetFieldOrDefault("pred"); auto path_func = fval->GetFieldOrDefault("path_func"); auto log_local = fval->GetFieldOrDefault("log_local"); auto log_remote = fval->GetFieldOrDefault("log_remote"); @@ -577,7 +575,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval) filter->name = name->AsString()->CheckString(); filter->id = id->Ref()->AsEnumVal(); filter->policy = policy ? policy->AsFunc() : stream->policy; - filter->pred = pred ? pred->AsFunc() : nullptr; filter->path_func = path_func ? path_func->AsFunc() : nullptr; filter->writer = writer->Ref()->AsEnumVal(); filter->local = log_local->AsBool(); @@ -660,7 +657,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval) DBG_LOG(DBG_LOGGING, " path : %s", filter->path.c_str()); DBG_LOG(DBG_LOGGING, " path_func : %s", (filter->path_func ? "set" : "not set")); DBG_LOG(DBG_LOGGING, " policy : %s", (filter->policy ? "set" : "not set")); - DBG_LOG(DBG_LOGGING, " pred : %s", (filter->pred ? "set" : "not set")); for ( int i = 0; i < filter->num_fields; i++ ) { @@ -747,18 +743,6 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg) continue; } - // $pred is deprecated and will get removed in 4.1. - // This block can go when that time comes. - if ( filter->pred ) - { - // See whether the predicate indicates that we want - // to log this record. - auto v = filter->pred->Invoke(columns); - - if ( v && ! v->AsBool() ) - continue; - } - if ( filter->path_func ) { ValPtr path_arg; diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output index 0f7e0d2bda..881178dbc4 100644 --- a/testing/btest/Baseline/plugins.hooks/output +++ b/testing/btest/Baseline/plugins.hooks/output @@ -194,51 +194,51 @@ 0.000000 MetaHookPost CallFunction(Files::register_protocol, , (Analyzer::ANALYZER_SMTP, [get_file_handle=SMTP::get_file_handle{ return (cat(Analyzer::ANALYZER_SMTP, SMTP::c$start_time, SMTP::c$smtp$trans_depth, SMTP::c$smtp_state$mime_depth))}, describe=SMTP::describe_file{ SMTP::cid, SMTP::c{ if (SMTP::f$source != SMTP) return ()for ([SMTP::cid] in SMTP::f$conns) { return (SMTP::describe(SMTP::c$smtp))}return ()}}])) -> 0.000000 MetaHookPost CallFunction(Files::register_protocol, , (Analyzer::ANALYZER_SSL, [get_file_handle=SSL::get_file_handle{ return ()}, describe=SSL::describe_file{ SSL::cid, SSL::c{ if (SSL::f$source != SSL || !SSL::f?$info || !SSL::f$info?$x509 || !SSL::f$info$x509?$certificate) return ()for ([SSL::cid] in SSL::f$conns) { if (SSL::c?$ssl) { return (cat(SSL::c$id$resp_h, :, SSL::c$id$resp_p))}}return (cat(Serial: , SSL::f$info$x509$certificate$serial, Subject: , SSL::f$info$x509$certificate$subject, Issuer: , SSL::f$info$x509$certificate$issuer))}}])) -> 0.000000 MetaHookPost CallFunction(FilteredTraceDetection::should_detect, , ()) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::__add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::__add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (Broker::LOG, [columns=Broker::Info, ev=, path=broker, policy=Broker::log_policy])) -> 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (Cluster::LOG, [columns=Cluster::Info, ev=, path=cluster, policy=Cluster::log_policy])) -> 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (Config::LOG, [columns=Config::Info, ev=Config::log_config, path=config, policy=Config::log_policy])) -> @@ -330,51 +330,51 @@ 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (Weird::LOG)) -> 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (X509::LOG)) -> 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (mysql::LOG)) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> -0.000000 MetaHookPost CallFunction(Log::add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(Log::add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> 0.000000 MetaHookPost CallFunction(Log::add_stream_filters, , (Broker::LOG, default)) -> 0.000000 MetaHookPost CallFunction(Log::add_stream_filters, , (Cluster::LOG, default)) -> 0.000000 MetaHookPost CallFunction(Log::add_stream_filters, , (Config::LOG, default)) -> @@ -604,7 +604,7 @@ 0.000000 MetaHookPost CallFunction(PacketFilter::build, , ()) -> 0.000000 MetaHookPost CallFunction(PacketFilter::combine_filters, , (ip or not ip, and, )) -> 0.000000 MetaHookPost CallFunction(PacketFilter::install, , ()) -> -0.000000 MetaHookPost CallFunction(PacketFilter::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +0.000000 MetaHookPost CallFunction(PacketFilter::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> 0.000000 MetaHookPost CallFunction(Pcap::install_pcap_filter, , (PacketFilter::DefaultPcapFilter)) -> 0.000000 MetaHookPost CallFunction(Pcap::precompile_pcap_filter, , (PacketFilter::DefaultPcapFilter, ip or not ip)) -> 0.000000 MetaHookPost CallFunction(SumStats::add_observe_plugin_dependency, , (SumStats::STD_DEV, SumStats::VARIANCE)) -> @@ -1192,51 +1192,51 @@ 0.000000 MetaHookPre CallFunction(Files::register_protocol, , (Analyzer::ANALYZER_SMTP, [get_file_handle=SMTP::get_file_handle{ return (cat(Analyzer::ANALYZER_SMTP, SMTP::c$start_time, SMTP::c$smtp$trans_depth, SMTP::c$smtp_state$mime_depth))}, describe=SMTP::describe_file{ SMTP::cid, SMTP::c{ if (SMTP::f$source != SMTP) return ()for ([SMTP::cid] in SMTP::f$conns) { return (SMTP::describe(SMTP::c$smtp))}return ()}}])) 0.000000 MetaHookPre CallFunction(Files::register_protocol, , (Analyzer::ANALYZER_SSL, [get_file_handle=SSL::get_file_handle{ return ()}, describe=SSL::describe_file{ SSL::cid, SSL::c{ if (SSL::f$source != SSL || !SSL::f?$info || !SSL::f$info?$x509 || !SSL::f$info$x509?$certificate) return ()for ([SSL::cid] in SSL::f$conns) { if (SSL::c?$ssl) { return (cat(SSL::c$id$resp_h, :, SSL::c$id$resp_p))}}return (cat(Serial: , SSL::f$info$x509$certificate$serial, Subject: , SSL::f$info$x509$certificate$subject, Issuer: , SSL::f$info$x509$certificate$issuer))}}])) 0.000000 MetaHookPre CallFunction(FilteredTraceDetection::should_detect, , ()) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::__add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::__add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (Broker::LOG, [columns=Broker::Info, ev=, path=broker, policy=Broker::log_policy])) 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (Cluster::LOG, [columns=Cluster::Info, ev=, path=cluster, policy=Cluster::log_policy])) 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (Config::LOG, [columns=Config::Info, ev=Config::log_config, path=config, policy=Config::log_policy])) @@ -1328,51 +1328,51 @@ 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (Weird::LOG)) 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (X509::LOG)) 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (mysql::LOG)) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -0.000000 MetaHookPre CallFunction(Log::add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(Log::add_filter, , (mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) 0.000000 MetaHookPre CallFunction(Log::add_stream_filters, , (Broker::LOG, default)) 0.000000 MetaHookPre CallFunction(Log::add_stream_filters, , (Cluster::LOG, default)) 0.000000 MetaHookPre CallFunction(Log::add_stream_filters, , (Config::LOG, default)) @@ -1602,7 +1602,7 @@ 0.000000 MetaHookPre CallFunction(PacketFilter::build, , ()) 0.000000 MetaHookPre CallFunction(PacketFilter::combine_filters, , (ip or not ip, and, )) 0.000000 MetaHookPre CallFunction(PacketFilter::install, , ()) -0.000000 MetaHookPre CallFunction(PacketFilter::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +0.000000 MetaHookPre CallFunction(PacketFilter::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) 0.000000 MetaHookPre CallFunction(Pcap::install_pcap_filter, , (PacketFilter::DefaultPcapFilter)) 0.000000 MetaHookPre CallFunction(Pcap::precompile_pcap_filter, , (PacketFilter::DefaultPcapFilter, ip or not ip)) 0.000000 MetaHookPre CallFunction(SumStats::add_observe_plugin_dependency, , (SumStats::STD_DEV, SumStats::VARIANCE)) @@ -2189,51 +2189,51 @@ 0.000000 | HookCallFunction Files::register_protocol(Analyzer::ANALYZER_SMTP, [get_file_handle=SMTP::get_file_handle{ return (cat(Analyzer::ANALYZER_SMTP, SMTP::c$start_time, SMTP::c$smtp$trans_depth, SMTP::c$smtp_state$mime_depth))}, describe=SMTP::describe_file{ SMTP::cid, SMTP::c{ if (SMTP::f$source != SMTP) return ()for ([SMTP::cid] in SMTP::f$conns) { return (SMTP::describe(SMTP::c$smtp))}return ()}}]) 0.000000 | HookCallFunction Files::register_protocol(Analyzer::ANALYZER_SSL, [get_file_handle=SSL::get_file_handle{ return ()}, describe=SSL::describe_file{ SSL::cid, SSL::c{ if (SSL::f$source != SSL || !SSL::f?$info || !SSL::f$info?$x509 || !SSL::f$info$x509?$certificate) return ()for ([SSL::cid] in SSL::f$conns) { if (SSL::c?$ssl) { return (cat(SSL::c$id$resp_h, :, SSL::c$id$resp_p))}}return (cat(Serial: , SSL::f$info$x509$certificate$serial, Subject: , SSL::f$info$x509$certificate$subject, Issuer: , SSL::f$info$x509$certificate$issuer))}}]) 0.000000 | HookCallFunction FilteredTraceDetection::should_detect() -0.000000 | HookCallFunction Log::__add_filter(Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::__add_filter(mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=broker, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=cluster, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=config, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=dce_rpc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=dhcp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=dnp3, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=dns, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=dpd, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ftp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=irc, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=intel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=kerberos, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=modbus, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntlm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=ntp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_drop, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=netcontrol, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=netcontrol_shunt, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=notice_alarm, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=notice, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=openflow, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=pe, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=radius, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=rdp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=rfb, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=reporter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=sip, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=smb_mapping, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=smtp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=snmp, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=socks, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssh, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=ssl, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=signatures, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=software, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=syslog, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=tunnel, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=weird, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=x509, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::__add_filter(mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=mysql, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) 0.000000 | HookCallFunction Log::__create_stream(Broker::LOG, [columns=Broker::Info, ev=, path=broker, policy=Broker::log_policy]) 0.000000 | HookCallFunction Log::__create_stream(Cluster::LOG, [columns=Cluster::Info, ev=, path=cluster, policy=Cluster::log_policy]) 0.000000 | HookCallFunction Log::__create_stream(Config::LOG, [columns=Config::Info, ev=Config::log_config, path=config, policy=Config::log_policy]) @@ -2325,51 +2325,51 @@ 0.000000 | HookCallFunction Log::add_default_filter(Weird::LOG) 0.000000 | HookCallFunction Log::add_default_filter(X509::LOG) 0.000000 | HookCallFunction Log::add_default_filter(mysql::LOG) -0.000000 | HookCallFunction Log::add_filter(Broker::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Config::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(DNS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(DPD::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(FTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(IRC::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Intel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(KRB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(NTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Notice::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(PE::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(RDP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(RFB::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SIP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SSH::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(SSL::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Software::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(Weird::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(X509::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) -0.000000 | HookCallFunction Log::add_filter(mysql::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Broker::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Cluster::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Config::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(DCE_RPC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(DHCP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(DNP3::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(DNS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(DPD::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(FTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(IRC::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Intel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(KRB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Modbus::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(NTLM::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(NTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(NetControl::DROP_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(NetControl::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(NetControl::SHUNT, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Notice::ALARM_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Notice::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(OpenFlow::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(PE::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(RADIUS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(RDP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(RFB::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Reporter::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SIP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SMB::FILES_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SMB::MAPPING_LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SMTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SNMP::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SOCKS::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SSH::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(SSL::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Signatures::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Software::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Syslog::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Tunnel::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(Weird::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(X509::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction Log::add_filter(mysql::LOG, [name=default, writer=Log::WRITER_ASCII, path=, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) 0.000000 | HookCallFunction Log::add_stream_filters(Broker::LOG, default) 0.000000 | HookCallFunction Log::add_stream_filters(Cluster::LOG, default) 0.000000 | HookCallFunction Log::add_stream_filters(Config::LOG, default) @@ -2599,7 +2599,7 @@ 0.000000 | HookCallFunction PacketFilter::build() 0.000000 | HookCallFunction PacketFilter::combine_filters(ip or not ip, and, ) 0.000000 | HookCallFunction PacketFilter::install() -0.000000 | HookCallFunction PacketFilter::log_policy([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +0.000000 | HookCallFunction PacketFilter::log_policy([ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T], PacketFilter::LOG, [name=default, writer=Log::WRITER_ASCII, path=packet_filter, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) 0.000000 | HookCallFunction Pcap::install_pcap_filter(PacketFilter::DefaultPcapFilter) 0.000000 | HookCallFunction Pcap::precompile_pcap_filter(PacketFilter::DefaultPcapFilter, ip or not ip) 0.000000 | HookCallFunction SumStats::add_observe_plugin_dependency(SumStats::STD_DEV, SumStats::VARIANCE) @@ -3329,12 +3329,12 @@ XXXXXXXXXX.XXXXXX MetaHookPre DrainEvents() XXXXXXXXXX.XXXXXX MetaHookPre UpdateNetworkTime(XXXXXXXXXX.XXXXXX) XXXXXXXXXX.XXXXXX | HookUpdateNetworkTime XXXXXXXXXX.XXXXXX XXXXXXXXXX.XXXXXX | HookDrainEvents -XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Files::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Files::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Files::set_info, , ([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=1448, state=4, num_pkts=2, num_bytes_ip=112, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 167.951584 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=, filename=, duration=0 secs, local_orig=, is_orig=F, seen_bytes=0, total_bytes=, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Files::set_info, , ([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::code_in_range, , (200, 100, 199)) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::get_file_handle, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F)) -> -XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::set_state, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F)) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Log::__write, , (Files::LOG, [ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Log::__write, , (HTTP::LOG, [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1])) -> @@ -3360,12 +3360,12 @@ XXXXXXXXXX.XXXXXX MetaHookPost QueueEvent(get_file_handle(Analyzer::ANALYZER_ XXXXXXXXXX.XXXXXX MetaHookPost QueueEvent(http_end_entity([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F)) -> false XXXXXXXXXX.XXXXXX MetaHookPost QueueEvent(http_message_done([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F, [start=XXXXXXXXXX.XXXXXX, interrupted=F, finish_msg=message ends normally, body_length=4705, content_gap_length=0, header_length=280])) -> false XXXXXXXXXX.XXXXXX MetaHookPost UpdateNetworkTime(XXXXXXXXXX.XXXXXX) -> -XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Files::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Files::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Files::set_info, , ([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=1448, state=4, num_pkts=2, num_bytes_ip=112, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 167.951584 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=, filename=, duration=0 secs, local_orig=, is_orig=F, seen_bytes=0, total_bytes=, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Files::set_info, , ([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::code_in_range, , (200, 100, 199)) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::get_file_handle, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F)) -XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::set_state, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F)) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Log::__write, , (Files::LOG, [ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Log::__write, , (HTTP::LOG, [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1])) @@ -3392,12 +3392,12 @@ XXXXXXXXXX.XXXXXX MetaHookPre QueueEvent(http_end_entity([id=[orig_h=141.142 XXXXXXXXXX.XXXXXX MetaHookPre QueueEvent(http_message_done([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F, [start=XXXXXXXXXX.XXXXXX, interrupted=F, finish_msg=message ends normally, body_length=4705, content_gap_length=0, header_length=280])) XXXXXXXXXX.XXXXXX MetaHookPre UpdateNetworkTime(XXXXXXXXXX.XXXXXX) XXXXXXXXXX.XXXXXX | HookUpdateNetworkTime XXXXXXXXXX.XXXXXX -XXXXXXXXXX.XXXXXX | HookCallFunction Files::log_policy([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +XXXXXXXXXX.XXXXXX | HookCallFunction Files::log_policy([ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], Files::LOG, [name=default, writer=Log::WRITER_ASCII, path=files, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) XXXXXXXXXX.XXXXXX | HookCallFunction Files::set_info([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=1448, state=4, num_pkts=2, num_bytes_ip=112, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 167.951584 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=, filename=, duration=0 secs, local_orig=, is_orig=F, seen_bytes=0, total_bytes=, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=, current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=]) XXXXXXXXXX.XXXXXX | HookCallFunction Files::set_info([id=FMnxxt3xjVcWNS2141, parent_id=, source=HTTP, is_orig=F, conns={[[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp]] = [id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]}, last_active=XXXXXXXXXX.XXXXXX, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timeout_interval=2.0 mins, bof_buffer_size=4096, bof_buffer=\x0a0.26 | 2012-08-24 15:10:04 -0700\x0a\x0a * Fixing update-changes, which could pick the wrong control file. (Robin Sommer)\x0a\x0a * Fixing GPG signing script. (Robin Sommer)\x0a\x0a0.25 | 2012-08-01 13:55:46 -0500\x0a\x0a * Fix configure script to exit with non-zero status on error (Jon Siwek)\x0a\x0a0.24 | 2012-07-05 12:50:43 -0700\x0a\x0a * Raise minimum required CMake version to 2.6.3 (Jon Siwek)\x0a\x0a * Adding script to delete old fully-merged branches. (Robin Sommer)\x0a\x0a0.23-2 | 2012-01-25 13:24:01 -0800\x0a\x0a * Fix a bro-cut error message. (Daniel Thayer)\x0a\x0a0.23 | 2012-01-11 12:16:11 -0800\x0a\x0a * Tweaks to release scripts, plus a new one for signing files.\x0a (Robin Sommer)\x0a\x0a0.22 | 2012-01-10 16:45:19 -0800\x0a\x0a * Tweaks for OpenBSD support. (Jon Siwek)\x0a\x0a * bro-cut extensions and fixes. (Robin Sommer)\x0a \x0a - If no field names are given on the command line, we now pass through\x0a all fields. Adresses #657.\x0a\x0a - Removing some GNUism from awk script. Addresses #653.\x0a\x0a - Added option for time output in UTC. Addresses #668.\x0a\x0a - Added output field separator option -F. Addresses #649.\x0a\x0a - Fixing option -c: only some header lines were passed through\x0a rather than all. (Robin Sommer)\x0a\x0a * Fix parallel make portability. (Jon Siwek)\x0a\x0a0.21-9 | 2011-11-07 05:44:14 -0800\x0a\x0a * Fixing compiler warnings. Addresses #388. (Jon Siwek)\x0a\x0a0.21-2 | 2011-11-02 18:12:13 -0700\x0a\x0a * Fix for misnaming temp file in update-changes script. (Robin Sommer)\x0a\x0a0.21-1 | 2011-11-02 18:10:39 -0700\x0a\x0a * Little fix for make-release script, which could pick out the wrong\x0a tag. (Robin Sommer)\x0a\x0a0.21 | 2011-10-27 17:40:45 -0700\x0a\x0a * Fixing bro-cut's usage message and argument error handling. (Robin Sommer)\x0a\x0a * Bugfix in update-changes script. (Robin Sommer)\x0a\x0a * update-changes now ignores commits it did itself. (Robin Sommer)\x0a\x0a * Fix a bug in the update-changes script. (Robin Sommer)\x0a\x0a * bro-cut now always installs to $prefix/bin by `make install`. (Jon Siwek)\x0a\x0a * Options to adjust time format for bro-cut. (Robin Sommer)\x0a\x0a The default with -d is now ISO format. The new option "-D "\x0a specifies a custom strftime()-style format string. Alternatively,\x0a the environment variable BRO_CUT_TIMEFMT can set the format as\x0a well.\x0a\x0a * bro-cut now understands the field separator header. (Robin Sommer)\x0a\x0a * Renaming options -h/-H -> -c/-C, and doing some general cleanup.\x0a\x0a0.2 | 2011-10-25 19:53:57 -0700\x0a\x0a * Adding support for replacing version string in a setup.py. (Robin\x0a Sommer)\x0a\x0a * Change generated root cert DN indices format for RFC2253\x0a compliance. (Jon Siwek)\x0a\x0a * New tool devel-tools/check-release to run before making releases.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes gets a new option -a to amend to\x0a previous commit if possible. Default is now not to (used to be the\x0a opposite). (Robin Sommer)\x0a\x0a * Change Mozilla trust root generation to index certs by subject DN. (Jon Siwek)\x0a\x0a * Change distclean to only remove build dir. (Jon Siwek)\x0a\x0a * Make dist now cleans the copied source (Jon Siwek)\x0a\x0a * Small tweak to make-release for forced git-clean. (Jon Siwek)\x0a\x0a * Fix to not let updates scripts loose their executable permissions.\x0a (Robin Sommer)\x0a\x0a * devel-tools/update-changes now looks for a 'release' tag to\x0a idenfify the stable version, and 'beta' for the beta versions.\x0a (Robin Sommer).\x0a\x0a * Distribution cleanup. (Robin Sommer)\x0a\x0a * New script devel-tools/make-release to create source tar balls.\x0a (Robin Sommer)\x0a\x0a * Removing bdcat. With the new log format, this isn't very useful\x0a anymore. (Robin Sommer)\x0a\x0a * Adding script that shows all pending git fastpath commits. (Robin\x0a Sommer)\x0a\x0a * Script to measure CPU time by loading an increasing set of\x0a scripts. (Robin Sommer)\x0a\x0a * extract-conn script now deals wit *.gz files. (Robin Sommer)\x0a\x0a * Tiny update to output a valid CA list file for SSL cert\x0a validation. (Seth Hall)\x0a\x0a * Adding "install-aux" target. Addresses #622. (Jon Siwek)\x0a\x0a * Distribution cleanup. (Jon Siwek and Robin Sommer)\x0a\x0a * FindPCAP now links against thread library when necessary (e.g.\x0a PF_RING's libpcap) (Jon Siwek)\x0a\x0a * Install binaries with an RPATH (Jon Siwek)\x0a\x0a * Workaround for FreeBSD CMake port missing debug flags (Jon Siwek)\x0a\x0a * Rewrite of the update-changes script. (Robin Sommer)\x0a\x0a0.1-1 | 2011-06-14 21:12:41 -0700\x0a\x0a * Add a script for generating Mozilla's CA list for the SSL analyzer.\x0a (Seth Hall)\x0a\x0a0.1 | 2011-04-01 16:28:22 -0700\x0a\x0a * Converting build process to CMake. (Jon Siwek)\x0a\x0a * Removing cf<...>/ca-* from distribution. The README has a note where\x0a to find them now. (Robin Sommer)\x0a\x0a * General cleanup. (Robin Sommer)\x0a\x0a * Initial import of bro/aux from SVN r7088. (Jon Siwek)\x0a, info=[ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4042, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=], ftp=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=[filename=], orig_mime_depth=1, resp_mime_depth=1], irc=, pe=]) XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::code_in_range(200, 100, 199) XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::get_file_handle([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F) -XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::log_policy([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::log_policy([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], HTTP::LOG, [name=default, writer=Log::WRITER_ASCII, path=http, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::set_state([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=4, num_pkts=3, num_bytes_ip=304, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=4, num_pkts=5, num_bytes_ip=4612, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=140.0 msecs 430.927277 usecs, service={HTTP}, history=ShADad, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={[1] = [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=0, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], F) XXXXXXXXXX.XXXXXX | HookCallFunction Log::__write(Files::LOG, [ts=XXXXXXXXXX.XXXXXX, fuid=FMnxxt3xjVcWNS2141, tx_hosts={192.150.187.43}, rx_hosts={141.142.228.5}, conn_uids={CHhAvVGS1DHFjwGM9}, source=HTTP, depth=0, analyzers={}, mime_type=text/plain, filename=, duration=262.975693 usecs, local_orig=, is_orig=F, seen_bytes=4705, total_bytes=4705, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=, sha1=, sha256=, x509=, extracted=, extracted_cutoff=, extracted_size=]) XXXXXXXXXX.XXXXXX | HookCallFunction Log::__write(HTTP::LOG, [ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1]) @@ -3452,7 +3452,7 @@ XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Broker::log_flush, , ()) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(ChecksumOffloading::check, , ()) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Conn::conn_state, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], tcp)) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Conn::determine_service, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=])) -> -XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Conn::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> +XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Conn::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(Conn::set_conn, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T)) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::finalize_http, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=])) -> XXXXXXXXXX.XXXXXX MetaHookPost CallFunction(HTTP::get_file_handle, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T)) -> @@ -3488,7 +3488,7 @@ XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Broker::log_flush, , ()) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(ChecksumOffloading::check, , ()) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Conn::conn_state, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], tcp)) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Conn::determine_service, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=])) -XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Conn::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) +XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Conn::log_policy, , ([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(Conn::set_conn, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T)) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::finalize_http, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=])) XXXXXXXXXX.XXXXXX MetaHookPre CallFunction(HTTP::get_file_handle, , ([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T)) @@ -3525,7 +3525,7 @@ XXXXXXXXXX.XXXXXX | HookCallFunction Broker::log_flush() XXXXXXXXXX.XXXXXX | HookCallFunction ChecksumOffloading::check() XXXXXXXXXX.XXXXXX | HookCallFunction Conn::conn_state([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], tcp) XXXXXXXXXX.XXXXXX | HookCallFunction Conn::determine_service([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=, local_orig=, local_resp=, missed_bytes=0, history=, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]) -XXXXXXXXXX.XXXXXX | HookCallFunction Conn::log_policy([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, pred=, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) +XXXXXXXXXX.XXXXXX | HookCallFunction Conn::log_policy([ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], Conn::LOG, [name=default, writer=Log::WRITER_ASCII, path=conn, path_func=, include=, exclude=, log_local=T, log_remote=T, field_name_map={}, scope_sep=., ext_prefix=_, ext_func=lambda_<2528247166937952945>, interv=0 secs, postprocessor=, config={}, policy=]) XXXXXXXXXX.XXXXXX | HookCallFunction Conn::set_conn([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T) XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::finalize_http([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], proto=tcp, service=http, duration=211.0 msecs 483.955383 usecs, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=], extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]) XXXXXXXXXX.XXXXXX | HookCallFunction HTTP::get_file_handle([id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], orig=[size=136, state=5, num_pkts=7, num_bytes_ip=512, flow_label=0, l2_addr=c8:bc:c8:96:d2:a0], resp=[size=5007, state=5, num_pkts=7, num_bytes_ip=5379, flow_label=0, l2_addr=00:10:db:88:d2:ef], start_time=XXXXXXXXXX.XXXXXX, duration=211.0 msecs 483.955383 usecs, service={HTTP}, history=ShADadFf, uid=CHhAvVGS1DHFjwGM9, tunnel=, vlan=, inner_vlan=, dpd=, dpd_state=, removal_hooks={HTTP::finalize_http{ HTTP::r, HTTP::info{ if (HTTP::c?$http_state) { for ([HTTP::r] in HTTP::c$http_state$pending) { if (0 == HTTP::r) next Log::write(HTTP::LOG, HTTP::info)}}}}}, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=, http=[ts=XXXXXXXXXX.XXXXXX, uid=CHhAvVGS1DHFjwGM9, id=[orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp], trans_depth=1, method=GET, host=bro.org, uri=<...>/CHANGES.bro-aux.txt, referrer=, version=1.1, user_agent=Wget/1.14 (darwin12.2.0), origin=, request_body_len=0, response_body_len=4705, status_code=200, status_msg=OK, info_code=, info_msg=, tags={}, username=, password=, capture_password=F, proxied=, range_request=F, orig_fuids=, orig_filenames=, orig_mime_types=, resp_fuids=[FMnxxt3xjVcWNS2141], resp_filenames=, resp_mime_types=[text/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, ntp=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T) diff --git a/testing/btest/scripts/base/frameworks/logging/pred.zeek b/testing/btest/scripts/base/frameworks/logging/pred.zeek index 9f59122081..9bab39eb56 100644 --- a/testing/btest/scripts/base/frameworks/logging/pred.zeek +++ b/testing/btest/scripts/base/frameworks/logging/pred.zeek @@ -14,26 +14,32 @@ export { type Log: record { t: time; id: conn_id; # Will be rolled out into individual columns. - status: string &optional; + status: string; country: string &default="unknown"; } &log; } -function fail(rec: Log): bool +hook success(rec: Log, id: Log::ID, filter: Log::Filter) { - return rec$status != "success"; + if ( rec$status != "success" ) + break; + } + +hook fail(rec: Log, id: Log::ID, filter: Log::Filter) + { + if ( rec$status == "success" ) + break; } event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); Log::remove_default_filter(Test::LOG); - Log::add_filter(Test::LOG, [$name="f1", $path="test.success", $pred=function(rec: Log): bool { return rec$status == "success"; }]); - Log::add_filter(Test::LOG, [$name="f2", $path="test.failure", $pred=fail]); + Log::add_filter(Test::LOG, [$name="f1", $path="test.success", $policy=success]); + Log::add_filter(Test::LOG, [$name="f2", $path="test.failure", $policy=fail]); local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp]; local r: Log = [$t=network_time(), $id=cid, $status="success"]; Log::write(Test::LOG, r); Log::write(Test::LOG, [$t=network_time(), $id=cid, $status="failure", $country="US"]); - } diff --git a/testing/btest/scripts/base/frameworks/logging/remove.zeek b/testing/btest/scripts/base/frameworks/logging/remove.zeek index c4a626610e..ae8926e4d7 100644 --- a/testing/btest/scripts/base/frameworks/logging/remove.zeek +++ b/testing/btest/scripts/base/frameworks/logging/remove.zeek @@ -15,15 +15,21 @@ export { type Log: record { t: time; id: conn_id; # Will be rolled out into individual columns. - status: string &optional; + status: string; country: string &default="unknown"; } &log; } +hook fail_only(rec: Log, id: Log::ID, filter: Log::Filter) + { + if ( rec$status != "failure" ) + break; + } + event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); - Log::add_filter(SSH::LOG, [$name="f1", $path="ssh.failure", $pred=function(rec: Log): bool { return rec$status == "failure"; }]); + Log::add_filter(SSH::LOG, [$name="f1", $path="ssh.failure", $policy=fail_only]); local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp]; From 00868e00d32ada17af01b8d3c3650ebdb312ee13 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 26 Jan 2021 13:52:43 -0700 Subject: [PATCH 10/11] Fix language.init-in-anon-function btest due to changes to log filter predicates --- testing/btest/language/init-in-anon-function.zeek | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/testing/btest/language/init-in-anon-function.zeek b/testing/btest/language/init-in-anon-function.zeek index 7fcf2225fb..f22306409a 100644 --- a/testing/btest/language/init-in-anon-function.zeek +++ b/testing/btest/language/init-in-anon-function.zeek @@ -1,18 +1,9 @@ # @TEST-EXEC: zeek -b -r ${TRACES}/wikipedia.trace %INPUT >out # @TEST-EXEC: btest-diff http.log - @load base/protocols/http module Foo; -event zeek_init() { - - Log::remove_default_filter(HTTP::LOG); - - local filter: Log::Filter = [$name = "http", - $pred = function(rec: HTTP::Info): bool { - rec$id$orig_h = remask_addr(rec$id$orig_h, 0.0.0.0, 112); - return T; - }]; - Log::add_filter(HTTP::LOG, filter); -} +hook HTTP::log_policy(rec: HTTP::Info, id: Log::ID, filter: Log::Filter) { + rec$id$orig_h = remask_addr(rec$id$orig_h, 0.0.0.0, 112); +} \ No newline at end of file From 5c1a068076a2e0e7382b4fb1f5518054c8ba1357 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 26 Jan 2021 13:52:54 -0700 Subject: [PATCH 11/11] Doc updates --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index cd0e4fae12..fe022ba4a9 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit cd0e4fae12dbd0e59eef4d30db9b637625e8734b +Subproject commit fe022ba4a9c12532bcbfd1dd54af91de5e8e32da