X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=b7b1d903b2526e9553f270ee76cb63ba32298385;hp=f250f197424064021ad7eb226bb859150e667975;hb=4138fb2c7936758da709eaed3f6b4f3df1d04eff;hpb=987efa17dd5c9be156d8f49ddd942df20a72dcb1 diff --git a/src/network/networkd.h b/src/network/networkd.h index f250f1974..b7b1d903b 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,10 @@ #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 typedef struct NetDev NetDev; typedef struct Network Network; @@ -44,6 +49,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 +74,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,19 +107,26 @@ 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); }; @@ -136,13 +152,18 @@ struct Network { NetDev *tunnel; Hashmap *vlans; Hashmap *macvlans; + Hashmap *vxlans; bool dhcp; bool dhcp_dns; + bool dhcp_ntp; bool dhcp_mtu; bool dhcp_hostname; bool dhcp_domainname; bool dhcp_critical; bool ipv4ll; + bool dhcp6; + + bool dhcp_server; LIST_HEAD(Address, static_addresses); LIST_HEAD(Route, static_routes); @@ -150,7 +171,8 @@ struct Network { Hashmap *addresses_by_section; Hashmap *routes_by_section; - Set *dns; + LIST_HEAD(Address, dns); + LIST_HEAD(Address, ntp); LIST_FIELDS(Network, networks); }; @@ -167,12 +189,9 @@ 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, static_addresses); + LIST_FIELDS(Address, addresses); }; struct Route { @@ -184,17 +203,10 @@ 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, static_routes); + LIST_FIELDS(Route, routes); }; typedef enum LinkState { @@ -210,6 +222,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,21 +244,42 @@ 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; unsigned enslaving; + LIST_HEAD(Address, addresses); + sd_dhcp_client *dhcp_client; sd_dhcp_lease *dhcp_lease; 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 { @@ -254,9 +297,9 @@ struct Manager { Hashmap *links; Hashmap *netdevs; LIST_HEAD(Network, networks); + LIST_HEAD(AddressPool, address_pools); usec_t network_dirs_ts_usec; - struct kmod_ctx *kmod_ctx; }; extern const char* const network_dirs[]; @@ -275,9 +318,10 @@ 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) @@ -296,6 +340,8 @@ 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_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_; @@ -379,6 +425,7 @@ void address_free(Address *address); int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback); int address_update(Address *address, Link *link, sd_rtnl_message_handler_t callback); int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callback); +bool address_equal(Address *a1, Address *a2); DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free); #define _cleanup_address_free_ _cleanup_(address_freep) @@ -419,12 +466,23 @@ 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) +/* 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__) @@ -435,7 +493,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__)