diff --git a/__main__.py b/__main__.py index bfa786a..5692ae0 100644 --- a/__main__.py +++ b/__main__.py @@ -4,9 +4,6 @@ cli = Client('127.0.01', 1080) cli.connect(('www.google.com', 80)) cli.sendall( - b'GET /HTTP/1.1\n' - b'Host: [rsid].112.2o7.net\n' - b'Keep-Alive: timeout=15\n' - b'Connection: Keep-Alive\n' - b'X-Forwarded-For: 192.168.10.1\n') + b'GET / HTTP/1.1\n' + b'Host: www.google.com\n\n') print(cli.recvall()) diff --git a/client.py b/client.py index 2d346f7..48f2aa5 100644 --- a/client.py +++ b/client.py @@ -11,7 +11,7 @@ STATUS_CONN_ESTABLISHED = 3 -BUFF_SIZE = 1024 +BUFF_SIZE = 1024*1024 class Client: @@ -77,14 +77,13 @@ def connect(self, dest): def sendall(self, _bytes): data_length = self._socket.sendall(_bytes) - print(data_length) - def recvall(self): data = b'' + import pdb; pdb.set_trace() while True: frag = self._socket.recv(BUFF_SIZE) - if not frag: + if len(frag) == 0: break data += frag return data @@ -101,7 +100,6 @@ def _send_conn_request(self, dest): self._socket.send(request_content) def _recv_conn_reponse(self): - import pdb;pdb.set_trace() res = self._socket.recv(255) # to be verified # check version ver, res = res[:1], res[1:]