diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2014-04-25 17:57:18 +0200 |
|---|---|---|
| committer | David Henningsson <david.henningsson@canonical.com> | 2014-06-27 14:28:21 +0200 |
| commit | a476371254eb78071db243f4fb9cecc0c52fabce (patch) | |
| tree | d156e4ac5f8560432ada5b56aa9e8cc19bf04bd4 /src/modules/module-protocol-stub.c | |
| parent | 1827991548495f1b2c3f44fe45b51901109f791c (diff) | |
| download | pulseaudio-a476371254eb78071db243f4fb9cecc0c52fabce.tar.gz | |
protocol-native: Enable srbchannel
The srbchannel is enabled if protocol version >= 30 and
SHM is available. There is also a module parameter
srbchannel=false that can be used for disabling the srbchannel.
The setup is done in these steps:
1) Server receives authentication (like today)
2) Server sends enable_srbchannel to client
3) Server sends memblock to client
4) Client receives enable_srbchannel
5) Client receives memblock
6) Client sends enable_srbchannel back to server
7) Client switches over
8) Server receives enable_srbchannel and switches over
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src/modules/module-protocol-stub.c')
| -rw-r--r-- | src/modules/module-protocol-stub.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index 3218a01e1..118351ec4 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -120,14 +120,17 @@ # endif # if defined(HAVE_CREDS) && !defined(USE_TCP_SOCKETS) -# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable", +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable", "srbchannel", # define AUTH_USAGE "auth-group=<system group to allow access> auth-group-enable=<enable auth by UNIX group?> " +# define SRB_USAGE "srbchannel=<enable shared ringbuffer communication channel?> " # elif defined(USE_TCP_SOCKETS) # define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", # define AUTH_USAGE "auth-ip-acl=<IP address ACL to allow access> " +# define SRB_USAGE # else # define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON # define AUTH_USAGE +# define SRB_USAGE # endif PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION); @@ -135,6 +138,7 @@ "auth-cookie=<path to cookie file> " "auth-cookie-enabled=<enable cookie authentication?> " AUTH_USAGE + SRB_USAGE SOCKET_USAGE); #elif defined(USE_PROTOCOL_ESOUND) # include <pulsecore/protocol-esound.h> |