From ce1c93478e233d277b4a2cd3a35f1176c2aecede Mon Sep 17 00:00:00 2001 From: PavelLinearB Date: Wed, 19 Feb 2025 13:57:50 +0200 Subject: [PATCH 1/4] strings --- src/client/client.py | 38 +++++++++++++++++++++++++ src/server/server.py | 67 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 src/client/client.py create mode 100644 src/server/server.py diff --git a/src/client/client.py b/src/client/client.py new file mode 100644 index 0000000..cd7bc76 --- /dev/null +++ b/src/client/client.py @@ -0,0 +1,38 @@ +import socket +import threading +import sys + +#Wait for incoming data from server +#.decode is used to turn the message in bytes to a string +def receive(socket, signal): + while signal: + try: + data = socket.recv(32) + print(str(data.decode('utf-8'))) + except: + print("You have been disconnected from the server") + signal = False + break + +#Get host and port +host = input("Host: ") +port = int(input("Port: ")) + +#Attempt connection to server +try: + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect((host, port)) +except: + print("Could not make a connection to the server") + input("Press enter to quit") + sys.exit(0) + +#Create new thread to wait for data +receiveThread = threading.Thread(target = receive, args = (sock, True)) +receiveThread.start() + +#Send data to server +#str.encode is used to turn the string message into bytes so it can be sent across the network +while True: + message = input() + sock.sendall(str.encode(message)) diff --git a/src/server/server.py b/src/server/server.py new file mode 100644 index 0000000..bd0e756 --- /dev/null +++ b/src/server/server.py @@ -0,0 +1,67 @@ +import socket +import threading + +#Variables for holding information about connections +connections = [] +total_connections = 0 + +#Client class, new instance created for each connected client +#Each instance has the socket and address that is associated with items +#Along with an assigned ID and a name chosen by the client +class Client(threading.Thread): + def __init__(self, socket, address, id, name, signal): + threading.Thread.__init__(self) + self.socket = socket + self.address = address + self.id = id + self.name = name + self.signal = signal + + def __str__(self): + return str(self.id) + " " + str(self.address) + + #Attempt to get data from client + #If unable to, assume client has disconnected and remove him from server data + #If able to and we get data back, print it in the server and send it back to every + #client aside from the client that has sent it + #.decode is used to convert the byte data into a printable string + def run(self): + while self.signal: + try: + data = self.socket.recv(32) + except: + print("Client " + str(self.address) + " has disconnected") + self.signal = False + connections.remove(self) + break + if data != "": + print("ID " + str(self.id) + ": " + str(data.decode('utf-8'))) + for client in connections: + if client.id != self.id: + client.socket.sendall(data) + +#Wait for new connections +def newConnections(socket): + while True: + sock, address = socket.accept() + global total_connections + connections.append(Client(sock, address, total_connections, "Name", True)) + connections[len(connections) - 1].start() + print("New connection at ID " + str(connections[len(connections) - 1])) + total_connections += 1 + +def main(): + #Get host and port + host = input("Host: ") + port = int(input("Port: ")) + + #Create new server socket + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.bind((host, port)) + sock.listen(5) + + #Create new thread to wait for connections + newConnectionsThread = threading.Thread(target = newConnections, args = (sock,)) + newConnectionsThread.start() + +main() From 74120c1c0ea54704b92581593b87f9beb3ea5bab Mon Sep 17 00:00:00 2001 From: PavelLinearB Date: Wed, 19 Feb 2025 14:08:45 +0200 Subject: [PATCH 2/4] socket-improvements --- src/client/client.py | 10 ++++++++-- src/server/server.py | 13 +++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/client/client.py b/src/client/client.py index cd7bc76..556f442 100644 --- a/src/client/client.py +++ b/src/client/client.py @@ -7,8 +7,14 @@ def receive(socket, signal): while signal: try: - data = socket.recv(32) - print(str(data.decode('utf-8'))) + data = b'' + while True: + chunk = socket.recv(4096) + data += chunk + if len(chunk) < 4096: + break + if data: + print(str(data.decode('utf-8'))) except: print("You have been disconnected from the server") signal = False diff --git a/src/server/server.py b/src/server/server.py index bd0e756..aeef87a 100644 --- a/src/server/server.py +++ b/src/server/server.py @@ -18,7 +18,7 @@ def __init__(self, socket, address, id, name, signal): self.signal = signal def __str__(self): - return str(self.id) + " " + str(self.address) + return str(self.id) + + str(self.address) #Attempt to get data from client #If unable to, assume client has disconnected and remove him from server data @@ -28,13 +28,18 @@ def __str__(self): def run(self): while self.signal: try: - data = self.socket.recv(32) + data = b'' + while True: + chunk = self.socket.recv(4096) + data += chunk + if len(chunk) < 4096: + break except: - print("Client " + str(self.address) + " has disconnected") + print(Client + str(self.address) + " has disconnected") self.signal = False connections.remove(self) break - if data != "": + if data != b"": print("ID " + str(self.id) + ": " + str(data.decode('utf-8'))) for client in connections: if client.id != self.id: From de41cb8080fd6f41c7565120e0aa7100c6903118 Mon Sep 17 00:00:00 2001 From: PavelLinearB Date: Wed, 19 Feb 2025 14:20:08 +0200 Subject: [PATCH 3/4] fixed --- src/client/client.py | 6 +++--- src/server/server.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/client.py b/src/client/client.py index 556f442..1fcf278 100644 --- a/src/client/client.py +++ b/src/client/client.py @@ -4,8 +4,8 @@ #Wait for incoming data from server #.decode is used to turn the message in bytes to a string -def receive(socket, signal): - while signal: +def receive(socket, connected = True): + while connected: try: data = b'' while True: @@ -17,7 +17,7 @@ def receive(socket, signal): print(str(data.decode('utf-8'))) except: print("You have been disconnected from the server") - signal = False + connected = False break #Get host and port diff --git a/src/server/server.py b/src/server/server.py index aeef87a..1e7b748 100644 --- a/src/server/server.py +++ b/src/server/server.py @@ -18,7 +18,7 @@ def __init__(self, socket, address, id, name, signal): self.signal = signal def __str__(self): - return str(self.id) + + str(self.address) + return str(self.id) + " " + str(self.address) #Attempt to get data from client #If unable to, assume client has disconnected and remove him from server data @@ -35,7 +35,7 @@ def run(self): if len(chunk) < 4096: break except: - print(Client + str(self.address) + " has disconnected") + print("Client " + str(self.address) + " has disconnected") self.signal = False connections.remove(self) break @@ -66,7 +66,7 @@ def main(): sock.listen(5) #Create new thread to wait for connections - newConnectionsThread = threading.Thread(target = newConnections, args = (sock,)) + newConnectionsThread = threading.Thread(target = newConnections, args = (sock)) newConnectionsThread.start() main() From 94fa7c84e7c9f31984c2a05f50e7515460a74c67 Mon Sep 17 00:00:00 2001 From: PavelLinearB Date: Wed, 19 Feb 2025 14:53:40 +0200 Subject: [PATCH 4/4] Error handling --- src/client/client.py | 8 ++++---- src/server/server.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/client.py b/src/client/client.py index 1fcf278..1723508 100644 --- a/src/client/client.py +++ b/src/client/client.py @@ -15,8 +15,8 @@ def receive(socket, connected = True): break if data: print(str(data.decode('utf-8'))) - except: - print("You have been disconnected from the server") + except (socket.error, ConnectionResetError) as e: + print("You have been disconnected from the server. Error: " + e.strerror) connected = False break @@ -28,8 +28,8 @@ def receive(socket, connected = True): try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((host, port)) -except: - print("Could not make a connection to the server") +except (socket.error, ConnectionRefusedError) as e: + print("Could not make a connection to the server. Error: " + e.strerror) input("Press enter to quit") sys.exit(0) diff --git a/src/server/server.py b/src/server/server.py index 1e7b748..85c94fb 100644 --- a/src/server/server.py +++ b/src/server/server.py @@ -34,7 +34,7 @@ def run(self): data += chunk if len(chunk) < 4096: break - except: + except (socket.error, ConnectionResetError) as e: print("Client " + str(self.address) + " has disconnected") self.signal = False connections.remove(self) @@ -66,7 +66,7 @@ def main(): sock.listen(5) #Create new thread to wait for connections - newConnectionsThread = threading.Thread(target = newConnections, args = (sock)) + newConnectionsThread = threading.Thread(target = newConnections, args = (sock,)) newConnectionsThread.start() main()