interface, ubus: rework netns up/down

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index e5639eb326cd425e18d277c67ba983ecbeb68d85..73a907059b8b605f27189b5cfeb6e45b5d40dc1b 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -82,6 +82,7 @@ struct interface_ip_settings {
        struct vlist_tree addr;
        struct vlist_tree route;
        struct vlist_tree prefix;
+       struct vlist_tree neighbor;
 
        struct vlist_simple_tree dns_servers;
        struct vlist_simple_tree dns_search;
@@ -106,7 +107,11 @@ struct interface {
        enum interface_event hotplug_ev;
 
        const char *name;
-       const char *ifname;
+       const char *device;
+       char *jail;
+       char *jail_device;
+       char *host_device;
+       int netns_fd;
 
        bool available;
        bool autostart;
@@ -146,6 +151,7 @@ struct interface {
        struct interface_ip_settings proto_ip;
        struct interface_ip_settings config_ip;
        struct vlist_tree host_routes;
+       struct vlist_tree host_neighbors;
 
        int metric;
        int dns_metric;
@@ -174,29 +180,24 @@ struct interface {
 extern struct vlist_tree interfaces;
 extern const struct uci_blob_param_list interface_attr_list;
 
-struct interface *interface_alloc(const char *name, struct blob_attr *config);
+struct interface *interface_alloc(const char *name, struct blob_attr *config, bool dynamic);
 
-void interface_set_dynamic(struct interface *iface);
-
-void interface_add(struct interface *iface, struct blob_attr *config);
+bool interface_add(struct interface *iface, struct blob_attr *config);
 bool interface_add_alias(struct interface *iface, struct blob_attr *config);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
 void interface_set_available(struct interface *iface, bool new_state);
-int interface_set_up(struct interface *iface);
-int interface_set_down(struct interface *iface);
-void __interface_set_down(struct interface *iface, bool force);
+void interface_set_up(struct interface *iface);
+void interface_set_down(struct interface *iface);
 int interface_renew(struct interface *iface);
 
-void interface_set_main_dev(struct interface *iface, struct device *dev);
 void interface_set_l3_dev(struct interface *iface, struct device *dev);
 
 void interface_add_user(struct interface_user *dep, struct interface *iface);
 void interface_remove_user(struct interface_user *dep);
 
-int interface_remove_link(struct interface *iface, struct device *dev);
-int interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext);
+int interface_handle_link(struct interface *iface, const char *name, struct blob_attr *vlan, bool add, bool link_ext);
 
 void interface_add_error(struct interface *iface, const char *subsystem,
                         const char *code, const char **data, int n_data);
@@ -208,5 +209,7 @@ void interface_update_start(struct interface *iface, const bool keep_old);
 void interface_update_complete(struct interface *iface);
 
 void interface_start_pending(void);
+void interface_start_jail(int netns_fd, const char *jail);
+void interface_stop_jail(int netns_fd);
 
 #endif