chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
network
/
networkd-fdb.c
diff --git
a/src/network/networkd-fdb.c
b/src/network/networkd-fdb.c
index 9bb45e33d1c8ab386d333b34ade5fe850f0a85ae..b6b8327b23fdcff3d0b0743bcd6150883213fc75 100644
(file)
--- a/
src/network/networkd-fdb.c
+++ b/
src/network/networkd-fdb.c
@@
-19,16
+19,11
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <ctype.h>
#include <net/if.h>
#include <net/ethernet.h>
#include "networkd.h"
#include <net/if.h>
#include <net/ethernet.h>
#include "networkd.h"
-#include "networkd-netdev.h"
#include "networkd-link.h"
#include "networkd-link.h"
-#include "network-internal.h"
-#include "path-util.h"
-#include "conf-files.h"
#include "conf-parser.h"
#include "util.h"
#include "conf-parser.h"
#include "util.h"
@@
-86,31
+81,32
@@
int fdb_entry_new_static(Network *const network,
}
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;
+
Link *link
= userdata;
int r;
int r;
- assert(
fdb_entry
);
+ assert(
link
);
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 *const link, FdbEntry *const fdb_entry) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ sd_rtnl *rtnl;
int r;
int r;
+ assert(link);
+ assert(link->manager);
assert(fdb_entry);
assert(fdb_entry);
- assert(rtnl);
+
+ 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);
@@
-136,9
+132,9
@@
int fdb_entry_configure(sd_rtnl *const rtnl,
}
/* 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);
if (r < 0) {
if (r < 0) {
- log_
error(
"Could not send rtnetlink message: %s", strerror(-r));
+ log_
link_error(link,
"Could not send rtnetlink message: %s", strerror(-r));
return r;
}
return r;
}