mirror of
https://github.com/meshcore-dev/meshcore_py.git
synced 2026-06-11 11:56:18 +00:00
fix issue with reset_path when sending to an hex prefix
This commit is contained in:
@@ -86,7 +86,12 @@ class MessagingCommands(CommandHandlerBase):
|
|||||||
max_attempts=3, max_flood_attempts=2, flood_after=2, timeout=0, min_timeout=0
|
max_attempts=3, max_flood_attempts=2, flood_after=2, timeout=0, min_timeout=0
|
||||||
) -> Event:
|
) -> Event:
|
||||||
|
|
||||||
dst_bytes = _validate_destination(dst)
|
try:
|
||||||
|
dst_bytes = _validate_destination(dst, prefix_length=32)
|
||||||
|
# with 32 bytes we can reset to flood
|
||||||
|
except ValueError:
|
||||||
|
# but if we can't, we'll assume we're flood
|
||||||
|
dst_bytes = _validate_destination(dst, prefix_length=6)
|
||||||
contact = self._get_contact_by_prefix(dst_bytes.hex())
|
contact = self._get_contact_by_prefix(dst_bytes.hex())
|
||||||
|
|
||||||
attempts = 0
|
attempts = 0
|
||||||
@@ -94,13 +99,17 @@ class MessagingCommands(CommandHandlerBase):
|
|||||||
if not contact is None :
|
if not contact is None :
|
||||||
flood = contact["out_path_len"] == -1
|
flood = contact["out_path_len"] == -1
|
||||||
else:
|
else:
|
||||||
flood = False
|
# we can't know if we're flood without fetching all contacts
|
||||||
|
# if we have a full key (meaning we can reset path) consider direct
|
||||||
|
# else consider flood
|
||||||
|
flood = len(dst_bytes) < 32
|
||||||
|
logger.info(f"send_msg_with_retry: can't determine if flood, assume {flood}")
|
||||||
res = None
|
res = None
|
||||||
while attempts < max_attempts and res is None \
|
while attempts < max_attempts and res is None \
|
||||||
and (not flood or flood_attempts < max_flood_attempts):
|
and (not flood or flood_attempts < max_flood_attempts):
|
||||||
if attempts == flood_after : # change path to flood
|
if attempts == flood_after and not flood: # change path to flood
|
||||||
logger.info("Resetting path")
|
logger.info("Resetting path")
|
||||||
rp_res = await self.reset_path(dst)
|
rp_res = await self.reset_path(dst_bytes)
|
||||||
if rp_res.type == EventType.ERROR:
|
if rp_res.type == EventType.ERROR:
|
||||||
logger.error(f"Couldn't reset path {rp_res} continuing ...")
|
logger.error(f"Couldn't reset path {rp_res} continuing ...")
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user