netifd: Fix multiple -Wsign-compare warnings

[project/netifd.git] / wireless.h

diff --git a/wireless.h b/wireless.h
index cdd7187fae2af29830e4ddda8c84fa0c80274852..690c79789cca0311e633b410dc24fbf1850a1e74 100644 (file)
--- a/wireless.h
+++ b/wireless.h
@@ -15,10 +15,11 @@
 #define __NETIFD_WIRELESS_H
 
 #include <libubox/utils.h>
+#include <libubox/list.h>
 #include "interface.h"
 
-struct vlist_tree wireless_devices;
-struct avl_tree wireless_drivers;
+extern struct vlist_tree wireless_devices;
+extern struct avl_tree wireless_drivers;
 
 struct wireless_driver {
        struct avl_node node;
@@ -29,14 +30,21 @@ struct wireless_driver {
        struct {
                char *buf;
                struct uci_blob_param_list *config;
-       } device, interface;
+       } device, interface, vlan, station;
 };
 
 struct wireless_device {
        struct vlist_node node;
 
+       struct list_head handler;
+       bool handler_action;
+       bool handler_pending;
+       bool serialize;
+
        struct wireless_driver *drv;
        struct vlist_tree interfaces;
+       struct vlist_tree vlans;
+       struct vlist_tree stations;
        char *name;
 
        struct netifd_process script_task;
@@ -49,19 +57,23 @@ struct wireless_device {
 
        struct ubus_request_data *kill_request;
 
+       struct blob_attr *prev_config;
        struct blob_attr *config;
        struct blob_attr *data;
 
-       bool config_autostart;
        bool autostart;
        bool disabled;
+       bool retry_setup_failed;
 
        enum interface_state state;
        enum interface_config_state config_state;
+       bool reconf;
        bool cancel;
        int retry;
 
        int vif_idx;
+       int vlan_idx;
+       int sta_idx;
 };
 
 struct wireless_interface {
@@ -76,6 +88,39 @@ struct wireless_interface {
 
        const char *ifname;
        struct blob_attr *network;
+       bool proxyarp;
+       bool isolate;
+       bool ap_mode;
+       int multicast_to_unicast;
+};
+
+struct wireless_vlan {
+       struct vlist_node node;
+       const char *section;
+       char *name;
+
+       struct wireless_device *wdev;
+       char *vif;
+
+       struct blob_attr *config;
+       struct blob_attr *data;
+
+       const char *ifname;
+       struct blob_attr *network;
+       int multicast_to_unicast;
+       bool isolate;
+};
+
+struct wireless_station {
+       struct vlist_node node;
+       const char *section;
+       char *name;
+
+       struct wireless_device *wdev;
+       char *vif;
+
+       struct blob_attr *config;
+       struct blob_attr *data;
 };
 
 struct wireless_process {
@@ -85,17 +130,23 @@ struct wireless_process {
        int pid;
 
        bool required;
+       bool keep;
 };
 
 void wireless_device_create(struct wireless_driver *drv, const char *name, struct blob_attr *data);
 void wireless_device_set_up(struct wireless_device *wdev);
 void wireless_device_set_down(struct wireless_device *wdev);
+void wireless_device_reconf(struct wireless_device *wdev);
 void wireless_device_status(struct wireless_device *wdev, struct blob_buf *b);
 void wireless_device_get_validate(struct wireless_device *wdev, struct blob_buf *b);
-void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section);
+struct wireless_interface* wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section);
+void wireless_vlan_create(struct wireless_device *wdev, char *vif, struct blob_attr *data, const char *section);
+void wireless_station_create(struct wireless_device *wdev, char *vif, struct blob_attr *data, const char *section);
 int wireless_device_notify(struct wireless_device *wdev, struct blob_attr *data,
                           struct ubus_request_data *req);
 
 void wireless_start_pending(void);
+void wireless_init(void);
+void wireless_device_hotplug_event(const char *name, bool add);
 
 #endif