Pass around Link objcets rather than FdbEntry objects. The link objects have an up-to-date
ifname we can use for logging. match_name sholud _never_ be used for anything except
matching. Firstly, it may be unset (usually is), and secondly it may not be up-to-date.
}
static int set_fdb_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
}
static int set_fdb_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- _cleanup_fdbentry_free_ FdbEntry *fdb_entry = userdata;
r = sd_rtnl_message_get_errno(m);
r = sd_rtnl_message_get_errno(m);
- if ((r < 0) && (r != (-EEXIST)))
- log_error("Could not add FDB entry for interface: %s error: %s",
- fdb_entry->network->match_name, strerror(-r));
+ if (r < 0 && r != -EEXIST)
+ log_link_error(link, "Could not add FDB entry: %s", strerror(-r));
return 1;
}
/* send a request to the kernel to add a FDB entry in its static MAC table. */
return 1;
}
/* send a request to the kernel to add a FDB entry in its static MAC table. */
-int fdb_entry_configure(sd_rtnl *const rtnl,
- FdbEntry *const fdb_entry,
- const int ifindex) {
+int fdb_entry_configure(Link *link,
+ FdbEntry *const fdb_entry) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ assert(link);
+ assert(link->manager);
+
+ rtnl = link->manager->rtnl;
/* create new RTM message */
/* create new RTM message */
- r = sd_rtnl_message_new_neigh(rtnl, &req, RTM_NEWNEIGH, ifindex, PF_BRIDGE);
+ r = sd_rtnl_message_new_neigh(rtnl, &req, RTM_NEWNEIGH, link->ifindex, PF_BRIDGE);
if (r < 0)
return rtnl_log_create_error(r);
if (r < 0)
return rtnl_log_create_error(r);
}
/* send message to the kernel to update its internal static MAC table. */
}
/* send message to the kernel to update its internal static MAC table. */
- r = sd_rtnl_call_async(rtnl, req, set_fdb_handler, fdb_entry, 0, NULL);
+ r = sd_rtnl_call_async(rtnl, req, set_fdb_handler, link, 0, NULL);
- log_error("Could not send rtnetlink message: %s", strerror(-r));
+ log_link_error(link, "Could not send rtnetlink message: %s", strerror(-r));
int r = 0;
LIST_FOREACH(static_fdb_entries, fdb_entry, link->network->static_fdb_entries) {
int r = 0;
LIST_FOREACH(static_fdb_entries, fdb_entry, link->network->static_fdb_entries) {
- r = fdb_entry_configure(link->manager->rtnl, fdb_entry, link->ifindex);
+ r = fdb_entry_configure(link, fdb_entry);
if(r < 0) {
log_link_error(link, "Failed to add MAC entry to static MAC table: %s", strerror(-r));
break;
if(r < 0) {
log_link_error(link, "Failed to add MAC entry to static MAC table: %s", strerror(-r));
break;
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 *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);