Skip to content

Commit da41260

Browse files
authored
Merge pull request #3 from thinmanj/adding_basic_protocol
Adding small protocol to send the filename
2 parents 1a67c77 + c45267e commit da41260

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

transmitter.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@ def server(args):
1010
try:
1111
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_s:
1212
server_s.bind((args.ip, args.port))
13+
logger.info(f"Listening on {args.ip}:{args.port}")
1314
server_s.listen()
1415
while True:
1516
conn, addr = server_s.accept()
1617
logger.info(f"Connection from {addr}")
18+
msg = conn.recv(1024).decode('utf-8')
19+
logger.debug(f"Client send: {msg}")
20+
conn.send("ok".encode('utf-8'))
21+
filename = msg
22+
1723
try:
18-
with conn, open("out.file", "wb") as out_file:
24+
with conn, open(filename, "wb") as out_file:
1925
logger.info(f"Connected by {addr}")
2026
while True:
2127
data = conn.recv(1024)
@@ -24,9 +30,9 @@ def server(args):
2430
out_file.write(data)
2531
logger.debug(f"Data: {data!r}")
2632
except FileNotFoundError:
27-
logger.exception(f"File or path not found")
33+
logger.exception(f"File {filename} or path not found")
2834
except OSError:
29-
logger.exception(f"OS error ocurred")
35+
logger.exception(f"OS error ocurred while accessing file {filename}")
3036
except Exception as err:
3137
logger.exception("Unexpected error happened")
3238

@@ -44,14 +50,19 @@ def client(args):
4450

4551
try:
4652
with open(args.filename, "rb") as in_file:
53+
out_bound = f"{args.filename}"
54+
client_s.send(out_bound.encode('utf-8'))
55+
msg = client_s.recv(1024).decode('utf-8')
56+
logger.debug(f"Server answered: {msg}")
57+
4758
for chunck in iter(lambda: in_file.read(1024), b''):
4859
client_s.sendall(chunck)
4960
logger.info(f"Sending data of size {len(chunck)}")
5061
except FileNotFoundError:
5162
logger.exception(f"File {args.filename} not found")
5263
except OSError:
5364
logger.exception(f"OS Error happend while trying to access file {args.filename}")
54-
except Exceptionas as err_c:
65+
except Exception as err_c:
5566
logger.exception("Unexpected error happened")
5667
except socket.error as err_c:
5768
logger.exception("Error heppened while processing sockets")

0 commit comments

Comments
 (0)