Implementation of server_name setting (-n) in progress (4)

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1641 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackSocket.cpp

@@ -57,8 +57,7 @@ int JackClientSocket::Connect(const char* dir, const char* name, int which) // A
     }
 
     addr.sun_family = AF_UNIX;
-    snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, "%s/jack_%s", dir, name);
-
+    snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, "%s/jack_%s_%d", dir, name, which);
     JackLog("Connect: addr.sun_path %s\n", addr.sun_path);
 
     if (connect(fSocket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
@@ -88,7 +87,6 @@ int JackClientSocket::Connect(const char* dir, int which)
 
     addr.sun_family = AF_UNIX;
     snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, "%s/jack_%d", dir, which);
-
     JackLog("Connect: addr.sun_path %s\n", addr.sun_path);
 
     if (connect(fSocket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
@@ -191,7 +189,7 @@ int JackServerSocket::Bind(const char* dir, const char* name, int which) // A re
     addr.sun_family = AF_UNIX;
 
     // TO CORRECT: always reuse the same name for now...
-    snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, "%s/jack_%s", dir, name);
+    snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, "%s/jack_%s_%d", dir, name, which);
     snprintf(fName, sizeof(addr.sun_path) - 1, "%s/jack_%s", dir, name);
     /*
     if (access(addr.sun_path, F_OK) == 0) {

common/JackSocketClientChannel.cpp

@@ -43,7 +43,7 @@ int JackSocketClientChannel::ServerCheck(const char* server_name)
 	JackLog("JackSocketClientChannel::ServerCheck = %s\n", server_name);
 		
     // Connect to server
-    if (fRequestSocket.Connect(jack_server_dir, 0) < 0) {
+    if (fRequestSocket.Connect(jack_server_dir, server_name, 0) < 0) {
 		jack_error("Cannot connect to server socket");
 		fRequestSocket.Close();
         return -1;

common/JackSocketServerChannel.cpp

@@ -50,7 +50,7 @@ int JackSocketServerChannel::Open(const char* server_name, JackServer* server)
 	fServer = server;
 
     // Prepare request socket
-    if (fRequestListenSocket.Bind(jack_server_dir, 0) < 0) {
+    if (fRequestListenSocket.Bind(jack_server_dir, server_name, 0) < 0) {
         JackLog("JackSocketServerChannel::Open : cannot create result listen socket\n");
         return -1;
     }

common/JackSocketServerNotifyChannel.cpp

@@ -27,7 +27,7 @@ namespace Jack
 
 int JackSocketServerNotifyChannel::Open(const char* server_name)
 {
-    if (fRequestSocket.Connect(jack_server_dir, 0) < 0) {
+    if (fRequestSocket.Connect(jack_server_dir, server_name, 0) < 0) {
         jack_error("Cannot connect to server socket");
         return -1;
     } else {