From 119942b7a49bce1cc9d2f125de7e9d9fe832d7d1 Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Wed, 3 Mar 2021 21:59:32 +0100
Subject: [PATCH] IPC: add slot init

---
 pcsx2/IPC.cpp | 21 +++++++++++++++------
 pcsx2/IPC.h   |  4 ++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pcsx2/IPC.cpp b/pcsx2/IPC.cpp
index 769a5a23ad..f8bf30f463 100644
--- a/pcsx2/IPC.cpp
+++ b/pcsx2/IPC.cpp
@@ -42,7 +42,7 @@
 #include "svnrev.h"
 #include "IPC.h"
 
-SocketIPC::SocketIPC(SysCoreThread* vm)
+SocketIPC::SocketIPC(SysCoreThread* vm, unsigned int slot = DEFAULT_PORT)
 	: pxThread("IPC_Socket")
 {
 #ifdef _WIN32
@@ -66,7 +66,7 @@ SocketIPC::SocketIPC(SysCoreThread* vm)
 	server.sin_family = AF_INET;
 	// localhost only
 	server.sin_addr.s_addr = inet_addr("127.0.0.1");
-	server.sin_port = htons(PORT);
+	server.sin_port = htons(slot);
 
 	if (bind(m_sock, (struct sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
 	{
@@ -75,8 +75,6 @@ SocketIPC::SocketIPC(SysCoreThread* vm)
 	}
 
 #else
-	// XXX: go back whenever we want to have multiple IPC instances with
-	// multiple emulators running and make this a folder
 #ifdef __APPLE__
 	char* runtime_dir = std::getenv("TMPDIR");
 #else
@@ -84,10 +82,21 @@ SocketIPC::SocketIPC(SysCoreThread* vm)
 #endif
 	// fallback in case macOS or other OSes don't implement the XDG base
 	// spec
+	char* tmp_socket;
+
 	if (runtime_dir == NULL)
-		m_socket_name = (char*)"/tmp/pcsx2.sock";
+		m_socket_name = tmp_socket = (char*)"/tmp/pcsx2.sock";
 	else
-		m_socket_name = strcat(runtime_dir, "/pcsx2.sock");
+		m_socket_name = tmp_socket = strcat(runtime_dir, "/pcsx2.sock");
+
+	if (slot != DEFAULT_PORT)
+	{
+		// maximum size of .%u
+		char slot_ending[34];
+		sprintf(slot_ending, ".%u", slot);
+		m_socket_name = strcat(tmp_socket, slot_ending);
+		free(tmp_socket);
+	}
 
 	struct sockaddr_un server;
 
diff --git a/pcsx2/IPC.h b/pcsx2/IPC.h
index d3dab97005..7e7b6d67e2 100644
--- a/pcsx2/IPC.h
+++ b/pcsx2/IPC.h
@@ -37,7 +37,7 @@ protected:
 #ifdef _WIN32
 	// windows claim to have support for AF_UNIX sockets but that is a blatant lie,
 	// their SDK won't even run their own examples, so we go on TCP sockets.
-#define PORT 28011
+#define DEFAULT_PORT 28011
 	SOCKET m_sock = INVALID_SOCKET;
 	// the message socket used in thread's accept().
 	SOCKET m_msgsock = INVALID_SOCKET;
@@ -200,7 +200,7 @@ public:
 	bool m_end = true;
 
 	/* Initializers */
-	SocketIPC(SysCoreThread* vm);
+	SocketIPC(SysCoreThread* vm, unsigned int slot = DEFAULT_PORT);
 	virtual ~SocketIPC();
 
 }; // class SocketIPC