include route/address flags in vlist comparison

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 598774b..5e3f383 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -41,12 +41,19 @@ struct interface_user {
 
 struct interface_ip_settings {
        struct interface *iface;
+       bool enabled;
+       bool no_defaultroute;
 
        struct vlist_tree addr;
        struct vlist_tree route;
 
-       struct list_head dns_servers;
-       struct list_head dns_search;
+       struct vlist_simple_tree dns_servers;
+       struct vlist_simple_tree dns_search;
+};
+
+struct interface_data {
+       struct avl_node node;
+       struct blob_attr data[];
 };
 
 /*
@@ -74,7 +81,7 @@ struct interface {
        struct device_user main_dev;
 
        /* interface that layer 3 communication will go through */
-       struct device_user *l3_dev;
+       struct device_user l3_dev;
 
        struct blob_attr *config;
 
@@ -83,10 +90,16 @@ struct interface {
        struct interface_proto_state *proto;
 
        struct interface_ip_settings proto_ip;
+       struct interface_ip_settings config_ip;
+
+       int metric;
 
        /* errors/warnings while trying to bring up the interface */
        struct list_head errors;
 
+       /* extra data provided by protocol handlers or modules */
+       struct avl_tree data;
+
        struct uloop_timeout remove_timer;
        struct ubus_object ubus;
 };
@@ -106,16 +119,23 @@ int interface_set_up(struct interface *iface);
 int interface_set_down(struct interface *iface);
 void __interface_set_down(struct interface *iface, bool force);
 
+void interface_set_main_dev(struct interface *iface, struct device *dev);
+void interface_set_l3_dev(struct interface *iface, struct device *dev);
 
 void interface_add_user(struct interface_user *dep, struct interface *iface);
 void interface_remove_user(struct interface_user *dep);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+int interface_add_link(struct interface *iface, struct device *dev);
+int interface_remove_link(struct interface *iface, struct device *dev);
 
 void interface_add_error(struct interface *iface, const char *subsystem,
                         const char *code, const char **data, int n_data);
 
+int interface_add_data(struct interface *iface, const struct blob_attr *data);
+
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
+
 void interface_queue_event(struct interface *iface, enum interface_event ev);
 void interface_dequeue_event(struct interface *iface);