X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.h;h=5eb4b889317473c324d8f3ff159da70c178c756b;hp=1d0b4665e731261c74acb5bf292bafab80fa63ca;hb=086891e5c1;hpb=b22d8a00f48f3c5fc4510b4acd3e1a43e731e592

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 1d0b4665e..5eb4b8893 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -24,7 +24,7 @@
 #include "networkd.h"
 
 typedef enum LinkState {
-        LINK_STATE_INITIALIZING,
+        LINK_STATE_PENDING,
         LINK_STATE_ENSLAVING,
         LINK_STATE_SETTING_ADDRESSES,
         LINK_STATE_SETTING_ROUTES,
@@ -37,7 +37,8 @@ typedef enum LinkState {
 } LinkState;
 
 typedef enum LinkOperationalState {
-        LINK_OPERSTATE_UNKNOWN,
+        LINK_OPERSTATE_OFF,
+        LINK_OPERSTATE_NO_CARRIER,
         LINK_OPERSTATE_DORMANT,
         LINK_OPERSTATE_CARRIER,
         LINK_OPERSTATE_DEGRADED,
@@ -66,8 +67,7 @@ struct Link {
         LinkState state;
         LinkOperationalState operstate;
 
-        unsigned addr_messages;
-        unsigned route_messages;
+        unsigned link_messages;
         unsigned enslaving;
 
         LIST_HEAD(Address, addresses);
@@ -76,11 +76,15 @@ struct Link {
         sd_dhcp_lease *dhcp_lease;
         char *lease_file;
         uint16_t original_mtu;
+        unsigned dhcp4_messages;
+        bool dhcp4_configured;
 
         sd_ipv4ll *ipv4ll;
         bool ipv4ll_address;
         bool ipv4ll_route;
 
+        bool static_configured;
+
         LIST_HEAD(Address, pool_addresses);
 
         sd_dhcp_server *dhcp_server;
@@ -109,9 +113,13 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
 
 int link_save(Link *link);
 
-bool link_has_carrier(unsigned flags, uint8_t operstate);
+bool link_has_carrier(Link *link);
+
+int link_set_mtu(Link *link, uint32_t mtu);
+int link_set_hostname(Link *link, const char *hostname);
 
 int ipv4ll_configure(Link *link);
+int dhcp4_configure(Link *link);
 
 const char* link_state_to_string(LinkState s) _const_;
 LinkState link_state_from_string(const char *s) _pure_;
@@ -124,7 +132,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref);
 
 /* Macros which append INTERFACE= to the message */
 
-#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
 #define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
 #define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
 #define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)