diff --git a/CHANGES b/CHANGES index 0f951bea1a..1134a5039f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.3.0-dev.411 | 2020-10-13 13:38:38 -0700 + + * Remove unused LoginConn type and variable in Conn.h (Tim Wojtulewicz, Corelight) + 3.3.0-dev.409 | 2020-10-13 13:32:18 -0700 * Make it possible to pass command line options through to scripts. (Seth Hall, Corelight) diff --git a/VERSION b/VERSION index c389413630..3c925ece13 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.409 +3.3.0-dev.411 diff --git a/src/Conn.cc b/src/Conn.cc index 048cab06ae..175cc8053a 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -94,8 +94,6 @@ Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t, vlan = pkt->vlan; inner_vlan = pkt->inner_vlan; - login_conn = nullptr; - is_active = 1; skip = 0; weird = 0; @@ -610,7 +608,6 @@ unsigned int Connection::MemoryAllocation() const + (timers.MemoryAllocation() - padded_sizeof(timers)) + (conn_val ? conn_val->MemoryAllocation() : 0) + (root_analyzer ? root_analyzer->MemoryAllocation(): 0) - // login_conn is just a casted 'this'. // primary_PIA is already contained in the analyzer tree. ; } diff --git a/src/Conn.h b/src/Conn.h index 9be0afc8fe..5b33b5eeed 100644 --- a/src/Conn.h +++ b/src/Conn.h @@ -24,7 +24,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(ConnectionTimer, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(NetSessions, zeek); -class LoginConn; ZEEK_FORWARD_DECLARE_NAMESPACED(EncapsulationStack, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Specific_RE_Matcher, zeek::detail); @@ -173,8 +172,6 @@ public: void AppendAddl(const char* str); - LoginConn* AsLoginConn() { return login_conn; } - void Match(detail::Rule::PatternType type, const u_char* data, int len, bool is_orig, bool bol, bool eol, bool clear_state); @@ -354,7 +351,6 @@ protected: double start_time, last_time; double inactivity_timeout; RecordValPtr conn_val; - LoginConn* login_conn; // either nil, or this const EncapsulationStack* encapsulation; // tunnels int suppress_event; // suppress certain events to once per conn.