Skip to content

mctpd: allow bridge for assign static endpoint #148

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

Open
potinlai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mctpd: allow bridge for assign static endpoint #148

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
52 changes: 25 additions & 27 deletions src/mctpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,38 +2288,33 @@ static int endpoint_assign_eid(struct ctx *ctx, sd_bus_error *berr,
return -EPROTO;
}

if (static_eid) {
rc = add_peer(ctx, dest, static_eid, net, &peer, false);
if (rc < 0)
return rc;

new_eid = static_eid;
} else {
struct eid_allocation alloc;
unsigned int alloc_size = 0;
struct eid_allocation alloc;
unsigned int alloc_size = 0;

if (assign_bridge)
alloc_size = ctx->max_pool_size;
if (assign_bridge)
alloc_size = ctx->max_pool_size;

rc = allocate_eid(ctx, n, alloc_size, &alloc);
if (rc) {
warnx("Cannot allocate any EID (+pool %d) on net %d for %s",
alloc_size, net, dest_phys_tostr(dest));
sd_bus_error_setf(berr, SD_BUS_ERROR_FAILED,
"Ran out of EIDs");
return -EADDRNOTAVAIL;
}
rc = allocate_eid(ctx, n, alloc_size, &alloc);
if (rc) {
warnx("Cannot allocate any EID (+pool %d) on net %d for %s",
alloc_size, net, dest_phys_tostr(dest));
sd_bus_error_setf(berr, SD_BUS_ERROR_FAILED, "Ran out of EIDs");
return -EADDRNOTAVAIL;
}

if (static_eid) {
new_eid = static_eid;
} else {
new_eid = alloc.start;
}
Comment on lines +2305 to +2309
Copy link
Member

@jk-ozlabs jk-ozlabs Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't just redefine the allocated range like this, those EIDs at [static_eid, static_eid + alloc.extent] may not be available.


rc = add_peer(ctx, dest, new_eid, net, &peer, false);
if (rc < 0)
return rc;
rc = add_peer(ctx, dest, new_eid, net, &peer, false);
if (rc < 0)
return rc;

peer->pool_size = alloc.extent;
if (peer->pool_size)
peer->pool_start = new_eid + 1;
}
peer->pool_size = alloc.extent;
if (peer->pool_size)
peer->pool_start = new_eid + 1;

/* Add a route to the peer prior to assigning it an EID.
* The peer may initiate communication immediately, so
Expand Down Expand Up @@ -3055,7 +3050,7 @@ static int method_assign_endpoint_static(sd_bus_message *call, void *data,
}
}

rc = endpoint_assign_eid(ctx, berr, dest, &peer, eid, false);
rc = endpoint_assign_eid(ctx, berr, dest, &peer, eid, true);
if (rc < 0) {
goto err;
}
Expand All @@ -3064,6 +3059,9 @@ static int method_assign_endpoint_static(sd_bus_message *call, void *data,
if (!peer_path)
goto err;

if (peer->pool_size > 0)
endpoint_allocate_eids(peer);

return sd_bus_reply_method_return(call, "yisb", peer->eid, peer->net,
peer_path, 1);
err:
Expand Down
Loading