s/get_interface/interface_get/

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index e19d61d..1a854cb 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,8 +1,8 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
-#include <netinet/in.h>
 #include "device.h"
+#include "config.h"
 
 struct interface;
 struct interface_proto_state;
@@ -27,42 +27,6 @@ struct interface_error {
        const char *data[];
 };
 
-enum interface_addr_flags {
-       /* address family for routes and addresses */
-       IFADDR_INET4    = (0 << 0),
-       IFADDR_INET6    = (1 << 0),
-       IFADDR_FAMILY   = IFADDR_INET4 | IFADDR_INET6,
-
-       /* device route (no gateway) */
-       IFADDR_DEVICE   = (1 << 1),
-};
-
-union if_addr {
-       struct in_addr in;
-       struct in6_addr in6;
-};
-
-struct interface_addr {
-       struct list_head list;
-       void *ctx;
-
-       enum interface_addr_flags flags;
-
-       unsigned int mask;
-       union if_addr addr;
-};
-
-struct interface_route {
-       struct list_head list;
-       void *ctx;
-
-       enum interface_addr_flags flags;
-
-       unsigned int mask;
-       union if_addr addr;
-       union if_addr nexthop;
-};
-
 /*
  * interface configuration
  */
@@ -93,14 +57,16 @@ struct interface {
        struct ubus_object ubus;
 };
 
-struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name, struct uci_section *s);
+extern const struct config_param_list interface_attr_list;
+
+struct interface *interface_get(const char *name);
+struct interface *alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr);
 void free_interface(struct interface *iface);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
-int set_interface_up(struct interface *iface);
-int set_interface_down(struct interface *iface);
+int interface_set_up(struct interface *iface);
+int interface_set_down(struct interface *iface);
 
 int interface_add_link(struct interface *iface, struct device *llif);
 void interface_remove_link(struct interface *iface, struct device *llif);
@@ -110,10 +76,14 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 
 int interface_attach_bridge(struct interface *iface, struct uci_section *s);
 
-int interface_add_address(struct interface *iface, struct interface_addr *addr);
-void interface_del_address(struct interface *iface, struct interface_addr *addr);
+int interface_add_address(struct interface *iface, struct device_addr *addr);
+void interface_del_address(struct interface *iface, struct device_addr *addr);
 void interface_del_ctx_addr(struct interface *iface, void *ctx);
 
-void start_pending_interfaces(void);
+int interface_add_route(struct interface *iface, struct device_route *route);
+void interface_del_route(struct interface *iface, struct device_route *route);
+void interface_del_all_routes(struct interface *iface);
+
+void interface_start_pending(void);
 
 #endif