ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip: fix ip-local errors

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ie8bc5c9a03e858487cf565b4e9b520e6b496337a
This commit is contained in:
Florin Coras
2020-02-11 03:01:19 +00:00
committed by Dave Barach
parent 4a06846dd6
commit fa2a316663
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vnet/ip/ip4.h
View File

@ -178,6 +178,7 @@ typedef struct ip4_main_t
/** Global ip4 main structure. */ /** Global ip4 main structure. */
extern ip4_main_t ip4_main; extern ip4_main_t ip4_main;
extern char *ip4_error_strings[];
/** Global ip4 input node. Errors get attached to ip4 input node. */ /** Global ip4 input node. Errors get attached to ip4 input node. */
extern vlib_node_registration_t ip4_input_node; extern vlib_node_registration_t ip4_input_node;

4
src/vnet/ip/ip4_forward.c
View File

@ -1696,7 +1696,7 @@ ip4_local_inline (vlib_main_t * vm,
{ {
u32 *from, n_left_from; u32 *from, n_left_from;
vlib_node_runtime_t *error_node = vlib_node_runtime_t *error_node =
vlib_node_get_runtime (vm, ip4_input_node.index); vlib_node_get_runtime (vm, ip4_local_node.index);
u16 nexts[VLIB_FRAME_SIZE], *next; u16 nexts[VLIB_FRAME_SIZE], *next;
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
ip4_header_t *ip[2]; ip4_header_t *ip[2];
@ -1825,6 +1825,8 @@ VLIB_REGISTER_NODE (ip4_local_node) =
.name = "ip4-local", .name = "ip4-local",
.vector_size = sizeof (u32), .vector_size = sizeof (u32),
.format_trace = format_ip4_forward_next_trace, .format_trace = format_ip4_forward_next_trace,
.n_errors = IP4_N_ERROR,
.error_strings = ip4_error_strings,
.n_next_nodes = IP_LOCAL_N_NEXT, .n_next_nodes = IP_LOCAL_N_NEXT,
.next_nodes = .next_nodes =
{ {

2
src/vnet/ip/ip4_input.h
View File

@ -43,8 +43,6 @@
#include <vnet/ip/ip.h> #include <vnet/ip/ip.h>
#include <vnet/ethernet/ethernet.h> #include <vnet/ethernet/ethernet.h>
extern char *ip4_error_strings[];
typedef enum typedef enum
{ {
IP4_INPUT_NEXT_DROP, IP4_INPUT_NEXT_DROP,

4
test/test_gre.py
View File

@ -48,7 +48,7 @@ class TestGREInputNodes(VppTestCase):
self.pg_start() self.pg_start()
# no tunnel created, gre-input not registered # no tunnel created, gre-input not registered
err = self.statistics.get_counter( err = self.statistics.get_counter(
'/err/ip4-input/unknown ip protocol')[0] '/err/ip4-local/unknown ip protocol')[0]
self.assertEqual(err, 1) self.assertEqual(err, 1)
err_count = err err_count = err
@ -60,7 +60,7 @@ class TestGREInputNodes(VppTestCase):
self.pg_start() self.pg_start()
# tunnel created, gre-input registered # tunnel created, gre-input registered
err = self.statistics.get_counter( err = self.statistics.get_counter(
'/err/ip4-input/unknown ip protocol')[0] '/err/ip4-local/unknown ip protocol')[0]
# expect no new errors # expect no new errors
self.assertEqual(err, err_count) self.assertEqual(err, err_count)