X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=d5c229cf4620b361f384643739d9bbde64a1a7a5;hp=b9c5eee54d7fa3d6de91b3df6eef6922af17bacd;hb=bd8f65387673e29f46136a4ed172097035002c23;hpb=fe8ac65b683ec7408b26ba40040134e6d66b1c5c diff --git a/src/network/networkd.h b/src/network/networkd.h index b9c5eee54..d5c229cf4 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -38,11 +38,11 @@ #include "list.h" #include "set.h" #include "condition-util.h" -#include "socket-util.h" +#include "in-addr-util.h" #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU -#define VXLAN_VID_MAX (1u << 24) - 1 -#define DHCP_STATIC_ROUTE_METRIC 1024 +#define DHCP_ROUTE_METRIC 1024 +#define IPV4LL_ROUTE_METRIC 2048 typedef struct NetDev NetDev; typedef struct Network Network; @@ -52,109 +52,6 @@ typedef struct Route Route; typedef struct Manager Manager; typedef struct AddressPool AddressPool; -typedef struct netdev_enslave_callback netdev_enslave_callback; - -struct netdev_enslave_callback { - sd_rtnl_message_handler_t callback; - Link *link; - - LIST_FIELDS(netdev_enslave_callback, callbacks); -}; - -typedef enum MacVlanMode { - NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE, - NETDEV_MACVLAN_MODE_VEPA = MACVLAN_MODE_VEPA, - NETDEV_MACVLAN_MODE_BRIDGE = MACVLAN_MODE_BRIDGE, - NETDEV_MACVLAN_MODE_PASSTHRU = MACVLAN_MODE_PASSTHRU, - _NETDEV_MACVLAN_MODE_MAX, - _NETDEV_MACVLAN_MODE_INVALID = -1 -} MacVlanMode; - -typedef enum BondMode { - NETDEV_BOND_MODE_BALANCE_RR, - NETDEV_BOND_MODE_ACTIVE_BACKUP, - NETDEV_BOND_MODE_BALANCE_XOR, - NETDEV_BOND_MODE_BROADCAST, - NETDEV_BOND_MODE_802_3AD, - NETDEV_BOND_MODE_BALANCE_TLB, - NETDEV_BOND_MODE_BALANCE_ALB, - _NETDEV_BOND_MODE_MAX, - _NETDEV_BOND_MODE_INVALID = -1 -} BondMode; - -typedef enum NetDevKind { - NETDEV_KIND_BRIDGE, - NETDEV_KIND_BOND, - NETDEV_KIND_VLAN, - NETDEV_KIND_MACVLAN, - NETDEV_KIND_VXLAN, - NETDEV_KIND_IPIP, - NETDEV_KIND_GRE, - NETDEV_KIND_SIT, - NETDEV_KIND_VETH, - NETDEV_KIND_VTI, - NETDEV_KIND_DUMMY, - NETDEV_KIND_TUN, - NETDEV_KIND_TAP, - _NETDEV_KIND_MAX, - _NETDEV_KIND_INVALID = -1 -} NetDevKind; - -typedef enum NetDevState { - NETDEV_STATE_FAILED, - NETDEV_STATE_CREATING, - NETDEV_STATE_READY, - NETDEV_STATE_LINGER, - _NETDEV_STATE_MAX, - _NETDEV_STATE_INVALID = -1, -} NetDevState; - -struct NetDev { - Manager *manager; - - int n_ref; - - char *filename; - - Condition *match_host; - Condition *match_virt; - Condition *match_kernel; - Condition *match_arch; - - char *description; - char *ifname; - char *ifname_peer; - char *user_name; - char *group_name; - size_t mtu; - struct ether_addr *mac; - struct ether_addr *mac_peer; - NetDevKind kind; - - uint64_t vlanid; - uint64_t vxlanid; - int32_t macvlan_mode; - int32_t bond_mode; - - int ifindex; - NetDevState state; - - bool tunnel_pmtudisc; - bool learning; - bool one_queue; - bool multi_queue; - bool packet_info; - - unsigned ttl; - unsigned tos; - unsigned char family; - union in_addr_union local; - union in_addr_union remote; - union in_addr_union group; - - LIST_HEAD(netdev_enslave_callback, callbacks); -}; - typedef enum DHCPSupport { DHCP_SUPPORT_NONE, DHCP_SUPPORT_BOTH, @@ -164,6 +61,14 @@ typedef enum DHCPSupport { _DHCP_SUPPORT_INVALID = -1, } DHCPSupport; +typedef enum LLMNRSupport { + LLMNR_SUPPORT_NO, + LLMNR_SUPPORT_YES, + LLMNR_SUPPORT_RESOLVE, + _LLMNR_SUPPORT_MAX, + _LLMNR_SUPPORT_INVALID = -1, +} LLMNRSupport; + struct Network { Manager *manager; @@ -174,6 +79,8 @@ struct Network { char *match_driver; char *match_type; char *match_name; + char *dhcp_vendor_class_identifier; + Condition *match_host; Condition *match_virt; Condition *match_kernel; @@ -182,10 +89,7 @@ struct Network { char *description; NetDev *bridge; NetDev *bond; - NetDev *tunnel; - Hashmap *vlans; - Hashmap *macvlans; - Hashmap *vxlans; + Hashmap *stacked_netdevs; DHCPSupport dhcp; bool dhcp_dns; bool dhcp_ntp; @@ -193,9 +97,11 @@ struct Network { bool dhcp_hostname; bool dhcp_domainname; bool dhcp_sendhost; + bool dhcp_broadcast; bool dhcp_critical; bool dhcp_routes; bool ipv4ll; + bool ipv4ll_route; bool dhcp_server; @@ -205,17 +111,18 @@ struct Network { Hashmap *addresses_by_section; Hashmap *routes_by_section; - LIST_HEAD(Address, dns); - LIST_HEAD(Address, ntp); + char **dns, **ntp; + + LLMNRSupport llmnr; LIST_FIELDS(Network, networks); }; struct Address { Network *network; - uint64_t section; + unsigned section; - unsigned char family; + int family; unsigned char prefixlen; unsigned char scope; char *label; @@ -231,12 +138,13 @@ struct Address { struct Route { Network *network; - uint64_t section; + unsigned section; - unsigned char family; + int family; unsigned char dst_prefixlen; unsigned char scope; uint32_t metrics; + unsigned char protocol; /* RTPROT_* */ union in_addr_union in_addr; union in_addr_union dst_addr; @@ -272,10 +180,11 @@ struct Link { int n_ref; - uint64_t ifindex; + int ifindex; char *ifname; char *state_file; struct ether_addr mac; + uint32_t mtu; struct udev_device *udev_device; unsigned flags; @@ -309,7 +218,7 @@ struct Link { struct AddressPool { Manager *manager; - unsigned family; + int family; unsigned prefixlen; union in_addr_union in_addr; @@ -355,55 +264,11 @@ int manager_bus_listen(Manager *m); int manager_save(Manager *m); -int manager_address_pool_acquire(Manager *m, unsigned family, unsigned prefixlen, union in_addr_union *found); +int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, union in_addr_union *found); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) -/* NetDev */ - -#define VLANID_MAX 4094 - -int netdev_load(Manager *manager); -void netdev_drop(NetDev *netdev); - -NetDev *netdev_unref(NetDev *netdev); -NetDev *netdev_ref(NetDev *netdev); - -DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_unref); -#define _cleanup_netdev_unref_ _cleanup_(netdev_unrefp) - -int netdev_get(Manager *manager, const char *name, NetDev **ret); -int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *newlink); -int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t cb); -int netdev_create_tunnel(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); -int netdev_create_veth(NetDev *netdev, sd_rtnl_message_handler_t callback); -int netdev_create_vxlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); -int netdev_create_vlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); -int netdev_create_macvlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); -int netdev_create_dummy(NetDev *netdev, sd_rtnl_message_handler_t callback); -int netdev_create_tuntap(NetDev *netdev); -int netdev_create_bond(NetDev *netdev, sd_rtnl_message_handler_t callback); - - -const char *netdev_kind_to_string(NetDevKind d) _const_; -NetDevKind netdev_kind_from_string(const char *d) _pure_; - -const char *macvlan_mode_to_string(MacVlanMode d) _const_; -MacVlanMode macvlan_mode_from_string(const char *d) _pure_; - -const char *bond_mode_to_string(BondMode d) _const_; -BondMode bond_mode_from_string(const char *d) _pure_; - -int config_parse_netdev_kind(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_macvlan_mode(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_bond_mode(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); - -/* gperf */ -const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); - /* Network */ int network_load(Manager *manager); @@ -449,7 +314,7 @@ const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsig /* Route */ int route_new_static(Network *network, unsigned section, Route **ret); -int route_new_dynamic(Route **ret); +int route_new_dynamic(Route **ret, unsigned char rtm_protocol); void route_free(Route *route); int route_configure(Route *route, Link *link, sd_rtnl_message_handler_t callback); int route_drop(Route *route, Link *link, sd_rtnl_message_handler_t callback); @@ -466,6 +331,9 @@ int config_parse_destination(const char *unit, const char *filename, unsigned li const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +int config_parse_route_priority(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); /* Address */ int address_new_static(Network *network, unsigned section, Address **ret); int address_new_dynamic(Address **ret); @@ -478,10 +346,6 @@ bool address_equal(Address *a1, Address *a2); 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); @@ -529,10 +393,19 @@ int config_parse_dhcp(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); +/* LLMNR support */ + +const char* llmnr_support_to_string(LLMNRSupport i) _const_; +LLMNRSupport llmnr_support_from_string(const char *s) _pure_; + +int config_parse_llmnr(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); + /* Address Pool */ -int address_pool_new(Manager *m, AddressPool **ret, unsigned family, const union in_addr_union *u, unsigned prefixlen); -int address_pool_new_from_string(Manager *m, AddressPool **ret, unsigned family, const char *p, unsigned prefixlen); +int address_pool_new(Manager *m, AddressPool **ret, int family, const union in_addr_union *u, unsigned prefixlen); +int address_pool_new_from_string(Manager *m, AddressPool **ret, int family, const char *p, unsigned prefixlen); void address_pool_free(AddressPool *p); int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union *found); @@ -548,18 +421,6 @@ int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union #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_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->ifname, "%-*s: " fmt, IFNAMSIZ, netdev->ifname, ##__VA_ARGS__) -#define log_debug_netdev(netdev, ...) log_full_netdev(LOG_DEBUG, netdev, ##__VA_ARGS__) -#define log_info_netdev(netdev, ...) log_full_netdev(LOG_INFO, netdev, ##__VA_ARGS__) -#define log_notice_netdev(netdev, ...) log_full_netdev(LOG_NOTICE, netdev, ##__VA_ARGS__) -#define log_warning_netdev(netdev, ...) log_full_netdev(LOG_WARNING, netdev,## __VA_ARGS__) -#define log_error_netdev(netdev, ...) log_full_netdev(LOG_ERR, netdev, ##__VA_ARGS__) - -#define log_struct_netdev(level, netdev, ...) log_struct(level, "INTERFACE=%s", netdev->ifname, __VA_ARGS__) - -#define NETDEV(netdev) "INTERFACE=%s", netdev->ifname #define ADDRESS_FMT_VAL(address) \ (address).s_addr & 0xFF, \ ((address).s_addr >> 8) & 0xFF, \