X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=e32cf5d9b29f0a0228419d47bf59590d9e145264;hb=7951dea20911969287878e6897b3eca348721ade;hp=184f631ecfa39a564103d2e88aa20b1552146f14;hpb=1a436809498faf6486815baa0338fb6b8e5def07;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index 184f631ec..e32cf5d9b 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -22,17 +22,21 @@ #pragma once #include -#include #include "sd-event.h" #include "sd-rtnl.h" #include "sd-bus.h" #include "sd-dhcp-client.h" +#include "sd-ipv4ll.h" #include "udev.h" #include "rtnl-util.h" #include "hashmap.h" #include "list.h" +#include "set.h" +#include "condition-util.h" + +#define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU typedef struct NetDev NetDev; typedef struct Network Network; @@ -50,10 +54,23 @@ struct netdev_enslave_callback { 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 NetDevKind { NETDEV_KIND_BRIDGE, NETDEV_KIND_BOND, NETDEV_KIND_VLAN, + NETDEV_KIND_MACVLAN, + NETDEV_KIND_IPIP, + NETDEV_KIND_GRE, + NETDEV_KIND_SIT, _NETDEV_KIND_MAX, _NETDEV_KIND_INVALID = -1 } NetDevKind; @@ -62,6 +79,7 @@ typedef enum NetDevState { NETDEV_STATE_FAILED, NETDEV_STATE_CREATING, NETDEV_STATE_READY, + NETDEV_STATE_LINGER, _NETDEV_STATE_MAX, _NETDEV_STATE_INVALID = -1, } NetDevState; @@ -69,17 +87,31 @@ typedef enum 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 *name; + size_t mtu; NetDevKind kind; - int vlanid; + uint64_t vlanid; + int32_t macvlan_mode; int ifindex; NetDevState state; + unsigned tunnel_ttl; + unsigned tunnel_tos; + struct in_addr tunnel_local; + struct in_addr tunnel_remote; + LIST_HEAD(netdev_enslave_callback, callbacks); }; @@ -93,25 +125,33 @@ struct Network { char *match_driver; char *match_type; char *match_name; + Condition *match_host; + Condition *match_virt; + Condition *match_kernel; + Condition *match_arch; char *description; NetDev *bridge; NetDev *bond; - NetDev *vlan; + NetDev *tunnel; + Hashmap *vlans; + Hashmap *macvlans; bool dhcp; bool dhcp_dns; bool dhcp_mtu; bool dhcp_hostname; bool dhcp_domainname; bool dhcp_critical; + bool ipv4ll; LIST_HEAD(Address, static_addresses); LIST_HEAD(Route, static_routes); - Address *dns; Hashmap *addresses_by_section; Hashmap *routes_by_section; + Set *dns; + LIST_FIELDS(Network, networks); }; @@ -121,9 +161,11 @@ struct Address { unsigned char family; unsigned char prefixlen; + unsigned char scope; char *label; struct in_addr broadcast; + struct ifa_cacheinfo cinfo; union { struct in_addr in; @@ -139,6 +181,8 @@ struct Route { unsigned char family; unsigned char dst_prefixlen; + unsigned char scope; + uint32_t metrics; union { struct in_addr in; @@ -154,11 +198,14 @@ struct Route { }; typedef enum LinkState { + LINK_STATE_INITIALIZING, LINK_STATE_ENSLAVING, LINK_STATE_SETTING_ADDRESSES, LINK_STATE_SETTING_ROUTES, LINK_STATE_CONFIGURED, + LINK_STATE_UNMANAGED, LINK_STATE_FAILED, + LINK_STATE_LINGER, _LINK_STATE_MAX, _LINK_STATE_INVALID = -1 } LinkState; @@ -166,11 +213,16 @@ typedef enum LinkState { struct Link { Manager *manager; + int n_ref; + uint64_t ifindex; char *ifname; + char *state_file; struct ether_addr mac; + struct udev_device *udev_device; unsigned flags; + uint8_t operstate; Network *network; @@ -182,7 +234,9 @@ struct Link { sd_dhcp_client *dhcp_client; sd_dhcp_lease *dhcp_lease; + char *lease_file; uint16_t original_mtu; + sd_ipv4ll *ipv4ll; }; struct Manager { @@ -192,12 +246,17 @@ 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; Hashmap *links; Hashmap *netdevs; LIST_HEAD(Network, networks); usec_t network_dirs_ts_usec; + struct kmod_ctx *kmod_ctx; }; extern const char* const network_dirs[]; @@ -210,13 +269,15 @@ void manager_free(Manager *m); int manager_load_config(Manager *m); bool manager_should_reload(Manager *m); -int manager_udev_enumerate_links(Manager *m); -int manager_udev_listen(Manager *m); +int manager_rtnl_enumerate_links(Manager *m); 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_init_kmod_ctx(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) @@ -224,21 +285,32 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); /* NetDev */ int netdev_load(Manager *manager); +void netdev_drop(NetDev *netdev); -void netdev_free(NetDev *netdev); +NetDev *netdev_unref(NetDev *netdev); +NetDev *netdev_ref(NetDev *netdev); -DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free); -#define _cleanup_netdev_free_ _cleanup_(netdev_freep) +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, int ifindex); +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); 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_; + 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); + +/* gperf */ +const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); + /* Network */ int network_load(Manager *manager); @@ -248,30 +320,47 @@ void network_free(Network *network); DEFINE_TRIVIAL_CLEANUP_FUNC(Network*, network_free); #define _cleanup_network_free_ _cleanup_(network_freep) -int network_get(Manager *manager, struct udev_device *device, Network **ret); +int network_get(Manager *manager, struct udev_device *device, + const char *ifname, const struct ether_addr *mac, + Network **ret); int network_apply(Manager *manager, Network *network, Link *link); -int config_parse_bridge(const char *unit, const char *filename, unsigned line, +int config_parse_netdev(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(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_vlan(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_tunnel(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_tunnel_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); /* gperf */ - -const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length); /* Route */ int route_new_static(Network *network, unsigned section, Route **ret); int route_new_dynamic(Route **ret); 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); + DEFINE_TRIVIAL_CLEANUP_FUNC(Route*, route_free); #define _cleanup_route_free_ _cleanup_(route_freep) @@ -289,6 +378,7 @@ int address_new_static(Network *network, unsigned section, Address **ret); int address_new_dynamic(Address **ret); 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); DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free); @@ -312,15 +402,26 @@ int config_parse_label(const char *unit, const char *filename, unsigned line, /* Link */ -int link_new(Manager *manager, struct udev_device *device, Link **ret); -void link_free(Link *link); -int link_add(Manager *manager, struct udev_device *device, Link **ret); -int link_configure(Link *link); +Link *link_unref(Link *link); +Link *link_ref(Link *link); +int link_get(Manager *m, int ifindex, Link **ret); +int link_add(Manager *manager, sd_rtnl_message *message, Link **ret); +void link_drop(Link *link); int link_update(Link *link, sd_rtnl_message *message); +int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata); + +int link_initialized(Link *link, struct udev_device *device); + +int link_save(Link *link); + +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_; -DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free); -#define _cleanup_link_free_ _cleanup_(link_freep) +DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref); +#define _cleanup_link_unref_ _cleanup_(link_unrefp) /* Macros which append INTERFACE= to the message */