device: use safe_list for device event, fixes some hang issues

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index 12176ce..1068a46 100644 (file)
--- a/device.h
+++ b/device.h
@@ -1,7 +1,21 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #ifndef __LL_H
 #define __LL_H
 
 #include <libubox/avl.h>
+#include <libubox/safe_list.h>
 #include <netinet/in.h>
 
 struct device;
@@ -23,6 +37,7 @@ enum {
 enum dev_change_type {
        DEV_CONFIG_NO_CHANGE,
        DEV_CONFIG_APPLIED,
+       DEV_CONFIG_RESTART,
        DEV_CONFIG_RECREATE,
 };
 
@@ -52,6 +67,8 @@ enum device_event {
        DEV_EVENT_ADD,
        DEV_EVENT_REMOVE,
 
+       DEV_EVENT_UPDATE_IFNAME,
+
        DEV_EVENT_SETUP,
        DEV_EVENT_TEARDOWN,
        DEV_EVENT_UP,
@@ -59,16 +76,21 @@ enum device_event {
 
        DEV_EVENT_LINK_UP,
        DEV_EVENT_LINK_DOWN,
+
+       __DEV_EVENT_MAX
 };
 
 /*
  * device dependency with callbacks
  */
 struct device_user {
-       struct list_head list;
+       struct safe_list list;
 
        bool claimed;
        bool hotplug;
+       bool alias;
+
+       uint8_t ev_idx[__DEV_EVENT_MAX];
 
        struct device *dev;
        void (*cb)(struct device_user *, enum device_event);
@@ -89,7 +111,8 @@ struct device {
        const struct device_type *type;
 
        struct avl_node avl;
-       struct list_head users;
+       struct safe_list users;
+       struct safe_list aliases;
 
        char ifname[IFNAMSIZ + 1];
        int ifindex;
@@ -99,8 +122,11 @@ struct device {
        bool sys_present;
        bool present;
        int active;
+
        bool external;
        bool disabled;
+       bool deferred;
+       bool hidden;
 
        bool current_config;
        bool default_config;
@@ -112,6 +138,7 @@ struct device {
 
        struct device_user parent;
 
+       struct device_settings orig_settings;
        struct device_settings settings;
 };
 
@@ -124,6 +151,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);
@@ -146,9 +174,10 @@ void device_cleanup(struct device *iface);
 struct device *device_get(const char *name, int create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
+void device_broadcast_event(struct device *dev, enum device_event ev);
 
 void device_set_present(struct device *dev, bool state);
-void device_set_disabled(struct device *dev, bool value);
+void device_refresh_present(struct device *dev);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
@@ -159,5 +188,20 @@ void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);
 void alias_notify_device(const char *name, struct device *dev);
+struct device *device_alias_get(const char *name);
+
+static inline void
+device_set_deferred(struct device *dev, bool value)
+{
+       dev->deferred = value;
+       device_refresh_present(dev);
+}
+
+static inline void
+device_set_disabled(struct device *dev, bool value)
+{
+       dev->disabled = value;
+       device_refresh_present(dev);
+}
 
 #endif