mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-03 06:47:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: use json builder for message handler output

Browse source 
Makes sure we escape the string correctly.
This commit is contained in:
Wim Taymans 2026-04-30 13:53:20 +02:00
parent 96c3ada6f2
commit b9b93f3cdb
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/modules/module-protocol-pulse/message-handler.c
View file

@ -12,7 +12,7 @@
#include <spa/pod/builder.h> #include <spa/pod/builder.h>
#include <spa/pod/pod.h> #include <spa/pod/pod.h>
#include <spa/utils/defs.h> #include <spa/utils/defs.h>
#include <spa/utils/json.h> #include <spa/utils/json-builder.h>
#include <spa/utils/string.h> #include <spa/utils/string.h>
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
@ -67,17 +67,18 @@ static int bluez_card_object_message_handler(struct client *client, struct pw_ma
SPA_PARAM_Props, 0, param); SPA_PARAM_Props, 0, param);
} else if (spa_streq(message, "list-codecs")) { } else if (spa_streq(message, "list-codecs")) {
uint32_t i; uint32_t i;
bool first = true; struct spa_json_builder b;
fputc('[', response); spa_json_builder_file(&b, response, 0);
spa_json_builder_array_push(&b, "[");
for (i = 0; i < n_codecs; ++i) { for (i = 0; i < n_codecs; ++i) {
const char *desc = codecs[i].description; const char *desc = codecs[i].description;
fprintf(response, "%s{\"name\":\"%d\",\"description\":\"%s\"}", spa_json_builder_array_push(&b, "{");
first ? "" : ",", spa_json_builder_object_stringf(&b, "name", "%d", (int)codecs[i].id);
(int)codecs[i].id, desc ? desc : "Unknown"); spa_json_builder_object_string(&b, "description", desc ? desc : "Unknown");
first = false; spa_json_builder_pop(&b, "}");
} }
fputc(']', response); spa_json_builder_pop(&b, "]");
} else if (spa_streq(message, "get-codec")) { } else if (spa_streq(message, "get-codec")) {
if (active == SPA_ID_INVALID) if (active == SPA_ID_INVALID)
fputs("null", response); fputs("null", response);
@ -194,18 +195,19 @@ static int core_object_message_handler(struct client *client, struct pw_manager_
" pipewire-pulse:bluetooth-headset-autoswitch use bluetooth headset mic if available" " pipewire-pulse:bluetooth-headset-autoswitch use bluetooth headset mic if available"
); );
} else if (spa_streq(message, "list-handlers")) { } else if (spa_streq(message, "list-handlers")) {
bool first = true; struct spa_json_builder b;
fputc('[', response); spa_json_builder_file(&b, response, 0);
spa_json_builder_array_push(&b, "[");
spa_list_for_each(o, &client->manager->object_list, link) { spa_list_for_each(o, &client->manager->object_list, link) {
if (o->message_object_path) { if (o->message_object_path) {
fprintf(response, "%s{\"name\":\"%s\",\"description\":\"%s\"}", spa_json_builder_array_push(&b, "{");
first ? "" : ",", spa_json_builder_object_string(&b, "name", o->message_object_path);
o->message_object_path, o->type); spa_json_builder_object_string(&b, "description", o->type);
first = false; spa_json_builder_pop(&b, "}");
} }
} }
fputc(']', response); spa_json_builder_pop(&b, "]");
#ifdef HAVE_MALLOC_INFO #ifdef HAVE_MALLOC_INFO
} else if (spa_streq(message, "pipewire-pulse:malloc-info")) { } else if (spa_streq(message, "pipewire-pulse:malloc-info")) {
malloc_info(0, response); malloc_info(0, response);
@ -219,15 +221,17 @@ static int core_object_message_handler(struct client *client, struct pw_manager_
int res = pw_log_set_level_string(params); int res = pw_log_set_level_string(params);
fprintf(response, "%d", res); fprintf(response, "%d", res);
} else if (spa_streq(message, "pipewire-pulse:list-modules")) { } else if (spa_streq(message, "pipewire-pulse:list-modules")) {
bool first = true;
const struct module_info *i = NULL; const struct module_info *i = NULL;
fputc('[', response); struct spa_json_builder b;
spa_json_builder_file(&b, response, 0);
spa_json_builder_array_push(&b, "[");
while ((i = module_info_next(client->impl, i)) != NULL) { while ((i = module_info_next(client->impl, i)) != NULL) {
fprintf(response, "%s{\"name\":\"%s\"}", spa_json_builder_array_push(&b, "{");
first ? "" : ",\n", i->name); spa_json_builder_object_string(&b, "name", i->name);
first = false; spa_json_builder_pop(&b, "}");
} }
fputc(']', response); spa_json_builder_pop(&b, "]");
} else if (spa_streq(message, "pipewire-pulse:describe-module")) { } else if (spa_streq(message, "pipewire-pulse:describe-module")) {
const struct module_info *i = module_info_find(client->impl, params); const struct module_info *i = module_info_find(client->impl, params);