From 23d4e9b664d696615a8c6e852840546bddf005b2 Mon Sep 17 00:00:00 2001
From: Zanger <MZanger@uhlsport.com>
Date: Sun, 14 Jan 2024 19:43:21 +0100
Subject: [PATCH] win to mac
---
chat_server.py | 2 +-
server.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chat_server.py b/chat_server.py
index c3681d9..762abcc 100644
--- a/chat_server.py
+++ b/chat_server.py
@@ -35,7 +35,7 @@ if __name__ == '__main__':
broadcast_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
broadcast_socket.sendto(MSG, (broadcast_address, BROADCAST_PORT))
else:
- broadcast_socket.sendto(MSG, ('<broadcast>', BROADCAST_PORT))
+ broadcast_socket.sendto(MSG, (broadcast_address, BROADCAST_PORT))
print("Successfully sent message")
message, server = broadcast_socket.recvfrom(1024)
diff --git a/server.py b/server.py
index 1bc6200..2bb98f9 100644
--- a/server.py
+++ b/server.py
@@ -257,7 +257,7 @@ class Server(multiprocessing.Process):
if self.os == "macOS":
server_socket.connect((BROADCAST_ADDRESS, self.server_port))
else:
- server_socket.connect((self.server_address, self.server_port))
+ server_socket.connect((BROADCAST_ADDRESS, self.server_port))
server_socket.sendto(str.encode(message), addr)
server_socket.close()
@@ -281,7 +281,7 @@ class Server(multiprocessing.Process):
listen_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
listen_socket.bind((BROADCAST_ADDRESS, BROADCAST_PORT))
else:
- listen_socket.bind((self.server_address, BROADCAST_PORT))
+ listen_socket.bind(('', BROADCAST_PORT))
print(self.server_id+": "+"Listening to client register broadcast messages")
@@ -385,7 +385,7 @@ class Server(multiprocessing.Process):
broadcast_socket.sendto(MSG, (BROADCAST_ADDRESS, PORT))
broadcast_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
else:
- broadcast_socket.sendto(MSG, ('<broadcast>', PORT))
+ broadcast_socket.sendto(MSG, (BROADCAST_ADDRESS, PORT))
broadcast_socket.close()
def listen_for_cache_update(self):
@@ -406,7 +406,7 @@ class Server(multiprocessing.Process):
listen_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
listen_socket.bind((BROADCAST_ADDRESS, BROADCAST_PORT))
else:
- listen_socket.bind((MY_IP, BROADCAST_PORT))
+ listen_socket.bind(('', BROADCAST_PORT))
print(self.server_id+": "+"Listening to cache update broadcast messages")
--
GitLab