Horizontal42/netsleuth
1
0
Fork 0
mirror of https://github.com/Horizontal42/netsleuth.git synced 2026-11-10 21:32:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix dead icmplib traceroute tier importing a nonexistent symbol

Browse source 
probes/traceroute.py imported async_traceroute from icmplib, which doesn't
exist in icmplib 3.0.4 - only a sync traceroute(), no async variant, and no
privileged= kwarg (traceroute always needs a raw socket, unlike ping's
unprivileged datagram option). The tier raised ImportError on every call and
silently fell through to the next tier. Call the real traceroute() via
asyncio.to_thread instead, drop the nonexistent privileged param.
This commit is contained in:
Andrew Pimenov 2026-08-09 13:39:35 +03:00
parent fd72604240
commit aefb41a463
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/netsleuth/probes/traceroute.py
View file

@ -183,12 +183,15 @@ async def _tier_icmp_win(
async def _tier_icmplib( async def _tier_icmplib(
target: str, max_hops: int, timeout: float, privileged: bool, source_ip: str | None = None target: str, max_hops: int, timeout: float, source_ip: str | None = None
) -> TraceResult: ) -> TraceResult:
from icmplib import async_traceroute # icmplib has no async traceroute (only async_ping) and traceroute() always
# needs a raw socket -- there is no unprivileged/"privileged=" variant for it,
# unlike ping. Run the sync call off the event loop thread.
from icmplib import traceroute as icmplib_traceroute
raw = await async_traceroute( raw = await asyncio.to_thread(
target, max_hops=max_hops, timeout=timeout, privileged=privileged, source=source_ip icmplib_traceroute, target, max_hops=max_hops, timeout=timeout, source=source_ip
) )
hops = [ hops = [
finalize_hop(TraceHop(ttl=h.distance, ip=h.address, probes=list(h.rtts))) finalize_hop(TraceHop(ttl=h.distance, ip=h.address, probes=list(h.rtts)))
@ -265,7 +268,7 @@ async def traceroute(
target, caps.mtr_binary or shutil.which("mtr") or "mtr", cycles, max_hops, timeout, source_ip target, caps.mtr_binary or shutil.which("mtr") or "mtr", cycles, max_hops, timeout, source_ip
), ),
"icmp_win": lambda: _tier_icmp_win(target, max_hops, timeout, source_ip), "icmp_win": lambda: _tier_icmp_win(target, max_hops, timeout, source_ip),
"icmplib": lambda: _tier_icmplib(target, max_hops, timeout, privileged=not caps.icmp_dgram, source_ip=source_ip), "icmplib": lambda: _tier_icmplib(target, max_hops, timeout, source_ip=source_ip),
"system_traceroute": lambda: _tier_system( "system_traceroute": lambda: _tier_system(
target, caps.traceroute_binary or "traceroute", max_hops, timeout, source_ip target, caps.traceroute_binary or "traceroute", max_hops, timeout, source_ip
), ),