more fixes

Changes

2 changed files (+5/-3)

• proxy.py
  • @@ -3,4 +3,4 @@
    while 1: req = requests.get('http://10.29.55.48:8000/queue').text resp = requests.get(f'http://localhost:4242{req}') - requests.post('http://10.29.55.48:8000/done?user=1', data=str(resp.status_code) + ' ' + resp.text) + requests.post('http://10.29.55.48:8000/done?user=1234', data=str(resp.status_code) + ' ' + resp.text)
• server.py
  • @@ -32,8 +32,8 @@ done = ''
    elif "petname" in p: petname = petname_to_pubkey[p['user'][0]][p["petname"][0]] print(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}") - get(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}") - + res = get(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}").text + self.wfile.write(res) elif func == "getinbox": user = p['user'][0] self.wfile.write(str(Fetch(user)).encode('utf-8'))
  • @@ -89,6 +89,8 @@ else:
    print('Not implemented') self.send_response(200) + self.send_header('Content-type', 'text/plain') + self.end_headers() server = ThreadingHTTPServer(("0.0.0.0", int(argv[1])), HTTPRequestHandler)