mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 22:58:20 +00:00

Internally, all BROv6 preprocessor switches were removed and addr/subnet representations wrapped in the new IPAddr/IPPrefix classes. Some script-layer changes of note: - dns_AAAA_reply event signature changed: the string representation of an IPv6 addr is easily derived from the addr value, it doesn't need to be another parameter. This event also now generated directly by the DNS analyzer instead of being "faked" into a dns_A_reply event. - removed addr_to_count BIF. It used to return the host-order count representation of IPv4 addresses only. To make it more generic, we might later add a BIF to return a vector of counts in order to support IPv6. - changed the result of enclosing addr variables in vertical pipes (e.g. |my_addr|) to return the bit-width of the address type which is 128 for IPv6 and 32 for IPv4. It used to function the same way as addr_to_count mentioned above. - remove bro_has_ipv6 BIF
51 lines
1.3 KiB
C++
51 lines
1.3 KiB
C++
#ifndef PREFIXTABLE_H
|
|
#define PREFIXTABLE_H
|
|
|
|
#include "Val.h"
|
|
#include "net_util.h"
|
|
#include "IPAddr.h"
|
|
|
|
extern "C" {
|
|
#include "patricia.h"
|
|
}
|
|
|
|
class PrefixTable {
|
|
private:
|
|
struct iterator {
|
|
patricia_node_t* Xstack[PATRICIA_MAXBITS+1];
|
|
patricia_node_t** Xsp;
|
|
patricia_node_t* Xrn;
|
|
patricia_node_t* Xnode;
|
|
};
|
|
|
|
public:
|
|
PrefixTable() { tree = New_Patricia(128); }
|
|
~PrefixTable() { Destroy_Patricia(tree, 0); }
|
|
|
|
// Addr in network byte order. If data is zero, acts like a set.
|
|
// Returns ptr to old data if already existing.
|
|
// For existing items without data, returns non-nil if found.
|
|
void* Insert(const IPAddr& addr, int width, void* data = 0);
|
|
|
|
// Value may be addr or subnet.
|
|
void* Insert(const Val* value, void* data = 0);
|
|
|
|
// Returns nil if not found, pointer to data otherwise.
|
|
// For items without data, returns non-nil if found.
|
|
// If exact is false, performs exact rather than longest-prefix match.
|
|
void* Lookup(const IPAddr& addr, int width, bool exact = false) const;
|
|
void* Lookup(const Val* value, bool exact = false) const;
|
|
|
|
// Returns pointer to data or nil if not found.
|
|
void* Remove(const IPAddr& addr, int width);
|
|
void* Remove(const Val* value);
|
|
|
|
void Clear() { Clear_Patricia(tree, 0); }
|
|
|
|
iterator InitIterator();
|
|
void* GetNext(iterator* i);
|
|
|
|
patricia_tree_t* tree;
|
|
};
|
|
|
|
#endif
|