Skip to content

nl_bridge: properly handle L2 neighbors moving between ports #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubensfig merged 2 commits into from
Sep 21, 2023
Merged

nl_bridge: properly handle L2 neighbors moving between ports #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a566d4c
nl_bridge::fdb_timeout(): check ifindex of hit before deletion
KanjiMonster Sep 18, 2023
82f59be
nl_bridge::add_neigh_to_fdb(): remove old cache item on update
KanjiMonster Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/netlink/nl_bridge.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,11 @@ void nl_bridge::add_neigh_to_fdb(rtnl_neigh *neigh, bool update) {
NEIGH_CAST(nl_cache_search(l2_cache.get(), OBJ_CAST(n.get()))),
rtnl_neigh_put);

if (n_lookup && rtnl_neigh_get_ifindex(n_lookup.get()) == ifindex) {
return;
if (n_lookup) {
if (rtnl_neigh_get_ifindex(n_lookup.get()) == ifindex)
return;

nl_cache_remove(OBJ_CAST(n_lookup.get()));
}
rtnl_neigh_set_ifindex(n.get(), ifindex);

Expand Down Expand Up @@ -827,20 +830,19 @@ int nl_bridge::fdb_timeout(rtnl_link *br_link, uint16_t vid,
std::unique_ptr<nl_addr, decltype(&nl_addr_put)> h_src(
nl_addr_build(AF_LLC, mac.somem(), mac.memlen()), nl_addr_put);

rtnl_neigh_set_ifindex(n.get(), rtnl_link_get_ifindex(br_link));
rtnl_neigh_set_master(n.get(), rtnl_link_get_master(br_link));
rtnl_neigh_set_family(n.get(), AF_BRIDGE);
rtnl_neigh_set_vlan(n.get(), vid);
rtnl_neigh_set_lladdr(n.get(), h_src.get());
rtnl_neigh_set_flags(n.get(), NTF_MASTER | NTF_EXT_LEARNED);
rtnl_neigh_set_state(n.get(), NUD_REACHABLE);

// find entry in local l2_cache
std::unique_ptr<rtnl_neigh, decltype(&rtnl_neigh_put)> n_lookup(
NEIGH_CAST(nl_cache_search(l2_cache.get(), OBJ_CAST(n.get()))),
rtnl_neigh_put);

if (n_lookup) {
if (n_lookup && rtnl_neigh_get_ifindex(n_lookup.get()) ==
rtnl_link_get_ifindex(br_link)) {
// * remove l2 entry from kernel
nl_msg *msg = nullptr;
rtnl_neigh_build_delete_request(n.get(), NLM_F_REQUEST, &msg);
Expand Down