do not attempt to get an interface if PROTO_FLAG_NODEV is set

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index b3a86f2..72a00c9 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,22 @@
 #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,
 };
 
-struct interface_proto_state {
-       const struct interface_proto *proto;
-
-       int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-       void (*free)(struct interface *, struct interface_proto_state *);
+enum interface_state {
+       IFS_SETUP,
+       IFS_UP,
+       IFS_TEARDOWN,
+       IFS_DOWN,
 };
 
 struct interface_error {
@@ -33,25 +33,27 @@ struct interface_error {
 struct interface {
        struct list_head list;
 
-       char name[IFNAMSIZ - 2];
-
-       /* interface is up and running */
-       bool up;
-
-       /* interface can be brought up */
-       bool active;
+       char name[IFNAMSIZ];
 
-       /* interface will be brought up when available */
+       bool available;
        bool autostart;
 
+       enum interface_state state;
+
        /* 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 config_state config;
+
        /* primary protocol state */
-       struct interface_proto_state *state;
+       const struct proto_handler *proto_handler;
+       struct interface_proto_state *proto;
+
+       struct vlist_tree proto_addr;
+       struct vlist_tree proto_route;
 
        /* errors/warnings while trying to bring up the interface */
        struct list_head errors;
@@ -59,12 +61,17 @@ struct interface {
        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 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_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
-int set_interface_up(struct interface *iface);
-int set_interface_down(struct interface *iface);
+void interface_set_available(struct interface *iface, bool new_state);
+int interface_set_up(struct interface *iface);
+int interface_set_down(struct interface *iface);
 
 int interface_add_link(struct interface *iface, struct device *llif);
 void interface_remove_link(struct interface *iface, struct device *llif);
@@ -72,6 +79,6 @@ void interface_remove_link(struct interface *iface, struct device *llif);
 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);
+void interface_start_pending(void);
 
 #endif