aboutsummaryrefslogtreecommitdiffstats
path: root/security/bro/files/patch-Conn.h
blob: 6d126fb09e23d3e74484c355337ed10b50fc6677 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- Conn.h.orig Sun Aug 31 02:39:01 2003
+++ Conn.h  Thu Dec 21 13:27:24 2006
@@ -59,7 +59,7 @@
    // dst_port just have to reflect the two different sides of the
    // connection, neither has to be the particular source/destination
    // or originator/responder.
-   HashKey* ConnID::BuildConnKey() const;
+   HashKey* BuildConnKey() const;
 };
 
 static inline int addr_port_canon_lt(const uint32* a1, uint32 p1,
@@ -223,6 +223,8 @@
        return 1;
        }
 
+   void DeleteTimer(double t);
+
 protected:
    virtual void UpdateEndpointVal(RecordVal* endp, int is_orig) = 0;
 
@@ -235,8 +237,6 @@
 
    friend class ConnectionTimer;
    void RemoveTimer(Timer* t);
-
-   void DeleteTimer(double t);
 
    void InactivityTimer(double t);