X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=c28c90f0e34f7bb5ccd9a74e1191c1c417bd6482;hb=7a7c74cae4db0c35cbe54d9bad8418a605cb870f;hp=04a56ea8c8bb73d08fa921d18cb74a8f849836dd;hpb=6ae115c1fe95611b39d2f20cfcea3d385429f59e;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 04a56ea8c..c28c90f0e 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -32,12 +32,45 @@
 #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,6 +83,7 @@ struct Network {
         char *match_name;
 
         char *description;
+        Bridge *bridge;
 
         LIST_HEAD(Address, addresses);
         LIST_HEAD(Route, routes);
@@ -99,10 +133,9 @@ struct Route {
 };
 
 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,
@@ -113,6 +146,7 @@ struct Link {
         Manager *manager;
 
         uint64_t ifindex;
+        char *ifname;
         struct ether_addr mac;
 
         unsigned flags;
@@ -132,6 +166,7 @@ struct Manager {
         sd_event_source *udev_event_source;
 
         Hashmap *links;
+        Hashmap *bridges;
         LIST_HEAD(Network, networks);
 
         char **network_dirs;
@@ -143,6 +178,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);
 
@@ -151,10 +189,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);
 
@@ -164,6 +214,12 @@ 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 */
@@ -205,5 +261,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)