interface: rework code to get rid of interface_set_dynamic

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 6f9112c5965dbaa48ba206b9e480a77ca4c1dba8..f92a35eb7651bd52483194a4e6de9ad81c610fb3 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -23,9 +23,13 @@ struct interface_proto_state;
 enum interface_event {
        IFEV_DOWN,
        IFEV_UP,
+       IFEV_UP_FAILED,
        IFEV_UPDATE,
        IFEV_FREE,
        IFEV_RELOAD,
+       IFEV_LINK_UP,
+       /* send when a new interface created. This is before proto handlers has been attached. */
+       IFEV_CREATE,
 };
 
 enum interface_state {
@@ -112,6 +116,8 @@ struct interface {
        bool link_state;
        bool force_link;
        bool dynamic;
+       bool policy_rules_set;
+       bool link_up_event;
 
        time_t start_time;
        enum interface_state state;
@@ -142,6 +148,7 @@ struct interface {
        struct vlist_tree host_routes;
 
        int metric;
+       int dns_metric;
        unsigned int ip4table;
        unsigned int ip6table;
 
@@ -151,6 +158,7 @@ struct interface {
        uint8_t assignment_length;
        int32_t assignment_hint;
        struct list_head assignment_classes;
+       int assignment_weight;
 
        /* errors/warnings while trying to bring up the interface */
        struct list_head errors;
@@ -166,19 +174,17 @@ struct interface {
 extern struct vlist_tree interfaces;
 extern const struct uci_blob_param_list interface_attr_list;
 
-struct interface *interface_alloc(const char *name, struct blob_attr *config);
+struct interface *interface_alloc(const char *name, struct blob_attr *config, bool dynamic);
 
-void interface_set_dynamic(struct interface *iface);
-
-void interface_add(struct interface *iface, struct blob_attr *config);
+bool interface_add(struct interface *iface, struct blob_attr *config);
 bool interface_add_alias(struct interface *iface, struct blob_attr *config);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
 void interface_set_available(struct interface *iface, bool new_state);
-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_up(struct interface *iface);
+void interface_set_down(struct interface *iface);
+int interface_renew(struct interface *iface);
 
 void interface_set_main_dev(struct interface *iface, struct device *dev);
 void interface_set_l3_dev(struct interface *iface, struct device *dev);
@@ -193,8 +199,9 @@ 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);
+int interface_parse_data(struct interface *iface, const struct blob_attr *attr);
 
-void interface_update_start(struct interface *iface);
+void interface_update_start(struct interface *iface, const bool keep_old);
 void interface_update_complete(struct interface *iface);
 
 void interface_start_pending(void);