diff options
| -rw-r--r-- | scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py | 15 | ||||
| -rw-r--r-- | scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py | 7 | ||||
| -rw-r--r-- | scripts/exp/udp_1pkt_vxlan.pcap | bin | 0 -> 2064 bytes | |||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/scapy/fields.py | 4 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/scapy/layers/inet6.py | 4 | ||||
| -rw-r--r-- | scripts/stl/udp_1pkt_vxlan.py | 48 |
6 files changed, 73 insertions, 5 deletions
diff --git a/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py b/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py index dcebecdb..147b3ad8 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py +++ b/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py @@ -72,6 +72,21 @@ class CTRexPktBuilderSanitySCapy_Test(pkt_bld_general_test.CGeneralPktBld_Test): 'split_by_var': ''} ) + + + def test_simple_teredo(self): + + pkt = Ether()/IP(src="16.0.0.1",dst="48.0.0.1")/UDP(dport=3797,sport=3544)/IPv6(src="2001:0:4137:9350:8000:f12a:b9c8:2815",dst="2001:4860:0:2001::68")/UDP(dport=12,sport=1025)/ICMPv6Unknown() + + pkt.build(); + p_utl=CTRexScapyPktUtl(pkt); + + assert_equal( p_utl.get_field_offet_by_str("IPv6.src"), (50,16) ) + assert_equal( p_utl.get_field_offet_by_str("IPv6.dst"), (66,16) ) + + + + def test_simple_scapy_vlan(self): py='5'*(9) diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py index 280a95ec..fd372aea 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py +++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py @@ -176,12 +176,13 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): #["udp_1pkt_simple.py","-m 1 -l 3",True], ["udp_1pkt_pcap_relative_path.py","-m 1 -l 3",True], ["udp_1pkt_tuple_gen_split.py","-m 1 -c 2 -l 100",True], - ["udp_1pkt_range_clients_split.py","-m 1 -c 2 -l 100",True] - + ["udp_1pkt_range_clients_split.py","-m 1 -c 2 -l 100",True], + ["udp_1pkt_vxlan.py","-m 1 -c 1 -l 17",True], + ["udp_1pkt_ipv6_in_ipv4.py","-m 1 -c 1 -l 17",True] ]; - p1 = [ ["udp_1pkt_range_clients_split.py","-m 1 -c 2 -l 100",True] ] + p1 = [ ["udp_1pkt_ipv6_in_ipv4.py","-m 1 -c 1 -l 17",True] ] for obj in p: diff --git a/scripts/exp/udp_1pkt_vxlan.pcap b/scripts/exp/udp_1pkt_vxlan.pcap Binary files differnew file mode 100644 index 00000000..601185a0 --- /dev/null +++ b/scripts/exp/udp_1pkt_vxlan.pcap diff --git a/scripts/external_libs/scapy-2.3.1/scapy/fields.py b/scripts/external_libs/scapy-2.3.1/scapy/fields.py index 1b8d8604..8bb8c970 100644 --- a/scripts/external_libs/scapy-2.3.1/scapy/fields.py +++ b/scripts/external_libs/scapy-2.3.1/scapy/fields.py @@ -282,6 +282,10 @@ class X3BytesField(XByteField): def getfield(self, pkt, s): return s[3:], self.m2i(pkt, struct.unpack(self.fmt, "\x00"+s[:3])[0]) +class ThreeBytesField(X3BytesField, ByteField): + def i2repr(self, pkt, x): + return ByteField.i2repr(self, pkt, x) + class ShortField(Field): def __init__(self, name, default): diff --git a/scripts/external_libs/scapy-2.3.1/scapy/layers/inet6.py b/scripts/external_libs/scapy-2.3.1/scapy/layers/inet6.py index 19dda97e..46cd85e5 100644 --- a/scripts/external_libs/scapy-2.3.1/scapy/layers/inet6.py +++ b/scripts/external_libs/scapy-2.3.1/scapy/layers/inet6.py @@ -355,9 +355,9 @@ class IPv6(_IPv6GuessPayload, Packet, IPTools): ShortField("plen", None), ByteEnumField("nh", 59, ipv6nh), ByteField("hlim", 64), - IP6Field("dst", "::2"), + IP6Field("src", "::2"), #SourceIP6Field("src", "dst"), # dst is for src @ selection - IP6Field("src", "::1") ] + IP6Field("dst", "::1") ] def route(self): dst = self.dst diff --git a/scripts/stl/udp_1pkt_vxlan.py b/scripts/stl/udp_1pkt_vxlan.py new file mode 100644 index 00000000..3cb3dfbb --- /dev/null +++ b/scripts/stl/udp_1pkt_vxlan.py @@ -0,0 +1,48 @@ +from trex_stl_lib.api import * + +# Adding header that does not exists yet in Scapy +# This was taken from pull request of Scapy +# + + +# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN): +# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks +# http://tools.ietf.org/html/rfc7348 +_VXLAN_FLAGS = ['R' for i in range(0, 24)] + ['R', 'R', 'R', 'I', 'R', 'R', 'R', 'R', 'R'] + +class VXLAN(Packet): + name = "VXLAN" + fields_desc = [FlagsField("flags", 0x08000000, 32, _VXLAN_FLAGS), + ThreeBytesField("vni", 0), + XByteField("reserved", 0x00)] + + def mysummary(self): + return self.sprintf("VXLAN (vni=%VXLAN.vni%)") + +bind_layers(UDP, VXLAN, dport=4789) +bind_layers(VXLAN, Ether) + + +class STLS1(object): + + def __init__ (self): + pass; + + def create_stream (self): + pkt = Ether()/IP()/UDP(sport=1337,dport=4789)/VXLAN(vni=42)/Ether()/IP()/('x'*20) + pkt.show2() + + # burst of 17 packets + return STLStream(packet = STLPktBuilder(pkt = pkt ,vm = []), + mode = STLTXSingleBurst( pps = 1, total_pkts = 17) ) + + + def get_streams (self, direction = 0): + # create 1 stream + return [ self.create_stream() ] + +def register(): + return STLS1() + + + |