Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
stats: counters data model
[vpp.git]
/
src
/
plugins
/
map
/
ip4_map_t.c
diff --git
a/src/plugins/map/ip4_map_t.c
b/src/plugins/map/ip4_map_t.c
index
4c0dd62
..
8ae76f3
100644
(file)
--- a/
src/plugins/map/ip4_map_t.c
+++ b/
src/plugins/map/ip4_map_t.c
@@
-92,14
+92,18
@@
ip4_to_ip6_set_inner_icmp_cb (vlib_buffer_t * b, ip4_header_t * ip4,
ip6_header_t * ip6, void *arg)
{
icmp_to_icmp6_ctx_t *ctx = arg;
ip6_header_t * ip6, void *arg)
{
icmp_to_icmp6_ctx_t *ctx = arg;
+ ip4_address_t old_src, old_dst;
+
+ old_src.as_u32 = ip4->src_address.as_u32;
+ old_dst.as_u32 = ip4->dst_address.as_u32;
//Note that the source address is within the domain
//while the destination address is the one outside the domain
//Note that the source address is within the domain
//while the destination address is the one outside the domain
- ip4_map_t_embedded_address (ctx->d, &ip6->dst_address, &
ip4->dst_address
);
+ ip4_map_t_embedded_address (ctx->d, &ip6->dst_address, &
old_dst
);
ip6->src_address.as_u64[0] =
ip6->src_address.as_u64[0] =
- map_get_pfx_net (ctx->d,
ip4->src_address
.as_u32, ctx->recv_port);
+ map_get_pfx_net (ctx->d,
old_src
.as_u32, ctx->recv_port);
ip6->src_address.as_u64[1] =
ip6->src_address.as_u64[1] =
- map_get_sfx_net (ctx->d,
ip4->src_address
.as_u32, ctx->recv_port);
+ map_get_sfx_net (ctx->d,
old_src
.as_u32, ctx->recv_port);
return 0;
}
return 0;
}
@@
-150,7
+154,7
@@
ip4_map_t_icmp (vlib_main_t * vm,
vnet_buffer (p0)->map_t.map_domain_index);
ip40 = vlib_buffer_get_current (p0);
vnet_buffer (p0)->map_t.map_domain_index);
ip40 = vlib_buffer_get_current (p0);
- ctx0.recv_port = ip4_get_port (ip40,
1
);
+ ctx0.recv_port = ip4_get_port (ip40,
0
);
ctx0.d = d0;
if (ctx0.recv_port == 0)
{
ctx0.d = d0;
if (ctx0.recv_port == 0)
{
@@
-680,12
+684,6
@@
ip4_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
return frame->n_vectors;
}
return frame->n_vectors;
}
-static char *map_t_error_strings[] = {
-#define _(sym,string) string,
- foreach_map_error
-#undef _
-};
-
/* *INDENT-OFF* */
VNET_FEATURE_INIT (ip4_map_t_feature, static) = {
.arc_name = "ip4-unicast",
/* *INDENT-OFF* */
VNET_FEATURE_INIT (ip4_map_t_feature, static) = {
.arc_name = "ip4-unicast",
@@
-702,7
+700,7
@@
VLIB_REGISTER_NODE(ip4_map_t_fragmented_node) = {
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
- .error_
strings = map_t_error_string
s,
+ .error_
counters = map_error_counter
s,
.n_next_nodes = IP4_MAPT_FRAGMENTED_N_NEXT,
.next_nodes = {
.n_next_nodes = IP4_MAPT_FRAGMENTED_N_NEXT,
.next_nodes = {
@@
-723,7
+721,7
@@
VLIB_REGISTER_NODE(ip4_map_t_icmp_node) = {
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
- .error_
strings = map_t_error_string
s,
+ .error_
counters = map_error_counter
s,
.n_next_nodes = IP4_MAPT_ICMP_N_NEXT,
.next_nodes = {
.n_next_nodes = IP4_MAPT_ICMP_N_NEXT,
.next_nodes = {
@@
-744,7
+742,7
@@
VLIB_REGISTER_NODE(ip4_map_t_tcp_udp_node) = {
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
- .error_
strings = map_t_error_string
s,
+ .error_
counters = map_error_counter
s,
.n_next_nodes = IP4_MAPT_TCP_UDP_N_NEXT,
.next_nodes = {
.n_next_nodes = IP4_MAPT_TCP_UDP_N_NEXT,
.next_nodes = {
@@
-765,7
+763,7
@@
VLIB_REGISTER_NODE(ip4_map_t_node) = {
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = MAP_N_ERROR,
- .error_
strings = map_t_error_string
s,
+ .error_
counters = map_error_counter
s,
.n_next_nodes = IP4_MAPT_N_NEXT,
.next_nodes = {
.n_next_nodes = IP4_MAPT_N_NEXT,
.next_nodes = {