Rename analyzer/protocols -> analyzer/protocol

src/Conn.cc

@@ -11,7 +11,7 @@
 #include "Sessions.h"
 #include "Reporter.h"
 #include "Timer.h"
-#include "analyzer/protocols/pia/PIA.h"
+#include "analyzer/protocol/pia/PIA.h"
 #include "binpac.h"
 #include "TunnelEncapsulation.h"
 #include "analyzer/Analyzer.h"

src/Func.cc

@@ -38,7 +38,7 @@
 #include "Func.h"
 #include "Frame.h"
 #include "Var.h"
-#include "analyzer/protocols/login/Login.h"
+#include "analyzer/protocol/login/Login.h"
 #include "Sessions.h"
 #include "RE.h"
 #include "Serializer.h"

src/RuleAction.cc

@@ -8,7 +8,7 @@ using std::string;
 #include "Conn.h"
 #include "Event.h"
 #include "NetVar.h"
-#include "analyzer/protocols/pia/PIA.h"
+#include "analyzer/protocol/pia/PIA.h"
 
 #include "analyzer/Manager.h"
 

src/RuleCondition.cc

@@ -1,7 +1,7 @@
 #include "config.h"
 
 #include "RuleCondition.h"
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 #include "Scope.h"
 
 static inline bool is_established(const analyzer::tcp::TCP_Endpoint* e)

src/Sessions.cc

@@ -16,17 +16,17 @@
 #include "Reporter.h"
 #include "OSFinger.h"
 
-#include "analyzer/protocols/icmp/ICMP.h"
-#include "analyzer/protocols/udp/UDP.h"
+#include "analyzer/protocol/icmp/ICMP.h"
+#include "analyzer/protocol/udp/UDP.h"
 
-#include "analyzer/protocols/stepping-stone/SteppingStone.h"
-#include "analyzer/protocols/stepping-stone/events.bif.h"
-#include "analyzer/protocols/backdoor/BackDoor.h"
-#include "analyzer/protocols/backdoor/events.bif.h"
-#include "analyzer/protocols/interconn/InterConn.h"
-#include "analyzer/protocols/interconn/events.bif.h"
-#include "analyzer/protocols/arp/ARP.h"
-#include "analyzer/protocols/arp/events.bif.h"
+#include "analyzer/protocol/stepping-stone/SteppingStone.h"
+#include "analyzer/protocol/stepping-stone/events.bif.h"
+#include "analyzer/protocol/backdoor/BackDoor.h"
+#include "analyzer/protocol/backdoor/events.bif.h"
+#include "analyzer/protocol/interconn/InterConn.h"
+#include "analyzer/protocol/interconn/events.bif.h"
+#include "analyzer/protocol/arp/ARP.h"
+#include "analyzer/protocol/arp/events.bif.h"
 #include "Discard.h"
 #include "RuleMatcher.h"
 

src/Sessions.h

@@ -11,7 +11,7 @@
 #include "Stats.h"
 #include "NetVar.h"
 #include "TunnelEncapsulation.h"
-#include "analyzer/protocols/tcp/Stats.h"
+#include "analyzer/protocol/tcp/Stats.h"
 
 #include <utility>
 

src/analyzer/Analyzer.cc

@@ -4,7 +4,7 @@
 #include "Analyzer.h"
 #include "Manager.h"
 
