clean up variable names (llif -> dev)

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 0fd70d7..6bd8761 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,29 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
+#include "device.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;
+enum interface_state {
+       IFS_SETUP,
+       IFS_UP,
+       IFS_TEARDOWN,
+       IFS_DOWN,
+};
+
+struct interface_error {
+       struct list_head list;
 
-       int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-       void (*free)(struct interface *, struct interface_proto_state *);
+       const char *subsystem;
+       const char *code;
+       const char *data[];
 };
 
 /*
@@ -25,17 +32,13 @@ struct interface_proto_state {
 struct interface {
        struct list_head list;
 
-       char name[IFNAMSIZ - 2];
+       char name[IFNAMSIZ];
 
-       /* interface is up and running */
-       bool up;
-
-       /* interface can be brought up */
        bool active;
-
-       /* interface will be brought up when available */
        bool autostart;
 
+       enum interface_state state;
+
        /* main interface that the interface is bound to */
        struct device_user main_dev;
 
@@ -43,7 +46,10 @@ struct interface {
        struct device_user *l3_iface;
 
        /* primary protocol state */
-       struct interface_proto_state *state;
+       struct interface_proto_state *proto;
+
+       /* errors/warnings while trying to bring up the interface */
+       struct list_head errors;
 
        struct ubus_object ubus;
 };
@@ -58,6 +64,9 @@ int set_interface_down(struct interface *iface);
 int interface_add_link(struct interface *iface, struct device *llif);
 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);
 
 #endif