From 0766f4dbe467b6fc57056fa27d324df506b630a8 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 6 Mar 2022 14:52:54 +0000 Subject: [PATCH] only print port and IP, not opcode in log --- hblink.py | 2 +- hotspot_proxy_v2.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hblink.py b/hblink.py index ec82f16..f846eda 100755 --- a/hblink.py +++ b/hblink.py @@ -1069,7 +1069,7 @@ class HBSYSTEM(DatagramProtocol): logger.debug('(%s) Peer has sent Talker Alias packet %s', self._system, _data) elif _command == PRIN: - logger.info('(%s) *ProxyInfo* Source IP/Port: %s', self._system, _data.decode('utf8')) + logger.info('(%s) *ProxyInfo* Connection from IP:Port: %s', self._system, _data.decode('utf8')[4:]) else: logger.error('(%s) Unrecognized command. Raw HBP PDU: %s', self._system, _data) diff --git a/hotspot_proxy_v2.py b/hotspot_proxy_v2.py index 9a3026b..4a52bac 100644 --- a/hotspot_proxy_v2.py +++ b/hotspot_proxy_v2.py @@ -183,7 +183,7 @@ class Proxy(DatagramProtocol): self.peerTrack[_peer_id]['shost'] = host self.peerTrack[_peer_id]['timer'] = reactor.callLater(self.timeout,self.reaper,_peer_id) self.transport.write(data, (self.master,_dport)) - pripacket = b''.join([b'PRIN',host.encode('UTF-8'),b':',port.to_bytes('big')]) + pripacket = b''.join([b'PRIN',host.encode('UTF-8'),b':',str(port).encode('UTF-8')]) #Send IP and Port info to server self.transport.write(pripacket, (self.master,_dport))