app/testpmd: fix MPLS IPv4 encapsulation fields
authorSaleh Alsouqi <salehals@mellanox.com>
Thu, 4 Jul 2019 07:33:22 +0000 (07:33 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Thu, 4 Jul 2019 23:52:01 +0000 (01:52 +0200)
Having version and ihl set to 0 would result in a
corrupted/incorrect encapsulating packet for MPLS,
this commit sets these fields to 4 and 5 respectively
as defined in librte_net/rte_ip.h.

Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")
Cc: stable@dpdk.org
Signed-off-by: Saleh Alsouqi <salehals@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
app/test-pmd/cmdline_flow.c

index e644efa..4e5fa7a 100644 (file)
@@ -3878,11 +3878,14 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
                        .src_addr = mplsogre_encap_conf.ipv4_src,
                        .dst_addr = mplsogre_encap_conf.ipv4_dst,
                        .next_proto_id = IPPROTO_GRE,
+                       .version_ihl = RTE_IPV4_VHL_DEF,
+                       .time_to_live = IPDEFTTL,
                },
        };
        struct rte_flow_item_ipv6 ipv6 = {
                .hdr =  {
                        .proto = IPPROTO_GRE,
+                       .hop_limits = IPDEFTTL,
                },
        };
        struct rte_flow_item_gre gre = {
@@ -4066,11 +4069,14 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
                        .src_addr = mplsoudp_encap_conf.ipv4_src,
                        .dst_addr = mplsoudp_encap_conf.ipv4_dst,
                        .next_proto_id = IPPROTO_UDP,
+                       .version_ihl = RTE_IPV4_VHL_DEF,
+                       .time_to_live = IPDEFTTL,
                },
        };
        struct rte_flow_item_ipv6 ipv6 = {
                .hdr =  {
                        .proto = IPPROTO_UDP,
+                       .hop_limits = IPDEFTTL,
                },
        };
        struct rte_flow_item_udp udp = {