diff options
18 files changed, 151 insertions, 20 deletions
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 dbaafd45..22a63ddd 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 @@ -141,12 +141,12 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): p = [ ["udp_1pkt_1mac_override.py","-m 1 -l 50",True], - ["syn_attack.py","-m 1 -l 50",False], # can't compare random now + ["syn_attack.py","-m 1 -l 50",True], # can't compare random now ["udp_1pkt_1mac.py","-m 1 -l 50",True], ["udp_1pkt_mac.py","-m 1 -l 50",True], ["udp_1pkt.py","-m 1 -l 50",True], ["udp_1pkt_tuple_gen.py","-m 1 -l 50",True], - ["udp_rand_len_9k.py","-m 1 -l 50",False], # can't do the compare + ["udp_rand_len_9k.py","-m 1 -l 50",True], # can't do the compare ["udp_1pkt_mpls.py","-m 1 -l 50",True], ["udp_1pkt_mpls_vm.py","-m 1 ",True], ["imix.py","-m 1 -l 100",True], @@ -183,13 +183,14 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): ["udp_1pkt_mac_mask2.py","-m 1 -l 20 ",True], ["udp_1pkt_mac_mask3.py","-m 1 -l 20 ",True], ["udp_1pkt_simple_test2.py","-m 1 -l 10 ",True], # test split of packet with ip option - ["udp_1pkt_simple_test.py","-m 1 -l 10 ",True] + ["udp_1pkt_simple_test.py","-m 1 -l 10 ",True], + ["udp_1pkt_mac_mask5.py","-m 1 -l 30 ",True] ]; - p1 = [ ["udp_1pkt_simple_test.py","-m 1 -l 10 ",True] ] + p1 = [ ["udp_rand_len_9k.py","-m 1 -l 50",True] ] for obj in p: diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py index 713769b6..e27563eb 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py @@ -246,7 +246,7 @@ class CTRexVmInsWrFlowVar(CTRexVmInsBase): assert type(is_big_endian)==bool, 'type of is_big_endian is not bool' class CTRexVmInsWrMaskFlowVar(CTRexVmInsBase): - def __init__(self, fv_name, pkt_offset,pkt_cast_size,mask,shift, is_big_endian=True): + def __init__(self, fv_name, pkt_offset,pkt_cast_size,mask,shift,add_value, is_big_endian=True): super(CTRexVmInsWrMaskFlowVar, self).__init__("write_mask_flow_var") self.name = fv_name assert type(fv_name)==str, 'type of fv_name is not str' @@ -258,6 +258,8 @@ class CTRexVmInsWrMaskFlowVar(CTRexVmInsBase): assert type(mask)==int, 'type of mask is not int' self.shift = shift assert type(shift)==int, 'type of shift is not int' + self.add_value =add_value + assert type(add_value)==int, 'type of add_value is not int' self.is_big_endian = is_big_endian assert type(is_big_endian)==bool, 'type of is_big_endian is not bool' @@ -590,7 +592,7 @@ class CTRexVmDescWrFlowVar(CTRexVmDescBase): self.pkt_offset = t[0] class CTRexVmDescWrMaskFlowVar(CTRexVmDescBase): - def __init__(self, fv_name, pkt_offset, pkt_cast_size=1, mask=0xff, shift=0, offset_fixup=0, is_big=True): + def __init__(self, fv_name, pkt_offset, pkt_cast_size=1, mask=0xff, shift=0, add_value=0, offset_fixup=0, is_big=True): super(CTRexVmDescWrMaskFlowVar, self).__init__() self.name =fv_name assert type(fv_name)==str, 'type of fv_name is not str' @@ -599,13 +601,16 @@ class CTRexVmDescWrMaskFlowVar(CTRexVmDescBase): self.pkt_offset =pkt_offset self.pkt_cast_size =pkt_cast_size assert type(pkt_cast_size)==int,'type of pkt_cast_size is not int' - if not (pkt_cast_size in [1,2,4,8]): + if not (pkt_cast_size in [1,2,4]): raise CTRexPacketBuildException(-10,"not valid cast size"); self.mask = mask assert type(mask)==int,'type of mask is not int' self.shift = shift assert type(shift)==int,'type of shift is not int' + self.add_value = add_value + assert type(add_value)==int,'type of add_value is not int' + self.is_big =is_big; assert type(is_big)==bool,'type of is_big_endian is not bool' @@ -613,7 +618,7 @@ class CTRexVmDescWrMaskFlowVar(CTRexVmDescBase): return self.name def get_obj (self): - return CTRexVmInsWrMaskFlowVar(self.name,self.pkt_offset+self.offset_fixup,self.pkt_cast_size,self.mask,self.shift,self.is_big) + return CTRexVmInsWrMaskFlowVar(self.name,self.pkt_offset+self.offset_fixup,self.pkt_cast_size,self.mask,self.shift,self.add_value,self.is_big) def compile(self,parent): if type(self.pkt_offset)==str: diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py index 127d1669..fdd330a5 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py @@ -152,6 +152,7 @@ class STLStream(object): next = None, stream_id = None, action_count = 0, + random_seed =0, mac_src_override_by_pkt=None, mac_dst_override_mode=None #see STLStreamDstMAC_xx ): @@ -163,6 +164,7 @@ class STLStream(object): validate_type('self_start', self_start, bool) validate_type('isg', isg, (int, float)) validate_type('stream_id', stream_id, (NoneType, int)) + validate_type('random_seed',random_seed,int); if (type(mode) == STLTXCont) and (next != None): raise STLError("continuous stream cannot have a next stream ID") @@ -207,6 +209,9 @@ class STLStream(object): self.fields['self_start'] = self_start self.fields['isg'] = isg + if random_seed !=0 : + self.fields['random_seed'] = random_seed # optional + # mode self.fields['mode'] = mode.to_json() self.mode_desc = str(mode) diff --git a/scripts/exp/syn_attack.pcap b/scripts/exp/syn_attack.pcap Binary files differindex d1aa5f6f..aa420d2c 100644 --- a/scripts/exp/syn_attack.pcap +++ b/scripts/exp/syn_attack.pcap diff --git a/scripts/exp/udp_1pkt_mac_mask5.pcap b/scripts/exp/udp_1pkt_mac_mask5.pcap Binary files differnew file mode 100644 index 00000000..cea46691 --- /dev/null +++ b/scripts/exp/udp_1pkt_mac_mask5.pcap diff --git a/scripts/exp/udp_1pkt_range_clients_split_garp.pcap b/scripts/exp/udp_1pkt_range_clients_split_garp.pcap Binary files differnew file mode 100644 index 00000000..b9cd27fb --- /dev/null +++ b/scripts/exp/udp_1pkt_range_clients_split_garp.pcap diff --git a/scripts/exp/udp_rand_len_9k.pcap b/scripts/exp/udp_rand_len_9k.pcap Binary files differindex 5e3a06d2..3f4c7c37 100644 --- a/scripts/exp/udp_rand_len_9k.pcap +++ b/scripts/exp/udp_rand_len_9k.pcap diff --git a/scripts/stl/syn_attack.py b/scripts/stl/syn_attack.py index eba11a82..55abadf1 100644 --- a/scripts/stl/syn_attack.py +++ b/scripts/stl/syn_attack.py @@ -38,6 +38,7 @@ class STLS1(object): vm = vm) return STLStream(packet = pkt, + random_seed = 0x1234,# can be remove. will give the same random value any run mode = STLTXCont()) diff --git a/scripts/stl/udp_1pkt_mac_mask5.py b/scripts/stl/udp_1pkt_mac_mask5.py new file mode 100644 index 00000000..07c83897 --- /dev/null +++ b/scripts/stl/udp_1pkt_mac_mask5.py @@ -0,0 +1,35 @@ +from trex_stl_lib.api import * + + +# step is not 1. +class STLS1(object): + + def __init__ (self): + self.fsize =64; # the size of the packet + + def create_stream (self): + + # create a base packet and pad it to size + size = self.fsize - 4; # no FCS + base_pkt = Ether()/IP(src="16.0.0.1",dst="48.0.0.1")/UDP(dport=12,sport=1025) + pad = max(0, size - len(base_pkt)) * 'x' + + vm = CTRexScRaw( [ STLVmFlowVar(name="mac_src", min_value=0, max_value=10, size=2, op="inc",step=1), + STLVmWrMaskFlowVar(fv_name="mac_src", pkt_offset= 10,pkt_cast_size=1, mask=0xff,add_value=5,shift=0) # range is 5-15 + ] + ) + + return STLStream(packet = STLPktBuilder(pkt = base_pkt/pad,vm = vm), + mode = STLTXCont( pps=10 )) + + def get_streams (self, direction = 0): + # create 1 stream + return [ self.create_stream() ] + + +# dynamic load - used for trex console or simulator +def register(): + return STLS1() + + + diff --git a/scripts/stl/udp_1pkt_range_clients_split_garp.py b/scripts/stl/udp_1pkt_range_clients_split_garp.py new file mode 100644 index 00000000..273b5202 --- /dev/null +++ b/scripts/stl/udp_1pkt_range_clients_split_garp.py @@ -0,0 +1,39 @@ +from trex_stl_lib.api import * + + +# send G ARP from many clients +# clients are "00:00:dd:dd:00:01+x", psrc="55.55.1.1+x" DG= self.dg + +class STLS1(object): + + def __init__ (self): + self.num_clients =3000; # max is 16bit + self.dg= "55.55.1.0" # set the DG + + + def create_stream (self): + # create a base packet and pad it to size + base_pkt = Ether(src="00:00:dd:dd:00:01",dst="ff:ff:ff:ff:ff:ff")/ARP(psrc="55.55.1.1",hwsrc="00:00:dd:dd:00:01", pdst=self.dg) + + vm = CTRexScRaw( [ STLVmFlowVar(name="mac_src", min_value=1, max_value=self.num_clients, size=2, op="inc"), + STLVmWrFlowVar(fv_name="mac_src", pkt_offset= 10), + STLVmWrFlowVar(fv_name="mac_src" ,pkt_offset="ARP.psrc",offset_fixup=2), + STLVmWrFlowVar(fv_name="mac_src" ,pkt_offset="ARP.hwsrc",offset_fixup=4) + ] + ,split_by_field = "mac_src" # split + ) + + return STLStream(packet = STLPktBuilder(pkt = base_pkt,vm = vm), + mode = STLTXSingleBurst( pps=10, total_pkts = self.num_clients )) # single burst of G-ARP + + def get_streams (self, direction = 0): + # create 1 stream + return [ self.create_stream() ] + + +# dynamic load - used for trex console or simulator +def register(): + return STLS1() + + + diff --git a/scripts/stl/udp_rand_len_9k.py b/scripts/stl/udp_rand_len_9k.py index cf78b1c9..335a6b33 100644 --- a/scripts/stl/udp_rand_len_9k.py +++ b/scripts/stl/udp_rand_len_9k.py @@ -30,6 +30,7 @@ class STLS1(object): vm = vm) return STLStream(packet = pkt, + random_seed = 0x1234, mode = STLTXCont()) diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp index e946f5d5..4cc40cdb 100644 --- a/src/gtest/trex_stateless_gtest.cpp +++ b/src/gtest/trex_stateless_gtest.cpp @@ -757,7 +757,7 @@ TEST_F(basic_vm, vm_mask1) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,0x10000007,0x10000007,0x100000fe) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0x00ff,0,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0x00ff,0,0,1) ); vm.compile(128); @@ -811,7 +811,7 @@ TEST_F(basic_vm, vm_mask2) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,0x10000007,0x10000007,0x100000fe) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0xff00,8,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0xff00,8,0,1) ); vm.compile(128); @@ -864,7 +864,7 @@ TEST_F(basic_vm, vm_mask3) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,0x10000007,0x10000007,0x100000fe) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,1,0x2,1,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,1,0x2,1,0,1) ); vm.compile(128); @@ -917,7 +917,7 @@ TEST_F(basic_vm, vm_mask4) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,1,1,10) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0xFF00,8,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0xFF00,8,0,1) ); vm.compile(128); @@ -970,7 +970,7 @@ TEST_F(basic_vm, vm_mask5) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,1,1,10) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,4,0x00FF0000,16,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,4,0x00FF0000,16,0,1) ); vm.compile(128); @@ -1024,7 +1024,7 @@ TEST_F(basic_vm, vm_mask6) { StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,1,1,20) ); - vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0x00FF,-1,1) ); + vm.add_instruction( new StreamVmInstructionWriteMaskToPkt("var1", 36,2,0x00FF,-1,0,1) ); vm.compile(128); diff --git a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp index 86759f99..cf11f8c6 100644 --- a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp +++ b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp @@ -59,7 +59,7 @@ TrexRpcCmdAddStream::_run(const Json::Value ¶ms, Json::Value &result) { stream->m_self_start = parse_bool(section, "self_start", result); stream->m_flags = parse_int(section, "flags", result); stream->m_action_count = parse_uint16(section, "action_count", result); - + stream->m_random_seed = parse_uint32(section, "random_seed", result,0); /* default is zero */ /* inter stream gap */ stream->m_isg_usec = parse_double(section, "isg", result); @@ -324,6 +324,7 @@ TrexRpcCmdAddStream::parse_vm_instr_write_mask_flow_var(const Json::Value &inst, uint16_t pkt_cast_size = parse_uint16(inst, "pkt_cast_size", result); uint32_t mask = parse_uint32(inst, "mask", result); int shift = parse_int(inst, "shift", result); + int add_value = parse_int(inst, "add_value", result); bool is_big_endian = parse_bool(inst, "is_big_endian", result); stream->m_vm.add_instruction(new StreamVmInstructionWriteMaskToPkt(flow_var_name, @@ -331,6 +332,7 @@ TrexRpcCmdAddStream::parse_vm_instr_write_mask_flow_var(const Json::Value &inst, (uint8_t)pkt_cast_size, mask, shift, + add_value, is_big_endian)); } diff --git a/src/stateless/cp/trex_stream.h b/src/stateless/cp/trex_stream.h index 36f9d407..161e9592 100644 --- a/src/stateless/cp/trex_stream.h +++ b/src/stateless/cp/trex_stream.h @@ -429,6 +429,7 @@ public: dp->m_ibg_usec = m_ibg_usec; dp->m_flags = m_flags; dp->m_action_count = m_action_count; + dp->m_random_seed = m_random_seed; dp->m_rate = m_rate; @@ -485,6 +486,7 @@ public: uint16_t m_flags; uint32_t m_stream_id; /* id from RPC can be anything */ uint16_t m_action_count; + uint32_t m_random_seed; /* config fields */ diff --git a/src/stateless/cp/trex_stream_vm.cpp b/src/stateless/cp/trex_stream_vm.cpp index 59efd6fc..7a1dc122 100644 --- a/src/stateless/cp/trex_stream_vm.cpp +++ b/src/stateless/cp/trex_stream_vm.cpp @@ -84,7 +84,7 @@ void StreamVmInstructionFlowMan::sanity_check(uint32_t ins_id,StreamVm *lp){ void StreamVmInstructionWriteMaskToPkt::Dump(FILE *fd){ - fprintf(fd," flow_var:%s, offset:%lu, cast_size:%lu, mask:0x%lx, shift:%ld, is_big:%lu \n",m_flow_var_name.c_str(),(ulong)m_pkt_offset,(ulong)m_pkt_cast_size,(ulong)m_mask,(long)m_shift,(ulong)(m_is_big_endian?1:0)); + fprintf(fd," flow_var:%s, offset:%lu, cast_size:%lu, mask:0x%lx, shift:%ld, add:%ld, is_big:%lu \n",m_flow_var_name.c_str(),(ulong)m_pkt_offset,(ulong)m_pkt_cast_size,(ulong)m_mask,(long)m_shift,(long)m_add_value,(ulong)(m_is_big_endian?1:0)); } @@ -735,6 +735,7 @@ void StreamVm::build_program(){ pmask.m_flags = flags; pmask.m_var_offset = flow_offset; pmask.m_shift = lpPkt->m_shift; + pmask.m_add_value = lpPkt->m_add_value; pmask.m_pkt_cast_size = cast_size; pmask.m_flowv_cast_size = op_size; pmask.m_pkt_offset = lpPkt->m_pkt_offset; @@ -1345,6 +1346,8 @@ void StreamDPOpPktWrMask::wr(uint8_t * flow_var_base, assert(0); } + val+=m_add_value; + /* shift the flow var val */ if (m_shift>0) { val=val<<m_shift; diff --git a/src/stateless/cp/trex_stream_vm.h b/src/stateless/cp/trex_stream_vm.h index d43d7d4b..4a0b1d59 100644 --- a/src/stateless/cp/trex_stream_vm.h +++ b/src/stateless/cp/trex_stream_vm.h @@ -444,6 +444,7 @@ struct StreamDPOpPktWrMask { uint8_t m_flowv_cast_size; /* 1,2,4 */ uint16_t m_pkt_offset; uint32_t m_mask; + int32_t m_add_value; bool is_big(){ return ( (m_flags &StreamDPOpPktWrMask::MASK_PKT_WR_IS_BIG) == StreamDPOpPktWrMask::MASK_PKT_WR_IS_BIG ?true:false); } @@ -1037,12 +1038,14 @@ public: uint8_t pkt_cast_size, /* valid 1,2,4 */ uint32_t mask, int shift, /* positive is shift left, negetive shift right */ + int32_t add_value = 0, bool is_big_endian = true) : m_flow_var_name(flow_var_name), m_pkt_offset(pkt_offset), m_pkt_cast_size(pkt_cast_size), m_mask(mask), m_shift(shift), + m_add_value(add_value), m_is_big_endian(is_big_endian) {} virtual instruction_type_t get_instruction_type() const { @@ -1057,6 +1060,7 @@ public: m_pkt_cast_size, m_mask, m_shift, + m_add_value, m_is_big_endian); } @@ -1070,7 +1074,8 @@ public: uint8_t m_pkt_cast_size; /* valid 1,2,4 */ uint32_t m_mask; - int m_shift; + int m_shift; + int m_add_value; bool m_is_big_endian; }; @@ -1271,7 +1276,8 @@ public: uint16_t prog_size, uint16_t max_pkt_offset, uint16_t prefix_size, - bool a_is_pkt_size_var + bool a_is_pkt_size_var, + bool a_is_random_seed ){ if (bss) { @@ -1298,6 +1304,7 @@ public: m_max_pkt_offset_change = max_pkt_offset; m_prefix_size = prefix_size; m_is_pkt_size_var=a_is_pkt_size_var; + m_is_random_seed=a_is_random_seed; } ~StreamVmDp(){ @@ -1320,7 +1327,8 @@ public: m_program_size, m_max_pkt_offset_change, m_prefix_size, - m_is_pkt_size_var + m_is_pkt_size_var, + m_is_random_seed ); assert(lp); return (lp); @@ -1368,6 +1376,9 @@ public: bool is_pkt_size_var(){ return (m_is_pkt_size_var); } + bool is_random_seed(){ + return (m_is_random_seed); + } private: @@ -1378,6 +1389,7 @@ private: uint16_t m_max_pkt_offset_change; uint16_t m_prefix_size; bool m_is_pkt_size_var; + bool m_is_random_seed; }; @@ -1440,7 +1452,8 @@ public: get_dp_instruction_buffer()->get_program_size(), get_max_packet_update_offset(), get_prefix_size(), - is_var_pkt_size() + is_var_pkt_size(), + m_is_random_var ); assert(lp); return (lp); diff --git a/src/stateless/dp/trex_stateless_dp_core.cpp b/src/stateless/dp/trex_stateless_dp_core.cpp index 39080453..549f923f 100644 --- a/src/stateless/dp/trex_stateless_dp_core.cpp +++ b/src/stateless/dp/trex_stateless_dp_core.cpp @@ -75,6 +75,13 @@ void CGenNodeStateless::refresh_vm_bss(){ StreamVmDp * vm_s=m_ref_stream_info->m_vm_dp; assert(vm_s); memcpy(m_vm_flow_var,vm_s->get_bss(),vm_s->get_bss_size()); + + if ( vm_s->is_random_seed() ){ + /* if we have random seed for this program */ + if (m_ref_stream_info->m_random_seed) { + set_random_seed(m_ref_stream_info->m_random_seed); + } + } } } @@ -670,6 +677,14 @@ TrexStatelessDpCore::add_stream(TrexStatelessDpPerPort * lp_port, node->m_vm_program_size = lpDpVm->get_program_size(); + /* set the random seed if was set */ + if ( lpDpVm->is_random_seed() ){ + /* if we have random seed for this program */ + if (stream->m_random_seed) { + node->set_random_seed(stream->m_random_seed); + } + } + /* we need to copy the object */ if ( pkt_size > lpDpVm->get_prefix_size() ) { /* we need const packet */ diff --git a/src/stateless/dp/trex_stream_node.h b/src/stateless/dp/trex_stream_node.h index ab43defe..b366a770 100644 --- a/src/stateless/dp/trex_stream_node.h +++ b/src/stateless/dp/trex_stream_node.h @@ -116,6 +116,15 @@ private: public: + void set_random_seed(uint32_t seed){ + uint32_t *p=get_random_bss_seed_memory(); + *p=seed; + } + + uint32_t* get_random_bss_seed_memory(){ + return (uint32_t*)m_vm_flow_var;/* always the first 4 bytes */ + } + uint8_t get_port_id(){ return (m_port_id); } |