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: disarm shutdown watchdog if we fail to set timeout
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 6fb920b1587b780897c0ac4562602b189aeea525..7f1f06c811fc9237b3a20967eb48c443da234421 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-100,10
+100,10
@@
struct Network {
char *name;
struct ether_addr *match_mac;
char *name;
struct ether_addr *match_mac;
- char *match_path;
- char *match_driver;
- char *match_type;
- char *match_name;
+ char *
*
match_path;
+ char *
*
match_driver;
+ char *
*
match_type;
+ char *
*
match_name;
Condition *match_host;
Condition *match_virt;
Condition *match_host;
Condition *match_virt;
@@
-352,6
+352,10
@@
int config_parse_destination(const char *unit, const char *filename, unsigned li
int config_parse_route_priority(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_route_priority(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_route_scope(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_static(Network *network, unsigned section, Address **ret);
int address_new_dynamic(Address **ret);
/* Address */
int address_new_static(Network *network, unsigned section, Address **ret);
int address_new_dynamic(Address **ret);
@@
-379,7
+383,7
@@
int config_parse_label(const char *unit, const char *filename, unsigned line,
int ltype, const char *rvalue, void *data, void *userdata);
/* Forwarding database table. */
int ltype, const char *rvalue, void *data, void *userdata);
/* Forwarding database table. */
-int fdb_entry_configure(
sd_rtnl *const rtnl, FdbEntry *const fdb_entry, const int ifindex
);
+int fdb_entry_configure(
Link *const link, FdbEntry *const fdb_entry
);
void fdb_entry_free(FdbEntry *fdb_entry);
int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);
void fdb_entry_free(FdbEntry *fdb_entry);
int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);