Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vxlan: vxlan/vxlan.api API cleanup
[vpp.git]
/
test
/
ipfix.py
diff --git
a/test/ipfix.py
b/test/ipfix.py
index
deaff67
..
5b32a85
100644
(file)
--- a/
test/ipfix.py
+++ b/
test/ipfix.py
@@
-1,7
+1,9
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
# IPFIX support for Scapy (RFC7011)
# IPFIX support for Scapy (RFC7011)
-from scapy.all import *
+from scapy.all import bind_layers, FieldLenField, IntField, Packet, \
+ PacketListField, ShortEnumField, ShortField, StrLenField
+from scapy.layers.inet import UDP
# IPFIX Information Elements http://www.iana.org/assignments/ipfix/ipfix.xhtml
# IPFIX Information Elements http://www.iana.org/assignments/ipfix/ipfix.xhtml
@@
-436,7
+438,12
@@
information_elements = {
459: "httpRequestMethod",
460: "httpRequestHost",
461: "httpRequestTarget",
459: "httpRequestMethod",
460: "httpRequestHost",
461: "httpRequestTarget",
- 462: "httpMessageVersion"
+ 462: "httpMessageVersion",
+ 466: "natQuotaExceededEvent",
+ 471: "maxSessionEntries",
+ 472: "maxBIBEntries",
+ 473: "maxEntriesPerUser",
+ 475: "maxFragmentsPendingReassembly"
}
}
@@
-502,7
+509,7
@@
class IPFIXDecoder(object):
def add_template(self, template):
"""
def add_template(self, template):
"""
- Add IPFIX temp
al
te
+ Add IPFIX temp
la
te
:param template: IPFIX template
"""
:param template: IPFIX template
"""
@@
-528,7
+535,7
@@
class IPFIXDecoder(object):
if template['id'] == data_set.setID:
offset = 0
d = data_set[Data].data
if template['id'] == data_set.setID:
offset = 0
d = data_set[Data].data
- for i in range(len(d) / template['rec_len']):
+ for i in range(len(d) /
/
template['rec_len']):
record = {}
for field in template['fields']:
f = d[offset:offset + field['len']]
record = {}
for field in template['fields']:
f = d[offset:offset + field['len']]