X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.h;h=887c62c65987907d935cbd423f3c1c0711e38294;hp=6049d144a1ca089bccab4a589a8373c16f1c5b90;hb=0f738b8f6c5d89ad5130c74a8dcb9a1df9a190bc;hpb=05c1f3b0c2058a579ca1a6e2b06329b8c814e5bd

diff --git a/interface-ip.h b/interface-ip.h
index 6049d14..887c62c 100644
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -1,17 +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,
 
-	/* device route (no gateway) */
-	DEVADDR_DEVICE		= (1 << 1),
-
 	/* externally added address */
 	DEVADDR_EXTERNAL	= (1 << 2),
+
+	/* route overrides the default interface metric */
+	DEVROUTE_METRIC		= (1 << 3)
 };
 
 union if_addr {
@@ -21,10 +23,13 @@ union if_addr {
 
 struct device_addr {
 	struct vlist_node node;
+	bool enabled;
 
-	enum device_addr_flags flags;
+	/* ipv4 only */
+	uint32_t broadcast;
 
 	/* must be last */
+	enum device_addr_flags flags;
 	unsigned int mask;
 	union if_addr addr;
 };
@@ -32,36 +37,44 @@ struct device_addr {
 struct device_route {
 	struct vlist_node node;
 
-	enum device_addr_flags flags;
+	bool enabled;
 	bool keep;
 
 	union if_addr nexthop;
-	struct device *device;
+	int metric;
+	int mtu;
 
 	/* must be last */
+	enum device_addr_flags flags;
 	unsigned int mask;
 	union if_addr addr;
 };
 
 struct dns_server {
-	struct list_head list;
+	struct vlist_simple_node node;
 	int af;
 	union if_addr addr;
 };
 
 struct dns_search_domain {
-	struct list_head list;
+	struct vlist_simple_node node;
 	char name[];
 };
 
-void interface_ip_init(struct interface *iface);
-void interface_add_dns_server(struct interface *iface, const char *str);
-void interface_add_dns_server_list(struct interface *iface, struct blob_attr *list);
-void interface_clear_dns(struct interface *iface);
+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_update_start(struct interface *iface);
-void interface_ip_update_complete(struct interface *iface);
+void interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6);
 
+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