X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=9acf31cd1d556917072e6682e2b46880934acaae;hb=086891e5c1;hp=c6e6b22c383e04413fffed24031410c2695dc190;hpb=46b0c76e2c355c0d0cc4792abb98cde07b28bc53;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index c6e6b22c3..9acf31cd1 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -37,7 +37,7 @@ #include "hashmap.h" #include "list.h" #include "set.h" -#include "condition-util.h" +#include "condition.h" #include "in-addr-util.h" #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU @@ -100,6 +100,7 @@ struct Network { bool dhcp_broadcast; bool dhcp_critical; bool dhcp_routes; + unsigned dhcp_route_metric; bool ipv4ll; bool ipv4ll_route; @@ -173,8 +174,6 @@ struct Manager { struct udev *udev; struct udev_monitor *udev_monitor; sd_event_source *udev_event_source; - sd_event_source *sigterm_event_source; - sd_event_source *sigint_event_source; char *state_file; @@ -337,7 +336,7 @@ int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union /* 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__)