Skip to content

Do not block on request input #31

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
EddyTheCo merged 3 commits into from
Apr 16, 2026
Merged

Do not block on request input #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae3cd5b
gagent: Do not block when requesting input
EddyTheCo Apr 15, 2026
a34598e
gconnman_manager: Do not lock services more than needed
EddyTheCo Apr 16, 2026
895478f
gconnman_manager: Fix parsing fields memory leak
EddyTheCo Apr 16, 2026
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 include/amarula/dbus/connman/gagent.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Connman;
class Agent {
GDBusNodeInfo *node_info_;
guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
std::string path_{"/net/amarula/gconnman/agent"};

explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down
47 changes: 37 additions & 10 deletions src/dbus/gconnman_agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
" </interface>"
"</node>";

Agent::Agent(DBus *dbus, const std::string &path)
: connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
if (!path.empty()) {
path_ = path;
}
Expand Down Expand Up @@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
GError *err = nullptr;

data->self->registration_id_ = g_dbus_connection_register_object(
data->self->connection_, data->self->path_.c_str(),
data->self->dbus_->connection(), data->self->path_.c_str(),
*(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
data->self, nullptr, &err);

Expand Down Expand Up @@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
}
}
Agent::~Agent() {
g_dbus_connection_unregister_object(connection_, registration_id_);
g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
g_dbus_node_info_unref(node_info_);
}

Expand All @@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
GVariant *child_fields = g_variant_get_child_value(parameters, 1);

service = g_variant_get_string(child_service, nullptr);
std::string service_str(service);
fields = g_variant_ref(child_fields);

g_variant_unref(child_service);
g_variant_unref(child_fields);

auto *result = request_input_cb_(service, fields);

GVariant *tuple = g_variant_new_tuple(&result, 1);

g_dbus_method_invocation_return_value(invocation, tuple);
g_variant_unref(fields);
g_object_ref(invocation);

std::thread([ctx = dbus_->context(), callback = request_input_cb_,
invocation, service_str = std::move(service_str),
fields]() {
GVariant *result = callback(service_str.c_str(), fields);
g_variant_unref(fields);

struct Data {
GDBusMethodInvocation *invocation;
GVariant *result;
};

auto data = std::make_unique<Data>(
Data{.invocation = invocation, .result = result});

g_main_context_invoke_full(
ctx, G_PRIORITY_DEFAULT,
[](gpointer user_data) -> gboolean {
auto *data = static_cast<Data *>(user_data);

GVariant *tuple = g_variant_new_tuple(&data->result, 1);
g_dbus_method_invocation_return_value(data->invocation,
tuple);

return G_SOURCE_REMOVE;
},
data.release(),
[](gpointer user_data) {
std::unique_ptr<Data> data(static_cast<Data *>(user_data));
g_object_unref(data->invocation);
});
}).detach();
Comment thread
EddyTheCo marked this conversation as resolved.
return;
}

Expand Down
46 changes: 33 additions & 13 deletions src/dbus/gconnman_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
agent_->set_request_input_handler([this](const gchar* service_path,
GVariant* fields) -> GVariant* {
std::lock_guard<std::mutex> const lock(mtx_);
GVariantBuilder builder;
g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
auto service_it = std::ranges::find_if(
services_, [&service_path](const auto& service) {
return service->objPath() == service_path;
});

if (service_it != services_.end()) {
std::shared_ptr<Service> found_service;
{
std::lock_guard<std::mutex> const lock(mtx_);
auto service_it = std::ranges::find_if(
services_, [&service_path](const auto& service) {
return service->objPath() == service_path;
});
if (service_it != services_.end()) {
found_service = *service_it;
}
}

if (found_service) {
auto* parsed_fields = parse_fields(fields);
auto input_requested = classify_input(parsed_fields);
g_ptr_array_unref(parsed_fields);
switch (input_requested) {
case InputType::InputWpA2Passphrase:
if (request_input_passphrase_cb_ != nullptr) {
const auto passphrase =
request_input_passphrase_cb_(*service_it);
request_input_passphrase_cb_(found_service);
g_variant_builder_add(
&builder, "{sv}", "Passphrase",
g_variant_new_string(passphrase.second.c_str()));
Expand All @@ -113,7 +121,7 @@ void Manager::setup_agent() {
case InputType::InputWpA2PassphraseWpsAlternative:
if (request_input_passphrase_cb_ != nullptr) {
const auto passphrase =
request_input_passphrase_cb_(*service_it);
request_input_passphrase_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}",
Expand All @@ -123,8 +131,8 @@ void Manager::setup_agent() {
break;
case InputType::InputHiddenNetworkName:
if (request_input_hidden_network_name_cb_ != nullptr) {
const auto name =
request_input_hidden_network_name_cb_(*service_it);
const auto name = request_input_hidden_network_name_cb_(
found_service);

GVariant* value = nullptr;
if (name.first) {
Expand All @@ -144,7 +152,7 @@ void Manager::setup_agent() {
case InputType::InputWpaEnterprise:
if (request_input_wpa_enterprise_cb_ != nullptr) {
const auto identity_password =
request_input_wpa_enterprise_cb_(*service_it);
request_input_wpa_enterprise_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}", "Identity",
Expand Down Expand Up @@ -173,7 +181,7 @@ void Manager::setup_agent() {
case InputType::InputWispr:
if (request_input_wispr_enabled_cb_ != nullptr) {
const auto user_password =
request_input_wispr_enabled_cb_(*service_it);
request_input_wispr_enabled_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}", "Username",
Expand Down Expand Up @@ -387,8 +395,20 @@ using FieldDescription = struct {
gchar* requirement;
};

static void field_description_free(gpointer data) {
auto* desc = static_cast<FieldDescription*>(data);
if (desc == nullptr) {
return;
}

g_free(desc->field_name);
g_free(desc->type);
g_free(desc->requirement);
g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

GVariantIter iter;
const gchar* field_name = nullptr;
Expand Down
Loading