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

Merge pull request #1053 from p-l-/fix-traceroute 

Python 3: fix make_table() sort with integers & IPs
This commit is contained in:
Guillaume Valadon 2018-01-16 14:42:49 +01:00 committed by GitHub
parent 343303a435 847c2fe764
commit 68d2a419a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scapy/utils.py
View File

@ -1411,40 +1411,40 @@ def pretty_list(rtlst, header, sortBy=0):
rt = "\n".join([fmt % x for x in rtlst])
return rt
def __make_table(yfmtfunc, fmtfunc, endline, list, fxyz, sortx=None, sorty=None, seplinefunc=None):
def __make_table(yfmtfunc, fmtfunc, endline, data, fxyz, sortx=None, sorty=None, seplinefunc=None):
vx = {}
vy = {}
vz = {}
vxf = {}
vyf = {}
l = 0
for e in list:
for e in data:
xx, yy, zz = [str(s) for s in fxyz(e)]
l = max(len(yy),l)
vx[xx] = max(vx.get(xx,0), len(xx), len(zz))
vy[yy] = None
vz[(xx,yy)] = zz
vxk = sorted(vx.keys())
vyk = sorted(vy.keys())
vxk = list(vx)
vyk = list(vy)
if sortx:
vxk.sort(sortx)
vxk.sort(key=sortx)
else:
try:
vxk.sort(lambda x,y:int(x)-int(y))
vxk.sort(key=int)
except:
try:
vxk.sort(lambda x,y: cmp(atol(x),atol(y)))
vxk.sort(key=atol)
except:
vxk.sort()
if sorty:
vyk.sort(sorty)
vyk.sort(key=sorty)
else:
try:
vyk.sort(lambda x,y:int(x)-int(y))
vyk.sort(key=int)
except:
try:
vyk.sort(lambda x,y: cmp(atol(x),atol(y)))
vyk.sort(key=atol)
except:
vyk.sort()

24
test/regression.uts
View File

@ -3420,14 +3420,14 @@ p.show()
+ TracerouteResult6
= get_trace()
ip6_hlim = [("2001:db8::%d" % i, i) for i in six.moves.range(1, 10)]
ip6_hlim = [("2001:db8::%d" % i, i) for i in six.moves.range(1, 12)]
tr6_packets = [ (IPv6(dst="2001:db8::1", src="2001:db8::254", hlim=hlim)/UDP()/"scapy",
IPv6(dst="2001:db8::254", src=ip)/ICMPv6TimeExceeded()/IPerror6(dst="2001:db8::1", src="2001:db8::254", hlim=0)/UDPerror()/"scapy")
for (ip, hlim) in ip6_hlim ]
tr6 = TracerouteResult6(tr6_packets)
tr6.get_trace() == {'2001:db8::1': {1: ('2001:db8::1', False), 2: ('2001:db8::2', False), 3: ('2001:db8::3', False), 4: ('2001:db8::4', False), 5: ('2001:db8::5', False), 6: ('2001:db8::6', False), 7: ('2001:db8::7', False), 8: ('2001:db8::8', False), 9: ('2001:db8::9', False)}}
tr6.get_trace() == {'2001:db8::1': {1: ('2001:db8::1', False), 2: ('2001:db8::2', False), 3: ('2001:db8::3', False), 4: ('2001:db8::4', False), 5: ('2001:db8::5', False), 6: ('2001:db8::6', False), 7: ('2001:db8::7', False), 8: ('2001:db8::8', False), 9: ('2001:db8::9', False), 10: ('2001:db8::10', False), 11: ('2001:db8::11', False)}}
= show()
def test_show():
@ -3436,15 +3436,17 @@ def test_show():
tr6.show()
result = cmco.get_output()
expected = " 2001:db8::1 :udpdomain \n"
expected += "1 2001:db8::1 3 \n"
expected += "2 2001:db8::2 3 \n"
expected += "3 2001:db8::3 3 \n"
expected += "4 2001:db8::4 3 \n"
expected += "5 2001:db8::5 3 \n"
expected += "6 2001:db8::6 3 \n"
expected += "7 2001:db8::7 3 \n"
expected += "8 2001:db8::8 3 \n"
expected += "9 2001:db8::9 3 \n"
expected += "1 2001:db8::1 3 \n"
expected += "2 2001:db8::2 3 \n"
expected += "3 2001:db8::3 3 \n"
expected += "4 2001:db8::4 3 \n"
expected += "5 2001:db8::5 3 \n"
expected += "6 2001:db8::6 3 \n"
expected += "7 2001:db8::7 3 \n"
expected += "8 2001:db8::8 3 \n"
expected += "9 2001:db8::9 3 \n"
expected += "10 2001:db8::10 3 \n"
expected += "11 2001:db8::11 3 \n"
index_result = result.index("\n1")
index_expected = expected.index("\n1")
assert(result[index_result:] == expected[index_expected:])