Merged changes with origin/1.1

This commit is contained in:
thorkill 2015-07-17 15:36:00 +02:00
parent b68eaa7ce4
commit bc747f8146

View file

@ -67,10 +67,6 @@ typedef struct subnet_t {
#define MAXNETSTR 64
extern splay_tree_t *subnet_tree;
extern hash_t *ipv4_cache;
extern hash_t *ipv6_cache;
extern hash_t *mac_cache;
extern int subnet_compare(const struct subnet_t *, const struct subnet_t *);
extern subnet_t *new_subnet(void) __attribute__ ((__malloc__));
extern void free_subnet(subnet_t *);