ubus: split address from mask in interface status

[project/netifd.git] / interface-ip.h

diff --git a/interface-ip.h b/interface-ip.h
index 2f5cf85..df5545d 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -1,14 +1,19 @@
 #ifndef __INTERFACE_IP_H
 #define __INTERFACE_IP_H
 
+#include "interface.h"
+
 enum device_addr_flags {
        /* address family for routes and addresses */
-       DEVADDR_INET4   = (0 << 0),
-       DEVADDR_INET6   = (1 << 0),
-       DEVADDR_FAMILY  = DEVADDR_INET4 | DEVADDR_INET6,
+       DEVADDR_INET4           = (0 << 0),
+       DEVADDR_INET6           = (1 << 0),
+       DEVADDR_FAMILY          = DEVADDR_INET4 | DEVADDR_INET6,
+
+       /* externally added address */
+       DEVADDR_EXTERNAL        = (1 << 2),
 
-       /* device route (no gateway) */
-       DEVADDR_DEVICE  = (1 << 1),
+       /* route overrides the default interface metric */
+       DEVROUTE_METRIC         = (1 << 3)
 };
 
 union if_addr {
@@ -17,32 +22,60 @@ union if_addr {
 };
 
 struct device_addr {
-       struct list_head list;
-       void *ctx;
+       struct vlist_node node;
 
        enum device_addr_flags flags;
+       bool enabled;
 
+       /* ipv4 only */
+       uint32_t broadcast;
+
+       /* must be last */
        unsigned int mask;
        union if_addr addr;
 };
 
 struct device_route {
-       struct list_head list;
-       void *ctx;
+       struct vlist_node node;
 
        enum device_addr_flags flags;
+       bool enabled;
+       bool keep;
 
+       union if_addr nexthop;
+       int metric;
+       int mtu;
+
+       /* must be last */
        unsigned int mask;
        union if_addr addr;
-       union if_addr nexthop;
 };
 
-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);
+struct dns_server {
+       struct vlist_simple_node node;
+       int af;
+       union if_addr addr;
+};
+
+struct dns_search_domain {
+       struct vlist_simple_node node;
+       char name[];
+};
+
+extern const struct config_param_list route_attr_list;
+
+void interface_ip_init(struct interface_ip_settings *ip, struct interface *iface);
+void interface_add_dns_server(struct interface_ip_settings *ip, const char *str);
+void interface_add_dns_server_list(struct interface_ip_settings *ip, struct blob_attr *list);
+void interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr *list);
+void interface_write_resolv_conf(void);
+
+void interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6);
 
-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_ip_update_start(struct interface_ip_settings *ip);
+void interface_ip_update_complete(struct interface_ip_settings *ip);
+void interface_ip_flush(struct interface_ip_settings *ip);
+void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
+void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
 
 #endif