chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.1.11
[secnet.git]
/
netlink.h
diff --git
a/netlink.h
b/netlink.h
index c13b0ae44cce6c58fa8488c4c25848639f29df96..9f46fa8807a5951160e4b9f661250096369eece4 100644
(file)
--- a/
netlink.h
+++ b/
netlink.h
@@
-13,7
+13,8
@@
struct netlink_client {
closure_t cl;
struct netlink_if ops;
struct netlink *nst;
closure_t cl;
struct netlink_if ops;
struct netlink *nst;
- struct subnet_list networks;
+ struct ipset *networks;
+ struct subnet_list *subnets; /* Same information as 'networks' */
netlink_deliver_fn *deliver;
void *dst;
string_t name;
netlink_deliver_fn *deliver;
void *dst;
string_t name;
@@
-45,8
+46,9
@@
struct netlink {
string_t name;
uint32_t max_start_pad;
uint32_t max_end_pad;
string_t name;
uint32_t max_start_pad;
uint32_t max_end_pad;
- struct subnet_list networks;
- struct subnet_list exclude_remote_networks;
+ struct ipset *networks; /* Local networks */
+ struct subnet_list *subnets; /* Same information as networks */
+ struct ipset *remote_networks; /* Allowable remote networks */
uint32_t secnet_address; /* our own address, or the address of the
other end of a point-to-point link */
bool_t ptp;
uint32_t secnet_address; /* our own address, or the address of the
other end of a point-to-point link */
bool_t ptp;