X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=cad81d9b711f0277e86d0c451b61735922a4a9d6;hb=88c59cb3c12b33449e0b8a57a79dd1d418334061;hp=913f17d3a0281efd909c08eb15fde1da91dbae31;hpb=c166a070553511e402de5ad216d3fb62b49bdacb;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 913f17d3a..cad81d9b7 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -26,18 +26,52 @@
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
+#include "sd-dhcp-client.h"
 #include "udev.h"
 
 #include "rtnl-util.h"
 #include "hashmap.h"
 #include "list.h"
 
+typedef struct Bridge Bridge;
 typedef struct Network Network;
 typedef struct Link Link;
 typedef struct Address Address;
 typedef struct Route Route;
 typedef struct Manager Manager;
 
+typedef struct bridge_join_callback bridge_join_callback;
+
+struct bridge_join_callback {
+        sd_rtnl_message_handler_t callback;
+        Link *link;
+
+        LIST_FIELDS(bridge_join_callback, callbacks);
+};
+
+typedef enum BridgeState {
+        BRIDGE_STATE_FAILED,
+        BRIDGE_STATE_CREATING,
+        BRIDGE_STATE_CREATED,
+        BRIDGE_STATE_READY,
+        _BRIDGE_STATE_MAX,
+        _BRIDGE_STATE_INVALID = -1,
+} BridgeState;
+
+struct Bridge {
+        Manager *manager;
+
+        char *filename;
+
+        char *description;
+        char *name;
+
+        Link *link;
+        BridgeState state;
+
+        LIST_HEAD(bridge_join_callback, callbacks);
+};
+
 struct Network {
         Manager *manager;
 
@@ -50,9 +84,11 @@ struct Network {
         char *match_name;
 
         char *description;
+        Bridge *bridge;
+        bool dhcp;
 
-        LIST_HEAD(Address, addresses);
-        LIST_HEAD(Route, routes);
+        LIST_HEAD(Address, static_addresses);
+        LIST_HEAD(Route, static_routes);
 
         Hashmap *addresses_by_section;
         Hashmap *routes_by_section;
@@ -75,7 +111,7 @@ struct Address {
                 struct in6_addr in6;
         } in_addr;
 
-        LIST_FIELDS(Address, addresses);
+        LIST_FIELDS(Address, static_addresses);
 };
 
 struct Route {
@@ -95,14 +131,13 @@ struct Route {
                 struct in6_addr in6;
         } dst_addr;
 
-        LIST_FIELDS(Route, routes);
+        LIST_FIELDS(Route, static_routes);
 };
 
 typedef enum LinkState {
-        LINK_STATE_SET_ADDRESSES,
-        LINK_STATE_ADDRESSES_SET,
-        LINK_STATE_SET_ROUTES,
-        LINK_STATE_ROUTES_SET,
+        LINK_STATE_JOINING_BRIDGE,
+        LINK_STATE_SETTING_ADDRESSES,
+        LINK_STATE_SETTING_ROUTES,
         LINK_STATE_CONFIGURED,
         LINK_STATE_FAILED,
         _LINK_STATE_MAX,
@@ -120,9 +155,15 @@ struct Link {
 
         Network *network;
 
+        Route *dhcp_route;
+        Address *dhcp_address;
+
         LinkState state;
 
-        unsigned rtnl_messages;
+        unsigned addr_messages;
+        unsigned route_messages;
+
+        sd_dhcp_client *dhcp;
 };
 
 struct Manager {
@@ -133,6 +174,7 @@ struct Manager {
         sd_event_source *udev_event_source;
 
         Hashmap *links;
+        Hashmap *bridges;
         LIST_HEAD(Network, networks);
 
         char **network_dirs;
@@ -144,6 +186,9 @@ struct Manager {
 int manager_new(Manager **ret);
 void manager_free(Manager *m);
 
+int manager_load_config(Manager *m);
+bool manager_should_reload(Manager *m);
+
 int manager_udev_enumerate_links(Manager *m);
 int manager_udev_listen(Manager *m);
 
@@ -152,10 +197,22 @@ int manager_rtnl_listen(Manager *m);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 #define _cleanup_manager_free_ _cleanup_(manager_freep)
 
+/* Bridge */
+
+int bridge_load(Manager *manager);
+
+void bridge_free(Bridge *bridge);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(Bridge*, bridge_free);
+#define _cleanup_bridge_free_ _cleanup_(bridge_freep)
+
+int bridge_get(Manager *manager, const char *name, Bridge **ret);
+int bridge_set_link(Manager *m, Link *link);
+int bridge_join(Bridge *bridge, Link *link, sd_rtnl_message_handler_t cb);
+
 /* Network */
 
 int network_load(Manager *manager);
-bool network_should_reload(Manager *manager);
 
 void network_free(Network *network);
 
@@ -165,10 +222,17 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Network*, network_free);
 int network_get(Manager *manager, struct udev_device *device, Network **ret);
 int network_apply(Manager *manager, Network *network, Link *link);
 
+int config_parse_bridge(const char *unit, const char *filename, unsigned line,
+                        const char *section, unsigned section_line, const char *lvalue,
+                        int ltype, const char *rvalue, void *data, void *userdata);
+
+/* gperf */
+
 const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
 
 /* Route */
-int route_new(Network *network, unsigned section, Route **ret);
+int route_new_static(Network *network, unsigned section, Route **ret);
+int route_new_dynamic(Route **ret);
 void route_free(Route *route);
 int route_configure(Route *route, Link *link, sd_rtnl_message_handler_t callback);
 
@@ -184,9 +248,11 @@ int config_parse_destination(const char *unit, const char *filename, unsigned li
                              int ltype, const char *rvalue, void *data, void *userdata);
 
 /* Address */
-int address_new(Network *network, unsigned section, Address **ret);
+int address_new_static(Network *network, unsigned section, Address **ret);
+int address_new_dynamic(Address **ret);
 void address_free(Address *address);
 int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback);
+int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callback);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
 #define _cleanup_address_free_ _cleanup_(address_freep)
@@ -206,5 +272,7 @@ void link_free(Link *link);
 int link_add(Manager *manager, struct udev_device *device);
 int link_configure(Link *link);
 
+int link_update(Link *link, sd_rtnl_message *message);
+
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define _cleanup_link_free_ _cleanup_(link_freep)