|
|
@@ -28,7 +28,7 @@ import argparse
|
|
|
|
|
|
|
|
|
|
|
|
-VERSION = '1.2'
|
|
|
+VERSION = '1.3'
|
|
|
|
|
|
PROC_TCP4 = "/proc/net/tcp"
|
|
|
PROC_UDP4 = "/proc/net/udp"
|
|
|
@@ -103,13 +103,11 @@ def _ip(s):
|
|
|
return '.'.join(ip)
|
|
|
|
|
|
def _ip6(s):
|
|
|
- ip = [s[6:8],s[4:6],s[2:4],s[0:2],s[12:14],s[14:16],s[10:12],s[8:10],s[22:24],s[20:22],s[18:20],s[16:18],s[30:32],s[28:30],s[26:28],s[24:26]]
|
|
|
- #print '66666:', ':'.join(ip), s
|
|
|
+ ip = [s[6:8],s[4:6],s[2:4],s[0:2],s[14:16],s[12:14],s[10:12],s[8:10],s[22:24],s[20:22],s[18:20],s[16:18],s[30:32],s[28:30],s[26:28],s[24:26]]
|
|
|
return ':'.join(ip)
|
|
|
|
|
|
def _ip6q(s):
|
|
|
- ip = [s[6:8]+s[4:6],s[2:4]+s[0:2],s[12:14]+s[14:16],s[10:12]+s[8:10],s[22:24]+s[20:22],s[18:20]+s[16:18],s[30:32]+s[28:30],s[26:28]+s[24:26]]
|
|
|
- #print '666qqq:', ':'.join(ip), s
|
|
|
+ ip = [s[6:8]+s[4:6],s[2:4]+s[0:2],s[14:16]+s[12:14],s[10:12]+s[8:10],s[22:24]+s[20:22],s[18:20]+s[16:18],s[30:32]+s[28:30],s[26:28]+s[24:26]]
|
|
|
return ':'.join(ip)
|
|
|
|
|
|
def _conv_v6(s):
|
