add prelocal table to manipulate locally destinated traffic

[project/netifd.git] / interface-ip.h

diff --git a/interface-ip.h b/interface-ip.h
index 054ed40..7c4a8ae 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -33,6 +33,21 @@ enum device_addr_flags {
 
        /* route automatically added by kernel */
        DEVADDR_KERNEL          = (1 << 5),
 
        /* route automatically added by kernel */
        DEVADDR_KERNEL          = (1 << 5),

+
+       /* address is off-link (no subnet-route) */
+       DEVADDR_OFFLINK         = (1 << 6),
+
+       /* route resides in different table */
+       DEVROUTE_TABLE          = (1 << 7),
+
+       /* route resides in default source-route table */
+       DEVROUTE_SRCTABLE       = (1 << 8),
+
+       /* route is on-link */
+       DEVROUTE_ONLINK         = (1 << 9),
+
+       /* route overrides the default route type */
+       DEVROUTE_TYPE           = (1 << 10),

 };
 
 union if_addr {
 };
 
 union if_addr {


@@ -40,31 +55,36 @@ union if_addr {
        struct in6_addr in6;
 };
 
        struct in6_addr in6;
 };
 

+struct device_prefix_assignment {
+       struct list_head head;
+       int32_t assigned;
+       uint8_t length;
+       struct in6_addr addr;
+       bool enabled;
+       char name[];
+};
+

 struct device_prefix {
        struct vlist_node node;
        struct list_head head;
 struct device_prefix {
        struct vlist_node node;
        struct list_head head;

-       struct vlist_tree *assignments;
+       struct list_head assignments;

        struct interface *iface;
        struct interface *iface;

-       uint64_t avail;

        time_t valid_until;
        time_t preferred_until;
 
        time_t valid_until;
        time_t preferred_until;
 

-       struct in6_addr addr;
-       uint8_t length;
-};
+       struct in6_addr excl_addr;
+       uint8_t excl_length;

 
 

-struct device_prefix_assignment {
-       struct vlist_node node;
-       struct device_prefix *prefix;

        struct in6_addr addr;
        struct in6_addr addr;

-       bool enabled;

        uint8_t length;
        uint8_t length;

-       char *name;
+
+       char pclass[];

 };
 
 struct device_addr {
        struct vlist_node node;
        bool enabled;
 };
 
 struct device_addr {
        struct vlist_node node;
        bool enabled;

+       bool failed;

 
        /* ipv4 only */
        uint32_t broadcast;
 
        /* ipv4 only */
        uint32_t broadcast;


@@ -73,6 +93,7 @@ struct device_addr {
        /* ipv6 only */
        time_t valid_until;
        time_t preferred_until;
        /* ipv6 only */
        time_t valid_until;
        time_t preferred_until;

+       char *pclass;

 
        /* must be last */
        enum device_addr_flags flags;
 
        /* must be last */
        enum device_addr_flags flags;


@@ -86,14 +107,29 @@ struct device_route {
 
        bool enabled;
        bool keep;
 
        bool enabled;
        bool keep;

+       bool failed;

 
        union if_addr nexthop;
 
        union if_addr nexthop;

-       int metric;

        int mtu;
        int mtu;

+       unsigned int type;
+       time_t valid_until;

 
        /* must be last */
        enum device_addr_flags flags;
 
        /* must be last */
        enum device_addr_flags flags;

+       int metric; // there can be multiple routes to the same target
+       unsigned int table;

        unsigned int mask;
        unsigned int mask;

+       unsigned int sourcemask;
+       union if_addr addr;
+       union if_addr source;
+};
+
+struct device_source_table {
+       struct list_head head;
+       uint32_t table;
+       uint16_t refcount;
+       uint8_t v6;
+       uint8_t mask;

        union if_addr addr;
 };
 
        union if_addr addr;
 };
 


@@ -108,7 +144,7 @@ struct dns_search_domain {
        char name[];
 };
 
        char name[];
 };
 

-extern const struct config_param_list route_attr_list;
+extern const struct uci_blob_param_list route_attr_list;

 extern struct list_head prefixes;
 
 void interface_ip_init(struct interface *iface);
 extern struct list_head prefixes;
 
 void interface_ip_init(struct interface *iface);


@@ -125,12 +161,12 @@ void interface_ip_flush(struct interface_ip_settings *ip);
 void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
 void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
 
 void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
 void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
 

-struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6);
+struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *iface);

 
 

-void interface_ip_set_prefix_assignment(struct device_prefix *prefix,
-               struct interface *iface, uint8_t length);
-void interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
-               uint8_t length, time_t valid_until, time_t preferred_until);
+struct device_prefix* interface_ip_add_device_prefix(struct interface *iface,
+               struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until,
+               struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass);

 void interface_ip_set_ula_prefix(const char *prefix);
 void interface_ip_set_ula_prefix(const char *prefix);

+void interface_refresh_assignments(bool hint);

 
 #endif
 
 #endif