diff --git a/scripts/base/packet-protocols/default/main.zeek b/scripts/base/packet-protocols/default/main.zeek index 12c8099b2d..e3868ada8e 100644 --- a/scripts/base/packet-protocols/default/main.zeek +++ b/scripts/base/packet-protocols/default/main.zeek @@ -1,4 +1,4 @@ -module LL_DEFAULT; +module PacketAnalyzer::DEFAULT; redef PacketAnalyzer::config_map += { PacketAnalyzer::ConfigEntry($analyzer=PacketAnalyzer::ANALYZER_DEFAULTANALYZER), diff --git a/scripts/base/packet-protocols/fddi/main.zeek b/scripts/base/packet-protocols/fddi/main.zeek index 372b098587..181cd27534 100644 --- a/scripts/base/packet-protocols/fddi/main.zeek +++ b/scripts/base/packet-protocols/fddi/main.zeek @@ -1,4 +1,4 @@ -module LL_FDDI; +module PacketAnalyzer::FDDI; const DLT_FDDI : count = 10; diff --git a/scripts/base/packet-protocols/ieee802_11/main.zeek b/scripts/base/packet-protocols/ieee802_11/main.zeek index 221f301ef3..21123cd719 100644 --- a/scripts/base/packet-protocols/ieee802_11/main.zeek +++ b/scripts/base/packet-protocols/ieee802_11/main.zeek @@ -1,4 +1,4 @@ -module LL_IEEE802_11; +module PacketAnalyzer::IEEE802_11; const DLT_IEEE802_11 : count = 105; diff --git a/scripts/base/packet-protocols/ieee802_11_radio/main.zeek b/scripts/base/packet-protocols/ieee802_11_radio/main.zeek index 52660f6e5e..8c369d0183 100644 --- a/scripts/base/packet-protocols/ieee802_11_radio/main.zeek +++ b/scripts/base/packet-protocols/ieee802_11_radio/main.zeek @@ -1,4 +1,4 @@ -module LL_IEEE802_11_RADIO; +module PacketAnalyzer::IEEE802_11_RADIO; const DLT_IEEE802_11_RADIO : count = 127; const DLT_IEEE802_11 : count = 105; diff --git a/scripts/base/packet-protocols/linux_sll/main.zeek b/scripts/base/packet-protocols/linux_sll/main.zeek index 096ffb2d74..d5c9708556 100644 --- a/scripts/base/packet-protocols/linux_sll/main.zeek +++ b/scripts/base/packet-protocols/linux_sll/main.zeek @@ -1,4 +1,4 @@ -module LL_LINUX_SLL; +module PacketAnalyzer::LINUX_SLL; const DLT_LINUX_SLL : count = 113; diff --git a/scripts/base/packet-protocols/nflog/main.zeek b/scripts/base/packet-protocols/nflog/main.zeek index ebbf156df8..50edf4b514 100644 --- a/scripts/base/packet-protocols/nflog/main.zeek +++ b/scripts/base/packet-protocols/nflog/main.zeek @@ -1,4 +1,4 @@ -module LL_NFLOG; +module PacketAnalyzer::NFLOG; const DLT_NFLOG : count = 239; const AF_INET : count = 2; diff --git a/scripts/base/packet-protocols/null/main.zeek b/scripts/base/packet-protocols/null/main.zeek index f2a8a02245..9ad54c9b74 100644 --- a/scripts/base/packet-protocols/null/main.zeek +++ b/scripts/base/packet-protocols/null/main.zeek @@ -1,4 +1,4 @@ -module LL_NULL; +module PacketAnalyzer::NULL; const DLT_NULL : count = 0; const AF_INET : count = 2; diff --git a/scripts/base/packet-protocols/ppp_serial/main.zeek b/scripts/base/packet-protocols/ppp_serial/main.zeek index 1feb5fdfe3..839e19c1d4 100644 --- a/scripts/base/packet-protocols/ppp_serial/main.zeek +++ b/scripts/base/packet-protocols/ppp_serial/main.zeek @@ -1,4 +1,4 @@ -module LL_PPP_SERIAL; +module PacketAnalyzer::PPP_SERIAL; const DLT_PPP_SERIAL : count = 50; diff --git a/scripts/base/packet-protocols/pppoe/main.zeek b/scripts/base/packet-protocols/pppoe/main.zeek index 8416e42bf2..425b857f2c 100644 --- a/scripts/base/packet-protocols/pppoe/main.zeek +++ b/scripts/base/packet-protocols/pppoe/main.zeek @@ -1,4 +1,4 @@ -module LL_PPPOE; +module PacketAnalyzer::PPPOE; redef PacketAnalyzer::config_map += { PacketAnalyzer::ConfigEntry($parent=PacketAnalyzer::ANALYZER_PPPOE, $identifier=0x0021, $analyzer=PacketAnalyzer::ANALYZER_IPV4), diff --git a/scripts/base/packet-protocols/vlan/main.zeek b/scripts/base/packet-protocols/vlan/main.zeek index 78bff9398a..927f381acf 100644 --- a/scripts/base/packet-protocols/vlan/main.zeek +++ b/scripts/base/packet-protocols/vlan/main.zeek @@ -1,4 +1,4 @@ -module LL_VLAN; +module PacketAnalyzer::VLAN; redef PacketAnalyzer::config_map += { PacketAnalyzer::ConfigEntry($parent=PacketAnalyzer::ANALYZER_VLAN, $identifier=0x8847, $analyzer=PacketAnalyzer::ANALYZER_MPLS), diff --git a/src/packet_analysis/CMakeLists.txt b/src/packet_analysis/CMakeLists.txt index c952e703ed..681dad1f82 100644 --- a/src/packet_analysis/CMakeLists.txt +++ b/src/packet_analysis/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(BEFORE add_subdirectory(protocol) -set(llanalyzer_SRCS +set(packet_analysis_SRCS Analyzer.cc Dispatcher.cc Manager.cc @@ -15,5 +15,5 @@ set(llanalyzer_SRCS Tag.cc ) -bro_add_subdir_library(llanalyzer ${llanalyzer_SRCS}) -add_dependencies(bro_llanalyzer generate_outputs) +bro_add_subdir_library(packet_analysis ${packet_analysis_SRCS}) +add_dependencies(bro_packet_analysis generate_outputs) diff --git a/src/packet_analysis/Tag.h b/src/packet_analysis/Tag.h index 0d554e52f8..2ab1f12a4f 100644 --- a/src/packet_analysis/Tag.h +++ b/src/packet_analysis/Tag.h @@ -107,9 +107,9 @@ protected: /** * Constructor. * - * @param type The main type. Note that the \a llanalyzer::Manager - * manages the value space internally, so noone else should assign - * any main types. + * @param type The main type. Note that the \a zeek::packet_analysis::Manager + * manages the value space internally, so noone else should assign any main + * types. * * @param subtype The sub type, which is left to an analyzer for * interpretation. By default it's set to zero. diff --git a/src/packet_analysis/protocol/arp/CMakeLists.txt b/src/packet_analysis/protocol/arp/CMakeLists.txt index 2db553b496..f2a482e4e1 100644 --- a/src/packet_analysis/protocol/arp/CMakeLists.txt +++ b/src/packet_analysis/protocol/arp/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE $ {CMAKE_CURRENT_SOURCE_DIR} $ {CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer ARP) +zeek_plugin_begin(PacketAnalyzer ARP) zeek_plugin_cc(ARP.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/default/CMakeLists.txt b/src/packet_analysis/protocol/default/CMakeLists.txt index 3753b432f9..c41a982b87 100644 --- a/src/packet_analysis/protocol/default/CMakeLists.txt +++ b/src/packet_analysis/protocol/default/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer Default) +zeek_plugin_begin(PacketAnalyzer Default) zeek_plugin_cc(Default.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ethernet/CMakeLists.txt b/src/packet_analysis/protocol/ethernet/CMakeLists.txt index 583abdcc44..a852c8f3f3 100644 --- a/src/packet_analysis/protocol/ethernet/CMakeLists.txt +++ b/src/packet_analysis/protocol/ethernet/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer Ethernet) +zeek_plugin_begin(PacketAnalyzer Ethernet) zeek_plugin_cc(Ethernet.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/fddi/CMakeLists.txt b/src/packet_analysis/protocol/fddi/CMakeLists.txt index a1a7c571a7..2e68aa92d9 100644 --- a/src/packet_analysis/protocol/fddi/CMakeLists.txt +++ b/src/packet_analysis/protocol/fddi/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer FDDI) +zeek_plugin_begin(PacketAnalyzer FDDI) zeek_plugin_cc(FDDI.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ieee802_11/CMakeLists.txt b/src/packet_analysis/protocol/ieee802_11/CMakeLists.txt index e8f20d8e80..bd6c43c6ea 100644 --- a/src/packet_analysis/protocol/ieee802_11/CMakeLists.txt +++ b/src/packet_analysis/protocol/ieee802_11/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer IEEE802_11) +zeek_plugin_begin(PacketAnalyzer IEEE802_11) zeek_plugin_cc(IEEE802_11.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ieee802_11_radio/CMakeLists.txt b/src/packet_analysis/protocol/ieee802_11_radio/CMakeLists.txt index 2df7896a34..e063cbecca 100644 --- a/src/packet_analysis/protocol/ieee802_11_radio/CMakeLists.txt +++ b/src/packet_analysis/protocol/ieee802_11_radio/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer IEEE802_11_Radio) +zeek_plugin_begin(PacketAnalyzer IEEE802_11_Radio) zeek_plugin_cc(IEEE802_11_Radio.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ipv4/CMakeLists.txt b/src/packet_analysis/protocol/ipv4/CMakeLists.txt index ca4a2e033c..80c8d9c5c0 100644 --- a/src/packet_analysis/protocol/ipv4/CMakeLists.txt +++ b/src/packet_analysis/protocol/ipv4/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer IPv4) +zeek_plugin_begin(PacketAnalyzer IPv4) zeek_plugin_cc(IPv4.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ipv6/CMakeLists.txt b/src/packet_analysis/protocol/ipv6/CMakeLists.txt index 36beced1b2..566652cc73 100644 --- a/src/packet_analysis/protocol/ipv6/CMakeLists.txt +++ b/src/packet_analysis/protocol/ipv6/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE $ {CMAKE_CURRENT_SOURCE_DIR} $ {CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer IPv6) +zeek_plugin_begin(PacketAnalyzer IPv6) zeek_plugin_cc(IPv6.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/linux_sll/CMakeLists.txt b/src/packet_analysis/protocol/linux_sll/CMakeLists.txt index 069b1db41a..8476d2524a 100644 --- a/src/packet_analysis/protocol/linux_sll/CMakeLists.txt +++ b/src/packet_analysis/protocol/linux_sll/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE $ {CMAKE_CURRENT_SOURCE_DIR} $ {CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer LinuxSLL) +zeek_plugin_begin(PacketAnalyzer LinuxSLL) zeek_plugin_cc(LinuxSLL.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/mpls/CMakeLists.txt b/src/packet_analysis/protocol/mpls/CMakeLists.txt index 3fd7a9f8df..a72da68f3f 100644 --- a/src/packet_analysis/protocol/mpls/CMakeLists.txt +++ b/src/packet_analysis/protocol/mpls/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer MPLS) +zeek_plugin_begin(PacketAnalyzer MPLS) zeek_plugin_cc(MPLS.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/nflog/CMakeLists.txt b/src/packet_analysis/protocol/nflog/CMakeLists.txt index 12069356b9..ada26faa3c 100644 --- a/src/packet_analysis/protocol/nflog/CMakeLists.txt +++ b/src/packet_analysis/protocol/nflog/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer NFLog) +zeek_plugin_begin(PacketAnalyzer NFLog) zeek_plugin_cc(NFLog.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/null/CMakeLists.txt b/src/packet_analysis/protocol/null/CMakeLists.txt index 1aa1392127..7a3c062af7 100644 --- a/src/packet_analysis/protocol/null/CMakeLists.txt +++ b/src/packet_analysis/protocol/null/CMakeLists.txt @@ -2,6 +2,6 @@ include(ZeekPlugin) include_directories(BEFORE $ {CMAKE_CURRENT_SOURCE_DIR} $ {CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer Null) +zeek_plugin_begin(PacketAnalyzer Null) zeek_plugin_cc(Null.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/ppp_serial/CMakeLists.txt b/src/packet_analysis/protocol/ppp_serial/CMakeLists.txt index 536eb1721d..25917e191b 100644 --- a/src/packet_analysis/protocol/ppp_serial/CMakeLists.txt +++ b/src/packet_analysis/protocol/ppp_serial/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer PPPSerial) +zeek_plugin_begin(PacketAnalyzer PPPSerial) zeek_plugin_cc(PPPSerial.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/pppoe/CMakeLists.txt b/src/packet_analysis/protocol/pppoe/CMakeLists.txt index 9a59457cf8..460f43856c 100644 --- a/src/packet_analysis/protocol/pppoe/CMakeLists.txt +++ b/src/packet_analysis/protocol/pppoe/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer PPPoE) +zeek_plugin_begin(PacketAnalyzer PPPoE) zeek_plugin_cc(PPPoE.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/vlan/CMakeLists.txt b/src/packet_analysis/protocol/vlan/CMakeLists.txt index 9105912d01..8f1c86ae55 100644 --- a/src/packet_analysis/protocol/vlan/CMakeLists.txt +++ b/src/packet_analysis/protocol/vlan/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer VLAN) +zeek_plugin_begin(PacketAnalyzer VLAN) zeek_plugin_cc(VLAN.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/wrapper/CMakeLists.txt b/src/packet_analysis/protocol/wrapper/CMakeLists.txt index d1506bcae6..76b59fc30a 100644 --- a/src/packet_analysis/protocol/wrapper/CMakeLists.txt +++ b/src/packet_analysis/protocol/wrapper/CMakeLists.txt @@ -3,6 +3,6 @@ include(ZeekPlugin) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -zeek_plugin_begin(LLAnalyzer Wrapper) +zeek_plugin_begin(PacketAnalyzer Wrapper) zeek_plugin_cc(Wrapper.cc Plugin.cc) zeek_plugin_end() diff --git a/src/packet_analysis/protocol/wrapper/Plugin.cc b/src/packet_analysis/protocol/wrapper/Plugin.cc index 45be64498e..c6e9fd5334 100644 --- a/src/packet_analysis/protocol/wrapper/Plugin.cc +++ b/src/packet_analysis/protocol/wrapper/Plugin.cc @@ -4,7 +4,7 @@ #include "plugin/Plugin.h" #include "packet_analysis/Component.h" -namespace zeek::plugin::LLAnalyzer { +namespace zeek::plugin::Zeek_Wrapper { class Plugin : public zeek::plugin::Plugin { public: