#include <net/if.h>
#include "netlink-util.h"
+#include "networkd-bridge-mdb.h"
#include "networkd-link.h"
#include "networkd-manager.h"
-#include "networkd-mdb.h"
#include "networkd-network.h"
#include "string-util.h"
#include "vlan-util.h"
-#define STATIC_MDB_ENTRIES_PER_NETWORK_MAX 1024U
+#define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
/* remove MDB entry. */
-MdbEntry *mdb_entry_free(MdbEntry *mdb_entry) {
- if (!mdb_entry)
+BridgeMDB *bridge_mdb_free(BridgeMDB *mdb) {
+ if (!mdb)
return NULL;
- if (mdb_entry->network) {
- assert(mdb_entry->section);
- hashmap_remove(mdb_entry->network->mdb_entries_by_section, mdb_entry->section);
+ if (mdb->network) {
+ assert(mdb->section);
+ hashmap_remove(mdb->network->bridge_mdb_entries_by_section, mdb->section);
}
- network_config_section_free(mdb_entry->section);
+ network_config_section_free(mdb->section);
- return mfree(mdb_entry);
+ return mfree(mdb);
}
-DEFINE_NETWORK_SECTION_FUNCTIONS(MdbEntry, mdb_entry_free);
+DEFINE_NETWORK_SECTION_FUNCTIONS(BridgeMDB, bridge_mdb_free);
/* create a new MDB entry or get an existing one. */
-static int mdb_entry_new_static(
+static int bridge_mdb_new_static(
Network *network,
const char *filename,
unsigned section_line,
- MdbEntry **ret) {
+ BridgeMDB **ret) {
_cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
- _cleanup_(mdb_entry_freep) MdbEntry *mdb_entry = NULL;
+ _cleanup_(bridge_mdb_freep) BridgeMDB *mdb = NULL;
int r;
assert(network);
return r;
/* search entry in hashmap first. */
- mdb_entry = hashmap_get(network->mdb_entries_by_section, n);
- if (mdb_entry) {
- *ret = TAKE_PTR(mdb_entry);
+ mdb = hashmap_get(network->bridge_mdb_entries_by_section, n);
+ if (mdb) {
+ *ret = TAKE_PTR(mdb);
return 0;
}
- if (hashmap_size(network->mdb_entries_by_section) >= STATIC_MDB_ENTRIES_PER_NETWORK_MAX)
+ if (hashmap_size(network->bridge_mdb_entries_by_section) >= STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX)
return -E2BIG;
/* allocate space for an MDB entry. */
- mdb_entry = new(MdbEntry, 1);
- if (!mdb_entry)
+ mdb = new(BridgeMDB, 1);
+ if (!mdb)
return -ENOMEM;
/* init MDB structure. */
- *mdb_entry = (MdbEntry) {
+ *mdb = (BridgeMDB) {
.network = network,
.section = TAKE_PTR(n),
};
- r = hashmap_ensure_put(&network->mdb_entries_by_section, &network_config_hash_ops, mdb_entry->section, mdb_entry);
+ r = hashmap_ensure_put(&network->bridge_mdb_entries_by_section, &network_config_hash_ops, mdb->section, mdb);
if (r < 0)
return r;
/* return allocated MDB structure. */
- *ret = TAKE_PTR(mdb_entry);
+ *ret = TAKE_PTR(mdb);
return 0;
}
int r;
assert(link);
- assert(link->bridge_mdb_messages > 0);
+ assert(link->static_bridge_mdb_messages > 0);
- link->bridge_mdb_messages--;
+ link->static_bridge_mdb_messages--;
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
return 1;
}
- if (link->bridge_mdb_messages == 0) {
- link->bridge_mdb_configured = true;
+ if (link->static_bridge_mdb_messages == 0) {
+ link->static_bridge_mdb_configured = true;
link_check_ready(link);
}
}
/* send a request to the kernel to add an MDB entry */
-static int mdb_entry_configure(Link *link, MdbEntry *mdb_entry) {
+static int bridge_mdb_configure(Link *link, BridgeMDB *mdb) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
struct br_mdb_entry entry;
int master, r;
assert(link);
assert(link->network);
assert(link->manager);
- assert(mdb_entry);
+ assert(mdb);
if (DEBUG_LOGGING) {
_cleanup_free_ char *a = NULL;
- (void) in_addr_to_string(mdb_entry->family, &mdb_entry->group_addr, &a);
+ (void) in_addr_to_string(mdb->family, &mdb->group_addr, &a);
log_link_debug(link, "Configuring bridge MDB entry: MulticastGroupAddress=%s, VLANId=%u",
- strna(a), mdb_entry->vlan_id);
+ strna(a), mdb->vlan_id);
}
master = link_get_bridge_master_ifindex(link);
* See br_mdb_add_group() in net/bridge/br_mdb.c of kernel. */
.state = master == link->ifindex ? MDB_TEMPORARY : MDB_PERMANENT,
.ifindex = link->ifindex,
- .vid = mdb_entry->vlan_id,
+ .vid = mdb->vlan_id,
};
/* create new RTM message */
if (r < 0)
return log_link_error_errno(link, r, "Could not create RTM_NEWMDB message: %m");
- switch (mdb_entry->family) {
+ switch (mdb->family) {
case AF_INET:
- entry.addr.u.ip4 = mdb_entry->group_addr.in.s_addr;
+ entry.addr.u.ip4 = mdb->group_addr.in.s_addr;
entry.addr.proto = htobe16(ETH_P_IP);
break;
case AF_INET6:
- entry.addr.u.ip6 = mdb_entry->group_addr.in6;
+ entry.addr.u.ip6 = mdb->group_addr.in6;
entry.addr.proto = htobe16(ETH_P_IPV6);
break;
}
int link_set_bridge_mdb(Link *link) {
- MdbEntry *mdb_entry;
+ BridgeMDB *mdb;
int r;
assert(link);
assert(link->manager);
- if (link->bridge_mdb_messages != 0) {
+ if (link->static_bridge_mdb_messages != 0) {
log_link_debug(link, "MDB entries are configuring.");
return 0;
}
- link->bridge_mdb_configured = false;
+ link->static_bridge_mdb_configured = false;
if (!link->network)
return 0;
- if (hashmap_isempty(link->network->mdb_entries_by_section))
+ if (hashmap_isempty(link->network->bridge_mdb_entries_by_section))
goto finish;
if (!link_has_carrier(link)) {
goto finish;
}
- HASHMAP_FOREACH(mdb_entry, link->network->mdb_entries_by_section) {
- r = mdb_entry_configure(link, mdb_entry);
+ HASHMAP_FOREACH(mdb, link->network->bridge_mdb_entries_by_section) {
+ r = bridge_mdb_configure(link, mdb);
if (r < 0)
return log_link_error_errno(link, r, "Failed to add MDB entry to multicast group database: %m");
- link->bridge_mdb_messages++;
+ link->static_bridge_mdb_messages++;
}
finish:
- if (link->bridge_mdb_messages == 0) {
- link->bridge_mdb_configured = true;
+ if (link->static_bridge_mdb_messages == 0) {
+ link->static_bridge_mdb_configured = true;
link_check_ready(link);
}
return 0;
}
-static int mdb_entry_verify(MdbEntry *mdb_entry) {
- if (section_is_invalid(mdb_entry->section))
+static int bridge_mdb_verify(BridgeMDB *mdb) {
+ if (section_is_invalid(mdb->section))
return -EINVAL;
- if (mdb_entry->family == AF_UNSPEC)
+ if (mdb->family == AF_UNSPEC)
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: [BridgeMDB] section without MulticastGroupAddress= field configured. "
"Ignoring [BridgeMDB] section from line %u.",
- mdb_entry->section->filename, mdb_entry->section->line);
+ mdb->section->filename, mdb->section->line);
- if (!in_addr_is_multicast(mdb_entry->family, &mdb_entry->group_addr))
+ if (!in_addr_is_multicast(mdb->family, &mdb->group_addr))
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: MulticastGroupAddress= is not a multicast address. "
"Ignoring [BridgeMDB] section from line %u.",
- mdb_entry->section->filename, mdb_entry->section->line);
+ mdb->section->filename, mdb->section->line);
- if (mdb_entry->family == AF_INET) {
- if (in4_addr_is_local_multicast(&mdb_entry->group_addr.in))
+ if (mdb->family == AF_INET) {
+ if (in4_addr_is_local_multicast(&mdb->group_addr.in))
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: MulticastGroupAddress= is a local multicast address. "
"Ignoring [BridgeMDB] section from line %u.",
- mdb_entry->section->filename, mdb_entry->section->line);
+ mdb->section->filename, mdb->section->line);
} else {
- if (in6_addr_is_link_local_all_nodes(&mdb_entry->group_addr.in6))
+ if (in6_addr_is_link_local_all_nodes(&mdb->group_addr.in6))
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: MulticastGroupAddress= is the multicast all nodes address. "
"Ignoring [BridgeMDB] section from line %u.",
- mdb_entry->section->filename, mdb_entry->section->line);
+ mdb->section->filename, mdb->section->line);
}
return 0;
}
-void network_drop_invalid_mdb_entries(Network *network) {
- MdbEntry *mdb_entry;
+void network_drop_invalid_bridge_mdb_entries(Network *network) {
+ BridgeMDB *mdb;
assert(network);
- HASHMAP_FOREACH(mdb_entry, network->mdb_entries_by_section)
- if (mdb_entry_verify(mdb_entry) < 0)
- mdb_entry_free(mdb_entry);
+ HASHMAP_FOREACH(mdb, network->bridge_mdb_entries_by_section)
+ if (bridge_mdb_verify(mdb) < 0)
+ bridge_mdb_free(mdb);
}
/* parse the VLAN Id from config files. */
void *data,
void *userdata) {
- _cleanup_(mdb_entry_free_or_set_invalidp) MdbEntry *mdb_entry = NULL;
+ _cleanup_(bridge_mdb_free_or_set_invalidp) BridgeMDB *mdb = NULL;
Network *network = userdata;
int r;
assert(rvalue);
assert(data);
- r = mdb_entry_new_static(network, filename, section_line, &mdb_entry);
+ r = bridge_mdb_new_static(network, filename, section_line, &mdb);
if (r < 0)
return log_oom();
r = config_parse_vlanid(unit, filename, line, section,
section_line, lvalue, ltype,
- rvalue, &mdb_entry->vlan_id, userdata);
+ rvalue, &mdb->vlan_id, userdata);
if (r < 0)
return r;
- TAKE_PTR(mdb_entry);
+ TAKE_PTR(mdb);
return 0;
}
void *data,
void *userdata) {
- _cleanup_(mdb_entry_free_or_set_invalidp) MdbEntry *mdb_entry = NULL;
+ _cleanup_(bridge_mdb_free_or_set_invalidp) BridgeMDB *mdb = NULL;
Network *network = userdata;
int r;
assert(rvalue);
assert(data);
- r = mdb_entry_new_static(network, filename, section_line, &mdb_entry);
+ r = bridge_mdb_new_static(network, filename, section_line, &mdb);
if (r < 0)
return log_oom();
- r = in_addr_from_string_auto(rvalue, &mdb_entry->family, &mdb_entry->group_addr);
+ r = in_addr_from_string_auto(rvalue, &mdb->family, &mdb->group_addr);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Cannot parse multicast group address: %m");
return 0;
}
- TAKE_PTR(mdb_entry);
+ TAKE_PTR(mdb);
return 0;
}
projects / thirdparty / systemd.git / commitdiff
