From 84c195278644cfd323cceaa55cbb1a5a71c25d54 Mon Sep 17 00:00:00 2001 From: Adrian Knoth Date: Fri, 24 May 2013 14:58:11 +0200 Subject: [PATCH] Fix promiscuous mode Original patch by Luciano Montanaro --- posix/JackPosixSemaphore.cpp | 6 +++++- posix/JackSocket.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/posix/JackPosixSemaphore.cpp b/posix/JackPosixSemaphore.cpp index 2b2cdc3c..e9503536 100644 --- a/posix/JackPosixSemaphore.cpp +++ b/posix/JackPosixSemaphore.cpp @@ -32,7 +32,11 @@ void JackPosixSemaphore::BuildName(const char* client_name, const char* server_n { char ext_client_name[SYNC_MAX_NAME_SIZE + 1]; JackTools::RewriteName(client_name, ext_client_name); - snprintf(res, size, "jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name); + if (getenv("JACK_PROMISCUOUS_SERVER")) { + snprintf(res, size, "jack_sem.%s_%s", server_name, ext_client_name); + } else { + snprintf(res, size, "jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name); + } } bool JackPosixSemaphore::Signal() diff --git a/posix/JackSocket.cpp b/posix/JackSocket.cpp index ae0f5a0f..e8b528d9 100644 --- a/posix/JackSocket.cpp +++ b/posix/JackSocket.cpp @@ -33,7 +33,11 @@ static void BuildName(const char* client_name, char* res, const char* dir, int w { char ext_client_name[SYNC_MAX_NAME_SIZE + 1]; JackTools::RewriteName(client_name, ext_client_name); - snprintf(res, size, "%s/jack_%s_%d_%d", dir, ext_client_name, JackTools::GetUID(), which); + if (getenv("JACK_PROMISCUOUS_SERVER")) { + snprintf(res, size, "%s/jack_%s_%d", dir, ext_client_name, which); + } else { + snprintf(res, size, "%s/jack_%s_%d_%d", dir, ext_client_name, JackTools::GetUID(), which); + } } JackClientSocket::JackClientSocket(int socket): JackClientRequestInterface(), fSocket(socket),fTimeOut(0)