From 2a3171f73e838fccbc82d2d8553e36c7c3820e28 Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Fri, 4 Mar 2016 17:10:33 +0200
Subject: [PATCH] add manual padding to 60 bytes with zeros

---
 .../stl/trex_stl_lib/trex_stl_packet_builder_scapy.py |  14 ++++++--------
 .../stl/trex_stl_lib/trex_stl_streams.py              |   2 --
 scripts/exp/pcap.pcap                                 | Bin 476 -> 476 bytes
 scripts/exp/pcap_with_vm.pcap                         | Bin 2284 -> 2284 bytes
 scripts/exp/syn_attack.pcap                           | Bin 3824 -> 3824 bytes
 scripts/exp/udp_1pkt_range_clients_split_garp.pcap    | Bin 3824 -> 3824 bytes
 6 files changed, 6 insertions(+), 10 deletions(-)

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 a3430c79..6a2e268f 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
@@ -950,20 +950,18 @@ class CScapyTRexPktBuilder(CTrexPktBuilderInterface):
         # for buffer, promote to a scapy packet
         if self.pkt_raw:
             self.pkt = Ether(self.pkt_raw)
-            if self.remove_fcs and self.pkt.lastlayer().name == 'Padding':
-                self.pkt.lastlayer().underlayer.remove_payload()
-            self.pkt.build()
             self.pkt_raw = None
 
         # regular scapy packet
-        elif self.pkt:
-            self.pkt.build()
-
-        else:
+        elif not self.pkt:
             # should not reach here
             raise CTRexPacketBuildException(-11, 'empty packet')  
 
-
+        if self.remove_fcs and self.pkt.lastlayer().name == 'Padding':
+            self.pkt.lastlayer().underlayer.remove_payload()
+        if len(self.pkt) < 60: # simulator can write padding with non-zeros, set it explicit
+            self.pkt /= Padding('\x00' * (60 - len(self.pkt)))
+        self.pkt.build()
         self.is_pkt_built = True
 
     def _pkt_layer_offset (self,layer_name):
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 c41fa0c2..5aa544ab 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
@@ -344,8 +344,6 @@ class STLStream(object):
         imports_arr = []
         if 'MPLS(' in packet_command:
             imports_arr.append('from scapy.contrib.mpls import MPLS')
-        if 'VXLAN(' in packet_command:
-            imports_arr.append('from scapy.contrib.mpls import MPLS')
             
         imports = '\n'.join(imports_arr)
         if payload:
diff --git a/scripts/exp/pcap.pcap b/scripts/exp/pcap.pcap
index 34a2e9b6892e87b44e48b82a44f1b23b78e6df84..b13275eeeb786d432e846596484d0af0556c8fa8 100644
GIT binary patch
delta 18
Xcmcb^e200$Iwl5&i5omX<gZ5nKb{8n

delta 18
acmcb^e200$Iwpgpi5ona0vRX%dISJR8wc9}

