chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: ipv4ll - default to setting up ipv4ll routes
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 3f0ef5d0ec0c7933c2bf3da71b3a67beaf41ded2..138b82d786e0873c8ca7c5639a3c0a1de1ebccaa 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-92,9
+92,11
@@
struct Network {
bool dhcp_hostname;
bool dhcp_domainname;
bool dhcp_sendhost;
bool dhcp_hostname;
bool dhcp_domainname;
bool dhcp_sendhost;
+ bool dhcp_broadcast;
bool dhcp_critical;
bool dhcp_routes;
bool ipv4ll;
bool dhcp_critical;
bool dhcp_routes;
bool ipv4ll;
+ bool ipv4ll_route;
bool dhcp_server;
bool dhcp_server;
@@
-104,8
+106,7
@@
struct Network {
Hashmap *addresses_by_section;
Hashmap *routes_by_section;
Hashmap *addresses_by_section;
Hashmap *routes_by_section;
- LIST_HEAD(Address, dns);
- LIST_HEAD(Address, ntp);
+ char **dns, **ntp;
LIST_FIELDS(Network, networks);
};
LIST_FIELDS(Network, networks);
};
@@
-114,7
+115,7
@@
struct Address {
Network *network;
uint64_t section;
Network *network;
uint64_t section;
-
unsigned char
family;
+
int
family;
unsigned char prefixlen;
unsigned char scope;
char *label;
unsigned char prefixlen;
unsigned char scope;
char *label;
@@
-132,10
+133,11
@@
struct Route {
Network *network;
uint64_t section;
Network *network;
uint64_t section;
-
unsigned char
family;
+
int
family;
unsigned char dst_prefixlen;
unsigned char scope;
uint32_t metrics;
unsigned char dst_prefixlen;
unsigned char scope;
uint32_t metrics;
+ unsigned char protocol; /* RTPROT_* */
union in_addr_union in_addr;
union in_addr_union dst_addr;
union in_addr_union in_addr;
union in_addr_union dst_addr;
@@
-208,7
+210,7
@@
struct Link {
struct AddressPool {
Manager *manager;
struct AddressPool {
Manager *manager;
-
unsigned
family;
+
int
family;
unsigned prefixlen;
union in_addr_union in_addr;
unsigned prefixlen;
union in_addr_union in_addr;
@@
-254,7
+256,7
@@
int manager_bus_listen(Manager *m);
int manager_save(Manager *m);
int manager_save(Manager *m);
-int manager_address_pool_acquire(Manager *m,
unsigned
family, unsigned prefixlen, union in_addr_union *found);
+int manager_address_pool_acquire(Manager *m,
int
family, unsigned prefixlen, union in_addr_union *found);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define _cleanup_manager_free_ _cleanup_(manager_freep)
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define _cleanup_manager_free_ _cleanup_(manager_freep)
@@
-304,7
+306,7
@@
const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsig
/* Route */
int route_new_static(Network *network, unsigned section, Route **ret);
/* Route */
int route_new_static(Network *network, unsigned section, Route **ret);
-int route_new_dynamic(Route **ret);
+int route_new_dynamic(Route **ret
, unsigned char rtm_protocol
);
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);
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);
@@
-336,10
+338,6
@@
bool address_equal(Address *a1, Address *a2);
DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
#define _cleanup_address_free_ _cleanup_(address_freep)
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_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);
@@
-389,8
+387,8
@@
int config_parse_dhcp(const char *unit, const char *filename, unsigned line,
/* Address Pool */
/* Address Pool */
-int address_pool_new(Manager *m, AddressPool **ret,
unsigned
family, const union in_addr_union *u, unsigned prefixlen);
-int address_pool_new_from_string(Manager *m, AddressPool **ret,
unsigned
family, const char *p, unsigned prefixlen);
+int address_pool_new(Manager *m, AddressPool **ret,
int
family, const union in_addr_union *u, unsigned prefixlen);
+int address_pool_new_from_string(Manager *m, AddressPool **ret,
int
family, const char *p, unsigned prefixlen);
void address_pool_free(AddressPool *p);
int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union *found);
void address_pool_free(AddressPool *p);
int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union *found);