mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

activate SHM support on the server side only when new client supports it and when client and server have the same UID.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1277 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-18 23:44:35 +00:00
parent c313b23d5f
commit e33abc3089
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/pulsecore/protocol-native.c
View file

@ -961,6 +961,15 @@ static void command_auth(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t
(unsigned long) creds->uid, (unsigned long) creds->uid,
(unsigned long) creds->gid, (unsigned long) creds->gid,
success); success);
if (c->version >= 10 &&
pa_mempool_is_shared(c->protocol->core->mempool) &&
creds->uid == getuid()) {
pa_pstream_use_shm(c->pstream, 1);
pa_log_info("Enabled SHM for new connection");
}
} }
#endif #endif
@ -982,7 +991,21 @@ static void command_auth(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t
reply = reply_new(tag); reply = reply_new(tag);
pa_tagstruct_putu32(reply, PA_PROTOCOL_VERSION); pa_tagstruct_putu32(reply, PA_PROTOCOL_VERSION);
#ifdef HAVE_CREDS
{
/* SHM support is only enabled after both sides made sure they are the same user. */
pa_creds ucred;
ucred.uid = getuid();
ucred.gid = getgid();
pa_pstream_send_tagstruct_with_creds(c->pstream, reply, &ucred);
}
#else
pa_pstream_send_tagstruct(c->pstream, reply); pa_pstream_send_tagstruct(c->pstream, reply);
#endif
} }
static void command_set_client_name(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { static void command_set_client_name(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
@ -2353,8 +2376,6 @@ static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, vo
c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool); c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool);
assert(c->pstream); assert(c->pstream);
pa_pstream_use_shm(c->pstream, 1);
pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c); pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c); pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c); pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);