hashmap_remove(fdb->network->bridge_fdb_entries_by_section, fdb->section);
}
- network_config_section_free(fdb->section);
+ config_section_free(fdb->section);
free(fdb->outgoing_ifname);
return mfree(fdb);
}
-DEFINE_NETWORK_SECTION_FUNCTIONS(BridgeFDB, bridge_fdb_free);
+DEFINE_SECTION_CLEANUP_FUNCTIONS(BridgeFDB, bridge_fdb_free);
/* create a new FDB entry or get an existing one. */
static int bridge_fdb_new_static(
unsigned section_line,
BridgeFDB **ret) {
- _cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
+ _cleanup_(config_section_freep) ConfigSection *n = NULL;
_cleanup_(bridge_fdb_freep) BridgeFDB *fdb = NULL;
int r;
assert(filename);
assert(section_line > 0);
- r = network_config_section_new(filename, section_line, &n);
+ r = config_section_new(filename, section_line, &n);
if (r < 0)
return r;
.ntf_flags = NEIGHBOR_CACHE_ENTRY_FLAGS_SELF,
};
- r = hashmap_ensure_put(&network->bridge_fdb_entries_by_section, &network_config_hash_ops, fdb->section, fdb);
+ r = hashmap_ensure_put(&network->bridge_fdb_entries_by_section, &config_section_hash_ops, fdb->section, fdb);
if (r < 0)
return r;
}
/* send a request to the kernel to add a FDB entry in its static MAC table. */
-static int bridge_fdb_configure(const BridgeFDB *fdb, Link *link, link_netlink_message_handler_t callback) {
- _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
+static int bridge_fdb_configure_message(const BridgeFDB *fdb, Link *link, sd_netlink_message *req) {
int r;
assert(fdb);
assert(link);
- assert(link->manager);
- assert(link->manager->rtnl);
- assert(callback);
-
- /* create new RTM message */
- r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
- if (r < 0)
- return log_link_error_errno(link, r, "Could not create RTM_NEWNEIGH message: %m");
r = sd_rtnl_message_neigh_set_flags(req, fdb->ntf_flags);
if (r < 0)
- return log_link_error_errno(link, r, "Could not set neighbor flags: %m");
+ return r;
/* only NUD_PERMANENT state supported. */
r = sd_rtnl_message_neigh_set_state(req, NUD_NOARP | NUD_PERMANENT);
if (r < 0)
- return log_link_error_errno(link, r, "Could not set neighbor state: %m");
+ return r;
r = sd_netlink_message_append_data(req, NDA_LLADDR, &fdb->mac_addr, sizeof(fdb->mac_addr));
if (r < 0)
- return log_link_error_errno(link, r, "Could not append NDA_LLADDR attribute: %m");
+ return r;
/* VLAN Id is optional. We'll add VLAN Id only if it's specified. */
if (fdb->vlan_id > 0) {
r = sd_netlink_message_append_u16(req, NDA_VLAN, fdb->vlan_id);
if (r < 0)
- return log_link_error_errno(link, r, "Could not append NDA_VLAN attribute: %m");
+ return r;
}
if (fdb->outgoing_ifindex > 0) {
r = sd_netlink_message_append_u32(req, NDA_IFINDEX, fdb->outgoing_ifindex);
if (r < 0)
- return log_link_error_errno(link, r, "Could not append NDA_IFINDEX attribute: %m");
+ return r;
}
if (in_addr_is_set(fdb->family, &fdb->destination_addr)) {
r = netlink_message_append_in_addr_union(req, NDA_DST, fdb->family, &fdb->destination_addr);
if (r < 0)
- return log_link_error_errno(link, r, "Could not append NDA_DST attribute: %m");
+ return r;
}
if (fdb->vni <= VXLAN_VID_MAX) {
r = sd_netlink_message_append_u32(req, NDA_VNI, fdb->vni);
if (r < 0)
- return log_link_error_errno(link, r, "Could not append NDA_VNI attribute: %m");
+ return r;
}
- /* send message to the kernel to update its internal static MAC table. */
- r = netlink_call_async(link->manager->rtnl, NULL, req, callback,
- link_netlink_destroy_callback, link);
- if (r < 0)
- return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
-
- link_ref(link);
-
- return 1;
+ return 0;
}
-int link_request_static_bridge_fdb(Link *link) {
- BridgeFDB *fdb;
+static int bridge_fdb_configure(BridgeFDB *fdb, Link *link, Request *req) {
+ _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
int r;
+ assert(fdb);
assert(link);
- assert(link->network);
+ assert(link->manager);
+ assert(req);
- link->static_bridge_fdb_configured = false;
+ r = sd_rtnl_message_new_neigh(link->manager->rtnl, &m, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
+ if (r < 0)
+ return r;
- HASHMAP_FOREACH(fdb, link->network->bridge_fdb_entries_by_section) {
- r = link_queue_request(link, REQUEST_TYPE_BRIDGE_FDB, fdb, false,
- &link->static_bridge_fdb_messages, bridge_fdb_configure_handler, NULL);
- if (r < 0)
- return log_link_error_errno(link, r, "Failed to request static bridge FDB entry: %m");
- }
+ r = bridge_fdb_configure_message(fdb, link, m);
+ if (r < 0)
+ return r;
- if (link->static_bridge_fdb_messages == 0) {
- link->static_bridge_fdb_configured = true;
- link_check_ready(link);
- } else {
- log_link_debug(link, "Setting bridge FDB entries");
- link_set_state(link, LINK_STATE_CONFIGURING);
- }
+ r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
+ link_netlink_destroy_callback, link);
+ if (r < 0)
+ return r;
+ link_ref(link);
return 0;
}
}
int request_process_bridge_fdb(Request *req) {
+ BridgeFDB *fdb;
+ Link *link;
+ int r;
+
assert(req);
- assert(req->link);
- assert(req->fdb);
assert(req->type == REQUEST_TYPE_BRIDGE_FDB);
+ assert_se(link = req->link);
+ assert_se(fdb = req->fdb);
- if (!bridge_fdb_is_ready_to_configure(req->fdb, req->link))
+ if (!bridge_fdb_is_ready_to_configure(fdb, link))
return 0;
- return bridge_fdb_configure(req->fdb, req->link, req->netlink_handler);
+ r = bridge_fdb_configure(fdb, link, req);
+ if (r < 0)
+ return log_link_warning_errno(link, r, "Failed to configure bridge FDB: %m");
+
+ return 1;
+}
+
+int link_request_static_bridge_fdb(Link *link) {
+ BridgeFDB *fdb;
+ int r;
+
+ assert(link);
+ assert(link->network);
+
+ link->static_bridge_fdb_configured = false;
+
+ HASHMAP_FOREACH(fdb, link->network->bridge_fdb_entries_by_section) {
+ r = link_queue_request(link, REQUEST_TYPE_BRIDGE_FDB, fdb, false,
+ &link->static_bridge_fdb_messages, bridge_fdb_configure_handler, NULL);
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to request static bridge FDB entry: %m");
+ }
+
+ if (link->static_bridge_fdb_messages == 0) {
+ link->static_bridge_fdb_configured = true;
+ link_check_ready(link);
+ } else {
+ log_link_debug(link, "Setting bridge FDB entries");
+ link_set_state(link, LINK_STATE_CONFIGURING);
+ }
+
+ return 0;
}
void network_drop_invalid_bridge_fdb_entries(Network *network) {
if (r < 0)
return log_oom();
- r = ether_addr_from_string(rvalue, &fdb->mac_addr);
+ r = parse_ether_addr(rvalue, &fdb->mac_addr);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Not a valid MAC address, ignoring assignment: %s", rvalue);
return 0;
projects / thirdparty / systemd.git / blobdiff