networkd: minor fixes

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

diff --git a/src/network/networkd.h b/src/network/networkd.h
index fd3b60a6cbf04a952f12f16f663b8b2e43317e1f..913f17d3a0281efd909c08eb15fde1da91dbae31 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -54,16 +54,22 @@ struct Network {
         LIST_HEAD(Address, addresses);
         LIST_HEAD(Route, routes);
 
         LIST_HEAD(Address, addresses);
         LIST_HEAD(Route, routes);
 

+        Hashmap *addresses_by_section;
+        Hashmap *routes_by_section;
+

         LIST_FIELDS(Network, networks);
 };
 
 struct Address {
         Network *network;
         LIST_FIELDS(Network, networks);
 };
 
 struct Address {
         Network *network;

+        uint64_t section;

 
         unsigned char family;
         unsigned char prefixlen;
         char *label;
 
 
         unsigned char family;
         unsigned char prefixlen;
         char *label;
 

+        struct in_addr netmask;
+

         union {
                 struct in_addr in;
                 struct in6_addr in6;
         union {
                 struct in_addr in;
                 struct in6_addr in6;


@@ -74,25 +80,49 @@ struct Address {
 
 struct Route {
         Network *network;
 
 struct Route {
         Network *network;

+        uint64_t section;

 
         unsigned char family;
 
         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;
         } in_addr;
 

+        union {
+                struct in_addr in;
+                struct in6_addr in6;
+        } dst_addr;
+

         LIST_FIELDS(Route, routes);
 };
 
         LIST_FIELDS(Route, routes);
 };
 

+typedef enum LinkState {
+        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;
 
 struct Link {
         Manager *manager;
 

-        int ifindex;
+        uint64_t ifindex;
+        char *ifname;
+        struct ether_addr mac;

 
         unsigned flags;
 
         Network *network;
 
         unsigned flags;
 
         Network *network;

+
+        LinkState state;
+
+        unsigned rtnl_messages;

 };
 
 struct Manager {
 };
 
 struct Manager {


@@ -117,6 +147,8 @@ void manager_free(Manager *m);
 int manager_udev_enumerate_links(Manager *m);
 int manager_udev_listen(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)
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 #define _cleanup_manager_free_ _cleanup_(manager_freep)
 


@@ -136,35 +168,43 @@ int network_apply(Manager *manager, Network *network, Link *link);
 const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
 
 /* Route */
 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);
 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,
 
 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 */
 
 /* Address */

-int address_new(Network *network, Address **ret);
+int address_new(Network *network, unsigned section, Address **ret);

 void address_free(Address *address);
 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,
 
 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);
 
 /* 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)
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define _cleanup_link_free_ _cleanup_(link_freep)