CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved the speed of scanning by only checking secondary ports if the 4028 connection is refused

Browse Source
This commit is contained in:
UpstreamData
2022-07-19 13:00:15 -06:00
parent 26ae6ebfb2
commit c5f2d71791
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pyasic/network/__init__.py
View File

@@ -157,21 +157,37 @@ class MinerNetwork:
@staticmethod @staticmethod
async def ping_miner(ip: ipaddress.ip_address) -> Union[None, ipaddress.ip_address]: async def ping_miner(ip: ipaddress.ip_address) -> Union[None, ipaddress.ip_address]:
tasks = [ping_miner(ip, port=port) for port in [4028, 4029, 8889]] try:
for miner in asyncio.as_completed(tasks): miner = await ping_miner(ip)
miner = await miner
if miner: if miner:
return miner return miner
except ConnectionRefusedError:
tasks = [ping_miner(ip, port=port) for port in [4029, 8889]]
for miner in asyncio.as_completed(tasks):
try:
miner = await miner
if miner:
return miner
except ConnectionRefusedError:
pass
@staticmethod @staticmethod
async def ping_and_get_miner( async def ping_and_get_miner(
ip: ipaddress.ip_address, ip: ipaddress.ip_address,
) -> Union[None, AnyMiner]: ) -> Union[None, AnyMiner]:
tasks = [ping_and_get_miner(ip, port=port) for port in [4028, 4029, 8889]] try:
for miner in asyncio.as_completed(tasks): miner = await ping_and_get_miner(ip)
miner = await miner
if miner: if miner:
return miner return miner
except ConnectionRefusedError:
tasks = [ping_and_get_miner(ip, port=port) for port in [4029, 8889]]
for miner in asyncio.as_completed(tasks):
try:
miner = await miner
if miner:
return miner
except ConnectionRefusedError:
pass
async def ping_miner( async def ping_miner(
@@ -196,6 +212,7 @@ async def ping_miner(
except ConnectionRefusedError: except ConnectionRefusedError:
# handle for other connection errors # handle for other connection errors
logging.debug(f"{str(ip)}: Connection Refused.") logging.debug(f"{str(ip)}: Connection Refused.")
raise ConnectionRefusedError
# ping failed, likely with an exception # ping failed, likely with an exception
except Exception as e: except Exception as e:
logging.warning(f"{str(ip)}: {e}") logging.warning(f"{str(ip)}: {e}")
@@ -225,6 +242,7 @@ async def ping_and_get_miner(
except ConnectionRefusedError: except ConnectionRefusedError:
# handle for other connection errors # handle for other connection errors
logging.debug(f"{str(ip)}: Connection Refused.") logging.debug(f"{str(ip)}: Connection Refused.")
raise ConnectionRefusedError
# ping failed, likely with an exception # ping failed, likely with an exception
except Exception as e: except Exception as e:
logging.warning(f"{str(ip)}: {e}") logging.warning(f"{str(ip)}: {e}")