Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 18:48:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move BroString to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 10:54:29 -07:00
parent 464efbe66a
commit 58c6e10b62
54 changed files with 317 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/IPAddr.h
View file

@ -10,15 +10,15 @@
#include "threading/SerialTypes.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(BroString, zeek);
struct ConnID;
class BroString;
class HashKey;
namespace analyzer { class ExpectedConn; }
typedef in_addr in4_addr;
struct ConnIDKey
{
struct ConnIDKey {
in6_addr ip1;
in6_addr ip2;
uint16_t port1;
@ -40,13 +40,12 @@ struct ConnIDKey
return *this;
}
};
};
/**
* Class storing both IPv4 and IPv6 addresses.
*/
class IPAddr
{
class IPAddr {
public:
/**
* Address family.
@ -112,7 +111,7 @@ public:
* @param s String containing an IP address as either a dotted IPv4
* address or a hex IPv6 address.
*/
explicit IPAddr(const BroString& s);
explicit IPAddr(const zeek::BroString& s);
/**
* Constructs an address instance from a raw byte representation.