chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: Keep old keys, and allow them to be used by peer
[secnet.git]
/
ipaddr.h
diff --git
a/ipaddr.h
b/ipaddr.h
index f481b3e5f55c1f33a65c391d101915db88668aae..54f10d434367988a596f526c6fb1f267b75fe544 100644
(file)
--- a/
ipaddr.h
+++ b/
ipaddr.h
@@
-6,12
+6,12
@@
struct subnet {
uint32_t prefix;
uint32_t mask;
struct subnet {
uint32_t prefix;
uint32_t mask;
-
uint32_
t len;
+
in
t len;
};
struct subnet_list {
};
struct subnet_list {
-
u
int32_t entries;
-
u
int32_t alloc;
+ int32_t entries;
+ int32_t alloc;
struct subnet *list;
};
struct subnet *list;
};
@@
-20,15
+20,14
@@
struct iprange {
};
struct ipset {
};
struct ipset {
-
u
int32_t l; /* Number of entries in list */
-
u
int32_t a; /* Allocated space in list */
+ int32_t l; /* Number of entries in list */
+ int32_t a; /* Allocated space in list */
struct iprange *d;
};
extern struct subnet_list *subnet_list_new(void);
extern void subnet_list_free(struct subnet_list *a);
struct iprange *d;
};
extern struct subnet_list *subnet_list_new(void);
extern void subnet_list_free(struct subnet_list *a);
-extern void subnet_list_append(struct subnet_list *a, uint32_t prefix,
- uint32_t len);
+extern void subnet_list_append(struct subnet_list *a, uint32_t prefix, int len);
static inline bool_t subnet_match(struct subnet s, uint32_t address)
{
static inline bool_t subnet_match(struct subnet s, uint32_t address)
{