utils: fix existing node check when keep_old/no_delete is enabled

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 9708a5e..9a9b211 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -19,6 +19,12 @@ enum interface_state {
        IFS_DOWN,
 };
 
+enum interface_config_state {
+       IFC_NORMAL,
+       IFC_RELOAD,
+       IFC_REMOVE
+};
+
 struct interface_error {
        struct list_head list;
 
@@ -31,14 +37,17 @@ struct interface_error {
  * interface configuration
  */
 struct interface {
-       struct list_head list;
+       struct vlist_node node;
 
        char name[IFNAMSIZ];
+       const char *ifname;
 
        bool available;
        bool autostart;
+       bool config_autostart;
 
        enum interface_state state;
+       enum interface_config_state config_state;
 
        /* main interface that the interface is bound to */
        struct device_user main_dev;
@@ -46,7 +55,7 @@ struct interface {
        /* interface that layer 3 communication will go through */
        struct device_user *l3_dev;
 
-       struct config_state config;
+       struct blob_attr *config;
 
        /* primary protocol state */
        const struct proto_handler *proto_handler;
@@ -58,14 +67,17 @@ struct interface {
        /* errors/warnings while trying to bring up the interface */
        struct list_head errors;
 
+       struct uloop_timeout remove_timer;
        struct ubus_object ubus;
 };
 
+extern struct vlist_tree interfaces;
 extern const struct config_param_list interface_attr_list;
 
-struct interface *interface_get(const char *name);
-struct interface *interface_alloc(const char *name, struct blob_attr *attr);
-void interface_free(struct interface *iface);
+void interface_init(struct interface *iface, const char *name,
+                   struct blob_attr *config);
+
+void interface_add(struct interface *iface, struct blob_attr *config);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);