X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=89f4cf24e796f7ec86361a993a43d13d419b1436;hb=1346b1f0388f4100bb3c2a2bb23bc881769c020c;hp=2da852fea4a4e0cb694c4b62571be2df7ac68a37;hpb=628706137efbca8aaf753ccd063e5abf7e31aed5;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 2da852fea..89f4cf24e 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -26,6 +26,7 @@
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
+#include "sd-bus.h"
 #include "sd-dhcp-client.h"
 #include "udev.h"
 
@@ -52,7 +53,6 @@ struct bridge_join_callback {
 typedef enum BridgeState {
         BRIDGE_STATE_FAILED,
         BRIDGE_STATE_CREATING,
-        BRIDGE_STATE_CREATED,
         BRIDGE_STATE_READY,
         _BRIDGE_STATE_MAX,
         _BRIDGE_STATE_INVALID = -1,
@@ -86,9 +86,13 @@ struct Network {
         char *description;
         Bridge *bridge;
         bool dhcp;
+        bool dhcp_dns;
+        bool dhcp_mtu;
+        bool dhcp_hostname;
 
         LIST_HEAD(Address, static_addresses);
         LIST_HEAD(Route, static_routes);
+        Address *dns;
 
         Hashmap *addresses_by_section;
         Hashmap *routes_by_section;
@@ -158,6 +162,8 @@ struct Link {
 
         Route *dhcp_route;
         Address *dhcp_address;
+        Address *dns;
+        uint16_t original_mtu;
 
         LinkState state;
 
@@ -170,6 +176,7 @@ struct Link {
 struct Manager {
         sd_rtnl *rtnl;
         sd_event *event;
+        sd_bus *bus;
         struct udev *udev;
         struct udev_monitor *udev_monitor;
         sd_event_source *udev_event_source;
@@ -195,6 +202,9 @@ int manager_udev_enumerate_links(Manager *m);
 int manager_udev_listen(Manager *m);
 
 int manager_rtnl_listen(Manager *m);
+int manager_bus_listen(Manager *m);
+
+int manager_update_resolv_conf(Manager *m);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 #define _cleanup_manager_free_ _cleanup_(manager_freep)
@@ -259,6 +269,10 @@ int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callbac
 DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
 #define _cleanup_address_free_ _cleanup_(address_freep)
 
+int config_parse_dns(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);
+
 int config_parse_address(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);
@@ -281,37 +295,23 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 
 /* 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, 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__)
-#define log_warning_link(link, ...)     log_full_link(LOG_WARNING, link, __VA_ARGS__)
-#define log_error_link(link, ...)       log_full_link(LOG_ERR, link, __VA_ARGS__)
-
-#define log_link_full(level, link, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " message, link->ifname)
-#define log_link_debug(link, ...)       log_link_full(LOG_DEBUG, link, __VA_ARGS__)
-#define log_link_info(link, ...)        log_link_full(LOG_INFO, link, __VA_ARGS__)
-#define log_link_notice(link, ...)      log_link_full(LOG_NOTICE, link, __VA_ARGS__)
-#define log_link_warning(link, ...)     log_link_full(LOG_WARNING, link, __VA_ARGS__)
-#define log_link_error(link, ...)       log_link_full(LOG_ERR, link, __VA_ARGS__)
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " fmt, 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__)
+#define log_warning_link(link, ...)     log_full_link(LOG_WARNING, link, ##__VA_ARGS__)
+#define log_error_link(link, ...)       log_full_link(LOG_ERR, link, ##__VA_ARGS__)
 
 #define log_struct_link(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
 
 /* More macros which append INTERFACE= to the message */
 
-#define log_full_bridge(level, bridge, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " fmt, bridge->name, __VA_ARGS__)
-#define log_debug_bridge(bridge, ...)       log_full_bridge(LOG_DEBUG, bridge, __VA_ARGS__)
-#define log_info_bridge(bridge, ...)        log_full_bridge(LOG_INFO, bridge, __VA_ARGS__)
-#define log_notice_bridge(bridge, ...)      log_full_bridge(LOG_NOTICE, bridge, __VA_ARGS__)
-#define log_warning_bridge(bridge, ...)     log_full_bridge(LOG_WARNING, bridge, __VA_ARGS__)
-#define log_error_bridge(bridge, ...)       log_full_bridge(LOG_ERR, bridge, __VA_ARGS__)
-
-#define log_bridge_full(level, bridge, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " message, bridge->name)
-#define log_bridge_debug(bridge, ...)       log_bridge_full(LOG_DEBUG, bridge, __VA_ARGS__)
-#define log_bridge_info(bridge, ...)        log_bridge_full(LOG_INFO, bridge, __VA_ARGS__)
-#define log_bridge_notice(bridge, ...)      log_bridge_full(LOG_NOTICE, bridge, __VA_ARGS__)
-#define log_bridge_warning(bridge, ...)     log_bridge_full(LOG_WARNING, bridge, __VA_ARGS__)
-#define log_bridge_error(bridge, ...)       log_bridge_full(LOG_ERR, bridge, __VA_ARGS__)
+#define log_full_bridge(level, bridge, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " fmt, bridge->name, ##__VA_ARGS__)
+#define log_debug_bridge(bridge, ...)       log_full_bridge(LOG_DEBUG, bridge, ##__VA_ARGS__)
+#define log_info_bridge(bridge, ...)        log_full_bridge(LOG_INFO, bridge, ##__VA_ARGS__)
+#define log_notice_bridge(bridge, ...)      log_full_bridge(LOG_NOTICE, bridge, ##__VA_ARGS__)
+#define log_warning_bridge(bridge, ...)     log_full_bridge(LOG_WARNING, bridge,## __VA_ARGS__)
+#define log_error_bridge(bridge, ...)       log_full_bridge(LOG_ERR, bridge, ##__VA_ARGS__)
 
 #define log_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__)