X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=fb0976491c31032b2aba0947a8e952ab5db4c4b0;hb=12e0f830f592ec4c6bb49ac7ae1e0e84f74105e3;hp=9be9330c999f89fc659741f10e2a6c9a0afe0f19;hpb=3333d748facc15f49935b6b793490ba0824976e6;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index 9be9330c9..fb0976491 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -22,54 +22,70 @@ #pragma once #include -#include #include "sd-event.h" #include "sd-rtnl.h" +#include "sd-bus.h" #include "sd-dhcp-client.h" #include "udev.h" #include "rtnl-util.h" #include "hashmap.h" #include "list.h" +#include "condition-util.h" -typedef struct Bridge Bridge; +typedef struct NetDev NetDev; typedef struct Network Network; typedef struct Link Link; typedef struct Address Address; typedef struct Route Route; typedef struct Manager Manager; -typedef struct bridge_join_callback bridge_join_callback; +typedef struct netdev_enslave_callback netdev_enslave_callback; -struct bridge_join_callback { +struct netdev_enslave_callback { sd_rtnl_message_handler_t callback; Link *link; - LIST_FIELDS(bridge_join_callback, callbacks); + LIST_FIELDS(netdev_enslave_callback, callbacks); }; -typedef enum BridgeState { - BRIDGE_STATE_FAILED, - BRIDGE_STATE_CREATING, - BRIDGE_STATE_CREATED, - BRIDGE_STATE_READY, - _BRIDGE_STATE_MAX, - _BRIDGE_STATE_INVALID = -1, -} BridgeState; - -struct Bridge { +typedef enum NetDevKind { + NETDEV_KIND_BRIDGE, + NETDEV_KIND_BOND, + NETDEV_KIND_VLAN, + _NETDEV_KIND_MAX, + _NETDEV_KIND_INVALID = -1 +} NetDevKind; + +typedef enum NetDevState { + NETDEV_STATE_FAILED, + NETDEV_STATE_CREATING, + NETDEV_STATE_READY, + _NETDEV_STATE_MAX, + _NETDEV_STATE_INVALID = -1, +} NetDevState; + +struct NetDev { Manager *manager; char *filename; + Condition *match_host; + Condition *match_virt; + Condition *match_kernel; + Condition *match_arch; + char *description; char *name; + NetDevKind kind; - Link *link; - BridgeState state; + uint64_t vlanid; - LIST_HEAD(bridge_join_callback, callbacks); + int ifindex; + NetDevState state; + + LIST_HEAD(netdev_enslave_callback, callbacks); }; struct Network { @@ -82,13 +98,25 @@ 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; - Bridge *bridge; + NetDev *bridge; + NetDev *bond; + Hashmap *vlans; bool dhcp; + bool dhcp_dns; + bool dhcp_mtu; + bool dhcp_hostname; + bool dhcp_domainname; + bool dhcp_critical; LIST_HEAD(Address, static_addresses); LIST_HEAD(Route, static_routes); + Address *dns; Hashmap *addresses_by_section; Hashmap *routes_by_section; @@ -104,7 +132,7 @@ struct Address { unsigned char prefixlen; char *label; - struct in_addr netmask; + struct in_addr broadcast; union { struct in_addr in; @@ -119,7 +147,6 @@ struct Route { uint64_t section; unsigned char family; - unsigned char dst_family; unsigned char dst_prefixlen; union { @@ -136,7 +163,7 @@ struct Route { }; typedef enum LinkState { - LINK_STATE_JOINING_BRIDGE, + LINK_STATE_ENSLAVING, LINK_STATE_SETTING_ADDRESSES, LINK_STATE_SETTING_ROUTES, LINK_STATE_CONFIGURED, @@ -156,26 +183,27 @@ struct Link { Network *network; - Route *dhcp_route; - Address *dhcp_address; - LinkState state; unsigned addr_messages; unsigned route_messages; + unsigned enslaving; - sd_dhcp_client *dhcp; + sd_dhcp_client *dhcp_client; + sd_dhcp_lease *dhcp_lease; + uint16_t original_mtu; }; struct Manager { sd_rtnl *rtnl; sd_event *event; + sd_bus *bus; struct udev *udev; struct udev_monitor *udev_monitor; sd_event_source *udev_event_source; Hashmap *links; - Hashmap *bridges; + Hashmap *netdevs; LIST_HEAD(Network, networks); usec_t network_dirs_ts_usec; @@ -195,22 +223,33 @@ int manager_udev_enumerate_links(Manager *m); int manager_udev_listen(Manager *m); int manager_rtnl_listen(Manager *m); +int manager_bus_listen(Manager *m); + +int manager_update_resolv_conf(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) -/* Bridge */ +/* NetDev */ + +int netdev_load(Manager *manager); + +void netdev_free(NetDev *netdev); -int bridge_load(Manager *manager); +DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free); +#define _cleanup_netdev_free_ _cleanup_(netdev_freep) -void bridge_free(Bridge *bridge); +int netdev_get(Manager *manager, const char *name, NetDev **ret); +int netdev_set_ifindex(NetDev *netdev, int ifindex); +int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t cb); -DEFINE_TRIVIAL_CLEANUP_FUNC(Bridge*, bridge_free); -#define _cleanup_bridge_free_ _cleanup_(bridge_freep) +const char *netdev_kind_to_string(NetDevKind d) _const_; +NetDevKind netdev_kind_from_string(const char *d) _pure_; -int bridge_get(Manager *manager, const char *name, Bridge **ret); -int bridge_set_link(Manager *m, Link *link); -int bridge_join(Bridge *bridge, Link *link, sd_rtnl_message_handler_t cb); +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); + +/* gperf */ +const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); /* Network */ @@ -228,9 +267,16 @@ int config_parse_bridge(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_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); -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); @@ -259,10 +305,18 @@ int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callbac 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); +int config_parse_broadcast(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_label(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); @@ -271,6 +325,7 @@ 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); @@ -281,38 +336,29 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free); /* 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, 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__) -#define log_warning_link(link, ...) log_full_link(LOG_WARNING, link, __VA_ARGS__) -#define log_error_link(link, ...) log_full_link(LOG_ERR, link, __VA_ARGS__) - -#define log_link_full(level, link, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " message, link->ifname) -#define log_link_debug(link, ...) log_link_full(LOG_DEBUG, link, __VA_ARGS__) -#define log_link_info(link, ...) log_link_full(LOG_INFO, link, __VA_ARGS__) -#define log_link_notice(link, ...) log_link_full(LOG_NOTICE, link, __VA_ARGS__) -#define log_link_warning(link, ...) log_link_full(LOG_WARNING, link, __VA_ARGS__) -#define log_link_error(link, ...) log_link_full(LOG_ERR, link, __VA_ARGS__) +#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " fmt, 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__) +#define log_warning_link(link, ...) log_full_link(LOG_WARNING, link, ##__VA_ARGS__) +#define log_error_link(link, ...) log_full_link(LOG_ERR, link, ##__VA_ARGS__) #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_bridge(level, bridge, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " fmt, bridge->name, __VA_ARGS__) -#define log_debug_bridge(bridge, ...) log_full_bridge(LOG_DEBUG, bridge, __VA_ARGS__) -#define log_info_bridge(bridge, ...) log_full_bridge(LOG_INFO, bridge, __VA_ARGS__) -#define log_notice_bridge(bridge, ...) log_full_bridge(LOG_NOTICE, bridge, __VA_ARGS__) -#define log_warning_bridge(bridge, ...) log_full_bridge(LOG_WARNING, bridge, __VA_ARGS__) -#define log_error_bridge(bridge, ...) log_full_bridge(LOG_ERR, bridge, __VA_ARGS__) - -#define log_bridge_full(level, bridge, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " message, bridge->name) -#define log_bridge_debug(bridge, ...) log_bridge_full(LOG_DEBUG, bridge, __VA_ARGS__) -#define log_bridge_info(bridge, ...) log_bridge_full(LOG_INFO, bridge, __VA_ARGS__) -#define log_bridge_notice(bridge, ...) log_bridge_full(LOG_NOTICE, bridge, __VA_ARGS__) -#define log_bridge_warning(bridge, ...) log_bridge_full(LOG_WARNING, bridge, __VA_ARGS__) -#define log_bridge_error(bridge, ...) log_bridge_full(LOG_ERR, bridge, __VA_ARGS__) - -#define log_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__) - -#define BRIDGE(bridge) "INTERFACE=%s", bridge->name +#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->name, "%s: " fmt, netdev->name, ##__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->name, __VA_ARGS__) + +#define NETDEV(netdev) "INTERFACE=%s", netdev->name +#define ADDRESS_FMT_VAL(address) \ + (address).s_addr & 0xFF, \ + ((address).s_addr >> 8) & 0xFF, \ + ((address).s_addr >> 16) & 0xFF, \ + (address).s_addr >> 24