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

module-avb: fail if ptp.management-socket not set

Browse source
This commit is contained in:
Nils Tonnaett 2026-04-12 17:52:37 -07:00 • committed by hackerman-kl
parent f4c26cd3ed
commit bf6fae7df9
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-avb/avdecc.c
View file

@ -407,6 +407,8 @@ struct server *avdecc_server_new(struct impl *impl, struct spa_dict *props)
goto error_free; goto error_free;
server->gptp = avb_gptp_new(server); server->gptp = avb_gptp_new(server);
if (server->gptp == NULL)
goto error_free;
init_descriptors(server); init_descriptors(server);

10
src/modules/module-avb/gptp.c
View file

@ -262,8 +262,12 @@ struct avb_gptp *avb_gptp_new(struct server *server)
str = pw_properties_get(impl->props, "ptp.management-socket"); str = pw_properties_get(impl->props, "ptp.management-socket");
gptp->ptp_mgmt_socket_path = str ? strdup(str) : NULL; gptp->ptp_mgmt_socket_path = str ? strdup(str) : NULL;
if(gptp->ptp_mgmt_socket_path) if(gptp->ptp_mgmt_socket_path) {
gptp->ptp_fd = make_unix_ptp_mgmt_socket(gptp->ptp_mgmt_socket_path); gptp->ptp_fd = make_unix_ptp_mgmt_socket(gptp->ptp_mgmt_socket_path);
} else {
pw_log_error("server %p: ptp.management-socket not set", impl);
goto error_free;
}
spa_list_init(&gptp->attributes); spa_list_init(&gptp->attributes);
spa_hook_list_init(&gptp->listener_list); spa_hook_list_init(&gptp->listener_list);
@ -271,5 +275,9 @@ struct avb_gptp *avb_gptp_new(struct server *server)
avdecc_server_add_listener(server, &gptp->server_listener, &server_events, gptp); avdecc_server_add_listener(server, &gptp->server_listener, &server_events, gptp);
return (struct avb_gptp*)gptp; return (struct avb_gptp*)gptp;
error_free:
gptp_destroy(gptp);
return NULL;
} }