Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IPv4/6 reassembly
[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
c4c54b7
..
2a21135
100755
(executable)
--- a/
src/vnet/ip/ip4_forward.c
+++ b/
src/vnet/ip/ip4_forward.c
@@
-883,11
+883,11
@@
ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
return;
}
if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
return;
}
- vnet_feature_enable_disable ("ip4-unicast", "ip4-
drop
", sw_if_index,
+ vnet_feature_enable_disable ("ip4-unicast", "ip4-
not-enabled
", sw_if_index,
!is_enable, 0, 0);
!is_enable, 0, 0);
- vnet_feature_enable_disable ("ip4-multicast", "ip4-
drop
",
+ vnet_feature_enable_disable ("ip4-multicast", "ip4-
not-enabled
",
sw_if_index, !is_enable, 0, 0);
}
sw_if_index, !is_enable, 0, 0);
}
@@
-1066,10
+1066,10
@@
VNET_FEATURE_INIT (ip4_vxlan_bypass, static) =
.runs_before = VNET_FEATURES ("ip4-lookup"),
};
.runs_before = VNET_FEATURES ("ip4-lookup"),
};
-VNET_FEATURE_INIT (ip4_
drop
, static) =
+VNET_FEATURE_INIT (ip4_
not_enabled
, static) =
{
.arc_name = "ip4-unicast",
{
.arc_name = "ip4-unicast",
- .node_name = "ip4-
drop
",
+ .node_name = "ip4-
not-enabled
",
.runs_before = VNET_FEATURES ("ip4-lookup"),
};
.runs_before = VNET_FEATURES ("ip4-lookup"),
};
@@
-1095,10
+1095,10
@@
VNET_FEATURE_INIT (ip4_vpath_mc, static) =
.runs_before = VNET_FEATURES ("ip4-mfib-forward-lookup"),
};
.runs_before = VNET_FEATURES ("ip4-mfib-forward-lookup"),
};
-VNET_FEATURE_INIT (ip4_mc_
drop
, static) =
+VNET_FEATURE_INIT (ip4_mc_
not_enabled
, static) =
{
.arc_name = "ip4-multicast",
{
.arc_name = "ip4-multicast",
- .node_name = "ip4-
drop
",
+ .node_name = "ip4-
not-enabled
",
.runs_before = VNET_FEATURES ("ip4-mfib-forward-lookup"),
};
.runs_before = VNET_FEATURES ("ip4-mfib-forward-lookup"),
};
@@
-1166,11
+1166,11
@@
ip4_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}
- vnet_feature_enable_disable ("ip4-unicast", "ip4-
drop
", sw_if_index,
+ vnet_feature_enable_disable ("ip4-unicast", "ip4-
not-enabled
", sw_if_index,
is_add, 0, 0);
is_add, 0, 0);
- vnet_feature_enable_disable ("ip4-multicast", "ip4-
drop", sw_if_index
,
- is_add, 0, 0);
+ vnet_feature_enable_disable ("ip4-multicast", "ip4-
not-enabled"
,
+
sw_if_index,
is_add, 0, 0);
return /* no error */ 0;
}
return /* no error */ 0;
}
@@
-1582,8
+1582,12
@@
ip4_local_inline (vlib_main_t * vm,
/* Treat IP frag packets as "experimental" protocol for now
until support of IP frag reassembly is implemented */
/* Treat IP frag packets as "experimental" protocol for now
until support of IP frag reassembly is implemented */
- proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
- proto1 = ip4_is_fragment (ip1) ? 0xfe : ip1->protocol;
+ proto0 =
+ ip4_is_fragment (ip0) ? IP_PROTOCOL_VPP_FRAGMENTATION :
+ ip0->protocol;
+ proto1 =
+ ip4_is_fragment (ip1) ? IP_PROTOCOL_VPP_FRAGMENTATION :
+ ip1->protocol;
if (head_of_feature_arc == 0)
goto skip_checks;
if (head_of_feature_arc == 0)
goto skip_checks;
@@
-1748,7
+1752,9
@@
ip4_local_inline (vlib_main_t * vm,
/* Treat IP frag packets as "experimental" protocol for now
until support of IP frag reassembly is implemented */
/* Treat IP frag packets as "experimental" protocol for now
until support of IP frag reassembly is implemented */
- proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
+ proto0 =
+ ip4_is_fragment (ip0) ? IP_PROTOCOL_VPP_FRAGMENTATION :
+ ip0->protocol;
if (head_of_feature_arc == 0 || p0->flags & VNET_BUFFER_F_IS_NATED)
goto skip_check;
if (head_of_feature_arc == 0 || p0->flags & VNET_BUFFER_F_IS_NATED)
goto skip_check;
@@
-1839,6
+1845,7
@@
VLIB_REGISTER_NODE (ip4_local_node) =
[IP_LOCAL_NEXT_PUNT] = "ip4-punt",
[IP_LOCAL_NEXT_UDP_LOOKUP] = "ip4-udp-lookup",
[IP_LOCAL_NEXT_ICMP] = "ip4-icmp-input",
[IP_LOCAL_NEXT_PUNT] = "ip4-punt",
[IP_LOCAL_NEXT_UDP_LOOKUP] = "ip4-udp-lookup",
[IP_LOCAL_NEXT_ICMP] = "ip4-icmp-input",
+ [IP_LOCAL_NEXT_REASSEMBLY] = "ip4-reassembly",
},
};
/* *INDENT-ON* */
},
};
/* *INDENT-ON* */