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=2323e3db856810735d7bcbadde0323bbb35c2f0f;hpb=52433f6b65eccd1c54606dde999610640f3458ac;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index 2323e3db8..fb0976491 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -22,7 +22,6 @@ #pragma once #include -#include #include "sd-event.h" #include "sd-rtnl.h" @@ -33,8 +32,9 @@ #include "rtnl-util.h" #include "hashmap.h" #include "list.h" +#include "condition-util.h" -typedef struct Netdev Netdev; +typedef struct NetDev NetDev; typedef struct Network Network; typedef struct Link Link; typedef struct Address Address; @@ -50,32 +50,40 @@ struct netdev_enslave_callback { LIST_FIELDS(netdev_enslave_callback, callbacks); }; -typedef enum NetdevKind { +typedef enum NetDevKind { NETDEV_KIND_BRIDGE, NETDEV_KIND_BOND, + NETDEV_KIND_VLAN, _NETDEV_KIND_MAX, _NETDEV_KIND_INVALID = -1 -} NetdevKind; +} NetDevKind; -typedef enum NetdevState { +typedef enum NetDevState { NETDEV_STATE_FAILED, NETDEV_STATE_CREATING, NETDEV_STATE_READY, _NETDEV_STATE_MAX, _NETDEV_STATE_INVALID = -1, -} NetdevState; +} NetDevState; -struct Netdev { +struct NetDev { Manager *manager; char *filename; + Condition *match_host; + Condition *match_virt; + Condition *match_kernel; + Condition *match_arch; + char *description; char *name; - NetdevKind kind; + NetDevKind kind; - Link *link; - NetdevState state; + uint64_t vlanid; + + int ifindex; + NetDevState state; LIST_HEAD(netdev_enslave_callback, callbacks); }; @@ -90,15 +98,21 @@ 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 *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); @@ -118,7 +132,7 @@ struct Address { unsigned char prefixlen; char *label; - struct in_addr netmask; + struct in_addr broadcast; union { struct in_addr in; @@ -133,7 +147,6 @@ struct Route { uint64_t section; unsigned char family; - unsigned char dst_family; unsigned char dst_prefixlen; union { @@ -170,18 +183,15 @@ struct Link { Network *network; - Route *dhcp_route; - Address *dhcp_address; - Address *dns; - uint16_t original_mtu; - 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 { @@ -220,24 +230,27 @@ int manager_update_resolv_conf(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) -/* Netdev */ +/* NetDev */ int netdev_load(Manager *manager); -void netdev_free(Netdev *netdev); +void netdev_free(NetDev *netdev); -DEFINE_TRIVIAL_CLEANUP_FUNC(Netdev*, netdev_free); +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_link(Manager *m, NetdevKind kind, Link *link); -int netdev_enslave(Netdev *netdev, Link *link, sd_rtnl_message_handler_t cb); +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); -const char *netdev_kind_to_string(NetdevKind d) _const_; -NetdevKind netdev_kind_from_string(const char *d) _pure_; +const char *netdev_kind_to_string(NetDevKind d) _const_; +NetDevKind netdev_kind_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); +/* gperf */ +const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); + /* Network */ int network_load(Manager *manager); @@ -258,9 +271,12 @@ 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); -/* gperf */ +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); @@ -297,6 +313,10 @@ 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); @@ -305,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);