From e3715681bc8b85737750c678a6f3714c802b38df Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Tue, 2 Apr 2024 14:21:12 -0700 Subject: [PATCH] + 28b90bae533d45fe37f990a845a025a49e02d6bf --- Rtp_cluster.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Rtp_cluster.py b/Rtp_cluster.py index 76c5b62..0a4e986 100644 --- a/Rtp_cluster.py +++ b/Rtp_cluster.py @@ -229,7 +229,6 @@ def up_command(self, clim, orig_cmd): out_cmd = Rtp_proxy_cmd(orig_cmd) out_cmd.ul_opts.local_ip = rtpp.lan_address out_cmd.ul_opts.destination_ip = None - out_cmd = str(out_cmd) else: out_cmd = orig_cmd rtpp.send_command(out_cmd, self.merge_results, br, rtpp) @@ -271,10 +270,9 @@ def up_command(self, clim, orig_cmd): out_cmd = Rtp_proxy_cmd(orig_cmd) out_cmd.ul_opts.local_ip = rtpp.lan_address out_cmd.ul_opts.destination_ip = None - out_cmd = str(out_cmd) else: out_cmd = orig_cmd - rtpp.send_command(out_cmd, partial(response_handler, clim, cmd, out_cmd, rtpp)) + rtpp.send_command(str(out_cmd), partial(response_handler, clim, cmd, out_cmd, rtpp)) def ignore_response(self, clim, cmd, out_cmd, rtpp, result): if result is None: @@ -294,7 +292,7 @@ def down_command(self, clim, cmd, out_cmd, rtpp, result): #print(f'down_command: {cmd.ul_opts.destination_ip=}, {cmd.ul_opts.local_ip=}, {rtpp.wan_address=}') req_dip = cmd.ul_opts.destination_ip req_lip = cmd.ul_opts.local_ip - req_lip_out = cmd_out.ul_opts.local_ip_out + req_lip_out = out_cmd.ul_opts.local_ip result_parts = result.strip().split() if result_parts[0] != '0' and req_dip != None and not is_dst_local(req_dip) and \ req_lip != rtpp.lan_address: