typedef enum subnet_type_t {
SUBNET_MAC = 0,
SUBNET_IPV4,
- SUBNET_IPV6,
- SUBNET_TYPES /* Guardian */
+ SUBNET_IPV6
} subnet_type_t;
typedef struct subnet_mac_t {
} subnet_mac_t;
typedef struct subnet_ipv4_t {
- ipv4_t address;
int prefixlength;
+ ipv4_t address;
} subnet_ipv4_t;
typedef struct subnet_ipv6_t {
- ipv6_t address;
int prefixlength;
+ ipv6_t address;
} subnet_ipv6_t;
typedef struct subnet_t {
extern void free_subnet(subnet_t *subnet);
extern void init_subnets(void);
extern void exit_subnets(void);
-extern splay_tree_t *new_subnet_tree(void) __attribute__((__malloc__));
-extern void free_subnet_tree(splay_tree_t *);
+extern void init_subnet_tree(splay_tree_t *tree);
extern void subnet_add(struct node_t *owner, subnet_t *subnet);
extern void subnet_del(struct node_t *owner, subnet_t *subnet);
extern void subnet_update(struct node_t *owner, subnet_t *subnet, bool up);
extern bool maskcheck(const void *mask, size_t masklen, size_t len);
extern bool net2str(char *netstr, size_t len, const subnet_t *subnet);
extern bool str2net(subnet_t *subnet, const char *netstr);
-extern subnet_t *lookup_subnet(const struct node_t *owner, const subnet_t *subnet);
+extern subnet_t *lookup_subnet(struct node_t *owner, const subnet_t *subnet);
extern subnet_t *lookup_subnet_mac(const struct node_t *owner, const mac_t *address);
extern subnet_t *lookup_subnet_ipv4(const ipv4_t *address);
extern subnet_t *lookup_subnet_ipv6(const ipv6_t *address);
extern bool dump_subnets(struct connection_t *c);
-extern void subnet_cache_flush(void);
+extern void subnet_cache_flush_tables(void);
+extern void subnet_cache_flush_table(subnet_type_t ipver);
#endif