diff --git a/src/DFA.h b/src/DFA.h index a63beca9ac..8af4907da1 100644 --- a/src/DFA.h +++ b/src/DFA.h @@ -117,8 +117,6 @@ typedef PList(DFA_State) DFA_state_list; class DFA_Machine : public BroObj { public: DFA_Machine(NFA_Machine* n, EquivClass* ec); - DFA_Machine(int** xtion_ptrs, int num_states, int num_ecs, - int* acc_array); ~DFA_Machine(); DFA_State* StartState() const { return start_state; } diff --git a/src/Dict.h b/src/Dict.h index 2def5ea28f..8a0b6b4f3d 100644 --- a/src/Dict.h +++ b/src/Dict.h @@ -109,8 +109,6 @@ public: // which should be delete'd when no longer needed. IterCookie* InitForIteration() const; void* NextEntry(HashKey*& h, IterCookie*& cookie, int return_hash) const; - void* NextEntry(const void*& key, int& key_len, IterCookie*& cookie) - const; void StopIteration(IterCookie* cookie) const; void SetDeleteFunc(dict_delete_func f) { delete_func = f; } diff --git a/src/ID.h b/src/ID.h index 8eb890b732..177adcdfde 100644 --- a/src/ID.h +++ b/src/ID.h @@ -118,7 +118,6 @@ public: protected: ID() { name = 0; type = 0; val = 0; attrs = 0; } - void CheckAttr(Attr* attr); void EvalFunc(Expr* ef, Expr* ev); #ifdef DEBUG diff --git a/src/OSFinger.h b/src/OSFinger.h index 0968fb5fd3..2f0dde976b 100644 --- a/src/OSFinger.h +++ b/src/OSFinger.h @@ -90,13 +90,6 @@ public: uint8 TTL, uint16 WSS, uint8 ocnt, uint8* op, uint16 MSS, uint8 win_scale, uint32 tstamp, uint32 quirks, uint8 ECN) const; bool CacheMatch(const IPAddr& addr, int id); - - int Get_OS_From_SYN(struct os_type* retval, - uint16 tot, uint8 DF_flag, uint8 TTL, uint16 WSS, - uint8 ocnt, uint8* op, uint16 MSS, uint8 win_scale, - uint32 tstamp, /* uint8 TOS, */ uint32 quirks, - uint8 ecn) const; - void load_config(const char* file); protected: diff --git a/src/OpaqueVal.h b/src/OpaqueVal.h index df928dff60..7954653c6c 100644 --- a/src/OpaqueVal.h +++ b/src/OpaqueVal.h @@ -106,7 +106,6 @@ public: protected: friend class Val; - EntropyVal(OpaqueType* t); DECLARE_SERIAL(EntropyVal); diff --git a/src/RE.h b/src/RE.h index 7437dbb8b8..ad38aeb306 100644 --- a/src/RE.h +++ b/src/RE.h @@ -175,7 +175,6 @@ public: RE_Matcher(const char* pat); virtual ~RE_Matcher(); - void AddDef(const char* defn_name, const char* defn_val); void AddPat(const char* pat); int Compile(int lazy = 0); diff --git a/src/Timer.h b/src/Timer.h index e095421c30..8fba53d3b7 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -150,7 +150,6 @@ public: int Size() const { return q->Size(); } int PeakSize() const { return q->PeakSize(); } uint64 CumulativeNum() const { return q->CumulativeNum(); } - unsigned int MemoryUsage() const; protected: int DoAdvance(double t, int max_expire); diff --git a/src/analyzer/protocol/ayiya/AYIYA.h b/src/analyzer/protocol/ayiya/AYIYA.h index 6e8baa11f8..bffc7aabf8 100644 --- a/src/analyzer/protocol/ayiya/AYIYA.h +++ b/src/analyzer/protocol/ayiya/AYIYA.h @@ -18,8 +18,6 @@ public: { return new AYIYA_Analyzer(conn); } protected: - void ExpireTimer(double t); - binpac::AYIYA::AYIYA_Conn* interp; }; diff --git a/src/analyzer/protocol/gtpv1/GTPv1.h b/src/analyzer/protocol/gtpv1/GTPv1.h index d8a04bc0b0..45cacaa17a 100644 --- a/src/analyzer/protocol/gtpv1/GTPv1.h +++ b/src/analyzer/protocol/gtpv1/GTPv1.h @@ -18,8 +18,6 @@ public: { return new GTPv1_Analyzer(conn); } protected: - void ExpireTimer(double t); - binpac::GTPv1::GTPv1_Conn* interp; }; diff --git a/src/analyzer/protocol/http/HTTP.h b/src/analyzer/protocol/http/HTTP.h index bfc079187f..31bc485f35 100644 --- a/src/analyzer/protocol/http/HTTP.h +++ b/src/analyzer/protocol/http/HTTP.h @@ -155,8 +155,6 @@ public: HTTP_Analyzer(Connection* conn); ~HTTP_Analyzer(); - void Undelivered(tcp::TCP_Endpoint* sender, uint64 seq, int len); - void HTTP_Header(int is_orig, mime::MIME_Header* h); void HTTP_EntityData(int is_orig, BroString* entity_data); void HTTP_MessageDone(int is_orig, HTTP_Message* message); diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h index 1de6a4afea..391ab4d7a7 100644 --- a/src/analyzer/protocol/icmp/ICMP.h +++ b/src/analyzer/protocol/icmp/ICMP.h @@ -25,8 +25,6 @@ public: { return new ICMP_Analyzer(conn); } protected: - ICMP_Analyzer(analyzer::Tag tag, Connection* conn); - virtual void Done(); virtual void DeliverPacket(int len, const u_char* data, bool orig, uint64 seq, const IP_Hdr* ip, int caplen); @@ -38,8 +36,6 @@ protected: void Echo(double t, const struct icmp* icmpp, int len, int caplen, const u_char*& data, const IP_Hdr* ip_hdr); - void Context(double t, const struct icmp* icmpp, int len, - int caplen, const u_char*& data, const IP_Hdr* ip_hdr); void Redirect(double t, const struct icmp* icmpp, int len, int caplen, const u_char*& data, const IP_Hdr* ip_hdr); void RouterAdvert(double t, const struct icmp* icmpp, int len, diff --git a/src/analyzer/protocol/rpc/NFS.h b/src/analyzer/protocol/rpc/NFS.h index 3a6da1f765..dd336d7dee 100644 --- a/src/analyzer/protocol/rpc/NFS.h +++ b/src/analyzer/protocol/rpc/NFS.h @@ -74,7 +74,6 @@ protected: // * size is the amount of bytes read (or requested to be written), StringVal* nfs3_file_data(const u_char*& buf, int& n, uint64_t offset, int size); - RecordVal* ExtractOptAttrs(const u_char*& buf, int& n); Val* ExtractUint32(const u_char*& buf, int& n); Val* ExtractUint64(const u_char*& buf, int& n); Val* ExtractTime(const u_char*& buf, int& n); diff --git a/src/analyzer/protocol/syslog/Syslog.h b/src/analyzer/protocol/syslog/Syslog.h index f1568e0b6f..8f2580806c 100644 --- a/src/analyzer/protocol/syslog/Syslog.h +++ b/src/analyzer/protocol/syslog/Syslog.h @@ -22,8 +22,6 @@ public: { return new Syslog_Analyzer(conn); } protected: - void ExpireTimer(double t); - int did_session_done; binpac::Syslog::Syslog_Conn* interp; diff --git a/src/analyzer/protocol/teredo/Teredo.h b/src/analyzer/protocol/teredo/Teredo.h index 4882dd97ca..af733b8814 100644 --- a/src/analyzer/protocol/teredo/Teredo.h +++ b/src/analyzer/protocol/teredo/Teredo.h @@ -49,8 +49,6 @@ public: } protected: - void ExpireTimer(double t); - bool valid_orig; bool valid_resp; }; diff --git a/src/iosource/Component.h b/src/iosource/Component.h index 4a38a9cd22..57e1084d3a 100644 --- a/src/iosource/Component.h +++ b/src/iosource/Component.h @@ -29,11 +29,6 @@ public: */ Component(const std::string& name); - /** - * Copy constructor. - */ - Component(const Component& other); - /** * Destructor. */ diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h index dcfda2030b..4e53cd7aff 100644 --- a/src/iosource/PktDumper.h +++ b/src/iosource/PktDumper.h @@ -54,13 +54,6 @@ public: */ int HdrSize() const; - /** - * Writes a packet to the dumper. - * - * @param pkt The packet to record. - */ - bool Record(const Packet* pkt); - // PktDumper interface for derived classes to implement. /** diff --git a/src/iosource/PktSrc.h b/src/iosource/PktSrc.h index 25a743dc53..f2f14aa9c2 100644 --- a/src/iosource/PktSrc.h +++ b/src/iosource/PktSrc.h @@ -92,11 +92,6 @@ public: */ const char* ErrorMsg() const; - /** - * Returns the size of the link-layer header for this source. - */ - int HdrSize() const; - /** * In pseudo-realtime mode, returns the logical timestamp of the * current packet. Undefined if not running pseudo-realtime mode. diff --git a/src/logging/Manager.h b/src/logging/Manager.h index 56626f39d3..ad526ec915 100644 --- a/src/logging/Manager.h +++ b/src/logging/Manager.h @@ -275,7 +275,6 @@ private: void RemoveDisabledWriters(Stream* stream); void InstallRotationTimer(WriterInfo* winfo); void Rotate(WriterInfo* info); - Filter* FindFilter(EnumVal* id, StringVal* filter); WriterInfo* FindWriter(WriterFrontend* writer); bool CompareFields(const Filter* filter, const WriterFrontend* writer); bool CheckFilterWriterConflict(const WriterInfo* winfo, const Filter* filter); diff --git a/src/logging/WriterFrontend.h b/src/logging/WriterFrontend.h index ae37613261..9228aeac45 100644 --- a/src/logging/WriterFrontend.h +++ b/src/logging/WriterFrontend.h @@ -138,19 +138,6 @@ public: */ void Rotate(const char* rotated_path, double open, double close, bool terminating); - /** - * Finalizes writing to this tream. - * - * This method generates a message to the backend writer and triggers - * the corresponding message there. If the backend method fails, it - * sends a message back that will asynchronously call Disable(). - * - * This method must only be called from the main thread. - * - * @param network_time The network time when the finish was triggered. - */ - void Finish(double network_time); - /** * Explicitly triggers a transfer of all potentially buffered Write() * operations over to the backend.