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

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 3b2908090..2da852fea 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -119,6 +119,7 @@ struct Route {
         uint64_t section;
 
         unsigned char family;
+        unsigned char dst_family;
         unsigned char dst_prefixlen;
 
         union {
@@ -177,10 +178,11 @@ struct Manager {
         Hashmap *bridges;
         LIST_HEAD(Network, networks);
 
-        char **network_dirs;
         usec_t network_dirs_ts_usec;
 };
 
+extern const char* const network_dirs[];
+
 /* Manager */
 
 int manager_new(Manager **ret);
@@ -276,3 +278,46 @@ int link_update(Link *link, sd_rtnl_message *message);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define _cleanup_link_free_ _cleanup_(link_freep)
+
+/* 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_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_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__)
+
+#define BRIDGE(bridge) "INTERFACE=%s", bridge->name
+#define ADDRESS_FMT_VAL(address)            \
+        (address).s_addr & 0xFF,            \
+        ((address).s_addr >> 8) & 0xFF,     \
+        ((address).s_addr >> 16) & 0xFF,    \
+        (address).s_addr >> 24