From 4bc2ba60c941d3a4f7f74a854fe3528a19d4250c Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 19 Apr 2013 15:50:57 -0700 Subject: [PATCH] Rename analyzer/protocols -> analyzer/protocol --- src/Conn.cc | 2 +- src/Func.cc | 2 +- src/RuleAction.cc | 2 +- src/RuleCondition.cc | 2 +- src/Sessions.cc | 20 +++++++++---------- src/Sessions.h | 2 +- src/analyzer/Analyzer.cc | 2 +- src/analyzer/CMakeLists.txt | 2 +- src/analyzer/Manager.cc | 16 +++++++-------- .../{protocols => protocol}/CMakeLists.txt | 0 src/analyzer/{protocols => protocol}/TODO | 2 -- .../{protocols => protocol}/arp/ARP.cc | 0 .../{protocols => protocol}/arp/ARP.h | 0 .../arp/CMakeLists.txt | 0 .../{protocols => protocol}/arp/Plugin.cc | 0 .../{protocols => protocol}/arp/events.bif | 0 .../{protocols => protocol}/ayiya/AYIYA.cc | 0 .../{protocols => protocol}/ayiya/AYIYA.h | 0 .../ayiya/CMakeLists.txt | 0 .../{protocols => protocol}/ayiya/Plugin.cc | 0 .../ayiya/ayiya-analyzer.pac | 0 .../ayiya/ayiya-protocol.pac | 0 .../{protocols => protocol}/ayiya/ayiya.pac | 0 .../{protocols => protocol}/ayiya/events.bif | 0 .../backdoor/BackDoor.cc | 2 +- .../backdoor/BackDoor.h | 4 ++-- .../backdoor/CMakeLists.txt | 0 .../backdoor/Plugin.cc | 0 .../backdoor/events.bif | 0 .../bittorrent/BitTorrent.cc | 2 +- .../bittorrent/BitTorrent.h | 2 +- .../bittorrent/BitTorrentTracker.cc | 2 +- .../bittorrent/BitTorrentTracker.h | 2 +- .../bittorrent/CMakeLists.txt | 0 .../bittorrent/Plugin.cc | 0 .../bittorrent/bittorrent-analyzer.pac | 0 .../bittorrent/bittorrent-protocol.pac | 0 .../bittorrent/bittorrent.pac | 0 .../bittorrent/events.bif | 0 .../conn-size/CMakeLists.txt | 0 .../conn-size/ConnSize.cc | 2 +- .../conn-size/ConnSize.h | 0 .../conn-size/Plugin.cc | 0 .../conn-size/events.bif | 0 .../dce-rpc/CMakeLists.txt | 0 .../dce-rpc/DCE_RPC.cc | 0 .../{protocols => protocol}/dce-rpc/DCE_RPC.h | 6 +++--- .../{protocols => protocol}/dce-rpc/Plugin.cc | 0 .../dce-rpc/dce_rpc-analyzer.pac | 0 .../dce-rpc/dce_rpc-protocol.pac | 0 .../dce-rpc/dce_rpc.pac | 0 .../dce-rpc/dce_rpc_simple.pac | 0 .../dce-rpc/epmapper.pac | 0 .../dce-rpc/events.bif | 0 .../dhcp/CMakeLists.txt | 0 .../{protocols => protocol}/dhcp/DHCP.cc | 0 .../{protocols => protocol}/dhcp/DHCP.h | 2 +- .../{protocols => protocol}/dhcp/Plugin.cc | 0 .../dhcp/dhcp-analyzer.pac | 0 .../dhcp/dhcp-protocol.pac | 0 .../{protocols => protocol}/dhcp/dhcp.pac | 0 .../{protocols => protocol}/dhcp/events.bif | 0 .../dns/CMakeLists.txt | 0 .../{protocols => protocol}/dns/DNS.cc | 0 .../{protocols => protocol}/dns/DNS.h | 2 +- .../{protocols => protocol}/dns/Plugin.cc | 0 .../{protocols => protocol}/dns/events.bif | 0 .../file/CMakeLists.txt | 0 .../{protocols => protocol}/file/File.cc | 0 .../{protocols => protocol}/file/File.h | 2 +- .../{protocols => protocol}/file/Plugin.cc | 0 .../{protocols => protocol}/file/events.bif | 0 .../finger/CMakeLists.txt | 0 .../{protocols => protocol}/finger/Finger.cc | 2 +- .../{protocols => protocol}/finger/Finger.h | 4 ++-- .../{protocols => protocol}/finger/Plugin.cc | 0 .../{protocols => protocol}/finger/events.bif | 0 .../ftp/CMakeLists.txt | 0 .../{protocols => protocol}/ftp/FTP.cc | 2 +- .../{protocols => protocol}/ftp/FTP.h | 4 ++-- .../{protocols => protocol}/ftp/Plugin.cc | 0 .../{protocols => protocol}/ftp/events.bif | 0 .../{protocols => protocol}/ftp/functions.bif | 0 .../gnutella/CMakeLists.txt | 0 .../gnutella/Gnutella.cc | 2 +- .../gnutella/Gnutella.h | 2 +- .../gnutella/Plugin.cc | 0 .../gnutella/events.bif | 0 .../gtpv1/CMakeLists.txt | 0 .../{protocols => protocol}/gtpv1/GTPv1.cc | 0 .../{protocols => protocol}/gtpv1/GTPv1.h | 0 .../{protocols => protocol}/gtpv1/Plugin.cc | 0 .../{protocols => protocol}/gtpv1/events.bif | 0 .../gtpv1/gtpv1-analyzer.pac | 0 .../gtpv1/gtpv1-protocol.pac | 0 .../{protocols => protocol}/gtpv1/gtpv1.pac | 0 .../http/CMakeLists.txt | 0 .../{protocols => protocol}/http/HTTP.cc | 2 +- .../{protocols => protocol}/http/HTTP.h | 8 ++++---- .../{protocols => protocol}/http/Plugin.cc | 0 .../{protocols => protocol}/http/events.bif | 0 .../http/functions.bif | 2 +- .../icmp/CMakeLists.txt | 0 .../{protocols => protocol}/icmp/ICMP.cc | 0 .../{protocols => protocol}/icmp/ICMP.h | 0 .../{protocols => protocol}/icmp/Plugin.cc | 0 .../{protocols => protocol}/icmp/events.bif | 0 .../ident/CMakeLists.txt | 0 .../{protocols => protocol}/ident/Ident.cc | 0 .../{protocols => protocol}/ident/Ident.h | 4 ++-- .../{protocols => protocol}/ident/Plugin.cc | 0 .../{protocols => protocol}/ident/events.bif | 0 .../interconn/CMakeLists.txt | 0 .../interconn/InterConn.cc | 2 +- .../interconn/InterConn.h | 2 +- .../interconn/Plugin.cc | 0 .../interconn/events.bif | 0 .../irc/CMakeLists.txt | 0 .../{protocols => protocol}/irc/IRC.cc | 4 ++-- .../{protocols => protocol}/irc/IRC.h | 2 +- .../{protocols => protocol}/irc/Plugin.cc | 0 .../{protocols => protocol}/irc/events.bif | 0 .../login/CMakeLists.txt | 0 .../{protocols => protocol}/login/Login.cc | 0 .../{protocols => protocol}/login/Login.h | 2 +- .../{protocols => protocol}/login/NVT.cc | 2 +- .../{protocols => protocol}/login/NVT.h | 2 +- .../{protocols => protocol}/login/Plugin.cc | 0 .../{protocols => protocol}/login/RSH.cc | 0 .../{protocols => protocol}/login/RSH.h | 2 +- .../{protocols => protocol}/login/Rlogin.cc | 0 .../{protocols => protocol}/login/Rlogin.h | 2 +- .../{protocols => protocol}/login/Telnet.cc | 0 .../{protocols => protocol}/login/Telnet.h | 0 .../{protocols => protocol}/login/events.bif | 0 .../login/functions.bif | 0 .../mime/CMakeLists.txt | 0 .../{protocols => protocol}/mime/MIME.cc | 0 .../{protocols => protocol}/mime/MIME.h | 0 .../{protocols => protocol}/mime/Plugin.cc | 0 .../{protocols => protocol}/mime/events.bif | 0 .../modbus/CMakeLists.txt | 0 .../{protocols => protocol}/modbus/Modbus.cc | 2 +- .../{protocols => protocol}/modbus/Modbus.h | 2 +- .../{protocols => protocol}/modbus/Plugin.cc | 0 .../{protocols => protocol}/modbus/events.bif | 0 .../modbus/modbus-analyzer.pac | 0 .../modbus/modbus-protocol.pac | 0 .../{protocols => protocol}/modbus/modbus.pac | 0 .../ncp/CMakeLists.txt | 0 .../{protocols => protocol}/ncp/NCP.cc | 0 .../{protocols => protocol}/ncp/NCP.h | 4 ++-- .../{protocols => protocol}/ncp/NCP_func.def | 0 .../{protocols => protocol}/ncp/Plugin.cc | 0 .../{protocols => protocol}/ncp/events.bif | 0 .../{protocols => protocol}/ncp/ncp.pac | 0 .../netbios/CMakeLists.txt | 0 .../netbios/NetbiosSSN.cc | 0 .../netbios/NetbiosSSN.h | 6 +++--- .../{protocols => protocol}/netbios/Plugin.cc | 0 .../netbios/events.bif | 0 .../netbios/functions.bif | 0 .../netflow/CMakeLists.txt | 0 .../{protocols => protocol}/netflow/Plugin.cc | 0 .../netflow/events.bif | 0 .../netflow/netflow-analyzer.pac | 0 .../netflow/netflow-protocol.pac | 0 .../netflow/netflow.pac | 0 .../ntp/CMakeLists.txt | 0 .../{protocols => protocol}/ntp/NTP.cc | 0 .../{protocols => protocol}/ntp/NTP.h | 2 +- .../{protocols => protocol}/ntp/Plugin.cc | 0 .../{protocols => protocol}/ntp/events.bif | 0 .../pia/CMakeLists.txt | 0 .../{protocols => protocol}/pia/PIA.cc | 2 +- .../{protocols => protocol}/pia/PIA.h | 2 +- .../{protocols => protocol}/pia/Plugin.cc | 0 .../{protocols => protocol}/pia/events.bif | 0 .../pop3/CMakeLists.txt | 0 .../{protocols => protocol}/pop3/POP3.cc | 2 +- .../{protocols => protocol}/pop3/POP3.h | 6 +++--- .../{protocols => protocol}/pop3/POP3_cmd.def | 0 .../{protocols => protocol}/pop3/Plugin.cc | 0 .../{protocols => protocol}/pop3/events.bif | 0 .../rpc/CMakeLists.txt | 0 .../{protocols => protocol}/rpc/NFS.cc | 0 .../{protocols => protocol}/rpc/NFS.h | 0 .../{protocols => protocol}/rpc/Plugin.cc | 0 .../{protocols => protocol}/rpc/Portmap.cc | 0 .../{protocols => protocol}/rpc/Portmap.h | 0 .../{protocols => protocol}/rpc/RPC.cc | 0 .../{protocols => protocol}/rpc/RPC.h | 4 ++-- .../{protocols => protocol}/rpc/XDR.cc | 0 .../{protocols => protocol}/rpc/XDR.h | 0 .../{protocols => protocol}/rpc/events.bif | 0 .../smb/CMakeLists.txt | 0 .../{protocols => protocol}/smb/Plugin.cc | 0 .../{protocols => protocol}/smb/SMB.cc | 0 .../{protocols => protocol}/smb/SMB.h | 4 ++-- .../{protocols => protocol}/smb/SMB_COM.def | 0 .../{protocols => protocol}/smb/events.bif | 0 .../smb/smb-mailslot.pac | 0 .../{protocols => protocol}/smb/smb-pipe.pac | 0 .../smb/smb-protocol.pac | 0 .../{protocols => protocol}/smb/smb.pac | 0 .../smtp/CMakeLists.txt | 0 .../{protocols => protocol}/smtp/Plugin.cc | 0 .../{protocols => protocol}/smtp/SMTP.cc | 2 +- .../{protocols => protocol}/smtp/SMTP.h | 4 ++-- .../{protocols => protocol}/smtp/SMTP_cmd.def | 0 .../{protocols => protocol}/smtp/events.bif | 0 .../smtp/functions.bif | 2 +- .../socks/CMakeLists.txt | 0 .../{protocols => protocol}/socks/Plugin.cc | 0 .../{protocols => protocol}/socks/SOCKS.cc | 2 +- .../{protocols => protocol}/socks/SOCKS.h | 4 ++-- .../{protocols => protocol}/socks/events.bif | 0 .../socks/socks-analyzer.pac | 0 .../socks/socks-protocol.pac | 0 .../{protocols => protocol}/socks/socks.pac | 0 .../ssh/CMakeLists.txt | 0 .../{protocols => protocol}/ssh/Plugin.cc | 0 .../{protocols => protocol}/ssh/SSH.cc | 2 +- .../{protocols => protocol}/ssh/SSH.h | 4 ++-- .../{protocols => protocol}/ssh/events.bif | 0 .../ssl/CMakeLists.txt | 0 .../{protocols => protocol}/ssl/Plugin.cc | 0 .../{protocols => protocol}/ssl/SSL.cc | 2 +- .../{protocols => protocol}/ssl/SSL.h | 2 +- .../{protocols => protocol}/ssl/events.bif | 0 .../{protocols => protocol}/ssl/functions.bif | 0 .../ssl/ssl-analyzer.pac | 0 .../{protocols => protocol}/ssl/ssl-defs.pac | 0 .../ssl/ssl-protocol.pac | 0 .../{protocols => protocol}/ssl/ssl.pac | 0 .../stepping-stone/CMakeLists.txt | 0 .../stepping-stone/Plugin.cc | 0 .../stepping-stone/SteppingStone.cc | 2 +- .../stepping-stone/SteppingStone.h | 2 +- .../stepping-stone/events.bif | 0 .../syslog/CMakeLists.txt | 0 .../{protocols => protocol}/syslog/Plugin.cc | 0 .../{protocols => protocol}/syslog/Syslog.cc | 2 +- .../{protocols => protocol}/syslog/Syslog.h | 4 ++-- .../{protocols => protocol}/syslog/events.bif | 0 .../syslog/syslog-analyzer.pac | 0 .../syslog/syslog-protocol.pac | 0 .../{protocols => protocol}/syslog/syslog.pac | 0 .../tcp/CMakeLists.txt | 0 .../tcp/ContentLine.cc | 2 +- .../{protocols => protocol}/tcp/ContentLine.h | 2 +- .../{protocols => protocol}/tcp/Plugin.cc | 0 .../{protocols => protocol}/tcp/Stats.cc | 0 .../{protocols => protocol}/tcp/Stats.h | 0 .../{protocols => protocol}/tcp/TCP.cc | 6 +++--- .../{protocols => protocol}/tcp/TCP.h | 2 +- .../tcp/TCP_Endpoint.cc | 2 +- .../tcp/TCP_Endpoint.h | 0 .../tcp/TCP_Reassembler.cc | 2 +- .../tcp/TCP_Reassembler.h | 0 .../{protocols => protocol}/tcp/events.bif | 0 .../{protocols => protocol}/tcp/functions.bif | 2 +- .../teredo/CMakeLists.txt | 0 .../{protocols => protocol}/teredo/Plugin.cc | 0 .../{protocols => protocol}/teredo/Teredo.cc | 0 .../{protocols => protocol}/teredo/Teredo.h | 0 .../{protocols => protocol}/teredo/events.bif | 0 .../udp/CMakeLists.txt | 0 .../{protocols => protocol}/udp/Plugin.cc | 2 +- .../{protocols => protocol}/udp/UDP.cc | 2 +- .../{protocols => protocol}/udp/UDP.h | 0 .../{protocols => protocol}/udp/events.bif | 0 .../zip/CMakeLists.txt | 0 .../{protocols => protocol}/zip/Plugin.cc | 0 .../{protocols => protocol}/zip/ZIP.cc | 0 .../{protocols => protocol}/zip/ZIP.h | 2 +- .../{protocols => protocol}/zip/events.bif | 0 src/bro.bif | 2 +- src/parse.y | 2 +- 279 files changed, 114 insertions(+), 116 deletions(-) rename src/analyzer/{protocols => protocol}/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/TODO (64%) rename src/analyzer/{protocols => protocol}/arp/ARP.cc (100%) rename src/analyzer/{protocols => protocol}/arp/ARP.h (100%) rename src/analyzer/{protocols => protocol}/arp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/arp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/arp/events.bif (100%) rename src/analyzer/{protocols => protocol}/ayiya/AYIYA.cc (100%) rename src/analyzer/{protocols => protocol}/ayiya/AYIYA.h (100%) rename src/analyzer/{protocols => protocol}/ayiya/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ayiya/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ayiya/ayiya-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/ayiya/ayiya-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/ayiya/ayiya.pac (100%) rename src/analyzer/{protocols => protocol}/ayiya/events.bif (100%) rename src/analyzer/{protocols => protocol}/backdoor/BackDoor.cc (99%) rename src/analyzer/{protocols => protocol}/backdoor/BackDoor.h (97%) rename src/analyzer/{protocols => protocol}/backdoor/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/backdoor/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/backdoor/events.bif (100%) rename src/analyzer/{protocols => protocol}/bittorrent/BitTorrent.cc (98%) rename src/analyzer/{protocols => protocol}/bittorrent/BitTorrent.h (95%) rename src/analyzer/{protocols => protocol}/bittorrent/BitTorrentTracker.cc (99%) rename src/analyzer/{protocols => protocol}/bittorrent/BitTorrentTracker.h (98%) rename src/analyzer/{protocols => protocol}/bittorrent/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/bittorrent/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/bittorrent/bittorrent-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/bittorrent/bittorrent-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/bittorrent/bittorrent.pac (100%) rename src/analyzer/{protocols => protocol}/bittorrent/events.bif (100%) rename src/analyzer/{protocols => protocol}/conn-size/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/conn-size/ConnSize.cc (98%) rename src/analyzer/{protocols => protocol}/conn-size/ConnSize.h (100%) rename src/analyzer/{protocols => protocol}/conn-size/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/conn-size/events.bif (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/DCE_RPC.cc (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/DCE_RPC.h (96%) rename src/analyzer/{protocols => protocol}/dce-rpc/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/dce_rpc-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/dce_rpc-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/dce_rpc.pac (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/dce_rpc_simple.pac (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/epmapper.pac (100%) rename src/analyzer/{protocols => protocol}/dce-rpc/events.bif (100%) rename src/analyzer/{protocols => protocol}/dhcp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/dhcp/DHCP.cc (100%) rename src/analyzer/{protocols => protocol}/dhcp/DHCP.h (93%) rename src/analyzer/{protocols => protocol}/dhcp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/dhcp/dhcp-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/dhcp/dhcp-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/dhcp/dhcp.pac (100%) rename src/analyzer/{protocols => protocol}/dhcp/events.bif (100%) rename src/analyzer/{protocols => protocol}/dns/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/dns/DNS.cc (100%) rename src/analyzer/{protocols => protocol}/dns/DNS.h (99%) rename src/analyzer/{protocols => protocol}/dns/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/dns/events.bif (100%) rename src/analyzer/{protocols => protocol}/file/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/file/File.cc (100%) rename src/analyzer/{protocols => protocol}/file/File.h (94%) rename src/analyzer/{protocols => protocol}/file/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/file/events.bif (100%) rename src/analyzer/{protocols => protocol}/finger/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/finger/Finger.cc (97%) rename src/analyzer/{protocols => protocol}/finger/Finger.h (89%) rename src/analyzer/{protocols => protocol}/finger/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/finger/events.bif (100%) rename src/analyzer/{protocols => protocol}/ftp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ftp/FTP.cc (99%) rename src/analyzer/{protocols => protocol}/ftp/FTP.h (94%) rename src/analyzer/{protocols => protocol}/ftp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ftp/events.bif (100%) rename src/analyzer/{protocols => protocol}/ftp/functions.bif (100%) rename src/analyzer/{protocols => protocol}/gnutella/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/gnutella/Gnutella.cc (99%) rename src/analyzer/{protocols => protocol}/gnutella/Gnutella.h (97%) rename src/analyzer/{protocols => protocol}/gnutella/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/gnutella/events.bif (100%) rename src/analyzer/{protocols => protocol}/gtpv1/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/gtpv1/GTPv1.cc (100%) rename src/analyzer/{protocols => protocol}/gtpv1/GTPv1.h (100%) rename src/analyzer/{protocols => protocol}/gtpv1/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/gtpv1/events.bif (100%) rename src/analyzer/{protocols => protocol}/gtpv1/gtpv1-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/gtpv1/gtpv1-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/gtpv1/gtpv1.pac (100%) rename src/analyzer/{protocols => protocol}/http/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/http/HTTP.cc (99%) rename src/analyzer/{protocols => protocol}/http/HTTP.h (97%) rename src/analyzer/{protocols => protocol}/http/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/http/events.bif (100%) rename src/analyzer/{protocols => protocol}/http/functions.bif (97%) rename src/analyzer/{protocols => protocol}/icmp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/icmp/ICMP.cc (100%) rename src/analyzer/{protocols => protocol}/icmp/ICMP.h (100%) rename src/analyzer/{protocols => protocol}/icmp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/icmp/events.bif (100%) rename src/analyzer/{protocols => protocol}/ident/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ident/Ident.cc (100%) rename src/analyzer/{protocols => protocol}/ident/Ident.h (91%) rename src/analyzer/{protocols => protocol}/ident/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ident/events.bif (100%) rename src/analyzer/{protocols => protocol}/interconn/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/interconn/InterConn.cc (99%) rename src/analyzer/{protocols => protocol}/interconn/InterConn.h (98%) rename src/analyzer/{protocols => protocol}/interconn/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/interconn/events.bif (100%) rename src/analyzer/{protocols => protocol}/irc/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/irc/IRC.cc (99%) rename src/analyzer/{protocols => protocol}/irc/IRC.h (97%) rename src/analyzer/{protocols => protocol}/irc/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/irc/events.bif (100%) rename src/analyzer/{protocols => protocol}/login/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/login/Login.cc (100%) rename src/analyzer/{protocols => protocol}/login/Login.h (98%) rename src/analyzer/{protocols => protocol}/login/NVT.cc (99%) rename src/analyzer/{protocols => protocol}/login/NVT.h (98%) rename src/analyzer/{protocols => protocol}/login/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/login/RSH.cc (100%) rename src/analyzer/{protocols => protocol}/login/RSH.h (96%) rename src/analyzer/{protocols => protocol}/login/Rlogin.cc (100%) rename src/analyzer/{protocols => protocol}/login/Rlogin.h (97%) rename src/analyzer/{protocols => protocol}/login/Telnet.cc (100%) rename src/analyzer/{protocols => protocol}/login/Telnet.h (100%) rename src/analyzer/{protocols => protocol}/login/events.bif (100%) rename src/analyzer/{protocols => protocol}/login/functions.bif (100%) rename src/analyzer/{protocols => protocol}/mime/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/mime/MIME.cc (100%) rename src/analyzer/{protocols => protocol}/mime/MIME.h (100%) rename src/analyzer/{protocols => protocol}/mime/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/mime/events.bif (100%) rename src/analyzer/{protocols => protocol}/modbus/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/modbus/Modbus.cc (94%) rename src/analyzer/{protocols => protocol}/modbus/Modbus.h (94%) rename src/analyzer/{protocols => protocol}/modbus/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/modbus/events.bif (100%) rename src/analyzer/{protocols => protocol}/modbus/modbus-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/modbus/modbus-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/modbus/modbus.pac (100%) rename src/analyzer/{protocols => protocol}/ncp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ncp/NCP.cc (100%) rename src/analyzer/{protocols => protocol}/ncp/NCP.h (96%) rename src/analyzer/{protocols => protocol}/ncp/NCP_func.def (100%) rename src/analyzer/{protocols => protocol}/ncp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ncp/events.bif (100%) rename src/analyzer/{protocols => protocol}/ncp/ncp.pac (100%) rename src/analyzer/{protocols => protocol}/netbios/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/netbios/NetbiosSSN.cc (100%) rename src/analyzer/{protocols => protocol}/netbios/NetbiosSSN.h (97%) rename src/analyzer/{protocols => protocol}/netbios/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/netbios/events.bif (100%) rename src/analyzer/{protocols => protocol}/netbios/functions.bif (100%) rename src/analyzer/{protocols => protocol}/netflow/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/netflow/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/netflow/events.bif (100%) rename src/analyzer/{protocols => protocol}/netflow/netflow-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/netflow/netflow-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/netflow/netflow.pac (100%) rename src/analyzer/{protocols => protocol}/ntp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ntp/NTP.cc (100%) rename src/analyzer/{protocols => protocol}/ntp/NTP.h (97%) rename src/analyzer/{protocols => protocol}/ntp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ntp/events.bif (100%) rename src/analyzer/{protocols => protocol}/pia/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/pia/PIA.cc (99%) rename src/analyzer/{protocols => protocol}/pia/PIA.h (99%) rename src/analyzer/{protocols => protocol}/pia/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/pia/events.bif (100%) rename src/analyzer/{protocols => protocol}/pop3/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/pop3/POP3.cc (99%) rename src/analyzer/{protocols => protocol}/pop3/POP3.h (94%) rename src/analyzer/{protocols => protocol}/pop3/POP3_cmd.def (100%) rename src/analyzer/{protocols => protocol}/pop3/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/pop3/events.bif (100%) rename src/analyzer/{protocols => protocol}/rpc/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/rpc/NFS.cc (100%) rename src/analyzer/{protocols => protocol}/rpc/NFS.h (100%) rename src/analyzer/{protocols => protocol}/rpc/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/rpc/Portmap.cc (100%) rename src/analyzer/{protocols => protocol}/rpc/Portmap.h (100%) rename src/analyzer/{protocols => protocol}/rpc/RPC.cc (100%) rename src/analyzer/{protocols => protocol}/rpc/RPC.h (98%) rename src/analyzer/{protocols => protocol}/rpc/XDR.cc (100%) rename src/analyzer/{protocols => protocol}/rpc/XDR.h (100%) rename src/analyzer/{protocols => protocol}/rpc/events.bif (100%) rename src/analyzer/{protocols => protocol}/smb/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/smb/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/smb/SMB.cc (100%) rename src/analyzer/{protocols => protocol}/smb/SMB.h (98%) rename src/analyzer/{protocols => protocol}/smb/SMB_COM.def (100%) rename src/analyzer/{protocols => protocol}/smb/events.bif (100%) rename src/analyzer/{protocols => protocol}/smb/smb-mailslot.pac (100%) rename src/analyzer/{protocols => protocol}/smb/smb-pipe.pac (100%) rename src/analyzer/{protocols => protocol}/smb/smb-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/smb/smb.pac (100%) rename src/analyzer/{protocols => protocol}/smtp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/smtp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/smtp/SMTP.cc (99%) rename src/analyzer/{protocols => protocol}/smtp/SMTP.h (97%) rename src/analyzer/{protocols => protocol}/smtp/SMTP_cmd.def (100%) rename src/analyzer/{protocols => protocol}/smtp/events.bif (100%) rename src/analyzer/{protocols => protocol}/smtp/functions.bif (88%) rename src/analyzer/{protocols => protocol}/socks/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/socks/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/socks/SOCKS.cc (97%) rename src/analyzer/{protocols => protocol}/socks/SOCKS.h (91%) rename src/analyzer/{protocols => protocol}/socks/events.bif (100%) rename src/analyzer/{protocols => protocol}/socks/socks-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/socks/socks-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/socks/socks.pac (100%) rename src/analyzer/{protocols => protocol}/ssh/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ssh/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ssh/SSH.cc (98%) rename src/analyzer/{protocols => protocol}/ssh/SSH.h (86%) rename src/analyzer/{protocols => protocol}/ssh/events.bif (100%) rename src/analyzer/{protocols => protocol}/ssl/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/ssl/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/ssl/SSL.cc (96%) rename src/analyzer/{protocols => protocol}/ssl/SSL.h (95%) rename src/analyzer/{protocols => protocol}/ssl/events.bif (100%) rename src/analyzer/{protocols => protocol}/ssl/functions.bif (100%) rename src/analyzer/{protocols => protocol}/ssl/ssl-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/ssl/ssl-defs.pac (100%) rename src/analyzer/{protocols => protocol}/ssl/ssl-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/ssl/ssl.pac (100%) rename src/analyzer/{protocols => protocol}/stepping-stone/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/stepping-stone/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/stepping-stone/SteppingStone.cc (99%) rename src/analyzer/{protocols => protocol}/stepping-stone/SteppingStone.h (98%) rename src/analyzer/{protocols => protocol}/stepping-stone/events.bif (100%) rename src/analyzer/{protocols => protocol}/syslog/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/syslog/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/syslog/Syslog.cc (97%) rename src/analyzer/{protocols => protocol}/syslog/Syslog.h (94%) rename src/analyzer/{protocols => protocol}/syslog/events.bif (100%) rename src/analyzer/{protocols => protocol}/syslog/syslog-analyzer.pac (100%) rename src/analyzer/{protocols => protocol}/syslog/syslog-protocol.pac (100%) rename src/analyzer/{protocols => protocol}/syslog/syslog.pac (100%) rename src/analyzer/{protocols => protocol}/tcp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/tcp/ContentLine.cc (99%) rename src/analyzer/{protocols => protocol}/tcp/ContentLine.h (98%) rename src/analyzer/{protocols => protocol}/tcp/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/tcp/Stats.cc (100%) rename src/analyzer/{protocols => protocol}/tcp/Stats.h (100%) rename src/analyzer/{protocols => protocol}/tcp/TCP.cc (99%) rename src/analyzer/{protocols => protocol}/tcp/TCP.h (99%) rename src/analyzer/{protocols => protocol}/tcp/TCP_Endpoint.cc (99%) rename src/analyzer/{protocols => protocol}/tcp/TCP_Endpoint.h (100%) rename src/analyzer/{protocols => protocol}/tcp/TCP_Reassembler.cc (99%) rename src/analyzer/{protocols => protocol}/tcp/TCP_Reassembler.h (100%) rename src/analyzer/{protocols => protocol}/tcp/events.bif (100%) rename src/analyzer/{protocols => protocol}/tcp/functions.bif (99%) rename src/analyzer/{protocols => protocol}/teredo/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/teredo/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/teredo/Teredo.cc (100%) rename src/analyzer/{protocols => protocol}/teredo/Teredo.h (100%) rename src/analyzer/{protocols => protocol}/teredo/events.bif (100%) rename src/analyzer/{protocols => protocol}/udp/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/udp/Plugin.cc (82%) rename src/analyzer/{protocols => protocol}/udp/UDP.cc (99%) rename src/analyzer/{protocols => protocol}/udp/UDP.h (100%) rename src/analyzer/{protocols => protocol}/udp/events.bif (100%) rename src/analyzer/{protocols => protocol}/zip/CMakeLists.txt (100%) rename src/analyzer/{protocols => protocol}/zip/Plugin.cc (100%) rename src/analyzer/{protocols => protocol}/zip/ZIP.cc (100%) rename src/analyzer/{protocols => protocol}/zip/ZIP.h (94%) rename src/analyzer/{protocols => protocol}/zip/events.bif (100%) diff --git a/src/Conn.cc b/src/Conn.cc index 1756d3860e..fb6ca3d810 100644 --- a/src/Conn.cc +++ b/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" diff --git a/src/Func.cc b/src/Func.cc index 668499d2ed..f3718fe231 100644 --- a/src/Func.cc +++ b/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" diff --git a/src/RuleAction.cc b/src/RuleAction.cc index 4e279e2cab..a13392ee40 100644 --- a/src/RuleAction.cc +++ b/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" diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc index 2296628878..36d8cba39d 100644 --- a/src/RuleCondition.cc +++ b/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) diff --git a/src/Sessions.cc b/src/Sessions.cc index 29c7a57e8f..6fa26c6f36 100644 --- a/src/Sessions.cc +++ b/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" diff --git a/src/Sessions.h b/src/Sessions.h index a5488bd188..27b052ba2d 100644 --- a/src/Sessions.h +++ b/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 diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 098535d0a9..72dbb2d4a5 100644 --- a/src/analyzer/Analyzer.cc +++ b/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 { diff --git a/src/analyzer/CMakeLists.txt b/src/analyzer/CMakeLists.txt index 1d0589c5bf..026bbac80a 100644 --- a/src/analyzer/CMakeLists.txt +++ b/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 diff --git a/src/analyzer/Manager.cc b/src/analyzer/Manager.cc index 45fce936fd..d337c0b849 100644 --- a/src/analyzer/Manager.cc +++ b/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" diff --git a/src/analyzer/protocols/CMakeLists.txt b/src/analyzer/protocol/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/CMakeLists.txt rename to src/analyzer/protocol/CMakeLists.txt diff --git a/src/analyzer/protocols/TODO b/src/analyzer/protocol/TODO similarity index 64% rename from src/analyzer/protocols/TODO rename to src/analyzer/protocol/TODO index 61a17a95c9..4302252a49 100644 --- a/src/analyzer/protocols/TODO +++ b/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 diff --git a/src/analyzer/protocols/arp/ARP.cc b/src/analyzer/protocol/arp/ARP.cc similarity index 100% rename from src/analyzer/protocols/arp/ARP.cc rename to src/analyzer/protocol/arp/ARP.cc diff --git a/src/analyzer/protocols/arp/ARP.h b/src/analyzer/protocol/arp/ARP.h similarity index 100% rename from src/analyzer/protocols/arp/ARP.h rename to src/analyzer/protocol/arp/ARP.h diff --git a/src/analyzer/protocols/arp/CMakeLists.txt b/src/analyzer/protocol/arp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/arp/CMakeLists.txt rename to src/analyzer/protocol/arp/CMakeLists.txt diff --git a/src/analyzer/protocols/arp/Plugin.cc b/src/analyzer/protocol/arp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/arp/Plugin.cc rename to src/analyzer/protocol/arp/Plugin.cc diff --git a/src/analyzer/protocols/arp/events.bif b/src/analyzer/protocol/arp/events.bif similarity index 100% rename from src/analyzer/protocols/arp/events.bif rename to src/analyzer/protocol/arp/events.bif diff --git a/src/analyzer/protocols/ayiya/AYIYA.cc b/src/analyzer/protocol/ayiya/AYIYA.cc similarity index 100% rename from src/analyzer/protocols/ayiya/AYIYA.cc rename to src/analyzer/protocol/ayiya/AYIYA.cc diff --git a/src/analyzer/protocols/ayiya/AYIYA.h b/src/analyzer/protocol/ayiya/AYIYA.h similarity index 100% rename from src/analyzer/protocols/ayiya/AYIYA.h rename to src/analyzer/protocol/ayiya/AYIYA.h diff --git a/src/analyzer/protocols/ayiya/CMakeLists.txt b/src/analyzer/protocol/ayiya/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ayiya/CMakeLists.txt rename to src/analyzer/protocol/ayiya/CMakeLists.txt diff --git a/src/analyzer/protocols/ayiya/Plugin.cc b/src/analyzer/protocol/ayiya/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ayiya/Plugin.cc rename to src/analyzer/protocol/ayiya/Plugin.cc diff --git a/src/analyzer/protocols/ayiya/ayiya-analyzer.pac b/src/analyzer/protocol/ayiya/ayiya-analyzer.pac similarity index 100% rename from src/analyzer/protocols/ayiya/ayiya-analyzer.pac rename to src/analyzer/protocol/ayiya/ayiya-analyzer.pac diff --git a/src/analyzer/protocols/ayiya/ayiya-protocol.pac b/src/analyzer/protocol/ayiya/ayiya-protocol.pac similarity index 100% rename from src/analyzer/protocols/ayiya/ayiya-protocol.pac rename to src/analyzer/protocol/ayiya/ayiya-protocol.pac diff --git a/src/analyzer/protocols/ayiya/ayiya.pac b/src/analyzer/protocol/ayiya/ayiya.pac similarity index 100% rename from src/analyzer/protocols/ayiya/ayiya.pac rename to src/analyzer/protocol/ayiya/ayiya.pac diff --git a/src/analyzer/protocols/ayiya/events.bif b/src/analyzer/protocol/ayiya/events.bif similarity index 100% rename from src/analyzer/protocols/ayiya/events.bif rename to src/analyzer/protocol/ayiya/events.bif diff --git a/src/analyzer/protocols/backdoor/BackDoor.cc b/src/analyzer/protocol/backdoor/BackDoor.cc similarity index 99% rename from src/analyzer/protocols/backdoor/BackDoor.cc rename to src/analyzer/protocol/backdoor/BackDoor.cc index 19b1a341a7..a466938ff6 100644 --- a/src/analyzer/protocols/backdoor/BackDoor.cc +++ b/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" diff --git a/src/analyzer/protocols/backdoor/BackDoor.h b/src/analyzer/protocol/backdoor/BackDoor.h similarity index 97% rename from src/analyzer/protocols/backdoor/BackDoor.h rename to src/analyzer/protocol/backdoor/BackDoor.h index 36c8430c34..5bc8a67381 100644 --- a/src/analyzer/protocols/backdoor/BackDoor.h +++ b/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 { diff --git a/src/analyzer/protocols/backdoor/CMakeLists.txt b/src/analyzer/protocol/backdoor/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/backdoor/CMakeLists.txt rename to src/analyzer/protocol/backdoor/CMakeLists.txt diff --git a/src/analyzer/protocols/backdoor/Plugin.cc b/src/analyzer/protocol/backdoor/Plugin.cc similarity index 100% rename from src/analyzer/protocols/backdoor/Plugin.cc rename to src/analyzer/protocol/backdoor/Plugin.cc diff --git a/src/analyzer/protocols/backdoor/events.bif b/src/analyzer/protocol/backdoor/events.bif similarity index 100% rename from src/analyzer/protocols/backdoor/events.bif rename to src/analyzer/protocol/backdoor/events.bif diff --git a/src/analyzer/protocols/bittorrent/BitTorrent.cc b/src/analyzer/protocol/bittorrent/BitTorrent.cc similarity index 98% rename from src/analyzer/protocols/bittorrent/BitTorrent.cc rename to src/analyzer/protocol/bittorrent/BitTorrent.cc index fc66987cc7..99fd9dc132 100644 --- a/src/analyzer/protocols/bittorrent/BitTorrent.cc +++ b/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" diff --git a/src/analyzer/protocols/bittorrent/BitTorrent.h b/src/analyzer/protocol/bittorrent/BitTorrent.h similarity index 95% rename from src/analyzer/protocols/bittorrent/BitTorrent.h rename to src/analyzer/protocol/bittorrent/BitTorrent.h index 4065b45648..7739463052 100644 --- a/src/analyzer/protocols/bittorrent/BitTorrent.h +++ b/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" diff --git a/src/analyzer/protocols/bittorrent/BitTorrentTracker.cc b/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc similarity index 99% rename from src/analyzer/protocols/bittorrent/BitTorrentTracker.cc rename to src/analyzer/protocol/bittorrent/BitTorrentTracker.cc index 18d1fe8ab9..b32db9a8bd 100644 --- a/src/analyzer/protocols/bittorrent/BitTorrentTracker.cc +++ b/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" diff --git a/src/analyzer/protocols/bittorrent/BitTorrentTracker.h b/src/analyzer/protocol/bittorrent/BitTorrentTracker.h similarity index 98% rename from src/analyzer/protocols/bittorrent/BitTorrentTracker.h rename to src/analyzer/protocol/bittorrent/BitTorrentTracker.h index 572a8d2093..b041e556b7 100644 --- a/src/analyzer/protocols/bittorrent/BitTorrentTracker.h +++ b/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 diff --git a/src/analyzer/protocols/bittorrent/CMakeLists.txt b/src/analyzer/protocol/bittorrent/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/bittorrent/CMakeLists.txt rename to src/analyzer/protocol/bittorrent/CMakeLists.txt diff --git a/src/analyzer/protocols/bittorrent/Plugin.cc b/src/analyzer/protocol/bittorrent/Plugin.cc similarity index 100% rename from src/analyzer/protocols/bittorrent/Plugin.cc rename to src/analyzer/protocol/bittorrent/Plugin.cc diff --git a/src/analyzer/protocols/bittorrent/bittorrent-analyzer.pac b/src/analyzer/protocol/bittorrent/bittorrent-analyzer.pac similarity index 100% rename from src/analyzer/protocols/bittorrent/bittorrent-analyzer.pac rename to src/analyzer/protocol/bittorrent/bittorrent-analyzer.pac diff --git a/src/analyzer/protocols/bittorrent/bittorrent-protocol.pac b/src/analyzer/protocol/bittorrent/bittorrent-protocol.pac similarity index 100% rename from src/analyzer/protocols/bittorrent/bittorrent-protocol.pac rename to src/analyzer/protocol/bittorrent/bittorrent-protocol.pac diff --git a/src/analyzer/protocols/bittorrent/bittorrent.pac b/src/analyzer/protocol/bittorrent/bittorrent.pac similarity index 100% rename from src/analyzer/protocols/bittorrent/bittorrent.pac rename to src/analyzer/protocol/bittorrent/bittorrent.pac diff --git a/src/analyzer/protocols/bittorrent/events.bif b/src/analyzer/protocol/bittorrent/events.bif similarity index 100% rename from src/analyzer/protocols/bittorrent/events.bif rename to src/analyzer/protocol/bittorrent/events.bif diff --git a/src/analyzer/protocols/conn-size/CMakeLists.txt b/src/analyzer/protocol/conn-size/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/conn-size/CMakeLists.txt rename to src/analyzer/protocol/conn-size/CMakeLists.txt diff --git a/src/analyzer/protocols/conn-size/ConnSize.cc b/src/analyzer/protocol/conn-size/ConnSize.cc similarity index 98% rename from src/analyzer/protocols/conn-size/ConnSize.cc rename to src/analyzer/protocol/conn-size/ConnSize.cc index 7d85fe4a0c..b912fe3d2d 100644 --- a/src/analyzer/protocols/conn-size/ConnSize.cc +++ b/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" diff --git a/src/analyzer/protocols/conn-size/ConnSize.h b/src/analyzer/protocol/conn-size/ConnSize.h similarity index 100% rename from src/analyzer/protocols/conn-size/ConnSize.h rename to src/analyzer/protocol/conn-size/ConnSize.h diff --git a/src/analyzer/protocols/conn-size/Plugin.cc b/src/analyzer/protocol/conn-size/Plugin.cc similarity index 100% rename from src/analyzer/protocols/conn-size/Plugin.cc rename to src/analyzer/protocol/conn-size/Plugin.cc diff --git a/src/analyzer/protocols/conn-size/events.bif b/src/analyzer/protocol/conn-size/events.bif similarity index 100% rename from src/analyzer/protocols/conn-size/events.bif rename to src/analyzer/protocol/conn-size/events.bif diff --git a/src/analyzer/protocols/dce-rpc/CMakeLists.txt b/src/analyzer/protocol/dce-rpc/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/dce-rpc/CMakeLists.txt rename to src/analyzer/protocol/dce-rpc/CMakeLists.txt diff --git a/src/analyzer/protocols/dce-rpc/DCE_RPC.cc b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc similarity index 100% rename from src/analyzer/protocols/dce-rpc/DCE_RPC.cc rename to src/analyzer/protocol/dce-rpc/DCE_RPC.cc diff --git a/src/analyzer/protocols/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h similarity index 96% rename from src/analyzer/protocols/dce-rpc/DCE_RPC.h rename to src/analyzer/protocol/dce-rpc/DCE_RPC.h index ff85e16ee1..2abfb584b5 100644 --- a/src/analyzer/protocols/dce-rpc/DCE_RPC.h +++ b/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: diff --git a/src/analyzer/protocols/dce-rpc/Plugin.cc b/src/analyzer/protocol/dce-rpc/Plugin.cc similarity index 100% rename from src/analyzer/protocols/dce-rpc/Plugin.cc rename to src/analyzer/protocol/dce-rpc/Plugin.cc diff --git a/src/analyzer/protocols/dce-rpc/dce_rpc-analyzer.pac b/src/analyzer/protocol/dce-rpc/dce_rpc-analyzer.pac similarity index 100% rename from src/analyzer/protocols/dce-rpc/dce_rpc-analyzer.pac rename to src/analyzer/protocol/dce-rpc/dce_rpc-analyzer.pac diff --git a/src/analyzer/protocols/dce-rpc/dce_rpc-protocol.pac b/src/analyzer/protocol/dce-rpc/dce_rpc-protocol.pac similarity index 100% rename from src/analyzer/protocols/dce-rpc/dce_rpc-protocol.pac rename to src/analyzer/protocol/dce-rpc/dce_rpc-protocol.pac diff --git a/src/analyzer/protocols/dce-rpc/dce_rpc.pac b/src/analyzer/protocol/dce-rpc/dce_rpc.pac similarity index 100% rename from src/analyzer/protocols/dce-rpc/dce_rpc.pac rename to src/analyzer/protocol/dce-rpc/dce_rpc.pac diff --git a/src/analyzer/protocols/dce-rpc/dce_rpc_simple.pac b/src/analyzer/protocol/dce-rpc/dce_rpc_simple.pac similarity index 100% rename from src/analyzer/protocols/dce-rpc/dce_rpc_simple.pac rename to src/analyzer/protocol/dce-rpc/dce_rpc_simple.pac diff --git a/src/analyzer/protocols/dce-rpc/epmapper.pac b/src/analyzer/protocol/dce-rpc/epmapper.pac similarity index 100% rename from src/analyzer/protocols/dce-rpc/epmapper.pac rename to src/analyzer/protocol/dce-rpc/epmapper.pac diff --git a/src/analyzer/protocols/dce-rpc/events.bif b/src/analyzer/protocol/dce-rpc/events.bif similarity index 100% rename from src/analyzer/protocols/dce-rpc/events.bif rename to src/analyzer/protocol/dce-rpc/events.bif diff --git a/src/analyzer/protocols/dhcp/CMakeLists.txt b/src/analyzer/protocol/dhcp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/dhcp/CMakeLists.txt rename to src/analyzer/protocol/dhcp/CMakeLists.txt diff --git a/src/analyzer/protocols/dhcp/DHCP.cc b/src/analyzer/protocol/dhcp/DHCP.cc similarity index 100% rename from src/analyzer/protocols/dhcp/DHCP.cc rename to src/analyzer/protocol/dhcp/DHCP.cc diff --git a/src/analyzer/protocols/dhcp/DHCP.h b/src/analyzer/protocol/dhcp/DHCP.h similarity index 93% rename from src/analyzer/protocols/dhcp/DHCP.h rename to src/analyzer/protocol/dhcp/DHCP.h index 207651d7c1..a1c06e8b85 100644 --- a/src/analyzer/protocols/dhcp/DHCP.h +++ b/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" diff --git a/src/analyzer/protocols/dhcp/Plugin.cc b/src/analyzer/protocol/dhcp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/dhcp/Plugin.cc rename to src/analyzer/protocol/dhcp/Plugin.cc diff --git a/src/analyzer/protocols/dhcp/dhcp-analyzer.pac b/src/analyzer/protocol/dhcp/dhcp-analyzer.pac similarity index 100% rename from src/analyzer/protocols/dhcp/dhcp-analyzer.pac rename to src/analyzer/protocol/dhcp/dhcp-analyzer.pac diff --git a/src/analyzer/protocols/dhcp/dhcp-protocol.pac b/src/analyzer/protocol/dhcp/dhcp-protocol.pac similarity index 100% rename from src/analyzer/protocols/dhcp/dhcp-protocol.pac rename to src/analyzer/protocol/dhcp/dhcp-protocol.pac diff --git a/src/analyzer/protocols/dhcp/dhcp.pac b/src/analyzer/protocol/dhcp/dhcp.pac similarity index 100% rename from src/analyzer/protocols/dhcp/dhcp.pac rename to src/analyzer/protocol/dhcp/dhcp.pac diff --git a/src/analyzer/protocols/dhcp/events.bif b/src/analyzer/protocol/dhcp/events.bif similarity index 100% rename from src/analyzer/protocols/dhcp/events.bif rename to src/analyzer/protocol/dhcp/events.bif diff --git a/src/analyzer/protocols/dns/CMakeLists.txt b/src/analyzer/protocol/dns/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/dns/CMakeLists.txt rename to src/analyzer/protocol/dns/CMakeLists.txt diff --git a/src/analyzer/protocols/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc similarity index 100% rename from src/analyzer/protocols/dns/DNS.cc rename to src/analyzer/protocol/dns/DNS.cc diff --git a/src/analyzer/protocols/dns/DNS.h b/src/analyzer/protocol/dns/DNS.h similarity index 99% rename from src/analyzer/protocols/dns/DNS.h rename to src/analyzer/protocol/dns/DNS.h index 9c7874400d..373250e8f4 100644 --- a/src/analyzer/protocols/dns/DNS.h +++ b/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 { diff --git a/src/analyzer/protocols/dns/Plugin.cc b/src/analyzer/protocol/dns/Plugin.cc similarity index 100% rename from src/analyzer/protocols/dns/Plugin.cc rename to src/analyzer/protocol/dns/Plugin.cc diff --git a/src/analyzer/protocols/dns/events.bif b/src/analyzer/protocol/dns/events.bif similarity index 100% rename from src/analyzer/protocols/dns/events.bif rename to src/analyzer/protocol/dns/events.bif diff --git a/src/analyzer/protocols/file/CMakeLists.txt b/src/analyzer/protocol/file/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/file/CMakeLists.txt rename to src/analyzer/protocol/file/CMakeLists.txt diff --git a/src/analyzer/protocols/file/File.cc b/src/analyzer/protocol/file/File.cc similarity index 100% rename from src/analyzer/protocols/file/File.cc rename to src/analyzer/protocol/file/File.cc diff --git a/src/analyzer/protocols/file/File.h b/src/analyzer/protocol/file/File.h similarity index 94% rename from src/analyzer/protocols/file/File.h rename to src/analyzer/protocol/file/File.h index 368fe22dae..a41ab380ae 100644 --- a/src/analyzer/protocols/file/File.h +++ b/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 diff --git a/src/analyzer/protocols/file/Plugin.cc b/src/analyzer/protocol/file/Plugin.cc similarity index 100% rename from src/analyzer/protocols/file/Plugin.cc rename to src/analyzer/protocol/file/Plugin.cc diff --git a/src/analyzer/protocols/file/events.bif b/src/analyzer/protocol/file/events.bif similarity index 100% rename from src/analyzer/protocols/file/events.bif rename to src/analyzer/protocol/file/events.bif diff --git a/src/analyzer/protocols/finger/CMakeLists.txt b/src/analyzer/protocol/finger/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/finger/CMakeLists.txt rename to src/analyzer/protocol/finger/CMakeLists.txt diff --git a/src/analyzer/protocols/finger/Finger.cc b/src/analyzer/protocol/finger/Finger.cc similarity index 97% rename from src/analyzer/protocols/finger/Finger.cc rename to src/analyzer/protocol/finger/Finger.cc index dce2cfef9f..bf9bdcc68a 100644 --- a/src/analyzer/protocols/finger/Finger.cc +++ b/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" diff --git a/src/analyzer/protocols/finger/Finger.h b/src/analyzer/protocol/finger/Finger.h similarity index 89% rename from src/analyzer/protocols/finger/Finger.h rename to src/analyzer/protocol/finger/Finger.h index 5624030f80..efea0fae6b 100644 --- a/src/analyzer/protocols/finger/Finger.h +++ b/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 { diff --git a/src/analyzer/protocols/finger/Plugin.cc b/src/analyzer/protocol/finger/Plugin.cc similarity index 100% rename from src/analyzer/protocols/finger/Plugin.cc rename to src/analyzer/protocol/finger/Plugin.cc diff --git a/src/analyzer/protocols/finger/events.bif b/src/analyzer/protocol/finger/events.bif similarity index 100% rename from src/analyzer/protocols/finger/events.bif rename to src/analyzer/protocol/finger/events.bif diff --git a/src/analyzer/protocols/ftp/CMakeLists.txt b/src/analyzer/protocol/ftp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ftp/CMakeLists.txt rename to src/analyzer/protocol/ftp/CMakeLists.txt diff --git a/src/analyzer/protocols/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc similarity index 99% rename from src/analyzer/protocols/ftp/FTP.cc rename to src/analyzer/protocol/ftp/FTP.cc index aed14b8de8..91afe6f8a4 100644 --- a/src/analyzer/protocols/ftp/FTP.cc +++ b/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" diff --git a/src/analyzer/protocols/ftp/FTP.h b/src/analyzer/protocol/ftp/FTP.h similarity index 94% rename from src/analyzer/protocols/ftp/FTP.h rename to src/analyzer/protocol/ftp/FTP.h index 577082644a..1cffa19b1d 100644 --- a/src/analyzer/protocols/ftp/FTP.h +++ b/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 { diff --git a/src/analyzer/protocols/ftp/Plugin.cc b/src/analyzer/protocol/ftp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ftp/Plugin.cc rename to src/analyzer/protocol/ftp/Plugin.cc diff --git a/src/analyzer/protocols/ftp/events.bif b/src/analyzer/protocol/ftp/events.bif similarity index 100% rename from src/analyzer/protocols/ftp/events.bif rename to src/analyzer/protocol/ftp/events.bif diff --git a/src/analyzer/protocols/ftp/functions.bif b/src/analyzer/protocol/ftp/functions.bif similarity index 100% rename from src/analyzer/protocols/ftp/functions.bif rename to src/analyzer/protocol/ftp/functions.bif diff --git a/src/analyzer/protocols/gnutella/CMakeLists.txt b/src/analyzer/protocol/gnutella/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/gnutella/CMakeLists.txt rename to src/analyzer/protocol/gnutella/CMakeLists.txt diff --git a/src/analyzer/protocols/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc similarity index 99% rename from src/analyzer/protocols/gnutella/Gnutella.cc rename to src/analyzer/protocol/gnutella/Gnutella.cc index a0d8812218..c0bab92007 100644 --- a/src/analyzer/protocols/gnutella/Gnutella.cc +++ b/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" diff --git a/src/analyzer/protocols/gnutella/Gnutella.h b/src/analyzer/protocol/gnutella/Gnutella.h similarity index 97% rename from src/analyzer/protocols/gnutella/Gnutella.h rename to src/analyzer/protocol/gnutella/Gnutella.h index d67d319c4e..11d51cf276 100644 --- a/src/analyzer/protocols/gnutella/Gnutella.h +++ b/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 diff --git a/src/analyzer/protocols/gnutella/Plugin.cc b/src/analyzer/protocol/gnutella/Plugin.cc similarity index 100% rename from src/analyzer/protocols/gnutella/Plugin.cc rename to src/analyzer/protocol/gnutella/Plugin.cc diff --git a/src/analyzer/protocols/gnutella/events.bif b/src/analyzer/protocol/gnutella/events.bif similarity index 100% rename from src/analyzer/protocols/gnutella/events.bif rename to src/analyzer/protocol/gnutella/events.bif diff --git a/src/analyzer/protocols/gtpv1/CMakeLists.txt b/src/analyzer/protocol/gtpv1/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/gtpv1/CMakeLists.txt rename to src/analyzer/protocol/gtpv1/CMakeLists.txt diff --git a/src/analyzer/protocols/gtpv1/GTPv1.cc b/src/analyzer/protocol/gtpv1/GTPv1.cc similarity index 100% rename from src/analyzer/protocols/gtpv1/GTPv1.cc rename to src/analyzer/protocol/gtpv1/GTPv1.cc diff --git a/src/analyzer/protocols/gtpv1/GTPv1.h b/src/analyzer/protocol/gtpv1/GTPv1.h similarity index 100% rename from src/analyzer/protocols/gtpv1/GTPv1.h rename to src/analyzer/protocol/gtpv1/GTPv1.h diff --git a/src/analyzer/protocols/gtpv1/Plugin.cc b/src/analyzer/protocol/gtpv1/Plugin.cc similarity index 100% rename from src/analyzer/protocols/gtpv1/Plugin.cc rename to src/analyzer/protocol/gtpv1/Plugin.cc diff --git a/src/analyzer/protocols/gtpv1/events.bif b/src/analyzer/protocol/gtpv1/events.bif similarity index 100% rename from src/analyzer/protocols/gtpv1/events.bif rename to src/analyzer/protocol/gtpv1/events.bif diff --git a/src/analyzer/protocols/gtpv1/gtpv1-analyzer.pac b/src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac similarity index 100% rename from src/analyzer/protocols/gtpv1/gtpv1-analyzer.pac rename to src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac diff --git a/src/analyzer/protocols/gtpv1/gtpv1-protocol.pac b/src/analyzer/protocol/gtpv1/gtpv1-protocol.pac similarity index 100% rename from src/analyzer/protocols/gtpv1/gtpv1-protocol.pac rename to src/analyzer/protocol/gtpv1/gtpv1-protocol.pac diff --git a/src/analyzer/protocols/gtpv1/gtpv1.pac b/src/analyzer/protocol/gtpv1/gtpv1.pac similarity index 100% rename from src/analyzer/protocols/gtpv1/gtpv1.pac rename to src/analyzer/protocol/gtpv1/gtpv1.pac diff --git a/src/analyzer/protocols/http/CMakeLists.txt b/src/analyzer/protocol/http/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/http/CMakeLists.txt rename to src/analyzer/protocol/http/CMakeLists.txt diff --git a/src/analyzer/protocols/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc similarity index 99% rename from src/analyzer/protocols/http/HTTP.cc rename to src/analyzer/protocol/http/HTTP.cc index 899c7de01f..f0d81482c0 100644 --- a/src/analyzer/protocols/http/HTTP.cc +++ b/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" diff --git a/src/analyzer/protocols/http/HTTP.h b/src/analyzer/protocol/http/HTTP.h similarity index 97% rename from src/analyzer/protocols/http/HTTP.h rename to src/analyzer/protocol/http/HTTP.h index cb53e30c9a..8896d4fa07 100644 --- a/src/analyzer/protocols/http/HTTP.h +++ b/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" diff --git a/src/analyzer/protocols/http/Plugin.cc b/src/analyzer/protocol/http/Plugin.cc similarity index 100% rename from src/analyzer/protocols/http/Plugin.cc rename to src/analyzer/protocol/http/Plugin.cc diff --git a/src/analyzer/protocols/http/events.bif b/src/analyzer/protocol/http/events.bif similarity index 100% rename from src/analyzer/protocols/http/events.bif rename to src/analyzer/protocol/http/events.bif diff --git a/src/analyzer/protocols/http/functions.bif b/src/analyzer/protocol/http/functions.bif similarity index 97% rename from src/analyzer/protocols/http/functions.bif rename to src/analyzer/protocol/http/functions.bif index eb9caf2a9a..c4e5df80d5 100644 --- a/src/analyzer/protocols/http/functions.bif +++ b/src/analyzer/protocol/http/functions.bif @@ -1,6 +1,6 @@ %%{ -#include "protocols/http/HTTP.h" +#include "protocol/http/HTTP.h" %%} ## Skips the data of the HTTP entity. diff --git a/src/analyzer/protocols/icmp/CMakeLists.txt b/src/analyzer/protocol/icmp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/icmp/CMakeLists.txt rename to src/analyzer/protocol/icmp/CMakeLists.txt diff --git a/src/analyzer/protocols/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc similarity index 100% rename from src/analyzer/protocols/icmp/ICMP.cc rename to src/analyzer/protocol/icmp/ICMP.cc diff --git a/src/analyzer/protocols/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h similarity index 100% rename from src/analyzer/protocols/icmp/ICMP.h rename to src/analyzer/protocol/icmp/ICMP.h diff --git a/src/analyzer/protocols/icmp/Plugin.cc b/src/analyzer/protocol/icmp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/icmp/Plugin.cc rename to src/analyzer/protocol/icmp/Plugin.cc diff --git a/src/analyzer/protocols/icmp/events.bif b/src/analyzer/protocol/icmp/events.bif similarity index 100% rename from src/analyzer/protocols/icmp/events.bif rename to src/analyzer/protocol/icmp/events.bif diff --git a/src/analyzer/protocols/ident/CMakeLists.txt b/src/analyzer/protocol/ident/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ident/CMakeLists.txt rename to src/analyzer/protocol/ident/CMakeLists.txt diff --git a/src/analyzer/protocols/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc similarity index 100% rename from src/analyzer/protocols/ident/Ident.cc rename to src/analyzer/protocol/ident/Ident.cc diff --git a/src/analyzer/protocols/ident/Ident.h b/src/analyzer/protocol/ident/Ident.h similarity index 91% rename from src/analyzer/protocols/ident/Ident.h rename to src/analyzer/protocol/ident/Ident.h index 7e1b7508c5..31df1dcdc6 100644 --- a/src/analyzer/protocols/ident/Ident.h +++ b/src/analyzer/protocol/ident/Ident.h @@ -3,8 +3,8 @@ #ifndef ANALYZER_PROTOCOL_IDENT_IDENT_H #define ANALYZER_PROTOCOL_IDENT_IDENT_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 ident { diff --git a/src/analyzer/protocols/ident/Plugin.cc b/src/analyzer/protocol/ident/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ident/Plugin.cc rename to src/analyzer/protocol/ident/Plugin.cc diff --git a/src/analyzer/protocols/ident/events.bif b/src/analyzer/protocol/ident/events.bif similarity index 100% rename from src/analyzer/protocols/ident/events.bif rename to src/analyzer/protocol/ident/events.bif diff --git a/src/analyzer/protocols/interconn/CMakeLists.txt b/src/analyzer/protocol/interconn/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/interconn/CMakeLists.txt rename to src/analyzer/protocol/interconn/CMakeLists.txt diff --git a/src/analyzer/protocols/interconn/InterConn.cc b/src/analyzer/protocol/interconn/InterConn.cc similarity index 99% rename from src/analyzer/protocols/interconn/InterConn.cc rename to src/analyzer/protocol/interconn/InterConn.cc index 58dc6c2bf0..4b298eaa52 100644 --- a/src/analyzer/protocols/interconn/InterConn.cc +++ b/src/analyzer/protocol/interconn/InterConn.cc @@ -5,7 +5,7 @@ #include "InterConn.h" #include "Event.h" #include "Net.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/interconn/InterConn.h b/src/analyzer/protocol/interconn/InterConn.h similarity index 98% rename from src/analyzer/protocols/interconn/InterConn.h rename to src/analyzer/protocol/interconn/InterConn.h index 4faa684818..b13abecab1 100644 --- a/src/analyzer/protocols/interconn/InterConn.h +++ b/src/analyzer/protocol/interconn/InterConn.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H #define ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "Timer.h" #include "NetVar.h" diff --git a/src/analyzer/protocols/interconn/Plugin.cc b/src/analyzer/protocol/interconn/Plugin.cc similarity index 100% rename from src/analyzer/protocols/interconn/Plugin.cc rename to src/analyzer/protocol/interconn/Plugin.cc diff --git a/src/analyzer/protocols/interconn/events.bif b/src/analyzer/protocol/interconn/events.bif similarity index 100% rename from src/analyzer/protocols/interconn/events.bif rename to src/analyzer/protocol/interconn/events.bif diff --git a/src/analyzer/protocols/irc/CMakeLists.txt b/src/analyzer/protocol/irc/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/irc/CMakeLists.txt rename to src/analyzer/protocol/irc/CMakeLists.txt diff --git a/src/analyzer/protocols/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc similarity index 99% rename from src/analyzer/protocols/irc/IRC.cc rename to src/analyzer/protocol/irc/IRC.cc index 7ac06a708f..71f591635f 100644 --- a/src/analyzer/protocols/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -2,10 +2,10 @@ #include #include "IRC.h" -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" #include "NetVar.h" #include "Event.h" -#include "analyzer/protocols/zip/ZIP.h" +#include "analyzer/protocol/zip/ZIP.h" #include "analyzer/Manager.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/irc/IRC.h b/src/analyzer/protocol/irc/IRC.h similarity index 97% rename from src/analyzer/protocols/irc/IRC.h rename to src/analyzer/protocol/irc/IRC.h index a0f35639d3..a4112ccb12 100644 --- a/src/analyzer/protocols/irc/IRC.h +++ b/src/analyzer/protocol/irc/IRC.h @@ -2,7 +2,7 @@ #ifndef ANALYZER_PROTOCOL_IRC_IRC_H #define ANALYZER_PROTOCOL_IRC_IRC_H -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" namespace analyzer { namespace irc { diff --git a/src/analyzer/protocols/irc/Plugin.cc b/src/analyzer/protocol/irc/Plugin.cc similarity index 100% rename from src/analyzer/protocols/irc/Plugin.cc rename to src/analyzer/protocol/irc/Plugin.cc diff --git a/src/analyzer/protocols/irc/events.bif b/src/analyzer/protocol/irc/events.bif similarity index 100% rename from src/analyzer/protocols/irc/events.bif rename to src/analyzer/protocol/irc/events.bif diff --git a/src/analyzer/protocols/login/CMakeLists.txt b/src/analyzer/protocol/login/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/login/CMakeLists.txt rename to src/analyzer/protocol/login/CMakeLists.txt diff --git a/src/analyzer/protocols/login/Login.cc b/src/analyzer/protocol/login/Login.cc similarity index 100% rename from src/analyzer/protocols/login/Login.cc rename to src/analyzer/protocol/login/Login.cc diff --git a/src/analyzer/protocols/login/Login.h b/src/analyzer/protocol/login/Login.h similarity index 98% rename from src/analyzer/protocols/login/Login.h rename to src/analyzer/protocol/login/Login.h index 3d41ad94c3..2178bdff1a 100644 --- a/src/analyzer/protocols/login/Login.h +++ b/src/analyzer/protocol/login/Login.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_LOGIN_LOGIN_H #define ANALYZER_PROTOCOL_LOGIN_LOGIN_H -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" namespace analyzer { namespace login { diff --git a/src/analyzer/protocols/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc similarity index 99% rename from src/analyzer/protocols/login/NVT.cc rename to src/analyzer/protocol/login/NVT.cc index 2c79fd7195..62e4d0c050 100644 --- a/src/analyzer/protocols/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -7,7 +7,7 @@ #include "NVT.h" #include "NetVar.h" #include "Event.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/login/NVT.h b/src/analyzer/protocol/login/NVT.h similarity index 98% rename from src/analyzer/protocols/login/NVT.h rename to src/analyzer/protocol/login/NVT.h index 9fb85c8823..3bcadcdc8e 100644 --- a/src/analyzer/protocols/login/NVT.h +++ b/src/analyzer/protocol/login/NVT.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_LOGIN_NVT_H #define ANALYZER_PROTOCOL_LOGIN_NVT_H -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" #define TELNET_OPTION_BINARY 0 #define TELNET_OPTION_TERMINAL 24 diff --git a/src/analyzer/protocols/login/Plugin.cc b/src/analyzer/protocol/login/Plugin.cc similarity index 100% rename from src/analyzer/protocols/login/Plugin.cc rename to src/analyzer/protocol/login/Plugin.cc diff --git a/src/analyzer/protocols/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc similarity index 100% rename from src/analyzer/protocols/login/RSH.cc rename to src/analyzer/protocol/login/RSH.cc diff --git a/src/analyzer/protocols/login/RSH.h b/src/analyzer/protocol/login/RSH.h similarity index 96% rename from src/analyzer/protocols/login/RSH.h rename to src/analyzer/protocol/login/RSH.h index c2d19c8958..2036ea966a 100644 --- a/src/analyzer/protocols/login/RSH.h +++ b/src/analyzer/protocol/login/RSH.h @@ -4,7 +4,7 @@ #define ANALYZER_PROTOCOL_LOGIN_RSH_H #include "Login.h" -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" namespace analyzer { namespace login { diff --git a/src/analyzer/protocols/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc similarity index 100% rename from src/analyzer/protocols/login/Rlogin.cc rename to src/analyzer/protocol/login/Rlogin.cc diff --git a/src/analyzer/protocols/login/Rlogin.h b/src/analyzer/protocol/login/Rlogin.h similarity index 97% rename from src/analyzer/protocols/login/Rlogin.h rename to src/analyzer/protocol/login/Rlogin.h index 3efdfa8107..79de3b8952 100644 --- a/src/analyzer/protocols/login/Rlogin.h +++ b/src/analyzer/protocol/login/Rlogin.h @@ -4,7 +4,7 @@ #define ANALYZER_PROTOCOL_LOGIN_RLOGIN_H #include "Login.h" -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" namespace analyzer { namespace login { diff --git a/src/analyzer/protocols/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc similarity index 100% rename from src/analyzer/protocols/login/Telnet.cc rename to src/analyzer/protocol/login/Telnet.cc diff --git a/src/analyzer/protocols/login/Telnet.h b/src/analyzer/protocol/login/Telnet.h similarity index 100% rename from src/analyzer/protocols/login/Telnet.h rename to src/analyzer/protocol/login/Telnet.h diff --git a/src/analyzer/protocols/login/events.bif b/src/analyzer/protocol/login/events.bif similarity index 100% rename from src/analyzer/protocols/login/events.bif rename to src/analyzer/protocol/login/events.bif diff --git a/src/analyzer/protocols/login/functions.bif b/src/analyzer/protocol/login/functions.bif similarity index 100% rename from src/analyzer/protocols/login/functions.bif rename to src/analyzer/protocol/login/functions.bif diff --git a/src/analyzer/protocols/mime/CMakeLists.txt b/src/analyzer/protocol/mime/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/mime/CMakeLists.txt rename to src/analyzer/protocol/mime/CMakeLists.txt diff --git a/src/analyzer/protocols/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc similarity index 100% rename from src/analyzer/protocols/mime/MIME.cc rename to src/analyzer/protocol/mime/MIME.cc diff --git a/src/analyzer/protocols/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h similarity index 100% rename from src/analyzer/protocols/mime/MIME.h rename to src/analyzer/protocol/mime/MIME.h diff --git a/src/analyzer/protocols/mime/Plugin.cc b/src/analyzer/protocol/mime/Plugin.cc similarity index 100% rename from src/analyzer/protocols/mime/Plugin.cc rename to src/analyzer/protocol/mime/Plugin.cc diff --git a/src/analyzer/protocols/mime/events.bif b/src/analyzer/protocol/mime/events.bif similarity index 100% rename from src/analyzer/protocols/mime/events.bif rename to src/analyzer/protocol/mime/events.bif diff --git a/src/analyzer/protocols/modbus/CMakeLists.txt b/src/analyzer/protocol/modbus/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/modbus/CMakeLists.txt rename to src/analyzer/protocol/modbus/CMakeLists.txt diff --git a/src/analyzer/protocols/modbus/Modbus.cc b/src/analyzer/protocol/modbus/Modbus.cc similarity index 94% rename from src/analyzer/protocols/modbus/Modbus.cc rename to src/analyzer/protocol/modbus/Modbus.cc index b36b916d06..9d216d356b 100644 --- a/src/analyzer/protocols/modbus/Modbus.cc +++ b/src/analyzer/protocol/modbus/Modbus.cc @@ -1,6 +1,6 @@ #include "Modbus.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/modbus/Modbus.h b/src/analyzer/protocol/modbus/Modbus.h similarity index 94% rename from src/analyzer/protocols/modbus/Modbus.h rename to src/analyzer/protocol/modbus/Modbus.h index 9ecd952e2e..6f566be828 100644 --- a/src/analyzer/protocols/modbus/Modbus.h +++ b/src/analyzer/protocol/modbus/Modbus.h @@ -1,7 +1,7 @@ #ifndef ANALYZER_PROTOCOL_MODBUS_MODBUS_H #define ANALYZER_PROTOCOL_MODBUS_MODBUS_H -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "modbus_pac.h" namespace analyzer { namespace modbus { diff --git a/src/analyzer/protocols/modbus/Plugin.cc b/src/analyzer/protocol/modbus/Plugin.cc similarity index 100% rename from src/analyzer/protocols/modbus/Plugin.cc rename to src/analyzer/protocol/modbus/Plugin.cc diff --git a/src/analyzer/protocols/modbus/events.bif b/src/analyzer/protocol/modbus/events.bif similarity index 100% rename from src/analyzer/protocols/modbus/events.bif rename to src/analyzer/protocol/modbus/events.bif diff --git a/src/analyzer/protocols/modbus/modbus-analyzer.pac b/src/analyzer/protocol/modbus/modbus-analyzer.pac similarity index 100% rename from src/analyzer/protocols/modbus/modbus-analyzer.pac rename to src/analyzer/protocol/modbus/modbus-analyzer.pac diff --git a/src/analyzer/protocols/modbus/modbus-protocol.pac b/src/analyzer/protocol/modbus/modbus-protocol.pac similarity index 100% rename from src/analyzer/protocols/modbus/modbus-protocol.pac rename to src/analyzer/protocol/modbus/modbus-protocol.pac diff --git a/src/analyzer/protocols/modbus/modbus.pac b/src/analyzer/protocol/modbus/modbus.pac similarity index 100% rename from src/analyzer/protocols/modbus/modbus.pac rename to src/analyzer/protocol/modbus/modbus.pac diff --git a/src/analyzer/protocols/ncp/CMakeLists.txt b/src/analyzer/protocol/ncp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ncp/CMakeLists.txt rename to src/analyzer/protocol/ncp/CMakeLists.txt diff --git a/src/analyzer/protocols/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc similarity index 100% rename from src/analyzer/protocols/ncp/NCP.cc rename to src/analyzer/protocol/ncp/NCP.cc diff --git a/src/analyzer/protocols/ncp/NCP.h b/src/analyzer/protocol/ncp/NCP.h similarity index 96% rename from src/analyzer/protocols/ncp/NCP.h rename to src/analyzer/protocol/ncp/NCP.h index aa667657ca..34174df74e 100644 --- a/src/analyzer/protocols/ncp/NCP.h +++ b/src/analyzer/protocol/ncp/NCP.h @@ -19,7 +19,7 @@ // http://faydoc.tripod.com/structures/21/2149.htm #include "NetVar.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "ncp_pac.h" @@ -73,7 +73,7 @@ protected: int buf_len; // size off msg_buf }; -#define ANALYZER_PROTOCOL_NCP_NCP_HEADER_LENGTH 8 +#define NCP_TCPIP_HEADER_LENGTH 8 class NCP_FrameBuffer : public FrameBuffer { public: diff --git a/src/analyzer/protocols/ncp/NCP_func.def b/src/analyzer/protocol/ncp/NCP_func.def similarity index 100% rename from src/analyzer/protocols/ncp/NCP_func.def rename to src/analyzer/protocol/ncp/NCP_func.def diff --git a/src/analyzer/protocols/ncp/Plugin.cc b/src/analyzer/protocol/ncp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ncp/Plugin.cc rename to src/analyzer/protocol/ncp/Plugin.cc diff --git a/src/analyzer/protocols/ncp/events.bif b/src/analyzer/protocol/ncp/events.bif similarity index 100% rename from src/analyzer/protocols/ncp/events.bif rename to src/analyzer/protocol/ncp/events.bif diff --git a/src/analyzer/protocols/ncp/ncp.pac b/src/analyzer/protocol/ncp/ncp.pac similarity index 100% rename from src/analyzer/protocols/ncp/ncp.pac rename to src/analyzer/protocol/ncp/ncp.pac diff --git a/src/analyzer/protocols/netbios/CMakeLists.txt b/src/analyzer/protocol/netbios/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/netbios/CMakeLists.txt rename to src/analyzer/protocol/netbios/CMakeLists.txt diff --git a/src/analyzer/protocols/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc similarity index 100% rename from src/analyzer/protocols/netbios/NetbiosSSN.cc rename to src/analyzer/protocol/netbios/NetbiosSSN.cc diff --git a/src/analyzer/protocols/netbios/NetbiosSSN.h b/src/analyzer/protocol/netbios/NetbiosSSN.h similarity index 97% rename from src/analyzer/protocols/netbios/NetbiosSSN.h rename to src/analyzer/protocol/netbios/NetbiosSSN.h index 5908250669..7c2728ef9a 100644 --- a/src/analyzer/protocols/netbios/NetbiosSSN.h +++ b/src/analyzer/protocol/netbios/NetbiosSSN.h @@ -3,9 +3,9 @@ #ifndef ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H #define ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H -#include "analyzer/protocols/udp/UDP.h" -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/smb/SMB.h" +#include "analyzer/protocol/udp/UDP.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/smb/SMB.h" namespace analyzer { namespace netbios_ssn { diff --git a/src/analyzer/protocols/netbios/Plugin.cc b/src/analyzer/protocol/netbios/Plugin.cc similarity index 100% rename from src/analyzer/protocols/netbios/Plugin.cc rename to src/analyzer/protocol/netbios/Plugin.cc diff --git a/src/analyzer/protocols/netbios/events.bif b/src/analyzer/protocol/netbios/events.bif similarity index 100% rename from src/analyzer/protocols/netbios/events.bif rename to src/analyzer/protocol/netbios/events.bif diff --git a/src/analyzer/protocols/netbios/functions.bif b/src/analyzer/protocol/netbios/functions.bif similarity index 100% rename from src/analyzer/protocols/netbios/functions.bif rename to src/analyzer/protocol/netbios/functions.bif diff --git a/src/analyzer/protocols/netflow/CMakeLists.txt b/src/analyzer/protocol/netflow/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/netflow/CMakeLists.txt rename to src/analyzer/protocol/netflow/CMakeLists.txt diff --git a/src/analyzer/protocols/netflow/Plugin.cc b/src/analyzer/protocol/netflow/Plugin.cc similarity index 100% rename from src/analyzer/protocols/netflow/Plugin.cc rename to src/analyzer/protocol/netflow/Plugin.cc diff --git a/src/analyzer/protocols/netflow/events.bif b/src/analyzer/protocol/netflow/events.bif similarity index 100% rename from src/analyzer/protocols/netflow/events.bif rename to src/analyzer/protocol/netflow/events.bif diff --git a/src/analyzer/protocols/netflow/netflow-analyzer.pac b/src/analyzer/protocol/netflow/netflow-analyzer.pac similarity index 100% rename from src/analyzer/protocols/netflow/netflow-analyzer.pac rename to src/analyzer/protocol/netflow/netflow-analyzer.pac diff --git a/src/analyzer/protocols/netflow/netflow-protocol.pac b/src/analyzer/protocol/netflow/netflow-protocol.pac similarity index 100% rename from src/analyzer/protocols/netflow/netflow-protocol.pac rename to src/analyzer/protocol/netflow/netflow-protocol.pac diff --git a/src/analyzer/protocols/netflow/netflow.pac b/src/analyzer/protocol/netflow/netflow.pac similarity index 100% rename from src/analyzer/protocols/netflow/netflow.pac rename to src/analyzer/protocol/netflow/netflow.pac diff --git a/src/analyzer/protocols/ntp/CMakeLists.txt b/src/analyzer/protocol/ntp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ntp/CMakeLists.txt rename to src/analyzer/protocol/ntp/CMakeLists.txt diff --git a/src/analyzer/protocols/ntp/NTP.cc b/src/analyzer/protocol/ntp/NTP.cc similarity index 100% rename from src/analyzer/protocols/ntp/NTP.cc rename to src/analyzer/protocol/ntp/NTP.cc diff --git a/src/analyzer/protocols/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h similarity index 97% rename from src/analyzer/protocols/ntp/NTP.h rename to src/analyzer/protocol/ntp/NTP.h index 25cc9bad43..201c5a8774 100644 --- a/src/analyzer/protocols/ntp/NTP.h +++ b/src/analyzer/protocol/ntp/NTP.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_NTP_NTP_H #define ANALYZER_PROTOCOL_NTP_NTP_H -#include "analyzer/protocols/udp/UDP.h" +#include "analyzer/protocol/udp/UDP.h" // The following are from the tcpdump distribution, credited there // to the U of MD implementation. diff --git a/src/analyzer/protocols/ntp/Plugin.cc b/src/analyzer/protocol/ntp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ntp/Plugin.cc rename to src/analyzer/protocol/ntp/Plugin.cc diff --git a/src/analyzer/protocols/ntp/events.bif b/src/analyzer/protocol/ntp/events.bif similarity index 100% rename from src/analyzer/protocols/ntp/events.bif rename to src/analyzer/protocol/ntp/events.bif diff --git a/src/analyzer/protocols/pia/CMakeLists.txt b/src/analyzer/protocol/pia/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/pia/CMakeLists.txt rename to src/analyzer/protocol/pia/CMakeLists.txt diff --git a/src/analyzer/protocols/pia/PIA.cc b/src/analyzer/protocol/pia/PIA.cc similarity index 99% rename from src/analyzer/protocols/pia/PIA.cc rename to src/analyzer/protocol/pia/PIA.cc index d5defc018e..cc1dd7ea0e 100644 --- a/src/analyzer/protocols/pia/PIA.cc +++ b/src/analyzer/protocol/pia/PIA.cc @@ -1,6 +1,6 @@ #include "PIA.h" #include "RuleMatcher.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/pia/PIA.h b/src/analyzer/protocol/pia/PIA.h similarity index 99% rename from src/analyzer/protocols/pia/PIA.h rename to src/analyzer/protocol/pia/PIA.h index a117a60978..d8c272d219 100644 --- a/src/analyzer/protocols/pia/PIA.h +++ b/src/analyzer/protocol/pia/PIA.h @@ -4,7 +4,7 @@ #define ANALYZER_PROTOCOL_PIA_PIA_H #include "analyzer/Analyzer.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" class RuleEndpointState; diff --git a/src/analyzer/protocols/pia/Plugin.cc b/src/analyzer/protocol/pia/Plugin.cc similarity index 100% rename from src/analyzer/protocols/pia/Plugin.cc rename to src/analyzer/protocol/pia/Plugin.cc diff --git a/src/analyzer/protocols/pia/events.bif b/src/analyzer/protocol/pia/events.bif similarity index 100% rename from src/analyzer/protocols/pia/events.bif rename to src/analyzer/protocol/pia/events.bif diff --git a/src/analyzer/protocols/pop3/CMakeLists.txt b/src/analyzer/protocol/pop3/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/pop3/CMakeLists.txt rename to src/analyzer/protocol/pop3/CMakeLists.txt diff --git a/src/analyzer/protocols/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc similarity index 99% rename from src/analyzer/protocols/pop3/POP3.cc rename to src/analyzer/protocol/pop3/POP3.cc index 7a81da1b5e..652fd20e32 100644 --- a/src/analyzer/protocols/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -13,7 +13,7 @@ #include "POP3.h" #include "Event.h" #include "Reporter.h" -#include "analyzer/protocols/login/NVT.h" +#include "analyzer/protocol/login/NVT.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/pop3/POP3.h b/src/analyzer/protocol/pop3/POP3.h similarity index 94% rename from src/analyzer/protocols/pop3/POP3.h rename to src/analyzer/protocol/pop3/POP3.h index bd882f480b..ab535420e5 100644 --- a/src/analyzer/protocols/pop3/POP3.h +++ b/src/analyzer/protocol/pop3/POP3.h @@ -9,9 +9,9 @@ #include #include -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/login/NVT.h" -#include "analyzer/protocols/mime/MIME.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/login/NVT.h" +#include "analyzer/protocol/mime/MIME.h" #undef POP3_CMD_DEF #define POP3_CMD_DEF(cmd) POP3_CMD_##cmd, diff --git a/src/analyzer/protocols/pop3/POP3_cmd.def b/src/analyzer/protocol/pop3/POP3_cmd.def similarity index 100% rename from src/analyzer/protocols/pop3/POP3_cmd.def rename to src/analyzer/protocol/pop3/POP3_cmd.def diff --git a/src/analyzer/protocols/pop3/Plugin.cc b/src/analyzer/protocol/pop3/Plugin.cc similarity index 100% rename from src/analyzer/protocols/pop3/Plugin.cc rename to src/analyzer/protocol/pop3/Plugin.cc diff --git a/src/analyzer/protocols/pop3/events.bif b/src/analyzer/protocol/pop3/events.bif similarity index 100% rename from src/analyzer/protocols/pop3/events.bif rename to src/analyzer/protocol/pop3/events.bif diff --git a/src/analyzer/protocols/rpc/CMakeLists.txt b/src/analyzer/protocol/rpc/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/rpc/CMakeLists.txt rename to src/analyzer/protocol/rpc/CMakeLists.txt diff --git a/src/analyzer/protocols/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc similarity index 100% rename from src/analyzer/protocols/rpc/NFS.cc rename to src/analyzer/protocol/rpc/NFS.cc diff --git a/src/analyzer/protocols/rpc/NFS.h b/src/analyzer/protocol/rpc/NFS.h similarity index 100% rename from src/analyzer/protocols/rpc/NFS.h rename to src/analyzer/protocol/rpc/NFS.h diff --git a/src/analyzer/protocols/rpc/Plugin.cc b/src/analyzer/protocol/rpc/Plugin.cc similarity index 100% rename from src/analyzer/protocols/rpc/Plugin.cc rename to src/analyzer/protocol/rpc/Plugin.cc diff --git a/src/analyzer/protocols/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc similarity index 100% rename from src/analyzer/protocols/rpc/Portmap.cc rename to src/analyzer/protocol/rpc/Portmap.cc diff --git a/src/analyzer/protocols/rpc/Portmap.h b/src/analyzer/protocol/rpc/Portmap.h similarity index 100% rename from src/analyzer/protocols/rpc/Portmap.h rename to src/analyzer/protocol/rpc/Portmap.h diff --git a/src/analyzer/protocols/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc similarity index 100% rename from src/analyzer/protocols/rpc/RPC.cc rename to src/analyzer/protocol/rpc/RPC.cc diff --git a/src/analyzer/protocols/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h similarity index 98% rename from src/analyzer/protocols/rpc/RPC.h rename to src/analyzer/protocol/rpc/RPC.h index 0face29d50..a705d272f6 100644 --- a/src/analyzer/protocols/rpc/RPC.h +++ b/src/analyzer/protocol/rpc/RPC.h @@ -3,8 +3,8 @@ #ifndef ANALYZER_PROTOCOL_RPC_RPC_H #define ANALYZER_PROTOCOL_RPC_RPC_H -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/udp/UDP.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/udp/UDP.h" namespace analyzer { namespace rpc { diff --git a/src/analyzer/protocols/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc similarity index 100% rename from src/analyzer/protocols/rpc/XDR.cc rename to src/analyzer/protocol/rpc/XDR.cc diff --git a/src/analyzer/protocols/rpc/XDR.h b/src/analyzer/protocol/rpc/XDR.h similarity index 100% rename from src/analyzer/protocols/rpc/XDR.h rename to src/analyzer/protocol/rpc/XDR.h diff --git a/src/analyzer/protocols/rpc/events.bif b/src/analyzer/protocol/rpc/events.bif similarity index 100% rename from src/analyzer/protocols/rpc/events.bif rename to src/analyzer/protocol/rpc/events.bif diff --git a/src/analyzer/protocols/smb/CMakeLists.txt b/src/analyzer/protocol/smb/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/smb/CMakeLists.txt rename to src/analyzer/protocol/smb/CMakeLists.txt diff --git a/src/analyzer/protocols/smb/Plugin.cc b/src/analyzer/protocol/smb/Plugin.cc similarity index 100% rename from src/analyzer/protocols/smb/Plugin.cc rename to src/analyzer/protocol/smb/Plugin.cc diff --git a/src/analyzer/protocols/smb/SMB.cc b/src/analyzer/protocol/smb/SMB.cc similarity index 100% rename from src/analyzer/protocols/smb/SMB.cc rename to src/analyzer/protocol/smb/SMB.cc diff --git a/src/analyzer/protocols/smb/SMB.h b/src/analyzer/protocol/smb/SMB.h similarity index 98% rename from src/analyzer/protocols/smb/SMB.h rename to src/analyzer/protocol/smb/SMB.h index eed1d2e5a0..b54852e5b7 100644 --- a/src/analyzer/protocols/smb/SMB.h +++ b/src/analyzer/protocol/smb/SMB.h @@ -6,8 +6,8 @@ // SMB (CIFS) analyzer. // Reference: http://www.snia.org/tech_activities/CIFS/CIFS-TR-1p00_FINAL.pdf -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/dce-rpc/DCE_RPC.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/dce-rpc/DCE_RPC.h" #include "smb_pac.h" namespace analyzer { namespace smb { diff --git a/src/analyzer/protocols/smb/SMB_COM.def b/src/analyzer/protocol/smb/SMB_COM.def similarity index 100% rename from src/analyzer/protocols/smb/SMB_COM.def rename to src/analyzer/protocol/smb/SMB_COM.def diff --git a/src/analyzer/protocols/smb/events.bif b/src/analyzer/protocol/smb/events.bif similarity index 100% rename from src/analyzer/protocols/smb/events.bif rename to src/analyzer/protocol/smb/events.bif diff --git a/src/analyzer/protocols/smb/smb-mailslot.pac b/src/analyzer/protocol/smb/smb-mailslot.pac similarity index 100% rename from src/analyzer/protocols/smb/smb-mailslot.pac rename to src/analyzer/protocol/smb/smb-mailslot.pac diff --git a/src/analyzer/protocols/smb/smb-pipe.pac b/src/analyzer/protocol/smb/smb-pipe.pac similarity index 100% rename from src/analyzer/protocols/smb/smb-pipe.pac rename to src/analyzer/protocol/smb/smb-pipe.pac diff --git a/src/analyzer/protocols/smb/smb-protocol.pac b/src/analyzer/protocol/smb/smb-protocol.pac similarity index 100% rename from src/analyzer/protocols/smb/smb-protocol.pac rename to src/analyzer/protocol/smb/smb-protocol.pac diff --git a/src/analyzer/protocols/smb/smb.pac b/src/analyzer/protocol/smb/smb.pac similarity index 100% rename from src/analyzer/protocols/smb/smb.pac rename to src/analyzer/protocol/smb/smb.pac diff --git a/src/analyzer/protocols/smtp/CMakeLists.txt b/src/analyzer/protocol/smtp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/smtp/CMakeLists.txt rename to src/analyzer/protocol/smtp/CMakeLists.txt diff --git a/src/analyzer/protocols/smtp/Plugin.cc b/src/analyzer/protocol/smtp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/smtp/Plugin.cc rename to src/analyzer/protocol/smtp/Plugin.cc diff --git a/src/analyzer/protocols/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc similarity index 99% rename from src/analyzer/protocols/smtp/SMTP.cc rename to src/analyzer/protocol/smtp/SMTP.cc index 7bbb7ec69e..dea418242b 100644 --- a/src/analyzer/protocols/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -8,7 +8,7 @@ #include "SMTP.h" #include "Event.h" #include "Reporter.h" -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/smtp/SMTP.h b/src/analyzer/protocol/smtp/SMTP.h similarity index 97% rename from src/analyzer/protocols/smtp/SMTP.h rename to src/analyzer/protocol/smtp/SMTP.h index c179db4ecb..cc12167d30 100644 --- a/src/analyzer/protocols/smtp/SMTP.h +++ b/src/analyzer/protocol/smtp/SMTP.h @@ -6,8 +6,8 @@ #include using namespace std; -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/mime/MIME.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/mime/MIME.h" #undef SMTP_CMD_DEF #define SMTP_CMD_DEF(cmd) SMTP_CMD_##cmd, diff --git a/src/analyzer/protocols/smtp/SMTP_cmd.def b/src/analyzer/protocol/smtp/SMTP_cmd.def similarity index 100% rename from src/analyzer/protocols/smtp/SMTP_cmd.def rename to src/analyzer/protocol/smtp/SMTP_cmd.def diff --git a/src/analyzer/protocols/smtp/events.bif b/src/analyzer/protocol/smtp/events.bif similarity index 100% rename from src/analyzer/protocols/smtp/events.bif rename to src/analyzer/protocol/smtp/events.bif diff --git a/src/analyzer/protocols/smtp/functions.bif b/src/analyzer/protocol/smtp/functions.bif similarity index 88% rename from src/analyzer/protocols/smtp/functions.bif rename to src/analyzer/protocol/smtp/functions.bif index 2bb0c52319..8630685096 100644 --- a/src/analyzer/protocols/smtp/functions.bif +++ b/src/analyzer/protocol/smtp/functions.bif @@ -1,6 +1,6 @@ %%{ -#include "analyzer/protocols/smtp/SMTP.h" +#include "analyzer/protocol/smtp/SMTP.h" %%} ## Skips SMTP data until the next email in a connection. diff --git a/src/analyzer/protocols/socks/CMakeLists.txt b/src/analyzer/protocol/socks/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/socks/CMakeLists.txt rename to src/analyzer/protocol/socks/CMakeLists.txt diff --git a/src/analyzer/protocols/socks/Plugin.cc b/src/analyzer/protocol/socks/Plugin.cc similarity index 100% rename from src/analyzer/protocols/socks/Plugin.cc rename to src/analyzer/protocol/socks/Plugin.cc diff --git a/src/analyzer/protocols/socks/SOCKS.cc b/src/analyzer/protocol/socks/SOCKS.cc similarity index 97% rename from src/analyzer/protocols/socks/SOCKS.cc rename to src/analyzer/protocol/socks/SOCKS.cc index dab464abf7..f9d81b8a16 100644 --- a/src/analyzer/protocols/socks/SOCKS.cc +++ b/src/analyzer/protocol/socks/SOCKS.cc @@ -1,6 +1,6 @@ #include "SOCKS.h" #include "socks_pac.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/socks/SOCKS.h b/src/analyzer/protocol/socks/SOCKS.h similarity index 91% rename from src/analyzer/protocols/socks/SOCKS.h rename to src/analyzer/protocol/socks/SOCKS.h index 424443c826..f005967fd8 100644 --- a/src/analyzer/protocols/socks/SOCKS.h +++ b/src/analyzer/protocol/socks/SOCKS.h @@ -3,8 +3,8 @@ // SOCKS v4 analyzer. -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/pia/PIA.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/pia/PIA.h" namespace binpac { namespace SOCKS { diff --git a/src/analyzer/protocols/socks/events.bif b/src/analyzer/protocol/socks/events.bif similarity index 100% rename from src/analyzer/protocols/socks/events.bif rename to src/analyzer/protocol/socks/events.bif diff --git a/src/analyzer/protocols/socks/socks-analyzer.pac b/src/analyzer/protocol/socks/socks-analyzer.pac similarity index 100% rename from src/analyzer/protocols/socks/socks-analyzer.pac rename to src/analyzer/protocol/socks/socks-analyzer.pac diff --git a/src/analyzer/protocols/socks/socks-protocol.pac b/src/analyzer/protocol/socks/socks-protocol.pac similarity index 100% rename from src/analyzer/protocols/socks/socks-protocol.pac rename to src/analyzer/protocol/socks/socks-protocol.pac diff --git a/src/analyzer/protocols/socks/socks.pac b/src/analyzer/protocol/socks/socks.pac similarity index 100% rename from src/analyzer/protocols/socks/socks.pac rename to src/analyzer/protocol/socks/socks.pac diff --git a/src/analyzer/protocols/ssh/CMakeLists.txt b/src/analyzer/protocol/ssh/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ssh/CMakeLists.txt rename to src/analyzer/protocol/ssh/CMakeLists.txt diff --git a/src/analyzer/protocols/ssh/Plugin.cc b/src/analyzer/protocol/ssh/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ssh/Plugin.cc rename to src/analyzer/protocol/ssh/Plugin.cc diff --git a/src/analyzer/protocols/ssh/SSH.cc b/src/analyzer/protocol/ssh/SSH.cc similarity index 98% rename from src/analyzer/protocols/ssh/SSH.cc rename to src/analyzer/protocol/ssh/SSH.cc index c2ff9a066c..ab3f6a5e5b 100644 --- a/src/analyzer/protocols/ssh/SSH.cc +++ b/src/analyzer/protocol/ssh/SSH.cc @@ -7,7 +7,7 @@ #include "NetVar.h" #include "SSH.h" #include "Event.h" -#include "analyzer/protocols/tcp/ContentLine.h" +#include "analyzer/protocol/tcp/ContentLine.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h similarity index 86% rename from src/analyzer/protocols/ssh/SSH.h rename to src/analyzer/protocol/ssh/SSH.h index 6587425807..3878881693 100644 --- a/src/analyzer/protocols/ssh/SSH.h +++ b/src/analyzer/protocol/ssh/SSH.h @@ -3,8 +3,8 @@ #ifndef ANALYZER_PROTOCOL_SSH_SSH_H #define ANALYZER_PROTOCOL_SSH_SSH_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 ssh { diff --git a/src/analyzer/protocols/ssh/events.bif b/src/analyzer/protocol/ssh/events.bif similarity index 100% rename from src/analyzer/protocols/ssh/events.bif rename to src/analyzer/protocol/ssh/events.bif diff --git a/src/analyzer/protocols/ssl/CMakeLists.txt b/src/analyzer/protocol/ssl/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/ssl/CMakeLists.txt rename to src/analyzer/protocol/ssl/CMakeLists.txt diff --git a/src/analyzer/protocols/ssl/Plugin.cc b/src/analyzer/protocol/ssl/Plugin.cc similarity index 100% rename from src/analyzer/protocols/ssl/Plugin.cc rename to src/analyzer/protocol/ssl/Plugin.cc diff --git a/src/analyzer/protocols/ssl/SSL.cc b/src/analyzer/protocol/ssl/SSL.cc similarity index 96% rename from src/analyzer/protocols/ssl/SSL.cc rename to src/analyzer/protocol/ssl/SSL.cc index cf41f273f6..6cd2fa59f8 100644 --- a/src/analyzer/protocols/ssl/SSL.cc +++ b/src/analyzer/protocol/ssl/SSL.cc @@ -1,6 +1,6 @@ #include "SSL.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "Reporter.h" #include "util.h" diff --git a/src/analyzer/protocols/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h similarity index 95% rename from src/analyzer/protocols/ssl/SSL.h rename to src/analyzer/protocol/ssl/SSL.h index f1323566af..6423d1b155 100644 --- a/src/analyzer/protocols/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -3,7 +3,7 @@ #include "events.bif.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "ssl_pac.h" namespace analyzer { namespace ssl { diff --git a/src/analyzer/protocols/ssl/events.bif b/src/analyzer/protocol/ssl/events.bif similarity index 100% rename from src/analyzer/protocols/ssl/events.bif rename to src/analyzer/protocol/ssl/events.bif diff --git a/src/analyzer/protocols/ssl/functions.bif b/src/analyzer/protocol/ssl/functions.bif similarity index 100% rename from src/analyzer/protocols/ssl/functions.bif rename to src/analyzer/protocol/ssl/functions.bif diff --git a/src/analyzer/protocols/ssl/ssl-analyzer.pac b/src/analyzer/protocol/ssl/ssl-analyzer.pac similarity index 100% rename from src/analyzer/protocols/ssl/ssl-analyzer.pac rename to src/analyzer/protocol/ssl/ssl-analyzer.pac diff --git a/src/analyzer/protocols/ssl/ssl-defs.pac b/src/analyzer/protocol/ssl/ssl-defs.pac similarity index 100% rename from src/analyzer/protocols/ssl/ssl-defs.pac rename to src/analyzer/protocol/ssl/ssl-defs.pac diff --git a/src/analyzer/protocols/ssl/ssl-protocol.pac b/src/analyzer/protocol/ssl/ssl-protocol.pac similarity index 100% rename from src/analyzer/protocols/ssl/ssl-protocol.pac rename to src/analyzer/protocol/ssl/ssl-protocol.pac diff --git a/src/analyzer/protocols/ssl/ssl.pac b/src/analyzer/protocol/ssl/ssl.pac similarity index 100% rename from src/analyzer/protocols/ssl/ssl.pac rename to src/analyzer/protocol/ssl/ssl.pac diff --git a/src/analyzer/protocols/stepping-stone/CMakeLists.txt b/src/analyzer/protocol/stepping-stone/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/stepping-stone/CMakeLists.txt rename to src/analyzer/protocol/stepping-stone/CMakeLists.txt diff --git a/src/analyzer/protocols/stepping-stone/Plugin.cc b/src/analyzer/protocol/stepping-stone/Plugin.cc similarity index 100% rename from src/analyzer/protocols/stepping-stone/Plugin.cc rename to src/analyzer/protocol/stepping-stone/Plugin.cc diff --git a/src/analyzer/protocols/stepping-stone/SteppingStone.cc b/src/analyzer/protocol/stepping-stone/SteppingStone.cc similarity index 99% rename from src/analyzer/protocols/stepping-stone/SteppingStone.cc rename to src/analyzer/protocol/stepping-stone/SteppingStone.cc index 2b25a2e080..09a7444213 100644 --- a/src/analyzer/protocols/stepping-stone/SteppingStone.cc +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.cc @@ -7,7 +7,7 @@ #include "Event.h" #include "Net.h" #include "NetVar.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "SteppingStone.h" #include "util.h" diff --git a/src/analyzer/protocols/stepping-stone/SteppingStone.h b/src/analyzer/protocol/stepping-stone/SteppingStone.h similarity index 98% rename from src/analyzer/protocols/stepping-stone/SteppingStone.h rename to src/analyzer/protocol/stepping-stone/SteppingStone.h index 212899f32c..1471c08a3b 100644 --- a/src/analyzer/protocols/stepping-stone/SteppingStone.h +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.h @@ -4,7 +4,7 @@ #define ANALYZER_PROTOCOL_STEPPING_STONE_STEPPINGSTONE_H #include "Queue.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" class NetSessions; diff --git a/src/analyzer/protocols/stepping-stone/events.bif b/src/analyzer/protocol/stepping-stone/events.bif similarity index 100% rename from src/analyzer/protocols/stepping-stone/events.bif rename to src/analyzer/protocol/stepping-stone/events.bif diff --git a/src/analyzer/protocols/syslog/CMakeLists.txt b/src/analyzer/protocol/syslog/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/syslog/CMakeLists.txt rename to src/analyzer/protocol/syslog/CMakeLists.txt diff --git a/src/analyzer/protocols/syslog/Plugin.cc b/src/analyzer/protocol/syslog/Plugin.cc similarity index 100% rename from src/analyzer/protocols/syslog/Plugin.cc rename to src/analyzer/protocol/syslog/Plugin.cc diff --git a/src/analyzer/protocols/syslog/Syslog.cc b/src/analyzer/protocol/syslog/Syslog.cc similarity index 97% rename from src/analyzer/protocols/syslog/Syslog.cc rename to src/analyzer/protocol/syslog/Syslog.cc index e1667ea38b..2b783afc64 100644 --- a/src/analyzer/protocols/syslog/Syslog.cc +++ b/src/analyzer/protocol/syslog/Syslog.cc @@ -1,6 +1,6 @@ #include "Syslog.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/syslog/Syslog.h b/src/analyzer/protocol/syslog/Syslog.h similarity index 94% rename from src/analyzer/protocols/syslog/Syslog.h rename to src/analyzer/protocol/syslog/Syslog.h index fd929a478e..355863e36e 100644 --- a/src/analyzer/protocols/syslog/Syslog.h +++ b/src/analyzer/protocol/syslog/Syslog.h @@ -2,8 +2,8 @@ #ifndef ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H #define ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H -#include "analyzer/protocols/udp/UDP.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/udp/UDP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "syslog_pac.h" diff --git a/src/analyzer/protocols/syslog/events.bif b/src/analyzer/protocol/syslog/events.bif similarity index 100% rename from src/analyzer/protocols/syslog/events.bif rename to src/analyzer/protocol/syslog/events.bif diff --git a/src/analyzer/protocols/syslog/syslog-analyzer.pac b/src/analyzer/protocol/syslog/syslog-analyzer.pac similarity index 100% rename from src/analyzer/protocols/syslog/syslog-analyzer.pac rename to src/analyzer/protocol/syslog/syslog-analyzer.pac diff --git a/src/analyzer/protocols/syslog/syslog-protocol.pac b/src/analyzer/protocol/syslog/syslog-protocol.pac similarity index 100% rename from src/analyzer/protocols/syslog/syslog-protocol.pac rename to src/analyzer/protocol/syslog/syslog-protocol.pac diff --git a/src/analyzer/protocols/syslog/syslog.pac b/src/analyzer/protocol/syslog/syslog.pac similarity index 100% rename from src/analyzer/protocols/syslog/syslog.pac rename to src/analyzer/protocol/syslog/syslog.pac diff --git a/src/analyzer/protocols/tcp/CMakeLists.txt b/src/analyzer/protocol/tcp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/tcp/CMakeLists.txt rename to src/analyzer/protocol/tcp/CMakeLists.txt diff --git a/src/analyzer/protocols/tcp/ContentLine.cc b/src/analyzer/protocol/tcp/ContentLine.cc similarity index 99% rename from src/analyzer/protocols/tcp/ContentLine.cc rename to src/analyzer/protocol/tcp/ContentLine.cc index c1738ccc64..2a810c5dd1 100644 --- a/src/analyzer/protocols/tcp/ContentLine.cc +++ b/src/analyzer/protocol/tcp/ContentLine.cc @@ -1,7 +1,7 @@ #include #include "ContentLine.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/tcp/ContentLine.h b/src/analyzer/protocol/tcp/ContentLine.h similarity index 98% rename from src/analyzer/protocols/tcp/ContentLine.h rename to src/analyzer/protocol/tcp/ContentLine.h index f5d3ef8211..ecc1347984 100644 --- a/src/analyzer/protocols/tcp/ContentLine.h +++ b/src/analyzer/protocol/tcp/ContentLine.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_TCP_CONTENTLINE_H #define ANALYZER_PROTOCOL_TCP_CONTENTLINE_H -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" namespace analyzer { namespace tcp { diff --git a/src/analyzer/protocols/tcp/Plugin.cc b/src/analyzer/protocol/tcp/Plugin.cc similarity index 100% rename from src/analyzer/protocols/tcp/Plugin.cc rename to src/analyzer/protocol/tcp/Plugin.cc diff --git a/src/analyzer/protocols/tcp/Stats.cc b/src/analyzer/protocol/tcp/Stats.cc similarity index 100% rename from src/analyzer/protocols/tcp/Stats.cc rename to src/analyzer/protocol/tcp/Stats.cc diff --git a/src/analyzer/protocols/tcp/Stats.h b/src/analyzer/protocol/tcp/Stats.h similarity index 100% rename from src/analyzer/protocols/tcp/Stats.h rename to src/analyzer/protocol/tcp/Stats.h diff --git a/src/analyzer/protocols/tcp/TCP.cc b/src/analyzer/protocol/tcp/TCP.cc similarity index 99% rename from src/analyzer/protocols/tcp/TCP.cc rename to src/analyzer/protocol/tcp/TCP.cc index 23de51642b..ee8a5938f5 100644 --- a/src/analyzer/protocols/tcp/TCP.cc +++ b/src/analyzer/protocol/tcp/TCP.cc @@ -7,9 +7,9 @@ #include "OSFinger.h" #include "Event.h" -#include "analyzer/protocols/pia/PIA.h" -#include "analyzer/protocols/tcp/TCP.h" -#include "analyzer/protocols/tcp/TCP_Reassembler.h" +#include "analyzer/protocol/pia/PIA.h" +#include "analyzer/protocol/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" diff --git a/src/analyzer/protocols/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h similarity index 99% rename from src/analyzer/protocols/tcp/TCP.h rename to src/analyzer/protocol/tcp/TCP.h index ded3cd7270..b2649b4ab8 100644 --- a/src/analyzer/protocols/tcp/TCP.h +++ b/src/analyzer/protocol/tcp/TCP.h @@ -4,7 +4,7 @@ #define ANALYZER_PROTOCOL_TCP_TCP_H #include "analyzer/Analyzer.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "PacketDumper.h" #include "IPAddr.h" #include "TCP_Endpoint.h" diff --git a/src/analyzer/protocols/tcp/TCP_Endpoint.cc b/src/analyzer/protocol/tcp/TCP_Endpoint.cc similarity index 99% rename from src/analyzer/protocols/tcp/TCP_Endpoint.cc rename to src/analyzer/protocol/tcp/TCP_Endpoint.cc index 922c52693a..3beafdeb8a 100644 --- a/src/analyzer/protocols/tcp/TCP_Endpoint.cc +++ b/src/analyzer/protocol/tcp/TCP_Endpoint.cc @@ -2,7 +2,7 @@ #include "Net.h" #include "NetVar.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "TCP_Reassembler.h" #include "Sessions.h" #include "Event.h" diff --git a/src/analyzer/protocols/tcp/TCP_Endpoint.h b/src/analyzer/protocol/tcp/TCP_Endpoint.h similarity index 100% rename from src/analyzer/protocols/tcp/TCP_Endpoint.h rename to src/analyzer/protocol/tcp/TCP_Endpoint.h diff --git a/src/analyzer/protocols/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc similarity index 99% rename from src/analyzer/protocols/tcp/TCP_Reassembler.cc rename to src/analyzer/protocol/tcp/TCP_Reassembler.cc index e54a1494af..949be9f599 100644 --- a/src/analyzer/protocols/tcp/TCP_Reassembler.cc +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc @@ -2,7 +2,7 @@ #include "analyzer/Analyzer.h" #include "TCP_Reassembler.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" #include "TCP_Endpoint.h" // Only needed for gap_report events. diff --git a/src/analyzer/protocols/tcp/TCP_Reassembler.h b/src/analyzer/protocol/tcp/TCP_Reassembler.h similarity index 100% rename from src/analyzer/protocols/tcp/TCP_Reassembler.h rename to src/analyzer/protocol/tcp/TCP_Reassembler.h diff --git a/src/analyzer/protocols/tcp/events.bif b/src/analyzer/protocol/tcp/events.bif similarity index 100% rename from src/analyzer/protocols/tcp/events.bif rename to src/analyzer/protocol/tcp/events.bif diff --git a/src/analyzer/protocols/tcp/functions.bif b/src/analyzer/protocol/tcp/functions.bif similarity index 99% rename from src/analyzer/protocols/tcp/functions.bif rename to src/analyzer/protocol/tcp/functions.bif index b0178a1279..ff812b80ee 100644 --- a/src/analyzer/protocols/tcp/functions.bif +++ b/src/analyzer/protocol/tcp/functions.bif @@ -1,6 +1,6 @@ %%{ -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" %%} ## Get the originator sequence number of a TCP connection. Sequence numbers diff --git a/src/analyzer/protocols/teredo/CMakeLists.txt b/src/analyzer/protocol/teredo/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/teredo/CMakeLists.txt rename to src/analyzer/protocol/teredo/CMakeLists.txt diff --git a/src/analyzer/protocols/teredo/Plugin.cc b/src/analyzer/protocol/teredo/Plugin.cc similarity index 100% rename from src/analyzer/protocols/teredo/Plugin.cc rename to src/analyzer/protocol/teredo/Plugin.cc diff --git a/src/analyzer/protocols/teredo/Teredo.cc b/src/analyzer/protocol/teredo/Teredo.cc similarity index 100% rename from src/analyzer/protocols/teredo/Teredo.cc rename to src/analyzer/protocol/teredo/Teredo.cc diff --git a/src/analyzer/protocols/teredo/Teredo.h b/src/analyzer/protocol/teredo/Teredo.h similarity index 100% rename from src/analyzer/protocols/teredo/Teredo.h rename to src/analyzer/protocol/teredo/Teredo.h diff --git a/src/analyzer/protocols/teredo/events.bif b/src/analyzer/protocol/teredo/events.bif similarity index 100% rename from src/analyzer/protocols/teredo/events.bif rename to src/analyzer/protocol/teredo/events.bif diff --git a/src/analyzer/protocols/udp/CMakeLists.txt b/src/analyzer/protocol/udp/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/udp/CMakeLists.txt rename to src/analyzer/protocol/udp/CMakeLists.txt diff --git a/src/analyzer/protocols/udp/Plugin.cc b/src/analyzer/protocol/udp/Plugin.cc similarity index 82% rename from src/analyzer/protocols/udp/Plugin.cc rename to src/analyzer/protocol/udp/Plugin.cc index a013c55a87..c18a846e00 100644 --- a/src/analyzer/protocols/udp/Plugin.cc +++ b/src/analyzer/protocol/udp/Plugin.cc @@ -1,7 +1,7 @@ #include "plugin/Plugin.h" -#include "analyzer/protocols/udp/UDP.h" +#include "analyzer/protocol/udp/UDP.h" BRO_PLUGIN_BEGIN(UDP) BRO_PLUGIN_DESCRIPTION("UDP Analyzer"); diff --git a/src/analyzer/protocols/udp/UDP.cc b/src/analyzer/protocol/udp/UDP.cc similarity index 99% rename from src/analyzer/protocols/udp/UDP.cc rename to src/analyzer/protocol/udp/UDP.cc index 8092a511c3..3050ea5648 100644 --- a/src/analyzer/protocols/udp/UDP.cc +++ b/src/analyzer/protocol/udp/UDP.cc @@ -6,7 +6,7 @@ #include "Net.h" #include "NetVar.h" -#include "analyzer/protocols/udp/UDP.h" +#include "analyzer/protocol/udp/UDP.h" #include "Reporter.h" #include "Conn.h" diff --git a/src/analyzer/protocols/udp/UDP.h b/src/analyzer/protocol/udp/UDP.h similarity index 100% rename from src/analyzer/protocols/udp/UDP.h rename to src/analyzer/protocol/udp/UDP.h diff --git a/src/analyzer/protocols/udp/events.bif b/src/analyzer/protocol/udp/events.bif similarity index 100% rename from src/analyzer/protocols/udp/events.bif rename to src/analyzer/protocol/udp/events.bif diff --git a/src/analyzer/protocols/zip/CMakeLists.txt b/src/analyzer/protocol/zip/CMakeLists.txt similarity index 100% rename from src/analyzer/protocols/zip/CMakeLists.txt rename to src/analyzer/protocol/zip/CMakeLists.txt diff --git a/src/analyzer/protocols/zip/Plugin.cc b/src/analyzer/protocol/zip/Plugin.cc similarity index 100% rename from src/analyzer/protocols/zip/Plugin.cc rename to src/analyzer/protocol/zip/Plugin.cc diff --git a/src/analyzer/protocols/zip/ZIP.cc b/src/analyzer/protocol/zip/ZIP.cc similarity index 100% rename from src/analyzer/protocols/zip/ZIP.cc rename to src/analyzer/protocol/zip/ZIP.cc diff --git a/src/analyzer/protocols/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h similarity index 94% rename from src/analyzer/protocols/zip/ZIP.h rename to src/analyzer/protocol/zip/ZIP.h index 7753ac2945..b284529d86 100644 --- a/src/analyzer/protocols/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -6,7 +6,7 @@ #include "config.h" #include "zlib.h" -#include "analyzer/protocols/tcp/TCP.h" +#include "analyzer/protocol/tcp/TCP.h" namespace analyzer { namespace zip { diff --git a/src/analyzer/protocols/zip/events.bif b/src/analyzer/protocol/zip/events.bif similarity index 100% rename from src/analyzer/protocols/zip/events.bif rename to src/analyzer/protocol/zip/events.bif diff --git a/src/bro.bif b/src/bro.bif index 5c39e335a6..6ad7dccc3a 100644 --- a/src/bro.bif +++ b/src/bro.bif @@ -2626,7 +2626,7 @@ function decode_base64_custom%(s: string, a: string%): string %} %%{ -#include "analyzer/protocols/dce-rpc/DCE_RPC.h" +#include "analyzer/protocol/dce-rpc/DCE_RPC.h" typedef struct { uint32 time_low; diff --git a/src/parse.y b/src/parse.y index 449b472c0c..5c54706168 100644 --- a/src/parse.y +++ b/src/parse.y @@ -79,7 +79,7 @@ #include "Expr.h" #include "Stmt.h" #include "Var.h" -/* #include "analyzer/protocols/dns/DNS.h" */ +/* #include "analyzer/protocol/dns/DNS.h" */ #include "RE.h" #include "Scope.h" #include "Reporter.h"