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: refuse to use .network files with missing Address/Gateway key
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 075cc1275ef0c47d8a4150a8dbea503abde368d2..75309a9b85f67970097954962b6b8c40ac7b8712 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-26,6
+26,7
@@
#include "sd-event.h"
#include "sd-rtnl.h"
#include "sd-event.h"
#include "sd-rtnl.h"
+#include "sd-dhcp-client.h"
#include "udev.h"
#include "rtnl-util.h"
#include "udev.h"
#include "rtnl-util.h"
@@
-84,9
+85,10
@@
struct Network {
char *description;
Bridge *bridge;
char *description;
Bridge *bridge;
+ bool dhcp;
- LIST_HEAD(Address, addresses);
- LIST_HEAD(Route, routes);
+ LIST_HEAD(Address,
static_
addresses);
+ LIST_HEAD(Route,
static_
routes);
Hashmap *addresses_by_section;
Hashmap *routes_by_section;
Hashmap *addresses_by_section;
Hashmap *routes_by_section;
@@
-109,7
+111,7
@@
struct Address {
struct in6_addr in6;
} in_addr;
struct in6_addr in6;
} in_addr;
- LIST_FIELDS(Address, addresses);
+ LIST_FIELDS(Address,
static_
addresses);
};
struct Route {
};
struct Route {
@@
-117,6
+119,7
@@
struct Route {
uint64_t section;
unsigned char family;
uint64_t section;
unsigned char family;
+ unsigned char dst_family;
unsigned char dst_prefixlen;
union {
unsigned char dst_prefixlen;
union {
@@
-129,15
+132,13
@@
struct Route {
struct in6_addr in6;
} dst_addr;
struct in6_addr in6;
} dst_addr;
- LIST_FIELDS(Route, routes);
+ LIST_FIELDS(Route,
static_
routes);
};
typedef enum LinkState {
};
typedef enum LinkState {
- LINK_STATE_JOIN_BRIDGE,
- LINK_STATE_BRIDGE_JOINED,
- LINK_STATE_SET_ADDRESSES,
- LINK_STATE_ADDRESSES_SET,
- LINK_STATE_SET_ROUTES,
+ LINK_STATE_JOINING_BRIDGE,
+ LINK_STATE_SETTING_ADDRESSES,
+ LINK_STATE_SETTING_ROUTES,
LINK_STATE_CONFIGURED,
LINK_STATE_FAILED,
_LINK_STATE_MAX,
LINK_STATE_CONFIGURED,
LINK_STATE_FAILED,
_LINK_STATE_MAX,
@@
-155,9
+156,15
@@
struct Link {
Network *network;
Network *network;
+ Route *dhcp_route;
+ Address *dhcp_address;
+
LinkState state;
LinkState state;
- unsigned rtnl_messages;
+ unsigned addr_messages;
+ unsigned route_messages;
+
+ sd_dhcp_client *dhcp;
};
struct Manager {
};
struct Manager {
@@
-225,7
+232,8
@@
int config_parse_bridge(const char *unit, const char *filename, unsigned line,
const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
/* Route */
const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
/* Route */
-int route_new(Network *network, unsigned section, Route **ret);
+int route_new_static(Network *network, unsigned section, Route **ret);
+int route_new_dynamic(Route **ret);
void route_free(Route *route);
int route_configure(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);
@@
-241,9
+249,11
@@
int config_parse_destination(const char *unit, const char *filename, unsigned li
int ltype, const char *rvalue, void *data, void *userdata);
/* Address */
int ltype, const char *rvalue, void *data, void *userdata);
/* Address */
-int address_new(Network *network, unsigned section, Address **ret);
+int address_new_static(Network *network, unsigned section, Address **ret);
+int address_new_dynamic(Address **ret);
void address_free(Address *address);
int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback);
void address_free(Address *address);
int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback);
+int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callback);
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)
@@
-260,10
+270,10
@@
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_new(Manager *manager, struct udev_device *device, Link **ret);
void link_free(Link *link);
-int link_add(Manager *manager, struct udev_device *device);
+int link_add(Manager *manager, struct udev_device *device
, Link **ret
);
int link_configure(Link *link);
int link_configure(Link *link);
-int link_update
_flags(Link *link, unsigned flags
);
+int link_update
(Link *link, sd_rtnl_message *message
);
DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
#define _cleanup_link_free_ _cleanup_(link_freep)
DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
#define _cleanup_link_free_ _cleanup_(link_freep)