chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fixate show_status earlier, so that we actually print the welcome message
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 2323e3db856810735d7bcbadde0323bbb35c2f0f..51d77570d40ebab12c8900b4bd68a04da98674fa 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-22,7
+22,6
@@
#pragma once
#include <arpa/inet.h>
#pragma once
#include <arpa/inet.h>
-#include <linux/rtnetlink.h>
#include "sd-event.h"
#include "sd-rtnl.h"
#include "sd-event.h"
#include "sd-rtnl.h"
@@
-34,7
+33,7
@@
#include "hashmap.h"
#include "list.h"
#include "hashmap.h"
#include "list.h"
-typedef struct Net
dev Netd
ev;
+typedef struct Net
Dev NetD
ev;
typedef struct Network Network;
typedef struct Link Link;
typedef struct Address Address;
typedef struct Network Network;
typedef struct Link Link;
typedef struct Address Address;
@@
-50,32
+49,35
@@
struct netdev_enslave_callback {
LIST_FIELDS(netdev_enslave_callback, callbacks);
};
LIST_FIELDS(netdev_enslave_callback, callbacks);
};
-typedef enum Net
d
evKind {
+typedef enum Net
D
evKind {
NETDEV_KIND_BRIDGE,
NETDEV_KIND_BOND,
NETDEV_KIND_BRIDGE,
NETDEV_KIND_BOND,
+ NETDEV_KIND_VLAN,
_NETDEV_KIND_MAX,
_NETDEV_KIND_INVALID = -1
_NETDEV_KIND_MAX,
_NETDEV_KIND_INVALID = -1
-} Net
d
evKind;
+} Net
D
evKind;
-typedef enum Net
d
evState {
+typedef enum Net
D
evState {
NETDEV_STATE_FAILED,
NETDEV_STATE_CREATING,
NETDEV_STATE_READY,
_NETDEV_STATE_MAX,
_NETDEV_STATE_INVALID = -1,
NETDEV_STATE_FAILED,
NETDEV_STATE_CREATING,
NETDEV_STATE_READY,
_NETDEV_STATE_MAX,
_NETDEV_STATE_INVALID = -1,
-} Net
d
evState;
+} Net
D
evState;
-struct Net
d
ev {
+struct Net
D
ev {
Manager *manager;
char *filename;
char *description;
char *name;
Manager *manager;
char *filename;
char *description;
char *name;
- Net
d
evKind kind;
+ Net
D
evKind kind;
- Link *link;
- NetdevState state;
+ uint64_t vlanid;
+
+ int ifindex;
+ NetDevState state;
LIST_HEAD(netdev_enslave_callback, callbacks);
};
LIST_HEAD(netdev_enslave_callback, callbacks);
};
@@
-92,13
+94,15
@@
struct Network {
char *match_name;
char *description;
char *match_name;
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;
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);
LIST_HEAD(Address, static_addresses);
LIST_HEAD(Route, static_routes);
@@
-118,7
+122,7
@@
struct Address {
unsigned char prefixlen;
char *label;
unsigned char prefixlen;
char *label;
- struct in_addr
netmask
;
+ struct in_addr
broadcast
;
union {
struct in_addr in;
union {
struct in_addr in;
@@
-133,7
+137,6
@@
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 {
@@
-170,18
+173,15
@@
struct Link {
Network *network;
Network *network;
- Route *dhcp_route;
- Address *dhcp_address;
- Address *dns;
- uint16_t original_mtu;
-
LinkState state;
unsigned addr_messages;
unsigned route_messages;
unsigned enslaving;
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 {
};
struct Manager {
@@
-220,21
+220,21
@@
int manager_update_resolv_conf(Manager *m);
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)
-/* Net
d
ev */
+/* Net
D
ev */
int netdev_load(Manager *manager);
int netdev_load(Manager *manager);
-void netdev_free(Net
d
ev *netdev);
+void netdev_free(Net
D
ev *netdev);
-DEFINE_TRIVIAL_CLEANUP_FUNC(Net
d
ev*, netdev_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Net
D
ev*, netdev_free);
#define _cleanup_netdev_free_ _cleanup_(netdev_freep)
#define _cleanup_netdev_free_ _cleanup_(netdev_freep)
-int netdev_get(Manager *manager, const char *name, Net
d
ev **ret);
-int netdev_set_
link(Manager *m, NetdevKind kind, Link *link
);
-int netdev_enslave(Net
d
ev *netdev, Link *link, sd_rtnl_message_handler_t cb);
+int netdev_get(Manager *manager, const char *name, Net
D
ev **ret);
+int netdev_set_
ifindex(NetDev *netdev, int ifindex
);
+int netdev_enslave(Net
D
ev *netdev, Link *link, sd_rtnl_message_handler_t cb);
-const char *netdev_kind_to_string(Net
d
evKind d) _const_;
-Net
d
evKind netdev_kind_from_string(const char *d) _pure_;
+const char *netdev_kind_to_string(Net
D
evKind d) _const_;
+Net
D
evKind 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);
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);
@@
-258,6
+258,10
@@
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);
const char *section, unsigned section_line, const char *lvalue,
int ltype, const char *rvalue, void *data, void *userdata);
+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);
+
/* gperf */
const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
/* gperf */
const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
@@
-297,6
+301,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);
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);
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);