projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure the ReplayWindow option works for SPTPS as well.
[tinc]
/
src
/
subnet.h
diff --git
a/src/subnet.h
b/src/subnet.h
index
c6aa93f
..
10ba6fc
100644
(file)
--- a/
src/subnet.h
+++ b/
src/subnet.h
@@
-27,7
+27,7
@@
typedef enum subnet_type_t {
SUBNET_MAC = 0,
SUBNET_IPV4,
SUBNET_IPV6,
SUBNET_MAC = 0,
SUBNET_IPV4,
SUBNET_IPV6,
- SUBNET_TYPES
/* Guardian */
+ SUBNET_TYPES /* Guardian */
} subnet_type_t;
typedef struct subnet_mac_t {
} subnet_type_t;
typedef struct subnet_mac_t {
@@
-47,11
+47,11
@@
typedef struct subnet_ipv6_t {
#include "node.h"
typedef struct subnet_t {
#include "node.h"
typedef struct subnet_t {
- struct node_t *owner;
/* the owner of this subnet */
+ struct node_t *owner; /* the owner of this subnet */
- subnet_type_t type;
/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
- time_t expires;
/* expiry time */
- int weight;
/* weight (higher value is higher priority) */
+ subnet_type_t type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
+ time_t expires; /* expiry time */
+ int weight; /* weight (higher value is higher priority) */
/* And now for the actual subnet: */
/* And now for the actual subnet: */
@@
-64,6
+64,8
@@
typedef struct subnet_t {
#define MAXNETSTR 64
#define MAXNETSTR 64
+extern splay_tree_t *subnet_tree;
+
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 *);
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 *);
@@
-74,13
+76,17
@@
extern void free_subnet_tree(splay_tree_t *);
extern void subnet_add(struct node_t *, subnet_t *);
extern void subnet_del(struct node_t *, subnet_t *);
extern void subnet_update(struct node_t *, subnet_t *, bool);
extern void subnet_add(struct node_t *, subnet_t *);
extern void subnet_del(struct node_t *, subnet_t *);
extern void subnet_update(struct node_t *, subnet_t *, bool);
+extern int maskcmp(const void *, const void *, int);
+extern void maskcpy(void *, const void *, int, int);
+extern void mask(void *, int, int);
+extern bool maskcheck(const void *, int, int);
extern bool net2str(char *, int, const subnet_t *);
extern bool str2net(subnet_t *, const char *);
extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
extern bool net2str(char *, int, const subnet_t *);
extern bool str2net(subnet_t *, const char *);
extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
-extern subnet_t *lookup_subnet_mac(const mac_t *);
+extern subnet_t *lookup_subnet_mac(const
struct node_t *, const
mac_t *);
extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
-extern
int dump_subnets(struct evbuffer
*);
+extern
bool dump_subnets(struct connection_t
*);
extern void subnet_cache_flush(void);
extern void subnet_cache_flush(void);
-#endif
/* __TINC_SUBNET_H__ */
+#endif /* __TINC_SUBNET_H__ */