From 45d2c96643dc8139c2bbe55484b9908b51ac0c15 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 2 Jul 2020 17:24:04 -0700 Subject: [PATCH] Rename BroString files to ZeekString --- src/Base64.cc | 2 +- src/BroString.h | 197 +----------------- src/CMakeLists.txt | 2 +- src/CompHash.cc | 2 +- src/DNS_Mgr.cc | 2 +- src/Desc.h | 2 +- src/Discard.cc | 2 +- src/Hash.cc | 2 +- src/IP.cc | 2 +- src/IPAddr.cc | 2 +- src/RE.cc | 2 +- src/RuleMatcher.cc | 2 +- src/SmithWaterman.h | 2 +- src/Val.cc | 2 +- src/{BroString.cc => ZeekString.cc} | 2 +- src/ZeekString.h | 195 +++++++++++++++++ src/analyzer/Analyzer.cc | 2 +- src/analyzer/protocol/dns/DNS.cc | 2 +- src/analyzer/protocol/ftp/FTP.cc | 2 +- .../protocol/gtpv1/gtpv1-analyzer.pac | 2 +- src/analyzer/protocol/ident/Ident.cc | 2 +- src/analyzer/protocol/login/Login.cc | 2 +- src/analyzer/protocol/login/NVT.cc | 2 +- src/analyzer/protocol/mime/MIME.h | 2 +- src/analyzer/protocol/netbios/NetbiosSSN.cc | 2 +- src/analyzer/protocol/rpc/MOUNT.cc | 2 +- src/analyzer/protocol/rpc/NFS.cc | 2 +- src/analyzer/protocol/ssh/ssh-protocol.pac | 2 +- src/analyzer/protocol/tcp/TCP_Reassembler.cc | 2 +- src/analyzer/protocol/teredo/Teredo.cc | 2 +- src/file_analysis/File.h | 2 +- src/input/ReaderBackend.h | 2 +- src/scan.l | 2 +- src/supervisor/Supervisor.cc | 2 +- src/threading/SerialTypes.cc | 2 +- 35 files changed, 230 insertions(+), 228 deletions(-) rename src/{BroString.cc => ZeekString.cc} (99%) create mode 100644 src/ZeekString.h diff --git a/src/Base64.cc b/src/Base64.cc index 1e2cba3872..443370f542 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -1,6 +1,6 @@ #include "zeek-config.h" #include "Base64.h" -#include "BroString.h" +#include "ZeekString.h" #include "Reporter.h" #include "Conn.h" diff --git a/src/BroString.h b/src/BroString.h index 0b0ab3db60..8d48b3acbd 100644 --- a/src/BroString.h +++ b/src/BroString.h @@ -1,195 +1,2 @@ -// See the file "COPYING" in the main distribution directory for copyright. - -#pragma once - -#include "zeek-config.h" - -#include -#include -#include - -#include - -// Forward declaration, for helper functions that convert (sub)string vectors -// to and from policy-level representations. -// -ZEEK_FORWARD_DECLARE_NAMESPACED(VectorVal, zeek); - -namespace zeek { - -typedef u_char* byte_vec; - -class String { -public: - typedef std::vector Vec; - typedef Vec::iterator VecIt; - typedef Vec::const_iterator VecCIt; - - typedef std::vector CVec; - typedef Vec::iterator CVecIt; - typedef Vec::const_iterator CVecCIt; - - // IdxVecs are vectors of indices of characters in a string. - typedef std::vector IdxVec; - typedef IdxVec::iterator IdxVecIt; - typedef IdxVec::const_iterator IdxVecCIt; - - // Constructors creating internal copies of the data passed in. - String(const u_char* str, int arg_n, bool add_NUL); - explicit String(const char* str); - explicit String(const std::string& str); - String(const String& bs); - - // Constructor that takes owernship of the vector passed in. - String(bool arg_final_NUL, byte_vec str, int arg_n); - - String(); - ~String() { Reset(); } - - const String& operator=(const String& bs); - bool operator==(const String& bs) const; - bool operator<(const String& bs) const; - - byte_vec Bytes() const { return b; } - int Len() const { return n; } - - // Releases the string's current contents, if any, and - // adopts the byte vector of given length. The string will - // manage the memory occupied by the string afterwards. - // - void Adopt(byte_vec bytes, int len); - - // Various flavors of methods that release the string's - // current contents, if any, and then set the string's - // contents to a copy of the string given by the arguments. - // - void Set(const u_char* str, int len, bool add_NUL=true); - void Set(const char* str); - void Set(const std::string& str); - void Set(const String &str); - - void SetUseFreeToDelete(int use_it) - { use_free_to_delete = use_it; } - - const char* CheckString() const; - - enum render_style { - ESC_NONE = 0, - ESC_ESC = (1 << 1), // '\' -> "\\" - ESC_QUOT = (1 << 2), // '"' -> "\"", ''' -> "\'" - ESC_HEX = (1 << 3), // Not in [32, 126]? -> "\xXX" - ESC_DOT = (1 << 4), // Not in [32, 126]? -> "." - - // For serialization: ' ' - ESC_SER = (1 << 7), - }; - - static constexpr int EXPANDED_STRING = // the original style - ESC_HEX; - - static constexpr int BRO_STRING_LITERAL = // as in a Bro string literal - ESC_ESC | ESC_QUOT | ESC_HEX; - - // Renders a string into a newly allocated character array that - // you have to delete[]. You can combine the render styles given - // above to achieve the representation you desire. If you pass a - // pointer to an integer as the final argument, you'll receive the - // entire length of the resulting char* in it. - // - // Note that you need to delete[] the resulting string. - // - char* Render(int format = EXPANDED_STRING, int* len = nullptr) const; - - // Similar to the above, but useful for output streams. - // Also more useful for debugging purposes since no deallocation - // is required on your part here. - // - std::ostream& Render(std::ostream& os, int format = ESC_SER) const; - - // Reads a string from an input stream. Unless you use a render - // style combination that uses ESC_SER, note that the streams - // will consider whitespace as a field delimiter. - // - std::istream& Read(std::istream& is, int format = ESC_SER); - - // XXX Fix redundancy: strings.bif implements both to_lower - // XXX and to_upper; the latter doesn't use String::ToUpper(). - void ToUpper(); - - unsigned int MemoryAllocation() const; - - // Returns new string containing the substring of this string, - // starting at @start >= 0 for going up to @length elements, - // A negative @length means "until end of string". Other invalid - // values result in a return value of 0. - // - String* GetSubstring(int start, int length) const; - - // Returns the start index of s in this string, counting from 0. - // If s is not found, -1 is returned. - // - int FindSubstring(const String* s) const; - - // Splits the string into substrings, taking all the indices in - // the given vector as cutting points. The vector does not need - // to be sorted, and can have multiple entries. Out-of-bounds - // indices are ignored. All returned strings are newly allocated. - // - Vec* Split(const IdxVec& indices) const; - - // Helper functions for vectors: - static zeek::VectorVal* VecToPolicy(Vec* vec); - static Vec* VecFromPolicy(zeek::VectorVal* vec); - static char* VecToString(const Vec* vec); - -protected: - void Reset(); - - byte_vec b; - int n; - bool final_NUL; // whether we have added a final NUL - bool use_free_to_delete; // free() vs. operator delete -}; - -// A comparison class that sorts pointers to String's according to -// the length of the pointed-to strings. Sort order can be specified -// through the constructor. -// -class StringLenCmp { -public: - explicit StringLenCmp(bool increasing = true) { _increasing = increasing; } - bool operator()(String*const& bst1, String*const& bst2); - - private: - unsigned int _increasing; -}; - -// Default output stream operator, using rendering mode EXPANDED_STRING. -std::ostream& operator<<(std::ostream& os, const String& bs); - -extern int Bstr_eq(const String* s1, const String* s2); -extern int Bstr_cmp(const String* s1, const String* s2); - -// A data_chunk_t specifies a length-delimited constant string. It is -// often used for substrings of other String's to avoid memory copy, -// which would be necessary if String were used. Unlike String, -// the string should not be deallocated on destruction. -// -// "BroConstString" might be a better name here. - -struct data_chunk_t { - int length; - const char* data; -}; - -extern String* concatenate(std::vector& v); -extern String* concatenate(String::Vec& v); -extern String* concatenate(String::CVec& v); -extern void delete_strings(std::vector& v); - -} // namespace zeek - -using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; -using BroStringLenCmp [[deprecated("Remove in v4.1. Use zeek::StringLenCmp instead.")]] = zeek::StringLenCmp; -using byte_vec [[deprecated("Remove in v4.1. Use zeek::byte_vec instead.")]] = zeek::byte_vec; -using data_chunk_t [[deprecated("Remove in v4.1. Use zeek::data_chunk_t instead.")]] = zeek::data_chunk_t; +#warning "BroString.h is deprecated and will be removed in v4.1. Use ZeekString.h instead." +#include "ZeekString.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 933c3010bb..1d2d5c5a9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -220,7 +220,6 @@ set(MAIN_SRCS Base64.cc BifReturnVal.cc Brofiler.cc - BroString.cc CCL.cc CompHash.cc Conn.cc @@ -290,6 +289,7 @@ set(MAIN_SRCS Var.cc WeirdState.cc ZeekArgs.cc + ZeekString.cc legacy-netvar-init.cc bsd-getopt-long.c bro_inet_ntop.c diff --git a/src/CompHash.cc b/src/CompHash.cc index d61349cc59..2518490f59 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -7,7 +7,7 @@ #include #include "CompHash.h" -#include "BroString.h" +#include "ZeekString.h" #include "Dict.h" #include "Val.h" #include "RE.h" diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 67ef15441b..be458ebe60 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -31,7 +31,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "Expr.h" #include "Event.h" #include "Net.h" diff --git a/src/Desc.h b/src/Desc.h index b6e64fe22c..fc02b1113d 100644 --- a/src/Desc.h +++ b/src/Desc.h @@ -2,7 +2,7 @@ #pragma once -#include "BroString.h" // for byte_vec +#include "ZeekString.h" // for byte_vec #include "util.h" // for bro_int_t #include diff --git a/src/Discard.cc b/src/Discard.cc index 3803adde40..053bed4e78 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -6,7 +6,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "Net.h" #include "Func.h" #include "Var.h" diff --git a/src/Hash.cc b/src/Hash.cc index 3879bed42b..3735b4470d 100644 --- a/src/Hash.cc +++ b/src/Hash.cc @@ -5,7 +5,7 @@ #include "Hash.h" #include "digest.h" #include "Reporter.h" -#include "BroString.h" +#include "ZeekString.h" #include "Val.h" // needed for const.bif #include "const.bif.netvar_h" diff --git a/src/IP.cc b/src/IP.cc index 41d68539a3..422689239a 100644 --- a/src/IP.cc +++ b/src/IP.cc @@ -10,7 +10,7 @@ #include "Type.h" #include "Val.h" #include "Var.h" -#include "BroString.h" +#include "ZeekString.h" #include "Reporter.h" static zeek::VectorValPtr BuildOptionsVal(const u_char* data, int len) diff --git a/src/IPAddr.cc b/src/IPAddr.cc index 8b04ab5d20..362d436ad1 100644 --- a/src/IPAddr.cc +++ b/src/IPAddr.cc @@ -5,7 +5,7 @@ #include #include "IPAddr.h" #include "Reporter.h" -#include "BroString.h" +#include "ZeekString.h" #include "Conn.h" #include "Hash.h" #include "bro_inet_ntop.h" diff --git a/src/RE.cc b/src/RE.cc index db8928e12e..e553c1d3c0 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -10,7 +10,7 @@ #include "CCL.h" #include "EquivClass.h" #include "Reporter.h" -#include "BroString.h" +#include "ZeekString.h" CCL* curr_ccl = nullptr; diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc index a19c4c25e9..622cac36d6 100644 --- a/src/RuleMatcher.cc +++ b/src/RuleMatcher.cc @@ -7,7 +7,7 @@ #include "RuleAction.h" #include "RuleCondition.h" -#include "BroString.h" +#include "ZeekString.h" #include "ID.h" #include "IntrusivePtr.h" #include "IntSet.h" diff --git a/src/SmithWaterman.h b/src/SmithWaterman.h index 3acfdd2414..a93becffe3 100644 --- a/src/SmithWaterman.h +++ b/src/SmithWaterman.h @@ -2,7 +2,7 @@ #pragma once -#include "BroString.h" +#include "ZeekString.h" #include // BroSubstrings are essentially BroStrings, augmented with indexing diff --git a/src/Val.cc b/src/Val.cc index 3d2c0d71e4..baa47f9bbf 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -17,7 +17,7 @@ #include #include "Attr.h" -#include "BroString.h" +#include "ZeekString.h" #include "CompHash.h" #include "Dict.h" #include "Net.h" diff --git a/src/BroString.cc b/src/ZeekString.cc similarity index 99% rename from src/BroString.cc rename to src/ZeekString.cc index 0ac18bdaba..e03ff5b797 100644 --- a/src/BroString.cc +++ b/src/ZeekString.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. #include "zeek-config.h" -#include "BroString.h" +#include "ZeekString.h" #include #include diff --git a/src/ZeekString.h b/src/ZeekString.h new file mode 100644 index 0000000000..0b0ab3db60 --- /dev/null +++ b/src/ZeekString.h @@ -0,0 +1,195 @@ +// See the file "COPYING" in the main distribution directory for copyright. + +#pragma once + +#include "zeek-config.h" + +#include +#include +#include + +#include + +// Forward declaration, for helper functions that convert (sub)string vectors +// to and from policy-level representations. +// +ZEEK_FORWARD_DECLARE_NAMESPACED(VectorVal, zeek); + +namespace zeek { + +typedef u_char* byte_vec; + +class String { +public: + typedef std::vector Vec; + typedef Vec::iterator VecIt; + typedef Vec::const_iterator VecCIt; + + typedef std::vector CVec; + typedef Vec::iterator CVecIt; + typedef Vec::const_iterator CVecCIt; + + // IdxVecs are vectors of indices of characters in a string. + typedef std::vector IdxVec; + typedef IdxVec::iterator IdxVecIt; + typedef IdxVec::const_iterator IdxVecCIt; + + // Constructors creating internal copies of the data passed in. + String(const u_char* str, int arg_n, bool add_NUL); + explicit String(const char* str); + explicit String(const std::string& str); + String(const String& bs); + + // Constructor that takes owernship of the vector passed in. + String(bool arg_final_NUL, byte_vec str, int arg_n); + + String(); + ~String() { Reset(); } + + const String& operator=(const String& bs); + bool operator==(const String& bs) const; + bool operator<(const String& bs) const; + + byte_vec Bytes() const { return b; } + int Len() const { return n; } + + // Releases the string's current contents, if any, and + // adopts the byte vector of given length. The string will + // manage the memory occupied by the string afterwards. + // + void Adopt(byte_vec bytes, int len); + + // Various flavors of methods that release the string's + // current contents, if any, and then set the string's + // contents to a copy of the string given by the arguments. + // + void Set(const u_char* str, int len, bool add_NUL=true); + void Set(const char* str); + void Set(const std::string& str); + void Set(const String &str); + + void SetUseFreeToDelete(int use_it) + { use_free_to_delete = use_it; } + + const char* CheckString() const; + + enum render_style { + ESC_NONE = 0, + ESC_ESC = (1 << 1), // '\' -> "\\" + ESC_QUOT = (1 << 2), // '"' -> "\"", ''' -> "\'" + ESC_HEX = (1 << 3), // Not in [32, 126]? -> "\xXX" + ESC_DOT = (1 << 4), // Not in [32, 126]? -> "." + + // For serialization: ' ' + ESC_SER = (1 << 7), + }; + + static constexpr int EXPANDED_STRING = // the original style + ESC_HEX; + + static constexpr int BRO_STRING_LITERAL = // as in a Bro string literal + ESC_ESC | ESC_QUOT | ESC_HEX; + + // Renders a string into a newly allocated character array that + // you have to delete[]. You can combine the render styles given + // above to achieve the representation you desire. If you pass a + // pointer to an integer as the final argument, you'll receive the + // entire length of the resulting char* in it. + // + // Note that you need to delete[] the resulting string. + // + char* Render(int format = EXPANDED_STRING, int* len = nullptr) const; + + // Similar to the above, but useful for output streams. + // Also more useful for debugging purposes since no deallocation + // is required on your part here. + // + std::ostream& Render(std::ostream& os, int format = ESC_SER) const; + + // Reads a string from an input stream. Unless you use a render + // style combination that uses ESC_SER, note that the streams + // will consider whitespace as a field delimiter. + // + std::istream& Read(std::istream& is, int format = ESC_SER); + + // XXX Fix redundancy: strings.bif implements both to_lower + // XXX and to_upper; the latter doesn't use String::ToUpper(). + void ToUpper(); + + unsigned int MemoryAllocation() const; + + // Returns new string containing the substring of this string, + // starting at @start >= 0 for going up to @length elements, + // A negative @length means "until end of string". Other invalid + // values result in a return value of 0. + // + String* GetSubstring(int start, int length) const; + + // Returns the start index of s in this string, counting from 0. + // If s is not found, -1 is returned. + // + int FindSubstring(const String* s) const; + + // Splits the string into substrings, taking all the indices in + // the given vector as cutting points. The vector does not need + // to be sorted, and can have multiple entries. Out-of-bounds + // indices are ignored. All returned strings are newly allocated. + // + Vec* Split(const IdxVec& indices) const; + + // Helper functions for vectors: + static zeek::VectorVal* VecToPolicy(Vec* vec); + static Vec* VecFromPolicy(zeek::VectorVal* vec); + static char* VecToString(const Vec* vec); + +protected: + void Reset(); + + byte_vec b; + int n; + bool final_NUL; // whether we have added a final NUL + bool use_free_to_delete; // free() vs. operator delete +}; + +// A comparison class that sorts pointers to String's according to +// the length of the pointed-to strings. Sort order can be specified +// through the constructor. +// +class StringLenCmp { +public: + explicit StringLenCmp(bool increasing = true) { _increasing = increasing; } + bool operator()(String*const& bst1, String*const& bst2); + + private: + unsigned int _increasing; +}; + +// Default output stream operator, using rendering mode EXPANDED_STRING. +std::ostream& operator<<(std::ostream& os, const String& bs); + +extern int Bstr_eq(const String* s1, const String* s2); +extern int Bstr_cmp(const String* s1, const String* s2); + +// A data_chunk_t specifies a length-delimited constant string. It is +// often used for substrings of other String's to avoid memory copy, +// which would be necessary if String were used. Unlike String, +// the string should not be deallocated on destruction. +// +// "BroConstString" might be a better name here. + +struct data_chunk_t { + int length; + const char* data; +}; + +extern String* concatenate(std::vector& v); +extern String* concatenate(String::Vec& v); +extern String* concatenate(String::CVec& v); +extern void delete_strings(std::vector& v); + +} // namespace zeek + +using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; +using BroStringLenCmp [[deprecated("Remove in v4.1. Use zeek::StringLenCmp instead.")]] = zeek::StringLenCmp; +using byte_vec [[deprecated("Remove in v4.1. Use zeek::byte_vec instead.")]] = zeek::byte_vec; +using data_chunk_t [[deprecated("Remove in v4.1. Use zeek::data_chunk_t instead.")]] = zeek::data_chunk_t; diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 3b085dff1f..7971ea9eb6 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -7,7 +7,7 @@ #include "binpac.h" #include "analyzer/protocol/pia/PIA.h" -#include "../BroString.h" +#include "../ZeekString.h" #include "../Event.h" namespace analyzer { diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 743b683111..09458db5f9 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -9,7 +9,7 @@ #include #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "Sessions.h" #include "Event.h" diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 461169d1b3..f62b9a43f2 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -5,7 +5,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "Event.h" #include "Base64.h" diff --git a/src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac b/src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac index 849e864cfa..d49578ef2f 100644 --- a/src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac +++ b/src/analyzer/protocol/gtpv1/gtpv1-analyzer.pac @@ -1,6 +1,6 @@ %extern{ #include "Sessions.h" -#include "BroString.h" +#include "ZeekString.h" %} %code{ diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index 6492ff9721..bf1cb9073a 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -4,7 +4,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "Ident.h" #include "Event.h" diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 50ca441076..2b5bbf3105 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -6,7 +6,7 @@ #include #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "RE.h" #include "Reporter.h" diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index add905ffa6..52922e58a7 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -5,7 +5,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "Event.h" #include "Reporter.h" diff --git a/src/analyzer/protocol/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h index bc07a81811..5511ceae3d 100644 --- a/src/analyzer/protocol/mime/MIME.h +++ b/src/analyzer/protocol/mime/MIME.h @@ -6,7 +6,7 @@ #include #include -#include "BroString.h" +#include "ZeekString.h" #include "Reporter.h" #include "analyzer/Analyzer.h" diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index 8840764b54..08d4fdc8a2 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -5,7 +5,7 @@ #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "Sessions.h" #include "Event.h" diff --git a/src/analyzer/protocol/rpc/MOUNT.cc b/src/analyzer/protocol/rpc/MOUNT.cc index f8168624d0..9bab07d5bf 100644 --- a/src/analyzer/protocol/rpc/MOUNT.cc +++ b/src/analyzer/protocol/rpc/MOUNT.cc @@ -6,7 +6,7 @@ #include #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "XDR.h" #include "Event.h" diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index 44615fa2eb..f6c6015162 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -6,7 +6,7 @@ #include #include -#include "BroString.h" +#include "ZeekString.h" #include "NetVar.h" #include "XDR.h" #include "Event.h" diff --git a/src/analyzer/protocol/ssh/ssh-protocol.pac b/src/analyzer/protocol/ssh/ssh-protocol.pac index 9b364601b8..56b65d25c0 100644 --- a/src/analyzer/protocol/ssh/ssh-protocol.pac +++ b/src/analyzer/protocol/ssh/ssh-protocol.pac @@ -1,7 +1,7 @@ %include consts.pac %extern{ -#include "BroString.h" +#include "ZeekString.h" %} # Common constructs across SSH1 and SSH2 diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc index cada67174a..62b39c4378 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.cc +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc @@ -3,7 +3,7 @@ #include "File.h" #include "analyzer/Analyzer.h" #include "analyzer/protocol/tcp/TCP.h" -#include "BroString.h" +#include "ZeekString.h" #include "Reporter.h" #include "RuleMatcher.h" diff --git a/src/analyzer/protocol/teredo/Teredo.cc b/src/analyzer/protocol/teredo/Teredo.cc index 73c2722d0b..319882cd96 100644 --- a/src/analyzer/protocol/teredo/Teredo.cc +++ b/src/analyzer/protocol/teredo/Teredo.cc @@ -5,7 +5,7 @@ #include "IP.h" #include "Reporter.h" #include "Sessions.h" -#include "BroString.h" +#include "ZeekString.h" #include "events.bif.h" diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h index d57bdfadaa..2af8def6b6 100644 --- a/src/file_analysis/File.h +++ b/src/file_analysis/File.h @@ -8,7 +8,7 @@ #include "analyzer/Tag.h" #include "AnalyzerSet.h" -#include "BroString.h" +#include "ZeekString.h" #include "BroList.h" // for val_list #include "ZeekArgs.h" #include "WeirdState.h" diff --git a/src/input/ReaderBackend.h b/src/input/ReaderBackend.h index 2748d1e2d2..f6ad3995ba 100644 --- a/src/input/ReaderBackend.h +++ b/src/input/ReaderBackend.h @@ -2,7 +2,7 @@ #pragma once -#include "BroString.h" +#include "ZeekString.h" #include "threading/SerialTypes.h" #include "threading/MsgThread.h" diff --git a/src/scan.l b/src/scan.l index 0699671085..c4fa68cd9b 100644 --- a/src/scan.l +++ b/src/scan.l @@ -15,7 +15,7 @@ #include "input.h" #include "util.h" #include "Scope.h" -#include "BroString.h" +#include "ZeekString.h" #include "DNS_Mgr.h" #include "Expr.h" #include "Func.h" diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index 236d169b8f..01b086608b 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -13,7 +13,7 @@ #include #include "iosource/Manager.h" -#include "BroString.h" +#include "ZeekString.h" #include "Dict.h" #include "RE.h" #include "Reporter.h" diff --git a/src/threading/SerialTypes.cc b/src/threading/SerialTypes.cc index 7dbb0ae737..8fcc3f3a10 100644 --- a/src/threading/SerialTypes.cc +++ b/src/threading/SerialTypes.cc @@ -6,7 +6,7 @@ #include "Reporter.h" // The following are required for ValueToVal. #include "Val.h" -#include "BroString.h" +#include "ZeekString.h" #include "RE.h" #include "module_util.h" #include "ID.h"