X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipfix_sessions.py;h=11e77fa08cd92685787ce2f981a5a5a431f68278;hb=90809c1375e79d4a3220f995bd0ed3b7762e7df8;hp=29949161443543ed90b9332d6c3f2bbde7cc25c3;hpb=54fc7b549da8d1cc979b9b4e69159e23b472480b;p=csit.git diff --git a/resources/traffic_scripts/ipfix_sessions.py b/resources/traffic_scripts/ipfix_sessions.py index 2994916144..11e77fa08c 100755 --- a/resources/traffic_scripts/ipfix_sessions.py +++ b/resources/traffic_scripts/ipfix_sessions.py @@ -22,7 +22,8 @@ from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6 from scapy.layers.l2 import Ether -from resources.libraries.python.IPFIXUtil import IPFIXHandler, IPFIXData +from resources.libraries.python.telemetry.IPFIXUtil import IPFIXHandler, \ + IPFIXData from resources.libraries.python.PacketVerifier import RxQueue, TxQueue, auto_pad from resources.libraries.python.TrafficScriptArg import TrafficScriptArg @@ -133,8 +134,6 @@ def main(): tx_if = args.get_arg('tx_if') protocol = args.get_arg('protocol') - source_port = int(args.get_arg('port')) - destination_port = int(args.get_arg('port')) count = int(args.get_arg('count')) sessions = int(args.get_arg('sessions')) @@ -193,6 +192,11 @@ def main(): pkt = rxq.recv(5) if pkt is None: raise RuntimeError("RX timeout") + + if pkt.haslayer("ICMPv6ND_NS"): + # read another packet in the queue if the current one is ICMPv6ND_NS + continue + if pkt.haslayer("IPFIXHeader"): if pkt.haslayer("IPFIXTemplate"): # create or update template for IPFIX data packets @@ -220,6 +224,6 @@ def main(): raise RuntimeError("Received non-IPFIX packet or IPFIX header was" "not recognized.") -if __name__ == "__main__": +if __name__ == "__main__": main()