X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=c2b88acd61b3f97d311d2edf32634fa49edc8e5d;hp=30a29c7b67dfa76cb6672bcfc981a934ff45ee8c;hb=4cc7a82c9490a3c5ae03b1d6d168ce40ba499e23;hpb=428fd0a75873d63b9d567f9db7871551d1ee0d62 diff --git a/src/network/networkd.h b/src/network/networkd.h index 30a29c7b6..c2b88acd6 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -27,7 +27,10 @@ #include "sd-rtnl.h" #include "sd-bus.h" #include "sd-dhcp-client.h" +#include "sd-dhcp-server.h" #include "sd-ipv4ll.h" +#include "sd-icmp6-nd.h" +#include "sd-dhcp6-client.h" #include "udev.h" #include "rtnl-util.h" @@ -35,8 +38,11 @@ #include "list.h" #include "set.h" #include "condition-util.h" +#include "socket-util.h" #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU +#define VXLAN_VID_MAX (1u << 24) - 1 +#define DHCP_STATIC_ROUTE_METRIC 1024 typedef struct NetDev NetDev; typedef struct Network Network; @@ -44,6 +50,7 @@ typedef struct Link Link; typedef struct Address Address; typedef struct Route Route; typedef struct Manager Manager; +typedef struct AddressPool AddressPool; typedef struct netdev_enslave_callback netdev_enslave_callback; @@ -68,9 +75,12 @@ typedef enum NetDevKind { 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_MAX, _NETDEV_KIND_INVALID = -1 } NetDevKind; @@ -98,23 +108,39 @@ struct NetDev { char *description; char *ifname; + char *ifname_peer; size_t mtu; + struct ether_addr *mac; + struct ether_addr *mac_peer; NetDevKind kind; uint64_t vlanid; + uint64_t vxlanid; int32_t macvlan_mode; int ifindex; NetDevState state; - unsigned tunnel_ttl; - unsigned tunnel_tos; - struct in_addr tunnel_local; - struct in_addr tunnel_remote; + bool tunnel_pmtudisc; + bool learning; + unsigned ttl; + unsigned tos; + struct in_addr local; + struct in_addr remote; + struct in_addr group; LIST_HEAD(netdev_enslave_callback, callbacks); }; +typedef enum DHCPSupport { + DHCP_SUPPORT_NONE, + DHCP_SUPPORT_BOTH, + DHCP_SUPPORT_V4, + DHCP_SUPPORT_V6, + _DHCP_SUPPORT_MAX, + _DHCP_SUPPORT_INVALID = -1, +} DHCPSupport; + struct Network { Manager *manager; @@ -136,14 +162,20 @@ struct Network { NetDev *tunnel; Hashmap *vlans; Hashmap *macvlans; - bool dhcp; + Hashmap *vxlans; + DHCPSupport dhcp; bool dhcp_dns; + bool dhcp_ntp; bool dhcp_mtu; bool dhcp_hostname; bool dhcp_domainname; + bool dhcp_sendhost; bool dhcp_critical; + bool dhcp_routes; bool ipv4ll; + bool dhcp_server; + LIST_HEAD(Address, static_addresses); LIST_HEAD(Route, static_routes); @@ -151,6 +183,7 @@ struct Network { Hashmap *routes_by_section; LIST_HEAD(Address, dns); + LIST_HEAD(Address, ntp); LIST_FIELDS(Network, networks); }; @@ -167,10 +200,7 @@ struct Address { struct in_addr broadcast; struct ifa_cacheinfo cinfo; - union { - struct in_addr in; - struct in6_addr in6; - } in_addr; + union in_addr_union in_addr; LIST_FIELDS(Address, addresses); }; @@ -184,15 +214,8 @@ struct Route { unsigned char scope; uint32_t metrics; - union { - struct in_addr in; - struct in6_addr in6; - } in_addr; - - union { - struct in_addr in; - struct in6_addr in6; - } dst_addr; + union in_addr_union in_addr; + union in_addr_union dst_addr; LIST_FIELDS(Route, routes); }; @@ -210,6 +233,16 @@ typedef enum LinkState { _LINK_STATE_INVALID = -1 } LinkState; +typedef enum LinkOperationalState { + LINK_OPERSTATE_UNKNOWN, + LINK_OPERSTATE_DORMANT, + LINK_OPERSTATE_CARRIER, + LINK_OPERSTATE_DEGRADED, + LINK_OPERSTATE_ROUTABLE, + _LINK_OPERSTATE_MAX, + _LINK_OPERSTATE_INVALID = -1 +} LinkOperationalState; + struct Link { Manager *manager; @@ -222,11 +255,12 @@ struct Link { struct udev_device *udev_device; unsigned flags; - uint8_t operstate; + uint8_t kernel_operstate; Network *network; LinkState state; + LinkOperationalState operstate; unsigned addr_messages; unsigned route_messages; @@ -239,6 +273,24 @@ struct Link { char *lease_file; uint16_t original_mtu; sd_ipv4ll *ipv4ll; + + LIST_HEAD(Address, pool_addresses); + + sd_dhcp_server *dhcp_server; + + sd_icmp6_nd *icmp6_router_discovery; + sd_dhcp6_client *dhcp6_client; +}; + +struct AddressPool { + Manager *manager; + + unsigned family; + unsigned prefixlen; + + union in_addr_union in_addr; + + LIST_FIELDS(AddressPool, address_pools); }; struct Manager { @@ -256,10 +308,9 @@ struct Manager { Hashmap *links; Hashmap *netdevs; LIST_HEAD(Network, networks); - LIST_HEAD(Address, fallback_dns); + LIST_HEAD(AddressPool, address_pools); usec_t network_dirs_ts_usec; - struct kmod_ctx *kmod_ctx; }; extern const char* const network_dirs[]; @@ -278,18 +329,13 @@ int manager_rtnl_listen(Manager *m); int manager_udev_listen(Manager *m); int manager_bus_listen(Manager *m); -int manager_update_resolv_conf(Manager *m); int manager_save(Manager *m); +int manager_address_pool_acquire(Manager *m, unsigned family, unsigned prefixlen, union in_addr_union *found); + DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) -const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length); - -int config_parse_dnsv(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); - /* NetDev */ int netdev_load(Manager *manager); @@ -304,7 +350,9 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_unref); 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(Link *link, sd_rtnl_message_handler_t callback); +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); const char *netdev_kind_to_string(NetDevKind d) _const_; NetDevKind netdev_kind_from_string(const char *d) _pure_; @@ -429,12 +477,32 @@ bool link_has_carrier(unsigned flags, uint8_t operstate); const char* link_state_to_string(LinkState s) _const_; LinkState link_state_from_string(const char *s) _pure_; +const char* link_operstate_to_string(LinkOperationalState s) _const_; +LinkOperationalState link_operstate_from_string(const char *s) _pure_; + DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref); #define _cleanup_link_unref_ _cleanup_(link_unrefp) +/* DHCP support */ + +const char* dhcp_support_to_string(DHCPSupport i) _const_; +DHCPSupport dhcp_support_from_string(const char *s) _pure_; + +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); + +/* 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); +void address_pool_free(AddressPool *p); + +int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union *found); + /* 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, __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__) @@ -445,7 +513,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref); /* 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_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__)