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: fix reporting errors from hostnamed
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 7d291e5ea34244dacad7fc5d334d08f4deb9e9b5..766297cffa6985f802b37cbf05f943d597290c13 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-81,10
+81,7
@@
struct Network {
char *description;
NetDev *bridge;
NetDev *bond;
char *description;
NetDev *bridge;
NetDev *bond;
- NetDev *tunnel;
- Hashmap *vlans;
- Hashmap *macvlans;
- Hashmap *vxlans;
+ Hashmap *stacked_netdevs;
DHCPSupport dhcp;
bool dhcp_dns;
bool dhcp_ntp;
DHCPSupport dhcp;
bool dhcp_dns;
bool dhcp_ntp;
@@
-96,6
+93,7
@@
struct Network {
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;
@@
-105,15
+103,14
@@
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);
};
struct Address {
Network *network;
LIST_FIELDS(Network, networks);
};
struct Address {
Network *network;
- u
int64_t
section;
+ u
nsigned
section;
int family;
unsigned char prefixlen;
int family;
unsigned char prefixlen;
@@
-131,7
+128,7
@@
struct Address {
struct Route {
Network *network;
struct Route {
Network *network;
- u
int64_t
section;
+ u
nsigned
section;
int family;
unsigned char dst_prefixlen;
int family;
unsigned char dst_prefixlen;
@@
-173,7
+170,7
@@
struct Link {
int n_ref;
int n_ref;
-
uint64_
t ifindex;
+
in
t ifindex;
char *ifname;
char *state_file;
struct ether_addr mac;
char *ifname;
char *state_file;
struct ether_addr mac;
@@
-338,10
+335,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);