netifd: Fix printf calls + function declarations.

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

diff --git a/interface-ip.h b/interface-ip.h
index cd6ec84..197bd9a 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -31,8 +31,8 @@ enum device_addr_flags {
        /* route overrides the default interface mtu */
        DEVROUTE_MTU            = (1 << 4),
 
-       /* route automatically added by kernel */
-       DEVADDR_KERNEL          = (1 << 5),
+       /* route overrides the default proto type */
+       DEVROUTE_PROTO          = (1 << 5),
 
        /* address is off-link (no subnet-route) */
        DEVADDR_OFFLINK         = (1 << 6),
@@ -42,6 +42,12 @@ enum device_addr_flags {
 
        /* 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 {
@@ -53,6 +59,8 @@ struct device_prefix_assignment {
        struct list_head head;
        int32_t assigned;
        uint8_t length;
+       int weight;
+       struct in6_addr addr;
        bool enabled;
        char name[];
 };
@@ -65,50 +73,71 @@ struct device_prefix {
        time_t valid_until;
        time_t preferred_until;
 
-       struct in6_addr addr;
        struct in6_addr excl_addr;
+       uint8_t excl_length;
 
+       struct in6_addr addr;
        uint8_t length;
-       uint8_t excl_length;
+
+       char pclass[];
 };
 
-struct device_addr {
+struct device_route {
        struct vlist_node node;
-       bool enabled;
+       struct interface *iface;
 
-       /* ipv4 only */
-       uint32_t broadcast;
-       uint32_t point_to_point;
+       bool enabled;
+       bool keep;
+       bool failed;
 
-       /* ipv6 only */
+       union if_addr nexthop;
+       int mtu;
+       unsigned int type;
+       unsigned int proto;
        time_t valid_until;
-       time_t preferred_until;
 
        /* 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 sourcemask;
        union if_addr addr;
+       union if_addr source;
 };
 
-struct device_route {
+struct device_addr {
        struct vlist_node node;
-       struct interface *iface;
-
        bool enabled;
-       bool keep;
+       bool failed;
+       unsigned int policy_table;
 
-       union if_addr nexthop;
-       int mtu;
+       struct device_route subnet;
+
+       /* ipv4 only */
+       uint32_t broadcast;
+       uint32_t point_to_point;
+
+       /* ipv6 only */
        time_t valid_until;
+       time_t preferred_until;
+       char *pclass;
 
        /* 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;
        union if_addr addr;
 };
 
+struct device_source_table {
+       struct list_head head;
+       uint32_t table;
+       uint16_t refcount;
+       uint8_t v6;
+       uint8_t mask;
+       union if_addr addr;
+};
+
 struct dns_server {
        struct vlist_simple_node node;
        int af;
@@ -120,7 +149,7 @@ struct dns_search_domain {
        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);
@@ -137,13 +166,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);
 
-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);
 
 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);
+               struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass);
 void interface_ip_set_ula_prefix(const char *prefix);
 void interface_refresh_assignments(bool hint);
-int interface_ip_resolve_v6_rtable(int ifindex);
 
 #endif