-#include "analyzer/protocols/pia/PIA.h"
+#include "analyzer/protocol/pia/PIA.h"
 #include "../Event.h"
 
 namespace analyzer {

src/analyzer/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories(BEFORE
                     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-add_subdirectory(protocols)
+add_subdirectory(protocol)
 
 set(analyzer_SRCS
     Analyzer.cc

src/analyzer/Manager.cc

@@ -4,14 +4,14 @@
 #include "Hash.h"
 #include "Val.h"
 
-#include "analyzer/protocols/backdoor/BackDoor.h"
-#include "analyzer/protocols/conn-size/ConnSize.h"
-#include "analyzer/protocols/icmp/ICMP.h"
-#include "analyzer/protocols/interconn/InterConn.h"
-#include "analyzer/protocols/pia/PIA.h"
-#include "analyzer/protocols/stepping-stone/SteppingStone.h"
-#include "analyzer/protocols/tcp/TCP.h"
-#include "analyzer/protocols/udp/UDP.h"
+#include "analyzer/protocol/backdoor/BackDoor.h"
+#include "analyzer/protocol/conn-size/ConnSize.h"
+#include "analyzer/protocol/icmp/ICMP.h"
+#include "analyzer/protocol/interconn/InterConn.h"
+#include "analyzer/protocol/pia/PIA.h"
+#include "analyzer/protocol/stepping-stone/SteppingStone.h"
+#include "analyzer/protocol/tcp/TCP.h"
+#include "analyzer/protocol/udp/UDP.h"
 
 #include "plugin/Manager.h"
 

src/analyzer/protocol/TODO

@@ -1,7 +1,5 @@
 
-- update *.h guards
 - cleanup analyzer descriptions
 - can now lower-case the analyzer name in plugin
 - not sure cmake dependencies work right yet
-- rename analyzers/protocols to analyzer/protocol
 

src/analyzer/protocol/backdoor/BackDoor.cc

@@ -5,7 +5,7 @@
 #include "BackDoor.h"
 #include "Event.h"
 #include "Net.h"
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/backdoor/BackDoor.h

@@ -3,10 +3,10 @@
 #ifndef ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
 #define ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 #include "Timer.h"
 #include "NetVar.h"
-#include "analyzer/protocols/login/Login.h"
+#include "analyzer/protocol/login/Login.h"
 
 namespace analyzer { namespace backdoor {
 

src/analyzer/protocol/bittorrent/BitTorrent.cc

@@ -1,7 +1,7 @@
 // This code contributed by Nadi Sarrar.
 
 #include "BitTorrent.h"
-#include "analyzer/protocols/tcp/TCP_Reassembler.h"
+#include "analyzer/protocol/tcp/TCP_Reassembler.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/bittorrent/BitTorrent.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
 #define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #include "bittorrent_pac.h"
 

src/analyzer/protocol/bittorrent/BitTorrentTracker.cc

@@ -1,7 +1,7 @@
 // This code contributed by Nadi Sarrar.
 
 #include "BitTorrentTracker.h"
-#include "analyzer/protocols/tcp/TCP_Reassembler.h"
+#include "analyzer/protocol/tcp/TCP_Reassembler.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/bittorrent/BitTorrentTracker.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
 #define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #define BTTRACKER_BUF 2048
 

src/analyzer/protocol/conn-size/ConnSize.cc

@@ -4,7 +4,7 @@
 
 
 #include "ConnSize.h"
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/dce-rpc/DCE_RPC.h

@@ -7,8 +7,8 @@
 // Windows systems) and shouldn't be considered as stable.
 
 #include "NetVar.h"
-#include "analyzer/protocols/tcp/TCP.h"
-#include "analyzer/protocols/dce-rpc/events.bif.h"
+#include "analyzer/protocol/tcp/TCP.h"
+#include "analyzer/protocol/dce-rpc/events.bif.h"
 #include "IPAddr.h"
 
 #include "dce_rpc_simple_pac.h"
@@ -88,7 +88,7 @@ enum DCE_RPC_PTYPE {
 };
 */
 
-#define ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_HEADER_LENGTH 16
+#define DCE_RPC_HEADER_LENGTH 16
 
 class DCE_RPC_Header {
 public:

src/analyzer/protocol/dhcp/DHCP.h

@@ -1,7 +1,7 @@
 #ifndef ANALYZER_PROTOCOL_DHCP_DHCP_H
 #define ANALYZER_PROTOCOL_DHCP_DHCP_H
 
-#include "analyzer/protocols/udp/UDP.h"
+#include "analyzer/protocol/udp/UDP.h"
 
 #include "dhcp_pac.h"
 

src/analyzer/protocol/dns/DNS.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_DNS_DNS_H
 #define ANALYZER_PROTOCOL_DNS_DNS_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 #include "binpac_bro.h"
 
 namespace analyzer { namespace dns {

src/analyzer/protocol/file/File.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_FILE_FILE_H
 #define ANALYZER_PROTOCOL_FILE_FILE_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #include <magic.h>
 

src/analyzer/protocol/finger/Finger.cc

@@ -7,7 +7,7 @@
 #include "NetVar.h"
 #include "Finger.h"
 #include "Event.h"
-#include "analyzer/protocols/tcp/ContentLine.h"
+#include "analyzer/protocol/tcp/ContentLine.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/finger/Finger.h

@@ -3,8 +3,8 @@
 #ifndef ANALYZER_PROTOCOL_FINGER_FINGER_H
 #define ANALYZER_PROTOCOL_FINGER_FINGER_H
 
-#include "analyzer/protocols/tcp/TCP.h"
-#include "analyzer/protocols/tcp/ContentLine.h"
+#include "analyzer/protocol/tcp/TCP.h"
+#include "analyzer/protocol/tcp/ContentLine.h"
 
 namespace analyzer { namespace finger {
 

src/analyzer/protocol/ftp/FTP.cc

@@ -9,7 +9,7 @@
 #include "Event.h"
 #include "Base64.h"
 #include "analyzer/Manager.h"
-#include "analyzer/protocols/login/NVT.h"
+#include "analyzer/protocol/login/NVT.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/ftp/FTP.h

@@ -3,8 +3,8 @@
 #ifndef ANALYZER_PROTOCOL_FTP_FTP_H
 #define ANALYZER_PROTOCOL_FTP_FTP_H
 
-#include "analyzer/protocols/login/NVT.h"
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/login/NVT.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 namespace analyzer { namespace ftp {
 

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -9,7 +9,7 @@
 #include "NetVar.h"
 #include "Gnutella.h"
 #include "Event.h"
-#include "analyzer/protocols/pia/PIA.h"
+#include "analyzer/protocol/pia/PIA.h"
 #include "analyzer/Manager.h"
 
 #include "events.bif.h"

src/analyzer/protocol/gnutella/Gnutella.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
 #define ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
 
-#include "analyzer/protocols/tcp/TCP.h"
+#include "analyzer/protocol/tcp/TCP.h"
 
 #define ORIG_OK               0x1
 #define RESP_OK               0x2

src/analyzer/protocol/http/HTTP.cc

@@ -11,7 +11,7 @@
 #include "NetVar.h"
 #include "HTTP.h"
 #include "Event.h"
-#include "analyzer/protocols/mime/MIME.h"
+#include "analyzer/protocol/mime/MIME.h"
 
 #include "events.bif.h"
 

src/analyzer/protocol/http/HTTP.h

@@ -3,10 +3,10 @@
 #ifndef ANALYZER_PROTOCOL_HTTP_HTTP_H
 #define ANALYZER_PROTOCOL_HTTP_HTTP_H
 
-#include "analyzer/protocols/tcp/TCP.h"
-#include "analyzer/protocols/tcp/ContentLine.h"
-#include "analyzer/protocols/zip/ZIP.h"
-#include "analyzer/protocols/mime/MIME.h"
+#include "analyzer/protocol/tcp/TCP.h"
+#include "analyzer/protocol/tcp/ContentLine.h"
+#include "analyzer/protocol/zip/ZIP.h"
+#include "analyzer/protocol/mime/MIME.h"
 #include "binpac_bro.h"
 #include "IPAddr.h"
 #include "events.bif.h"