Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #356 from p-l-/fix-353 

Fix .trace3D()
This commit is contained in:
Guillaume Valadon 2016-11-21 15:54:28 +01:00 committed by GitHub
parent a7a85a2639 56079017c3
commit 155d5d2976
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scapy/layers/inet.py
View File

@ -1037,7 +1037,7 @@ class TracerouteResult(SndRcvList):
trace[d][s[IP].ttl] = r[IP].src, ICMP not in r
for k in trace.itervalues():
try:
m = min(x for x, y in k.itervalues() if y[1])
m = min(x for x, y in k.itervalues() if y)
except ValueError:
continue
for l in k.keys(): # use .keys(): k is modified in the loop

2
scapy/layers/inet6.py
View File

@ -2998,7 +2998,7 @@ class TracerouteResult6(TracerouteResult):
for k in trace.itervalues():
try:
m = min(x for x, y in k.itervalues() if y[1])
m = min(x for x, y in k.itervalues() if y)
except ValueError:
continue
for l in k.keys(): # use .keys(): k is modified in the loop