feat: allow custom ip for cemuhook server

Author: git-developer

scc/cemuhook_server.c

@@ -302,10 +302,10 @@ const int cemuhook_module_version(void) {
 	return CEMUHOOK_MODULE_VERSION;
 }
 
-void cemuhook_data_recieved(int fd, int port, const char* buffer, size_t size) {
+void cemuhook_data_received(int fd, const char* ip, int port, const char* buffer, size_t size) {
 	struct sockaddr_in source;
 	source.sin_family = AF_INET;
-	source.sin_addr.s_addr = inet_addr("127.0.0.1");
+	source.sin_addr.s_addr = inet_addr(ip);
 	source.sin_port = htons(port);
 
 	parse_message(fd, buffer, size, &source);
@@ -321,7 +321,7 @@ bool cemuhook_socket_enable() {
 
 #else
 
-static void on_data_recieved(Daemon* d, int fd, void* userdata) {
+static void on_data_received(Daemon* d, int fd, void* userdata) {
 	char buffer[BUFFER_SIZE];
 	struct sockaddr_in source;
 	socklen_t len = sizeof(struct sockaddr_in);
@@ -345,7 +345,11 @@ bool sccd_cemuhook_socket_enable() {
 	struct sockaddr_in server_addr;
 	memset(&server_addr, 0, sizeof(struct sockaddr_in));
 	server_addr.sin_family = AF_INET;
-	server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+	if (const char* custom_ip = getenv("SCC_SERVER_IP")) {
+		server_addr.sin_addr.s_addr = inet_addr(custom_ip);
+	} else {
+		server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+	}
 	if (const char* custom_port = getenv("SCC_SERVER_PORT")) {
 		server_addr.sin_port = atoi(custom_port);
 	} else {
@@ -381,7 +385,7 @@ bool sccd_cemuhook_socket_enable() {
 		return false;
 	}
 
-	if (!sccd_poller_add(sock, &on_data_recieved, NULL)) {
+	if (!sccd_poller_add(sock, &on_data_received, NULL)) {
 		LERROR("sccd_poller_add failed to add listening socket");
 		return false;
 	}

scc/cemuhook_server.py

@@ -17,6 +17,7 @@
 log = logging.getLogger("CemuHook")
 
 BUFFER_SIZE = 1024
+IP = '127.0.0.1'
 PORT = 26760
 
 
@@ -35,8 +36,8 @@ class CemuhookServer:
 
 	def __init__(self, daemon):
 		self._lib = find_library('libcemuhook')
-		self._lib.cemuhook_data_recieved.argtypes = [ c_int, c_int, c_char_p, c_size_t ]
-		self._lib.cemuhook_data_recieved.restype = None
+		self._lib.cemuhook_data_received.argtypes = [ c_int, c_char_p, c_int, c_char_p, c_size_t ]
+		self._lib.cemuhook_data_received.restype = None
 		self._lib.cemuhook_feed.argtypes = [ c_int, c_int, CemuhookServer.C_DATA_T ]
 		self._lib.cemuhook_feed.restype = None
 		self._lib.cemuhook_socket_enable.argtypes = []
@@ -50,10 +51,11 @@ def __init__(self, daemon):
 		self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
 		poller = daemon.get_poller()
-		daemon.poller.register(self.socket.fileno(), poller.POLLIN, self.on_data_recieved)
+		daemon.poller.register(self.socket.fileno(), poller.POLLIN, self.on_data_received)
 
 		server_port = os.getenv('SCC_SERVER_PORT') or PORT;
-		self.socket.bind(('127.0.0.1', server_port))
+		server_ip = os.getenv('SCC_SERVER_IP') or IP;
+		self.socket.bind((server_ip, server_port))
 		log.info("Created CemuHookUDP Motion Provider")
 
 		Thread(target=self._keepalive).start()
@@ -66,11 +68,11 @@ def _keepalive(self):
 				self.feed((0.0, 0.0, 0.0, 0.0, 0.0, 0.0))
 			sleep(1)
 
-	def on_data_recieved(self, fd, event_type):
+	def on_data_received(self, fd, event_type):
 		if fd != self.socket.fileno(): return
 		message, (ip, port) = self.socket.recvfrom(BUFFER_SIZE)
 		buffer = create_string_buffer(BUFFER_SIZE)
-		self._lib.cemuhook_data_recieved(fd, port, message, len(message), buffer)
+		self._lib.cemuhook_data_received(fd, ip, port, message, len(message), buffer)
 
 
 	def feed(self, data):