Skip to content

mctpd: Update interface vtables when we change to BusOwner role #138

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

Draft
jk-ozlabs wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

mctpd: Update interface vtables when we change to BusOwner role #138

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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

### Fixes

1. mctpd's interface objects now expose the BusOwner1 interface when set
as a BusOwner via the Role property

### Added

1. `mctpd` will now retry endpoint query commands (Get Message Type Support and
Expand Down
30 changes: 30 additions & 0 deletions src/mctpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ struct link {
char *path;
sd_bus_slot *slot_iface;
sd_bus_slot *slot_busowner;
sd_event_source *role_defer;

struct ctx *ctx;
};
Expand Down Expand Up @@ -4023,6 +4024,27 @@ static int bus_link_get_prop(sd_bus *bus, const char *path,
return rc;
}

/* deferred handler for link changes, which may alter vtable state */
static int link_set_role(sd_event_source *ev, void *userdata)
{
struct link *link = userdata;
int rc;

sd_event_source_unref(link->role_defer);
link->role_defer = NULL;

if (link->role != ENDPOINT_ROLE_BUS_OWNER)
return 0;

rc = sd_bus_add_object_vtable(link->ctx->bus, &link->slot_busowner,
link->path, CC_MCTP_DBUS_IFACE_BUSOWNER,
bus_link_owner_vtable, link);
if (rc)
warnx("adding link owner vtable failed: %d", rc);

return 0;
}

static int bus_link_set_prop(sd_bus *bus, const char *path,
const char *interface, const char *property,
sd_bus_message *value, void *userdata,
Expand Down Expand Up @@ -4063,8 +4085,15 @@ static int bus_link_set_prop(sd_bus *bus, const char *path,
rc = -EINVAL;
goto out;
}

printf("Role for %s set to %s, via dbus\n", link->path, role.conf_val);
link->role = role.role;

/* We need to defer the link role change, as we cannot update the vtables
* during the call.
*/
sd_event_add_defer(ctx->event, &link->role_defer, link_set_role, link);

out:
set_berr(ctx, rc, berr);
return rc;
Expand Down Expand Up @@ -4494,6 +4523,7 @@ static int prune_old_nets(struct ctx *ctx)

static void free_link(struct link *link)
{
sd_event_source_disable_unref(link->role_defer);
sd_bus_slot_unref(link->slot_iface);
sd_bus_slot_unref(link->slot_busowner);
free(link->path);
Expand Down