allow proto handlers to attach data items in notify

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 3a0b96f..5e3f383 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,28 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
+#include "device.h"
+#include "config.h"
+
 struct interface;
-struct interface_proto;
 struct interface_proto_state;
 
-extern struct list_head interfaces;
-
 enum interface_event {
-       IFEV_UP,
        IFEV_DOWN,
+       IFEV_UP,
 };
 
-struct interface_proto_state {
-       const struct interface_proto *proto;
+enum interface_state {
+       IFS_SETUP,
+       IFS_UP,
+       IFS_TEARDOWN,
+       IFS_DOWN,
+};
 
-       int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-       void (*free)(struct interface *, struct interface_proto_state *);
+enum interface_config_state {
+       IFC_NORMAL,
+       IFC_RELOAD,
+       IFC_REMOVE
 };
 
 struct interface_error {
@@ -27,46 +33,112 @@ struct interface_error {
        const char *data[];
 };
 
+struct interface_user {
+       struct list_head list;
+       struct interface *iface;
+       void (*cb)(struct interface_user *dep, enum interface_event ev);
+};
+
+struct interface_ip_settings {
+       struct interface *iface;
+       bool enabled;
+       bool no_defaultroute;
+
+       struct vlist_tree addr;
+       struct vlist_tree route;
+
+       struct vlist_simple_tree dns_servers;
+       struct vlist_simple_tree dns_search;
+};
+
+struct interface_data {
+       struct avl_node node;
+       struct blob_attr data[];
+};
+
 /*
  * interface configuration
  */
 struct interface {
-       struct list_head list;
+       struct vlist_node node;
+       struct list_head hotplug_list;
+       enum interface_event hotplug_ev;
 
        char name[IFNAMSIZ];
+       const char *ifname;
 
-       bool up;
-       bool active;
+       bool available;
        bool autostart;
+       bool config_autostart;
+
+       time_t start_time;
+       enum interface_state state;
+       enum interface_config_state config_state;
+
+       struct list_head users;
 
        /* main interface that the interface is bound to */
        struct device_user main_dev;
 
        /* interface that layer 3 communication will go through */
-       struct device_user *l3_iface;
+       struct device_user l3_dev;
+
+       struct blob_attr *config;
 
        /* primary protocol state */
-       struct interface_proto_state *state;
+       const struct proto_handler *proto_handler;
+       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;
 };
 
-struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name);
-void free_interface(struct interface *iface);
+extern struct vlist_tree interfaces;
+extern const struct config_param_list interface_attr_list;
+
+void interface_init(struct interface *iface, const char *name,
+                   struct blob_attr *config);
 
-int set_interface_up(struct interface *iface);
-int set_interface_down(struct interface *iface);
+void interface_add(struct interface *iface, struct blob_attr *config);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+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_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 *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_attach_bridge(struct interface *iface, struct uci_section *s);
+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);
+
+void interface_start_pending(void);
 
 #endif