shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

network: move link_set_bridge_fdb()

Browse Source
This commit is contained in:
Yu Watanabe 2020-09-30 02:05:08 +09:00
parent 62ed9442bf
commit 5bb4542b0c
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/networkd-fdb.c
View File

@ -122,7 +122,7 @@ static int set_fdb_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
}
/* send a request to the kernel to add a FDB entry in its static MAC table. */
int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
static int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
int r;
@ -179,6 +179,22 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
return 1;
}
int link_set_bridge_fdb(Link *link) {
FdbEntry *fdb_entry;
int r;
assert(link);
assert(link->network);
HASHMAP_FOREACH(fdb_entry, link->network->fdb_entries_by_section) {
r = fdb_entry_configure(link, fdb_entry);
if (r < 0)
return log_link_error_errno(link, r, "Failed to add MAC entry to static MAC table: %m");
}
return 0;
}
/* parse the HW address from config files. */
int config_parse_fdb_hwaddr(
const char *unit,

3
src/network/networkd-fdb.h
View File

@ -42,7 +42,8 @@ struct FdbEntry {
};
FdbEntry *fdb_entry_free(FdbEntry *fdb_entry);
int fdb_entry_configure(Link *link, FdbEntry *fdb_entry);
int link_set_bridge_fdb(Link *link);
const char* fdb_ntf_flags_to_string(NeighborCacheEntryFlags i) _const_;
NeighborCacheEntryFlags fdb_ntf_flags_from_string(const char *s) _pure_;

13
src/network/networkd-link.c
View File

@ -1132,19 +1132,6 @@ void link_check_ready(Link *link) {
return;
}
static int link_set_bridge_fdb(Link *link) {
FdbEntry *fdb_entry;
int r;
HASHMAP_FOREACH(fdb_entry, link->network->fdb_entries_by_section) {
r = fdb_entry_configure(link, fdb_entry);
if (r < 0)
return log_link_error_errno(link, r, "Failed to add MAC entry to static MAC table: %m");
}
return 0;
}
static int static_address_ready_callback(Address *address) {
Address *a;
Link *link;