system-linux: set the point to point address if present

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 0e81304..6304eca 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
@@ -10,6 +23,8 @@ struct interface_proto_state;
 enum interface_event {
        IFEV_DOWN,
        IFEV_UP,
+       IFEV_FREE,
+       IFEV_RELOAD,
 };
 
 enum interface_state {
@@ -33,6 +48,29 @@ struct interface_error {
        const char *data[];
 };
 
+struct interface_user {
+       struct list_head list;
+       struct interface *iface;
+       void (*cb)(struct interface_user *dep, struct interface *iface, enum interface_event ev);
+};
+
+struct interface_ip_settings {
+       struct interface *iface;
+       bool enabled;
+       bool no_defaultroute;
+
+       struct vlist_tree addr;
+       struct vlist_tree route;
+
+       struct vlist_simple_tree dns_servers;
+       struct vlist_simple_tree dns_search;
+};
+
+struct interface_data {
+       struct avl_node node;
+       struct blob_attr data[];
+};
+
 /*
  * interface configuration
  */
@@ -52,11 +90,13 @@ struct interface {
        enum interface_state state;
        enum interface_config_state config_state;
 
+       struct list_head users;
+
        /* main interface that the interface is bound to */
        struct device_user main_dev;
 
        /* interface that layer 3 communication will go through */
-       struct device_user *l3_dev;
+       struct device_user l3_dev;
 
        struct blob_attr *config;
 
@@ -64,12 +104,18 @@ struct interface {
        const struct proto_handler *proto_handler;
        struct interface_proto_state *proto;
 
-       struct vlist_tree proto_addr;
-       struct vlist_tree proto_route;
+       struct interface_ip_settings proto_ip;
+       struct interface_ip_settings config_ip;
+       struct vlist_tree host_routes;
+
+       int metric;
 
        /* errors/warnings while trying to bring up the interface */
        struct list_head errors;
 
+       /* extra data provided by protocol handlers or modules */
+       struct avl_tree data;
+
        struct uloop_timeout remove_timer;
        struct ubus_object ubus;
 };
@@ -87,15 +133,24 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 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_main_dev(struct interface *iface, struct device *dev);
+void interface_set_l3_dev(struct interface *iface, struct device *dev);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+void interface_add_user(struct interface_user *dep, struct interface *iface);
+void interface_remove_user(struct interface_user *dep);
+
+int interface_add_link(struct interface *iface, struct device *dev);
+int interface_remove_link(struct interface *iface, struct device *dev);
 
 void interface_add_error(struct interface *iface, const char *subsystem,
                         const char *code, const char **data, int n_data);
 
-void interface_queue_event(struct interface *iface, enum interface_event ev);
-void interface_dequeue_event(struct interface *iface);
+int interface_add_data(struct interface *iface, const struct blob_attr *data);
+
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
 
 void interface_start_pending(void);