From 534b94e53de5cfba410f777ce4f63da3e98e70d2 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Mon, 11 Jan 2021 07:58:15 -0800 Subject: [PATCH] Parse the correct ip addr when saving sent offer (#597) --- squeaknode/server/squeak_server_servicer.py | 4 +++- squeaknode/server/util.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 squeaknode/server/util.py diff --git a/squeaknode/server/squeak_server_servicer.py b/squeaknode/server/squeak_server_servicer.py index f995d36c..05393efb 100644 --- a/squeaknode/server/squeak_server_servicer.py +++ b/squeaknode/server/squeak_server_servicer.py @@ -7,6 +7,7 @@ from squeak.core import CSqueak from proto import squeak_server_pb2 from proto import squeak_server_pb2_grpc from squeaknode.core.util import get_hash +from squeaknode.server.util import parse_ip_address logger = logging.getLogger(__name__) @@ -72,8 +73,9 @@ class SqueakServerServicer(squeak_server_pb2_grpc.SqueakServerServicer): squeak_hash = bytes.fromhex(squeak_hash_str) # TODO: check if hash is valid client_addr = context.peer() + ip_addr = parse_ip_address(client_addr) - buy_response = self.handler.handle_get_offer(squeak_hash, client_addr) + buy_response = self.handler.handle_get_offer(squeak_hash, ip_addr) if buy_response is None: context.set_code(grpc.StatusCode.NOT_FOUND) diff --git a/squeaknode/server/util.py b/squeaknode/server/util.py new file mode 100644 index 00000000..a5e60789 --- /dev/null +++ b/squeaknode/server/util.py @@ -0,0 +1,4 @@ + + +def parse_ip_address(grpc_addr_str: str) -> str: + return grpc_addr_str.split(':')[1]