networkd: fix several Address entries in [Network] section

[elogind.git] / src / network / networkd.h

diff --git a/src/network/networkd.h b/src/network/networkd.h
index fd3b60a6cbf04a952f12f16f663b8b2e43317e1f..1ab8a55a88213ed293445d2b7baba1126c5e89bc 100644 (file)
--- 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,20 +83,27 @@ struct Network {
         char *match_name;
 
         char *description;
+        Bridge *bridge;
 
         LIST_HEAD(Address, addresses);
         LIST_HEAD(Route, routes);
 
+        Hashmap *addresses_by_section;
+        Hashmap *routes_by_section;
+
         LIST_FIELDS(Network, networks);
 };
 
 struct Address {
         Network *network;
+        uint64_t section;
 
         unsigned char family;
         unsigned char prefixlen;
         char *label;
 
+        struct in_addr netmask;
+
         union {
                 struct in_addr in;
                 struct in6_addr in6;
@@ -74,25 +114,51 @@ struct Address {
 
 struct Route {
         Network *network;
+        uint64_t section;
 
         unsigned char family;
+        unsigned char dst_prefixlen;
 
         union {
                 struct in_addr in;
                 struct in6_addr in6;
         } in_addr;
 
+        union {
+                struct in_addr in;
+                struct in6_addr in6;
+        } dst_addr;
+
         LIST_FIELDS(Route, routes);
 };
 
+typedef enum LinkState {
+        LINK_STATE_JOIN_BRIDGE,
+        LINK_STATE_BRIDGE_JOINED,
+        LINK_STATE_SET_ADDRESSES,
+        LINK_STATE_ADDRESSES_SET,
+        LINK_STATE_SET_ROUTES,
+        LINK_STATE_ROUTES_SET,
+        LINK_STATE_CONFIGURED,
+        LINK_STATE_FAILED,
+        _LINK_STATE_MAX,
+        _LINK_STATE_INVALID = -1
+} LinkState;
+
 struct Link {
         Manager *manager;
 
-        int ifindex;
+        uint64_t ifindex;
+        char *ifname;
+        struct ether_addr mac;
 
         unsigned flags;
 
         Network *network;
+
+        LinkState state;
+
+        unsigned rtnl_messages;
 };
 
 struct Manager {
@@ -103,6 +169,7 @@ struct Manager {
         sd_event_source *udev_event_source;
 
         Hashmap *links;
+        Hashmap *bridges;
         LIST_HEAD(Network, networks);
 
         char **network_dirs;
@@ -114,16 +181,33 @@ 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);
 
+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);
 
@@ -133,38 +217,52 @@ 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, Route **ret);
+int route_new(Network *network, unsigned section, Route **ret);
 void route_free(Route *route);
-int route_configure(Manager *manager, Route *route, Link *link);
+int route_configure(Route *route, Link *link, sd_rtnl_message_handler_t callback);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Route*, route_free);
 #define _cleanup_route_free_ _cleanup_(route_freep)
 
 int config_parse_gateway(const char *unit, const char *filename, unsigned line,
-                         const char *section, const char *lvalue, int ltype,
-                         const char *rvalue, void *data, void *userdata);
+                         const char *section, unsigned section_line, const char *lvalue,
+                         int ltype, const char *rvalue, void *data, void *userdata);
+
+int config_parse_destination(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);
 
 /* Address */
-int address_new(Network *network, Address **ret);
+int address_new(Network *network, unsigned section, Address **ret);
 void address_free(Address *address);
-int address_configure(Manager *manager, Address *address, Link *link);
+int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
 #define _cleanup_address_free_ _cleanup_(address_freep)
 
 int config_parse_address(const char *unit, const char *filename, unsigned line,
-                         const char *section, const char *lvalue, int ltype,
-                         const char *rvalue, void *data, void *userdata);
+                         const char *section, unsigned section_line, const char *lvalue,
+                         int ltype, const char *rvalue, void *data, void *userdata);
+
+int config_parse_label(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);
 
 /* Link */
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret);
 void link_free(Link *link);
 int link_add(Manager *manager, struct udev_device *device);
-int link_up(Manager *manager, Link *link);
+int link_configure(Link *link);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define _cleanup_link_free_ _cleanup_(link_freep)