X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=c28c90f0e34f7bb5ccd9a74e1191c1c417bd6482;hb=dff91e8b7fa396284768a22b62c36dbe23a3b206;hp=7c23793cf92557d1c86c16cf614b3653cd003191;hpb=f882c247ad59776c3a7753bb963c1f8e2386cb79;p=elogind.git diff --git a/src/network/networkd.h b/src/network/networkd.h index 7c23793cf..c28c90f0e 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -32,12 +32,45 @@ #include "hashmap.h" #include "list.h" +typedef struct Bridge Bridge; 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; + +struct bridge_join_callback { + sd_rtnl_message_handler_t callback; + Link *link; + + LIST_FIELDS(bridge_join_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 { + Manager *manager; + + char *filename; + + char *description; + char *name; + + Link *link; + BridgeState state; + + LIST_HEAD(bridge_join_callback, callbacks); +}; + struct Network { Manager *manager; @@ -50,15 +83,20 @@ struct Network { char *match_name; char *description; + Bridge *bridge; LIST_HEAD(Address, addresses); LIST_HEAD(Route, routes); + Hashmap *addresses_by_section; + Hashmap *routes_by_section; + LIST_FIELDS(Network, networks); }; struct Address { Network *network; + uint64_t section; unsigned char family; unsigned char prefixlen; @@ -76,22 +114,28 @@ struct Address { struct Route { Network *network; + uint64_t section; unsigned char family; + unsigned char dst_prefixlen; union { struct in_addr in; struct in6_addr in6; } in_addr; + union { + struct in_addr in; + struct in6_addr in6; + } dst_addr; + LIST_FIELDS(Route, routes); }; typedef enum LinkState { - LINK_STATE_SET_ADDRESSES, - LINK_STATE_ADDRESSES_SET, - LINK_STATE_SET_ROUTES, - LINK_STATE_ROUTES_SET, + LINK_STATE_JOINING_BRIDGE, + LINK_STATE_SETTING_ADDRESSES, + LINK_STATE_SETTING_ROUTES, LINK_STATE_CONFIGURED, LINK_STATE_FAILED, _LINK_STATE_MAX, @@ -101,7 +145,8 @@ typedef enum LinkState { struct Link { Manager *manager; - int ifindex; + uint64_t ifindex; + char *ifname; struct ether_addr mac; unsigned flags; @@ -121,6 +166,7 @@ struct Manager { sd_event_source *udev_event_source; Hashmap *links; + Hashmap *bridges; LIST_HEAD(Network, networks); char **network_dirs; @@ -132,6 +178,9 @@ struct Manager { int manager_new(Manager **ret); 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); @@ -140,10 +189,22 @@ int manager_rtnl_listen(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); #define _cleanup_manager_free_ _cleanup_(manager_freep) +/* Bridge */ + +int bridge_load(Manager *manager); + +void bridge_free(Bridge *bridge); + +DEFINE_TRIVIAL_CLEANUP_FUNC(Bridge*, bridge_free); +#define _cleanup_bridge_free_ _cleanup_(bridge_freep) + +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); + /* Network */ int network_load(Manager *manager); -bool network_should_reload(Manager *manager); void network_free(Network *network); @@ -153,10 +214,16 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Network*, network_free); int network_get(Manager *manager, struct udev_device *device, Network **ret); int network_apply(Manager *manager, Network *network, Link *link); +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 */ + const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length); /* Route */ -int route_new(Network *network, Route **ret); +int route_new(Network *network, unsigned section, Route **ret); void route_free(Route *route); int route_configure(Route *route, Link *link, sd_rtnl_message_handler_t callback); @@ -164,11 +231,15 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Route*, route_free); #define _cleanup_route_free_ _cleanup_(route_freep) int config_parse_gateway(const char *unit, const char *filename, unsigned line, - const char *section, const char *lvalue, int ltype, - const char *rvalue, void *data, void *userdata); + const char *section, unsigned section_line, const char *lvalue, + int ltype, const char *rvalue, void *data, void *userdata); + +int config_parse_destination(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); /* Address */ -int address_new(Network *network, Address **ret); +int address_new(Network *network, unsigned section, Address **ret); void address_free(Address *address); int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback); @@ -176,8 +247,12 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free); #define _cleanup_address_free_ _cleanup_(address_freep) int config_parse_address(const char *unit, const char *filename, unsigned line, - const char *section, const char *lvalue, int ltype, - const char *rvalue, void *data, void *userdata); + 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); /* Link */ @@ -186,5 +261,7 @@ void link_free(Link *link); int link_add(Manager *manager, struct udev_device *device); int link_configure(Link *link); +int link_update(Link *link, sd_rtnl_message *message); + DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free); #define _cleanup_link_free_ _cleanup_(link_freep)