Skip to content

nl_vxlan: always pass bridge interface to ::create_endpoint() #481

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 1 commit into from
Aug 18, 2025
Merged

nl_vxlan: always pass bridge interface to ::create_endpoint() #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/netlink/cnetlink.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ void cnetlink::link_created(rtnl_link *link) noexcept {
<< rtnl_link_get_name(link);

if (rtnl_link_is_vxlan(base_link) && !new_bridge)
vxlan->create_endpoint(base_link);
vxlan->create_endpoint(base_link, link);
vlan->disable_vlans(link);
bridge->add_interface(link);

Expand Down
10 changes: 5 additions & 5 deletions src/netlink/nl_vxlan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,10 @@ void nl_vxlan::register_bridge(nl_bridge *bridge) {
if (rtnl_link_get_master(link) == 0)
continue;

auto br_link = nl->get_link(rtnl_link_get_ifindex(link), AF_BRIDGE);

// XXX TODO maybe before cont.
rv = create_endpoint(link);
rv = create_endpoint(link, br_link);
if (rv < 0) {
LOG(ERROR) << __FUNCTION__ << ": failed (rv=" << rv
<< ") to create create endpoint " << link;
Expand Down Expand Up @@ -529,7 +531,7 @@ int nl_vxlan::remove_vni(rtnl_link *link) {
return 0;
}

int nl_vxlan::create_endpoint(rtnl_link *vxlan_link) {
int nl_vxlan::create_endpoint(rtnl_link *vxlan_link, rtnl_link *br_link) {
assert(vxlan_link);

if (!rtnl_link_is_vxlan(vxlan_link)) {
Expand All @@ -555,9 +557,7 @@ int nl_vxlan::create_endpoint(rtnl_link *vxlan_link) {
return -ENOTSUP;
}

// XXX get br_link if master exists

create_endpoint(vxlan_link, nullptr, group_.get());
create_endpoint(vxlan_link, br_link, group_.get());

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/netlink/nl_vxlan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class nl_vxlan : public net_reachable, nh_reachable {
int delete_access_port(rtnl_link *br_link, uint32_t pport_no, uint16_t vid,
bool wipe_l2_addresses);

int create_endpoint(rtnl_link *vxlan_link);
int create_endpoint(rtnl_link *vxlan_link, rtnl_link *br_link);
int delete_endpoint(rtnl_link *vxlan_link);

private:
Expand Down