fix a logic error leading to segfaults on updates

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

diff --git a/interface-ip.h b/interface-ip.h
index 6049d14..78f0644 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -1,6 +1,8 @@
 #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),
@@ -23,6 +25,9 @@ struct device_addr {
        struct vlist_node node;
 
        enum device_addr_flags flags;
+       bool enabled;
+
+       struct device *device;
 
        /* must be last */
        unsigned int mask;
@@ -33,10 +38,13 @@ 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 */
        unsigned int mask;
@@ -54,14 +62,20 @@ struct dns_search_domain {
        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);
 
 
 #endif