parse tunnel devices from config

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index a3728f3..7454d54 100644 (file)
--- a/device.h
+++ b/device.h
@@ -16,12 +16,14 @@ enum {
        DEV_ATTR_MTU,
        DEV_ATTR_MACADDR,
        DEV_ATTR_TXQUEUELEN,
+       DEV_ATTR_ENABLED,
        __DEV_ATTR_MAX,
 };
 
 enum dev_change_type {
        DEV_CONFIG_NO_CHANGE,
        DEV_CONFIG_APPLIED,
+       DEV_CONFIG_RESTART,
        DEV_CONFIG_RECREATE,
 };
 
@@ -73,6 +75,13 @@ struct device_user {
        void (*cb)(struct device_user *, enum device_event);
 };
 
+struct device_settings {
+       unsigned int flags;
+       unsigned int mtu;
+       unsigned int txqueuelen;
+       uint8_t macaddr[6];
+};
+
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -88,9 +97,11 @@ struct device {
 
        struct blob_attr *config;
        bool config_pending;
+       bool sys_present;
        bool present;
        int active;
        bool external;
+       bool disabled;
 
        bool current_config;
        bool default_config;
@@ -102,15 +113,12 @@ struct device {
 
        struct device_user parent;
 
-       /* settings */
-       unsigned int flags;
-
-       unsigned int mtu;
-       unsigned int txqueuelen;
-       uint8_t macaddr[6];
+       struct device_settings orig_settings;
+       struct device_settings settings;
 };
 
 struct device_hotplug_ops {
+       int (*prepare)(struct device *dev);
        int (*add)(struct device *main, struct device *member);
        int (*del)(struct device *main, struct device *member);
 };
@@ -118,6 +126,7 @@ struct device_hotplug_ops {
 extern const struct config_param_list device_attr_list;
 extern const struct device_type simple_device_type;
 extern const struct device_type bridge_device_type;
+extern const struct device_type tunnel_device_type;
 
 void device_lock(void);
 void device_unlock(void);
@@ -142,17 +151,13 @@ void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
 
 void device_set_present(struct device *dev, bool state);
+void device_set_disabled(struct device *dev, bool value);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-static inline void
-device_free(struct device *dev)
-{
-       dev->type->free(dev);
-}
-
+void device_free(struct device *dev);
 void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);