X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=netlink.h;h=ffefd8082ef67f2b662f5391b9baf628080c9e16;hp=c13b0ae44cce6c58fa8488c4c25848639f29df96;hb=090dbeef60c7e578950c3dbe807a9e2ea7e24875;hpb=469fd1d95b2528212a46b155cb115c078de4228f

diff --git a/netlink.h b/netlink.h
index c13b0ae..ffefd80 100644
--- a/netlink.h
+++ b/netlink.h
@@ -13,27 +13,25 @@ struct netlink_client {
     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' */
+    uint32_t priority; /* Higher priority clients have their networks
+			  checked first during routing.  This allows
+			  things like laptops to supersede whole
+			  networks. */
     netlink_deliver_fn *deliver;
     void *dst;
     string_t name;
     uint32_t link_quality;
+    int32_t mtu;
     uint32_t options;
-    struct netlink_client *next;
-};
-
-struct netlink_route {
-    struct subnet net;
-    bool_t hard;
-    bool_t allow_route;
-    bool_t up;
-    bool_t kup;
-    uint32_t quality; /* provided by client */
     uint32_t outcount;
-    struct netlink_client *c;
+    bool_t up; /* Should these routes exist in the kernel? */
+    bool_t kup; /* Do these routes exist in the kernel? */
+    struct netlink_client *next;
 };
 
-typedef bool_t netlink_route_fn(void *cst, struct netlink_route *route);
+typedef bool_t netlink_route_fn(void *cst, struct netlink_client *routes);
 
 /* Netlink provides one function to the device driver, to call to deliver
    a packet from the device. The device driver provides one function to
@@ -42,29 +40,30 @@ typedef bool_t netlink_route_fn(void *cst, struct netlink_route *route);
 struct netlink {
     closure_t cl;
     void *dst; /* Pointer to host interface state */
-    string_t name;
-    uint32_t max_start_pad;
-    uint32_t max_end_pad;
-    struct subnet_list networks;
-    struct subnet_list exclude_remote_networks;
+    cstring_t name;
+    int32_t max_start_pad;
+    int32_t max_end_pad;
+    struct ipset *networks; /* Local networks */
+    struct subnet_list *subnets; /* Same as networks, for display */
+    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 mtu;
-    struct netlink_client *clients;
+    int32_t mtu;
+    struct netlink_client *clients; /* Linked list of clients */
+    struct netlink_client **routes; /* Array of clients, sorted by priority */
+    int32_t n_clients;
     netlink_deliver_fn *deliver_to_host; /* Provided by driver */
-    netlink_route_fn *set_route; /* Provided by driver */
+    netlink_route_fn *set_routes; /* Provided by driver */
     struct buffer_if icmp; /* Buffer for assembly of outgoing ICMP */
-    uint32_t n_routes; /* How many routes do we know about? */
-    struct netlink_route *routes;
     uint32_t outcount; /* Packets sent to host */
     uint32_t localcount; /* Packets sent to secnet */
 };
 
 extern netlink_deliver_fn *netlink_init(struct netlink *st,
 					void *dst, struct cloc loc,
-					dict_t *dict, string_t description,
-					netlink_route_fn *set_route,
+					dict_t *dict, cstring_t description,
+					netlink_route_fn *set_routes,
 					netlink_deliver_fn *to_host);
 
 #endif /* netlink_h */