mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use machine id instead of hostname to identify local connections

Browse source
This commit is contained in:
Lennart Poettering 2009-04-01 21:15:52 +02:00
parent dcb24f5068
commit 380e97a596
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-x11-publish.c
View file

@ -136,7 +136,7 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) {
int pa__init(pa_module*m) { int pa__init(pa_module*m) {
struct userdata *u; struct userdata *u;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char hn[256], un[128]; char *mid;
char hx[PA_NATIVE_COOKIE_LENGTH*2+1]; char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
const char *t; const char *t;
@ -164,10 +164,10 @@ int pa__init(pa_module*m) {
if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail; goto fail;
if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un))) mid = pa_machine_id();
goto fail; u->id = pa_sprintf_malloc("%lu@%s/%lu", (unsigned long) getuid(), mid, (unsigned long) getpid());
pa_xfree(mid);
u->id = pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid());
pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", u->id); pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", u->id);
publish_servers(u, pa_native_protocol_servers(u->protocol)); publish_servers(u, pa_native_protocol_servers(u->protocol));

10
src/pulsecore/parseaddr.c
View file

@ -87,13 +87,15 @@ int pa_parse_address(const char *name, pa_parsed_address *ret_p) {
ret_p->type = PA_PARSED_ADDRESS_TCP_AUTO; ret_p->type = PA_PARSED_ADDRESS_TCP_AUTO;
if (*name == '{') { if (*name == '{') {
char hn[256], *pfx; char *id, *pfx;
/* The URL starts with a host specification for detecting local connections */
if (!pa_get_host_name(hn, sizeof(hn))) /* The URL starts with a host id for detecting local connections */
if (!(id = pa_machine_id()))
return -1; return -1;
pfx = pa_sprintf_malloc("{%s}", hn); pfx = pa_sprintf_malloc("{%s}", id);
pa_xfree(id);
if (!pa_startswith(name, pfx)) { if (!pa_startswith(name, pfx)) {
pa_xfree(pfx); pa_xfree(pfx);
/* Not local */ /* Not local */

22
src/pulsecore/socket-server.c
View file

@ -467,11 +467,13 @@ char *pa_socket_server_get_address(pa_socket_server *s, char *c, size_t l) {
pa_snprintf(c, l, "tcp6:%s:%u", fqdn, (unsigned) ntohs(sa.sin6_port)); pa_snprintf(c, l, "tcp6:%s:%u", fqdn, (unsigned) ntohs(sa.sin6_port));
} else if (memcmp(&in6addr_loopback, &sa.sin6_addr, sizeof(in6addr_loopback)) == 0) { } else if (memcmp(&in6addr_loopback, &sa.sin6_addr, sizeof(in6addr_loopback)) == 0) {
char hn[256]; char *id;
if (!pa_get_host_name(hn, sizeof(hn)))
if (!(id = pa_machine_id()))
return NULL; return NULL;
pa_snprintf(c, l, "{%s}tcp6:localhost:%u", hn, (unsigned) ntohs(sa.sin6_port)); pa_snprintf(c, l, "{%s}tcp6:localhost:%u", id, (unsigned) ntohs(sa.sin6_port));
pa_xfree(id);
} else { } else {
char ip[INET6_ADDRSTRLEN]; char ip[INET6_ADDRSTRLEN];
@ -503,11 +505,13 @@ char *pa_socket_server_get_address(pa_socket_server *s, char *c, size_t l) {
pa_snprintf(c, l, "tcp:%s:%u", fqdn, (unsigned) ntohs(sa.sin_port)); pa_snprintf(c, l, "tcp:%s:%u", fqdn, (unsigned) ntohs(sa.sin_port));
} else if (sa.sin_addr.s_addr == INADDR_LOOPBACK) { } else if (sa.sin_addr.s_addr == INADDR_LOOPBACK) {
char hn[256]; char *id;
if (!pa_get_host_name(hn, sizeof(hn)))
if (!(id = pa_machine_id()))
return NULL; return NULL;
pa_snprintf(c, l, "{%s}tcp:localhost:%u", hn, (unsigned) ntohs(sa.sin_port)); pa_snprintf(c, l, "{%s}tcp:localhost:%u", id, (unsigned) ntohs(sa.sin_port));
pa_xfree(id);
} else { } else {
char ip[INET_ADDRSTRLEN]; char ip[INET_ADDRSTRLEN];
@ -523,15 +527,15 @@ char *pa_socket_server_get_address(pa_socket_server *s, char *c, size_t l) {
} }
case SOCKET_SERVER_UNIX: { case SOCKET_SERVER_UNIX: {
char hn[256]; char *id;
if (!s->filename) if (!s->filename)
return NULL; return NULL;
if (!pa_get_host_name(hn, sizeof(hn))) if (!(id = pa_machine_id()))
return NULL; return NULL;
pa_snprintf(c, l, "{%s}unix:%s", hn, s->filename); pa_snprintf(c, l, "{%s}unix:%s", id, s->filename);
return c; return c;
} }