Update tcp_client_split_call.py

tcp_client_split_call.py

@@ -1,12 +1,10 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python 
 import socket
 import timeit
-import sys
-import time
 
 tcp_server_adress = sys.argv[1] # expecting "www.perdu.com"
 
-def print_sock_ctts(sock):
+def print_sock_ctts():
     buffer = b""
     data = sock.recv(4096)
     while data:
@@ -15,36 +13,29 @@ def print_sock_ctts(sock):
     print(buffer.decode())
 
 def test_request_single_packet():
-    client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    client.connect((f'{tcp_server_adress}', 8000))
-    t1 = timeit.default_timer()
-    request = b"GET / HTTP/1.0\r\nHost: "
-    request += tcp_server_adress.encode()
-    request += b"\r\n\r\n"
-    client.sendall(request)
-    print_sock_ctts(client)
-    client.close()
-    t2 = timeit.default_timer()
-
-    print(t2-t1)
+    sock.connect((f'{tcp_server_adress}', 80))
+    request = b"GET / HTTP/1.1\r\nHost: " + tcp_server_adress.encode() + b"\r\n\r\n")
+    sock.sendall(request.)
+    print_sock_ctts()
+    sock.close()
 
 def test_request_split_packet():
-    client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    client.connect((f'{tcp_server_adress}', 8000))
+    sock.connect((f'{tcp_server_adress}', 80))
+    request = b"GET / HTTP/1.1\r\nHost: "
+    sock.sendall(request)
+    request = tcp_server_adress.encode() + "\r\n\r\n"
+    sock.sendall(request)
+    print_sock_ctts()
+    sock.close()
+
+def time_test(function)
     t1 = timeit.default_timer()
-    request = b"GET / HTTP/1.0\r\nHost: "
-    client.sendall(request)
-    request = tcp_server_adress.encode()
-    request += b"\r\n\r\n"
-    client.sendall(request)
-    print_sock_ctts(client)
-    client.close()
+    function()
     t2 = timeit.default_timer()
 
     print(t2-t1)
 
+client_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
-test_request_single_packet()
-print("\n\t---\n")
-time.sleep(1)
-test_request_split_packet()
+time_test(test_request_single_packet)
+time_test(test_request_split_packet)