VOM: mroutes

[vpp.git] / src / vnet / ip / ip4_forward.c

diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 1ca4f93..f523ae6 100644 (file)
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -754,13 +754,13 @@ VNET_FEATURE_INIT (ip4_policer_classify, static) =
 {
   .arc_name = "ip4-unicast",
   .node_name = "ip4-policer-classify",
-  .runs_before = VNET_FEATURES ("ipsec4-input"),
+  .runs_before = VNET_FEATURES ("ipsec4-input-feature"),
 };
 
 VNET_FEATURE_INIT (ip4_ipsec, static) =
 {
   .arc_name = "ip4-unicast",
-  .node_name = "ipsec4-input",
+  .node_name = "ipsec4-input-feature",
   .runs_before = VNET_FEATURES ("vpath-input-ip4"),
 };
 
@@ -842,13 +842,13 @@ VNET_FEATURE_INIT (ip4_outacl, static) =
 {
   .arc_name = "ip4-output",
   .node_name = "ip4-outacl",
-  .runs_before = VNET_FEATURES ("ipsec4-output"),
+  .runs_before = VNET_FEATURES ("ipsec4-output-feature"),
 };
 
 VNET_FEATURE_INIT (ip4_ipsec_output, static) =
 {
   .arc_name = "ip4-output",
-  .node_name = "ipsec4-output",
+  .node_name = "ipsec4-output-feature",
   .runs_before = VNET_FEATURES ("interface-output"),
 };
 
@@ -2348,7 +2348,7 @@ ip4_rewrite_inline (vlib_main_t * vm,
          adj0->sub_type.midchain.fixup_func
            (vm, adj0, b[0], adj0->sub_type.midchain.fixup_data);
          adj1->sub_type.midchain.fixup_func
-           (vm, adj1, b[1], adj0->sub_type.midchain.fixup_data);
+           (vm, adj1, b[1], adj1->sub_type.midchain.fixup_data);
        }
 
       if (is_mcast)
@@ -2360,7 +2360,7 @@ ip4_rewrite_inline (vlib_main_t * vm,
                                      adj0->rewrite_header.dst_mcast_offset,
                                      &ip0->dst_address.as_u32, (u8 *) ip0);
          vnet_ip_mcast_fixup_header (IP4_MCAST_ADDR_MASK,
-                                     adj0->rewrite_header.dst_mcast_offset,
+                                     adj1->rewrite_header.dst_mcast_offset,
                                      &ip1->dst_address.as_u32, (u8 *) ip1);
        }