LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 07:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnbase: fix read_message, reduce verbosity

Browse source
This commit is contained in:
ThomasV 2018-04-15 18:33:23 +02:00 • committed by SomberNight
parent 8a58516782
commit f68b186be0
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/lnbase.py
View file

@ -330,6 +330,8 @@ class Peer(PrintError):
self.writer.write(lc+c) self.writer.write(lc+c)
async def read_message(self): async def read_message(self):
rn_l = self.rn()
rn_m = self.rn()
while True: while True:
s = await self.reader.read(2**10) s = await self.reader.read(2**10)
if not s: if not s:
@ -338,14 +340,14 @@ class Peer(PrintError):
if len(self.read_buffer) < 18: if len(self.read_buffer) < 18:
continue continue
lc = self.read_buffer[:18] lc = self.read_buffer[:18]
l = aead_decrypt(self.rk, self.rn(), b'', lc) l = aead_decrypt(self.rk, rn_l, b'', lc)
length = int.from_bytes(l, byteorder="big") length = int.from_bytes(l, byteorder="big")
offset = 18 + length + 16 offset = 18 + length + 16
if len(self.read_buffer) < offset: if len(self.read_buffer) < offset:
continue continue
c = self.read_buffer[18:offset] c = self.read_buffer[18:offset]
self.read_buffer = self.read_buffer[offset:] self.read_buffer = self.read_buffer[offset:]
msg = aead_decrypt(self.rk, self.rn(), b'', c) msg = aead_decrypt(self.rk, rn_m, b'', c)
return msg return msg
async def handshake(self): async def handshake(self):
@ -400,10 +402,10 @@ class Peer(PrintError):
def process_message(self, message): def process_message(self, message):
message_type, payload = decode_msg(message) message_type, payload = decode_msg(message)
self.print_error("Received '%s'" % message_type.upper(), payload)
try: try:
f = getattr(self, 'on_' + message_type) f = getattr(self, 'on_' + message_type)
except AttributeError: except AttributeError:
self.print_error("Received '%s'" % message_type.upper(), payload)
return return
# raw message is needed to check signature # raw message is needed to check signature
if message_type=='node_announcement': if message_type=='node_announcement':
@ -467,10 +469,10 @@ class Peer(PrintError):
pass pass
def on_channel_update(self, payload): def on_channel_update(self, payload):
pass self.print_error('channel update')
def on_channel_announcement(self, payload): def on_channel_announcement(self, payload):
pass self.print_error('channel announcement')
#def open_channel(self, funding_sat, push_msat): #def open_channel(self, funding_sat, push_msat):
# self.send_message(gen_msg('open_channel', funding_satoshis=funding_sat, push_msat=push_msat)) # self.send_message(gen_msg('open_channel', funding_satoshis=funding_sat, push_msat=push_msat))