Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-39 - refactoring of NSH into own folder
[vpp.git]
/
vnet
/
vnet
/
nsh-gre
/
decap.c
diff --git
a/vnet/vnet/nsh-gre/decap.c
b/vnet/vnet/nsh-gre/decap.c
index
2b6ae9a
..
c10b11b
100644
(file)
--- a/
vnet/vnet/nsh-gre/decap.c
+++ b/
vnet/vnet/nsh-gre/decap.c
@@
-18,7
+18,7
@@
#include <vlib/vlib.h>
#include <vnet/pg/pg.h>
#include <vnet/nsh-gre/nsh_gre.h>
#include <vlib/vlib.h>
#include <vnet/pg/pg.h>
#include <vnet/nsh-gre/nsh_gre.h>
-#include <vnet/nsh
-gre/nsh_gre
_packet.h>
+#include <vnet/nsh
/nsh
_packet.h>
vlib_node_registration_t nsh_input_node;
vlib_node_registration_t nsh_input_node;
@@
-42,10
+42,10
@@
u8 * format_nsh_header_with_length (u8 * s, va_list * args)
s = format (s, "ver %d ", h->ver_o_c>>6);
s = format (s, "ver %d ", h->ver_o_c>>6);
- if (h->ver_o_c & NSH_
GRE_
O_BIT)
+ if (h->ver_o_c & NSH_O_BIT)
s = format (s, "O-set ");
s = format (s, "O-set ");
- if (h->ver_o_c & NSH_
GRE_
C_BIT)
+ if (h->ver_o_c & NSH_C_BIT)
s = format (s, "C-set ");
s = format (s, "len %d (%d bytes) md_type %d next_protocol %d\n",
s = format (s, "C-set ");
s = format (s, "len %d (%d bytes) md_type %d next_protocol %d\n",
@@
-54,8
+54,8
@@
u8 * format_nsh_header_with_length (u8 * s, va_list * args)
tmp = clib_net_to_host_u32 (h->spi_si);
s = format (s, " spi %d si %d ",
tmp = clib_net_to_host_u32 (h->spi_si);
s = format (s, " spi %d si %d ",
- (tmp>>NSH_
GRE_SPI_SHIFT) & NSH_GRE
_SPI_MASK,
- tmp & NSH_
GRE_
SINDEX_MASK);
+ (tmp>>NSH_
SPI_SHIFT) & NSH
_SPI_MASK,
+ tmp & NSH_SINDEX_MASK);
s = format (s, "c1 %u c2 %u c3 %u c4 %u",
clib_net_to_host_u32 (h->c1),
s = format (s, "c1 %u c2 %u c3 %u c4 %u",
clib_net_to_host_u32 (h->c1),
@@
-171,8
+171,8
@@
nsh_gre_input (vlib_main_t * vm,
tunnel_index1 = ~0;
error0 = 0;
error1 = 0;
tunnel_index1 = ~0;
error0 = 0;
error1 = 0;
- next0 = NSH_INPUT_NEXT_DROP;
- next1 = NSH_INPUT_NEXT_DROP;
+ next0 = NSH_
GRE_
INPUT_NEXT_DROP;
+ next1 = NSH_
GRE_
INPUT_NEXT_DROP;
if (PREDICT_FALSE(key0 != last_key))
{
if (PREDICT_FALSE(key0 != last_key))
{
@@
-332,7
+332,7
@@
nsh_gre_input (vlib_main_t * vm,
tunnel_index0 = ~0;
error0 = 0;
tunnel_index0 = ~0;
error0 = 0;
- next0 = NSH_INPUT_NEXT_DROP;
+ next0 = NSH_
GRE_
INPUT_NEXT_DROP;
if (PREDICT_FALSE(key0 != last_key))
{
if (PREDICT_FALSE(key0 != last_key))
{
@@
-418,7
+418,7
@@
nsh_gre_input (vlib_main_t * vm,
static char * nsh_error_strings[] = {
#define nsh_gre_error(n,s) s,
static char * nsh_error_strings[] = {
#define nsh_gre_error(n,s) s,
-#include <vnet/nsh
-gre/nsh_gre
_error.def>
+#include <vnet/nsh
/nsh
_error.def>
#undef nsh_gre_error
#undef _
};
#undef nsh_gre_error
#undef _
};
@@
-432,9
+432,9
@@
VLIB_REGISTER_NODE (nsh_gre_input_node) = {
.n_errors = NSH_GRE_N_ERROR,
.error_strings = nsh_error_strings,
.n_errors = NSH_GRE_N_ERROR,
.error_strings = nsh_error_strings,
- .n_next_nodes = NSH_INPUT_N_NEXT,
+ .n_next_nodes = NSH_
GRE_
INPUT_N_NEXT,
.next_nodes = {
.next_nodes = {
-#define _(s,n) [NSH_INPUT_NEXT_##s] = n,
+#define _(s,n) [NSH_
GRE_
INPUT_NEXT_##s] = n,
foreach_nsh_gre_input_next
#undef _
},
foreach_nsh_gre_input_next
#undef _
},