Improve naming in packet analysis.

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),

scripts/base/packet-protocols/fddi/main.zeek

@@ -1,4 +1,4 @@
-module LL_FDDI;
+module PacketAnalyzer::FDDI;
 
 const DLT_FDDI : count = 10;
 

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;
 

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;

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;
 

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;

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;

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;
 

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),

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),

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})
+bro_add_subdir_library(packet_analysis ${packet_analysis_SRCS})
-add_dependencies(bro_llanalyzer generate_outputs)
+add_dependencies(bro_packet_analysis generate_outputs)

src/packet_analysis/Tag.h

@@ -107,9 +107,9 @@ protected:
 	/**
 	 * Constructor.
 	 *
-	 * @param type The main type. Note that the \a llanalyzer::Manager
+	 * @param type The main type. Note that the \a zeek::packet_analysis::Manager
-	 * manages the value space internally, so noone else should assign
+	 * manages the value space internally, so noone else should assign any main
-	 * any main types.
+	 * types.
 	 *
 	 * @param subtype The sub type, which is left to an analyzer for
 	 * interpretation. By default it's set to zero.

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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: