author | Tero Marttila <terom@paivola.fi> |
Sun, 07 Sep 2014 16:04:42 +0300 | |
changeset 431 | 4e920e09fc60 |
parent 184 | eef756d892e9 |
permissions | -rw-r--r-- |
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
1 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
2 |
DHCP... stuff |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
3 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
4 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
5 |
import re |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
6 |
import functools |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
7 |
from datetime import datetime, timedelta |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
8 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
9 |
TIMEDELTA_RE = re.compile(r'(\d+)([a-z]*)', re.IGNORECASE) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
10 |
TIMEDELTA_UNITS = { |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
11 |
'd': 'days', |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
12 |
'h': 'hours', |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
13 |
'm': 'minutes', |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
14 |
's': 'seconds', |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
15 |
} |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
16 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
17 |
def parse_timedelta (expr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
18 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
19 |
Parse timeout -> timedelta |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
20 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
21 |
>>> parse_timedelta('1d') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
22 |
datetime.timedelta(1) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
23 |
>>> parse_timedelta('1h') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
24 |
datetime.timedelta(0, 3600) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
25 |
>>> parse_timedelta('15m') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
26 |
datetime.timedelta(0, 900) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
27 |
>>> parse_timedelta('1d1h1s') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
28 |
datetime.timedelta(1, 3601) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
29 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
30 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
31 |
what = {} |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
32 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
33 |
for (value, unit) in TIMEDELTA_RE.findall(expr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
34 |
unit = unit.lower() |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
35 |
value = int(value) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
36 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
37 |
if unit in TIMEDELTA_UNITS : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
38 |
what[TIMEDELTA_UNITS[unit]] = value |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
39 |
else : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
40 |
raise ValueError(unit) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
41 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
42 |
return timedelta(**what) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
43 |
|
184
eef756d892e9
pvl.verkko.leases: implement ui for dhcp_leases table
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
44 |
def format_timedelta (td): |
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
45 |
""" |
184
eef756d892e9
pvl.verkko.leases: implement ui for dhcp_leases table
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
46 |
datetime.timedelta -> str |
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
47 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
48 |
>>> print timedelta_str(timedelta(days=1)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
49 |
1d |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
50 |
>>> print timedelta_str(timedelta(hours=6)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
51 |
6h |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
52 |
>>> print timedelta_str(timedelta(days=2, hours=6, seconds=120)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
53 |
2d6h2m |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
54 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
55 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
56 |
# divmod |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
57 |
days = td.days |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
58 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
59 |
seconds = td.seconds |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
60 |
minutes, seconds = divmod(seconds, 60) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
61 |
hours, minutes = divmod(minutes, 60) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
62 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
63 |
# format |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
64 |
data = ( |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
65 |
(days, 'd'), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
66 |
(hours, 'h'), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
67 |
(minutes, 'm'), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
68 |
(seconds, 's'), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
69 |
) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
70 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
71 |
return ''.join('%d%s' % (count, unit) for count, unit in data if count) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
73 |
def parse_addr (addr, pad=False) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
74 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
75 |
Parse IPv4 addr -> int. |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
76 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
77 |
partial - allow partial addrs; right-pad with .0 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
78 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
79 |
>>> print "%#010x/%d" % parse_addr('1.2.3.4') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
80 |
0x01020304/32 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
81 |
>>> print "%#010x/%d" % parse_addr('1.2', pad=True) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
82 |
0x01020000/16 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
83 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
84 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
85 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
86 |
# split net |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
87 |
addr = [int(part) for part in addr.split('.') if part] |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
88 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
89 |
addrlen = len(addr) * 8 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
90 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
91 |
# fixup base? |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
92 |
if len(addr) == 4 : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
93 |
# fine |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
94 |
pass |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
95 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
96 |
elif len(addr) > 4 : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
97 |
raise ValueError("Invalid IPv4 net: {0}".format(addr)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
98 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
99 |
elif len(addr) < 4 and pad : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
100 |
# pad |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
101 |
addr += [0] * (4 - len(addr)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
102 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
103 |
else : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
104 |
raise ValueError("Incomplete IPv4 addr: {0}".format(addr)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
105 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
106 |
# pack to int |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
107 |
return functools.reduce(lambda a, b: a * 256 + b, addr), addrlen |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
108 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
109 |
def parse_net (expr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
110 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
111 |
Parse given expr into (base, mask). |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
112 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
113 |
>>> print "%#010x/%#010x" % parse_net('1.2.3.4') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
114 |
0x01020304/0xffffffff |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
115 |
>>> print "%#010x/%#010x" % parse_net('1.2.0.0/16') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
116 |
0x01020000/0xffff0000 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
117 |
>>> print "%#010x/%#010x" % parse_net('1.2') |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
118 |
0x01020000/0xffff0000 |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
119 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
120 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
121 |
if '/' in expr : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
122 |
net, masklen = expr.split('/', 1) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
123 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
124 |
masklen = int(masklen) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
125 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
126 |
else : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
127 |
net = expr |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
128 |
masklen = None |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
129 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
130 |
base, baselen = parse_addr(net, pad=True) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
131 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
132 |
if not masklen : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
133 |
# implicit mask, by leaving off octets in the base |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
134 |
masklen = baselen |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
135 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
136 |
elif masklen > 32 : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
137 |
raise ValueError("Invalid IPv4 mask: /{0:d}".format(masklen)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
138 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
139 |
# pack |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
140 |
mask = (0xffffffff << (32 - masklen)) & 0xffffffff |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
141 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
142 |
# verify |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
143 |
if base & ~mask : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
144 |
raise ValueError("Invalid IPv4 net base: {base:x} & {mask:x}".format(base=base, mask=mask)) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
145 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
146 |
return base, mask, masklen |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
147 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
148 |
def IPv4Address (addr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
149 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
150 |
Parse IPv4 address to int. |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
151 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
152 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
153 |
addr, len = parse_addr(addr) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
154 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
155 |
return addr |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
156 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
157 |
class IPv4Network (object) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
158 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
159 |
Parse and match network masks. |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
160 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
161 |
XXX: is used as a dict key |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
162 |
""" |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
163 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
164 |
def __init__ (self, expr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
165 |
self.expr = expr |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
166 |
self.base, self.mask, self.masklen = parse_net(expr) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
167 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
168 |
def __contains__ (self, addr) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
169 |
return (addr & self.mask) == self.base |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
170 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
171 |
def __str__ (self) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
172 |
return self.expr |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
173 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
174 |
def __repr__ (self) : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
175 |
return "IPv4Network(%r)" % (self.expr, ) |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
176 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
177 |
if __name__ == '__main__' : |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
178 |
import logging |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
179 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
180 |
logging.basicConfig() |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
181 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
182 |
import doctest |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
183 |
doctest.testmod() |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
184 |