mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire: module-zeroconf-publish: only unpublish service when necessary

Browse source 
When a server is stopped, only unpublish those services
that have been published with that particular server,
do not touch the others.
This commit is contained in:
Barnabás Pőcze 2022-11-28 14:50:58 +01:00
parent 5f000b007d
commit c933c5ed74
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
View file

@ -73,6 +73,7 @@ struct service {
AvahiEntryGroup *entry_group; AvahiEntryGroup *entry_group;
AvahiStringList *txt; AvahiStringList *txt;
struct server *server;
const char *service_type; const char *service_type;
enum service_subtype subtype; enum service_subtype subtype;
@ -154,6 +155,7 @@ static void unpublish_service(struct service *s)
spa_list_remove(&s->link); spa_list_remove(&s->link);
spa_list_append(&s->userdata->pending, &s->link); spa_list_append(&s->userdata->pending, &s->link);
s->published = false; s->published = false;
s->server = NULL;
} }
static void unpublish_all_services(struct module_zeroconf_publish_data *d) static void unpublish_all_services(struct module_zeroconf_publish_data *d)
@ -397,7 +399,7 @@ static AvahiStringList *get_service_txt(const struct service *s)
return txt; return txt;
} }
static int find_port(struct service *s, int *proto, uint16_t *port) static struct server *find_server(struct service *s, int *proto, uint16_t *port)
{ {
struct module_zeroconf_publish_data *d = s->userdata; struct module_zeroconf_publish_data *d = s->userdata;
struct impl *impl = d->module->impl; struct impl *impl = d->module->impl;
@ -407,14 +409,15 @@ static int find_port(struct service *s, int *proto, uint16_t *port)
if (server->addr.ss_family == AF_INET) { if (server->addr.ss_family == AF_INET) {
*proto = AVAHI_PROTO_INET; *proto = AVAHI_PROTO_INET;
*port = ntohs(((struct sockaddr_in*) &server->addr)->sin_port); *port = ntohs(((struct sockaddr_in*) &server->addr)->sin_port);
return 0; return server;
} else if (server->addr.ss_family == AF_INET6) { } else if (server->addr.ss_family == AF_INET6) {
*proto = AVAHI_PROTO_INET6; *proto = AVAHI_PROTO_INET6;
*port = ntohs(((struct sockaddr_in6*) &server->addr)->sin6_port); *port = ntohs(((struct sockaddr_in6*) &server->addr)->sin6_port);
return 0; return server;
} }
} }
return -ENODEV;
return NULL;
} }
static void publish_service(struct service *s) static void publish_service(struct service *s)
@ -423,10 +426,11 @@ static void publish_service(struct service *s)
int proto; int proto;
uint16_t port; uint16_t port;
if (find_port(s, &proto, &port) < 0) struct server *server = find_server(s, &proto, &port);
if (!server)
return; return;
pw_log_debug("found proto:%d port:%d", proto, port); pw_log_debug("found server:%p proto:%d port:%d", server, proto, port);
if (!d->client || avahi_client_get_state(d->client) != AVAHI_CLIENT_S_RUNNING) if (!d->client || avahi_client_get_state(d->client) != AVAHI_CLIENT_S_RUNNING)
return; return;
@ -499,6 +503,7 @@ static void publish_service(struct service *s)
spa_list_remove(&s->link); spa_list_remove(&s->link);
spa_list_append(&d->published, &s->link); spa_list_append(&d->published, &s->link);
s->server = server;
pw_log_info("created service: %s", s->service_name); pw_log_info("created service: %s", s->service_name);
return; return;
@ -626,7 +631,13 @@ static void impl_server_stopped(void *data, struct server *server)
{ {
struct module_zeroconf_publish_data *d = data; struct module_zeroconf_publish_data *d = data;
pw_log_info("a server stopped, try republish"); pw_log_info("a server stopped, try republish");
unpublish_all_services(d);
struct service *s, *tmp;
spa_list_for_each_safe(s, tmp, &d->published, link) {
if (s->server == server)
unpublish_service(s);
}
publish_pending(d); publish_pending(d);
} }