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

zeroconf: sanitize the properties

Browse source 
Use some constants for the zeroconf properties. Make the right ones are
used in all places.
This commit is contained in:
Wim Taymans 2026-02-27 17:20:26 +01:00
parent 3a1b790588
commit dee2d5ee06
10 changed files with 165 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-sendspin-recv.c
View file

@ -1116,7 +1116,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
struct client *c;
struct pw_properties *props;
name = spa_dict_lookup(info, "zeroconf.hostname");
name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
if (impl->single_server && !spa_list_is_empty(&impl->clients))
return;
@ -1127,8 +1127,8 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
props = pw_properties_copy(impl->stream_props);
pw_properties_update(props, info);
addr = spa_dict_lookup(info, "zeroconf.address");
port = spa_dict_lookup(info, "zeroconf.port");
addr = spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS);
port = spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT);
path = spa_dict_lookup(info, "path");
pw_properties_set(props, "sendspin.ip", addr);
@ -1144,7 +1144,7 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
const char *name;
struct client *c;
name = spa_dict_lookup(info, "zeroconf.hostname");
name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
if ((c = client_find(impl, name)) == NULL)
return;
@ -1341,9 +1341,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
str = pw_properties_get(props, "sendspin.client-id");
pw_zeroconf_set_announce(impl->zeroconf, NULL,
&SPA_DICT_ITEMS(
SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_CLIENT_SERVICE),
SPA_DICT_ITEM("zeroconf.session", str),
SPA_DICT_ITEM("zeroconf.port", port),
SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_CLIENT_SERVICE_TYPE),
SPA_DICT_ITEM(PW_KEY_ZEROCONF_NAME, str),
SPA_DICT_ITEM(PW_KEY_ZEROCONF_PORT, port),
SPA_DICT_ITEM("path", path)));
}
}
@ -1371,7 +1371,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (impl->zeroconf) {
pw_zeroconf_set_browse(impl->zeroconf, NULL,
&SPA_DICT_ITEMS(
SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_SERVER_SERVICE)));
SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_SERVER_SERVICE_TYPE)));
}
}