add seed per stream

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 eb8bf1a..22a63dd 100644 (file)
--- 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],
@@ -190,7 +190,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
           ];
 
 
-        p1  = [ ["udp_1pkt_range_clients_split_garp.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_streams.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py
index 127d166..fdd330a 100644 (file)
--- 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
index d1aa5f6..aa420d2 100644 (file)
Binary files a/scripts/exp/syn_attack.pcap and b/scripts/exp/syn_attack.pcap differ

diff --git a/scripts/exp/udp_rand_len_9k.pcap b/scripts/exp/udp_rand_len_9k.pcap
index 5e3a06d..3f4c7c3 100644 (file)
Binary files a/scripts/exp/udp_rand_len_9k.pcap and b/scripts/exp/udp_rand_len_9k.pcap differ

diff --git a/scripts/stl/syn_attack.py b/scripts/stl/syn_attack.py
index eba11a8..55abadf 100644 (file)
--- 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_rand_len_9k.py b/scripts/stl/udp_rand_len_9k.py
index cf78b1c..335a6b3 100644 (file)
--- 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 e946f5d..4cc40cd 100644 (file)
--- 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 d2cb4ce..5e23b81 100644 (file)
--- 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 &params, 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);

diff --git a/src/stateless/cp/trex_stream.h b/src/stateless/cp/trex_stream.h
index 36f9d40..161e959 100644 (file)
--- 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.h b/src/stateless/cp/trex_stream_vm.h
index c1db090..4a0b1d5 100644 (file)
--- a/src/stateless/cp/trex_stream_vm.h
+++ b/src/stateless/cp/trex_stream_vm.h
@@ -1276,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) {
@@ -1303,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(){
@@ -1325,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);
@@ -1373,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:
@@ -1383,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;
 
 };
 
@@ -1445,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 3908045..549f923 100644 (file)
--- 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 ab43def..b366a77 100644 (file)
--- 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);
     }