X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=36902e3c51f810eef252be844b2014eb80e2f703;hb=aba496a58acf9d9c61314de71353550e579f85ee;hp=184f631ecfa39a564103d2e88aa20b1552146f14;hpb=1a436809498faf6486815baa0338fb6b8e5def07;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index 184f631ec..36902e3c5 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,20 @@ 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_MAX, _NETDEV_KIND_INVALID = -1 } NetDevKind; @@ -71,11 +85,17 @@ struct NetDev { char *filename; + Condition *match_host; + Condition *match_virt; + Condition *match_kernel; + Condition *match_arch; + char *description; char *name; NetDevKind kind; - int vlanid; + uint64_t vlanid; + int32_t macvlan_mode; int ifindex; NetDevState state; @@ -93,25 +113,32 @@ 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; + 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 +148,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 +168,8 @@ struct Route { unsigned char family; unsigned char dst_prefixlen; + unsigned char scope; + uint32_t metrics; union { struct in_addr in; @@ -168,7 +199,9 @@ struct Link { uint64_t ifindex; char *ifname; + char *state_file; struct ether_addr mac; + struct udev_device *udev_device; unsigned flags; @@ -183,6 +216,7 @@ struct Link { sd_dhcp_client *dhcp_client; sd_dhcp_lease *dhcp_lease; uint16_t original_mtu; + sd_ipv4ll *ipv4ll; }; struct Manager { @@ -192,6 +226,8 @@ 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; Hashmap *links; Hashmap *netdevs; @@ -231,14 +267,22 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free); #define _cleanup_netdev_free_ _cleanup_(netdev_freep) 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); 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); @@ -263,15 +307,20 @@ 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); -/* gperf */ +int config_parse_macvlan(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); -const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length); +/* gperf */ +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 +338,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); @@ -314,11 +364,16 @@ int config_parse_label(const char *unit, const char *filename, unsigned line, int link_new(Manager *manager, struct udev_device *device, Link **ret); void link_free(Link *link); +int link_get(Manager *m, int ifindex, Link **ret); int link_add(Manager *manager, struct udev_device *device, Link **ret); -int link_configure(Link *link); int link_update(Link *link, sd_rtnl_message *message); +int link_save(Link *link); + +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)