networkd: add DHCPv4 support

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

diff --git a/src/network/networkd.h b/src/network/networkd.h
index d1bc348913c02f4b470596b2955032de7754cf21..cad81d9b711f0277e86d0c451b61735922a4a9d6 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -26,6 +26,7 @@
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
+#include "sd-dhcp-client.h"
 #include "udev.h"
 
 #include "rtnl-util.h"
@@ -84,9 +85,10 @@ struct Network {
 
         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;
@@ -109,7 +111,7 @@ struct Address {
                 struct in6_addr in6;
         } in_addr;
 
-        LIST_FIELDS(Address, addresses);
+        LIST_FIELDS(Address, static_addresses);
 };
 
 struct Route {
@@ -129,15 +131,13 @@ struct Route {
                 struct in6_addr in6;
         } dst_addr;
 
-        LIST_FIELDS(Route, routes);
+        LIST_FIELDS(Route, static_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_JOINING_BRIDGE,
+        LINK_STATE_SETTING_ADDRESSES,
+        LINK_STATE_SETTING_ROUTES,
         LINK_STATE_CONFIGURED,
         LINK_STATE_FAILED,
         _LINK_STATE_MAX,
@@ -155,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 {
@@ -225,7 +231,8 @@ int config_parse_bridge(const char *unit, const char *filename, unsigned line,
 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);
 
@@ -241,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)