diff --git a/scripts/exp/pcap_with_vm.pcap b/scripts/exp/pcap_with_vm.pcap
index a278dd8e3c7efeafbabad031768f22be90af8c2c..a7a2d2bac025332aeb8bf93a477e409cf93410b6 100644
GIT binary patch
delta 103
zcmaDO_(pKTIwl5&i5ol^88-f`WMpRmgMi75Y$}uIGRZSCY~ITR7j6OzC$fNq8(AtD
jfjTGuVfEmIXkuX4H<^)9Wpg2$FIeUPJJ8U{oE(n<6o(g2

delta 103
zcmaDO_(pKTIwqxpi5ol^6F2^>WMo$=U;u)E$&73&ljkzYGbV1{%LEs00t+XyfP@=a
mDj9(~C;wsf;7kPR0fK##85vbJ7qa<+We%_d4V}!%@fZLS>l_XM

diff --git a/scripts/exp/syn_attack.pcap b/scripts/exp/syn_attack.pcap
index aa420d2c3d1cb582044b50fa36f16b8fb615b2d9..84da36a730bcef541eac5ebf17ba43a17066d28f 100644
GIT binary patch
delta 472
zcmXBRze>YE0LSrMlFMEGTvRM5Xi18N22||e>L9pfQE(O72M`o|00mc}@n%86wL`&G
z&<79{Tpa`-AU=TL{rbxg`11SYhD+ORyOWXdnsM!3(^`7&37Xl!_C-055OF3-;n_ww
zWWNNJ!f@<UX~ew`_3A^JfGWjs9Z+S6_W<fQfZ7YG7BD=8REsWdB~VWSol2r*pdU%p
zK@20PqX_CQqFTYwQB<plk%GEXP;ZKA4a0$^T1QMY)J#MDX{rLlMNCy9USg>47-~DA
z+Q9IbQ1uaQ0=1MvoupI)44)}gWyfh{ds*SYeg<}vk!{)!Rat3@`Q>lnqeFw!&JEbJ
VA=|;QoAb0G;xdPN$m<Zl@E?4XXG#D7

delta 472
zcmXBRze>YE0LSrMlFMEGTvRM5Xi18N2DI40)j@E}qTnht4<IP`01B=`<IRFX*A4|&
zK_5U+aCH!TfcOA{`SrIPeEEHH!=>pq-N{%~byc><tdy1GI9@#;*uKaY;UmsPE-G7#
z7TGUBr7)bhR2uQ%LcO|B#-oZc+;~(8;@yM#^`Q2BswE6hKGkv?cM_;4fzBk+D$tK4
z>L5k|)NufHA5g7f=qRdn#8^RHE2uX`wSnPKQ*9z98fvbg{xnsF;WDJk5icRscL+6%
zsJ1XnBdR{4iJ(?usMDBgfZ;QyDr^-OwwGirI7q;56S8glp$aQaws`y<d~{@R+l2vp
WHe|aP_EO$9LR_U#k7?=S7ybho+<H6!

diff --git a/scripts/exp/udp_1pkt_range_clients_split_garp.pcap b/scripts/exp/udp_1pkt_range_clients_split_garp.pcap
index dde0c6dd23c7961c2ae1f98c84b3544c873ec97b..627bcd54c3dd45df98745152d0668b3069a4fd5c 100644
GIT binary patch
delta 373
zcmXxgp$`FJ7{~E@dGFkN?rbJ`H^C&qpCFiIm&^pg#$-VdM3V%Y+mi)B5CoG1!5`oc
z5CoGnCJ8ov&$%~z_wM;@@1DJn+#@&d2qWnFzig1VZyGpMk(zp<Bn%3~59q=z#&92U
zk6bT~NsGJUKDlLy`BaAQ3AzeRFNyc^CZx~Zo1w=@C`|<mUbo;2?%j$U`!o{paRPqg
zX6?uarlyGv-`emGx28gm2U|@$1->e9$w5cXpLxBT15YO*ZSFc5y5#jTF1+HxXWX+J
XIo7Ls@PP+Ea8(NTCU=?gC4Tk`?4wZI

delta 373
zcmew$`$2X>0%PLDL~kIm7DW8?W=&)Og2|37Qj?Pzbr};UPh<p2Ouh>yHJL!{QZRWC
zO!6{=L?XfDQZV@uOxm)5#5-9a<}prw$S5`WGYiN(MOKhZE|}cO3Xx};%*ZJ<S(yza
zAIJuhp9>~mvccp*?g?fG$v3it<j;ahNe-BNA*<BnW)6`2Mh=ktUoh#(36W=>xKV2I
zW=@dwLr##iE*FTb<bq0ro%fgvBrnJfl8FVAE4d-^EMVse^MK?Xc|h{LVDcspOdjMs
cXI_weAumXNFPP-y1F=KF<U&4g7EsUv0Pk&M%>V!Z

-- 
2.16.6