From 1343d6e7ea58dffaf0456ed7cda5fbb4a188299d Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sun, 28 May 2023 12:33:43 +0200 Subject: [PATCH] fixed network based decoding of string --- tnc/sock.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tnc/sock.py b/tnc/sock.py index 438f7300..05180664 100644 --- a/tnc/sock.py +++ b/tnc/sock.py @@ -777,8 +777,8 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler): for _, route in enumerate(MeshParam.routing_table): output["routes"].append( { - "dxcall": str(MeshParam.routing_table[_][0], "utf-8"), - "router": str(MeshParam.routing_table[_][1], "utf-8"), + "dxcall": MeshParam.routing_table[_][0].decode('utf-8'), + "router": MeshParam.routing_table[_][1].decode('utf-8'), "hops": MeshParam.routing_table[_][2], "snr": MeshParam.routing_table[_][3], "score": MeshParam.routing_table[_][4], @@ -1152,8 +1152,8 @@ def send_tnc_state(): for _, route in enumerate(MeshParam.routing_table): output["routing_table"].append( { - "dxcall": str(MeshParam.routing_table[_][0], encoding), - "router": str(MeshParam.routing_table[_][1], encoding), + "dxcall": MeshParam.routing_table[_][0].decode('utf-8'), + "router": MeshParam.routing_table[_][1].decode('utf-8'), "hops": MeshParam.routing_table[_][2], "snr": MeshParam.routing_table[_][3], "score": MeshParam.routing_table[_][4],