diff --git a/client.py b/client.py index 9d270931784f7b204451bdbecc138acb8f1b2b00..b80b968fd2dd9e8f5946ad2189578cf74cb2cabf 100644 --- a/client.py +++ b/client.py @@ -2,12 +2,6 @@ import multiprocessing import socket import threading import re -import struct - -client_broadcast_listener_port = 49153 - -client_receive_message_multicast_port = 51001 -multicast_group_ip = '224.0.1.1' class Client(multiprocessing.Process): @@ -40,13 +34,14 @@ class Client(multiprocessing.Process): print(message) def register(self, message_type, message_group): + PORT = 49153 MSG = bytes(message_type + '_' + message_group, 'utf-8') broadcast_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) broadcast_socket.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) - broadcast_socket.sendto(MSG, ('<broadcast>', client_broadcast_listener_port)) + broadcast_socket.sendto(MSG, ('<broadcast>', PORT)) data, server = broadcast_socket.recvfrom(1024) @@ -65,11 +60,8 @@ class Client(multiprocessing.Process): broadcast_socket.close() def send_message(self): - PORT = 50001 - print("addr",self.registered_server_address) - while True: message = input() if message.lower() == 'exit': @@ -77,19 +69,12 @@ class Client(multiprocessing.Process): client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) client_socket.connect((self.registered_server_address, PORT)) - client_socket.sendall(bytes(message, 'utf-8')) - - #data = client_socket.recv(1024) - #print(f"Received response from server: {data.decode('utf-8')}") - client_socket.close() def receive_messages(self): - PORT = 51000 - client_receive_message_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) client_receive_message_socket.bind((self.client_address, PORT)) client_receive_message_socket.listen() @@ -98,34 +83,5 @@ class Client(multiprocessing.Process): while True: connection, addr = client_receive_message_socket.accept() - #print(addr) - #print(f"Connection established with {addr}") - message = connection.recv(1024) - print(f"GC message: {message.decode('utf-8')}") - - #multicast_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) - #multicast_socket.bind(('0.0.0.0', client_receive_message_multicast_port)) - - # Füge die Multicast-Gruppe dem lokalen Interface hinzu - #group = socket.inet_aton(self.client_address) - # mreq = struct.pack('4sL', group, socket.INADDR_ANY) - #multicast_socket.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq) - - multicast_get_message_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) - multicast_get_message_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - - multicast_get_message_socket.bind(('', client_receive_message_multicast_port)) - mreq = struct.pack('4sl', socket.inet_aton(multicast_group_ip), socket.INADDR_ANY) - print(mreq) - - multicast_get_message_socket.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq) - - # Empfange die Nachricht - while True: - print('I am there') - data, addr = multicast_get_message_socket.recv(1024) - print(data) - print(f"Empfangene Nachricht von {addr}: {data.decode()}") - - + print(f"GC message: {message.decode('utf-8')}") \ No newline at end of file