Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
api: pg - Mark old message versions as deprecated
[vpp.git]
/
src
/
vnet
/
adj
/
rewrite.h
diff --git
a/src/vnet/adj/rewrite.h
b/src/vnet/adj/rewrite.h
index
c2084ea
..
5cb90e4
100644
(file)
--- a/
src/vnet/adj/rewrite.h
+++ b/
src/vnet/adj/rewrite.h
@@
-55,10
+55,22
@@
typedef enum vnet_rewrite_flags_t_
* This adjacency/interface has output features configured
*/
VNET_REWRITE_HAS_FEATURES = (1 << 0),
* This adjacency/interface has output features configured
*/
VNET_REWRITE_HAS_FEATURES = (1 << 0),
+
+ /**
+ * this adj performs IP4 over IP4 fixup
+ */
+ VNET_REWRITE_FIXUP_IP4_O_4 = (1 << 1),
+
+ /**
+ * this adj performs the flow hash fixup
+ */
+ VNET_REWRITE_FIXUP_FLOW_HASH = (1 << 2),
} __attribute__ ((packed)) vnet_rewrite_flags_t;
} __attribute__ ((packed)) vnet_rewrite_flags_t;
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
+extern u8 *format_vnet_rewrite_flags (u8 *s, va_list *ap);
+
+typedef struct vnet_rewrite_header_t_
+{
/* Interface to mark re-written packets with. */
u32 sw_if_index;
/* Interface to mark re-written packets with. */
u32 sw_if_index;
@@
-83,8
+95,7
@@
typedef CLIB_PACKED (struct {
/* Rewrite string starting at end and going backwards. */
u8 data[0];
/* Rewrite string starting at end and going backwards. */
u8 data[0];
-}) vnet_rewrite_header_t;
-/* *INDENT-ON* */
+} __clib_packed vnet_rewrite_header_t;
/**
* At 16 bytes of rewrite herader we have enought space left for a IPv6
/**
* At 16 bytes of rewrite herader we have enought space left for a IPv6
@@
-114,11
+125,18
@@
STATIC_ASSERT (sizeof (vnet_rewrite_header_t) <= 16,
sizeof (vnet_rewrite_header_t)]; \
}
sizeof (vnet_rewrite_header_t)]; \
}
+typedef struct __rewrite_unused_t__
+{
+ VNET_DECLARE_REWRITE;
+} __rewrite_unused_t;
+
+STATIC_ASSERT_SIZEOF (__rewrite_unused_t, 128);
+
always_inline void
vnet_rewrite_clear_data_internal (vnet_rewrite_header_t * rw, int max_size)
{
/* Sanity check values carefully for this clib_memset operation */
always_inline void
vnet_rewrite_clear_data_internal (vnet_rewrite_header_t * rw, int max_size)
{
/* Sanity check values carefully for this clib_memset operation */
- ASSERT ((max_size > 0) && (max_size < V
LIB_BUFFER_PRE_DATA_SIZE
));
+ ASSERT ((max_size > 0) && (max_size < V
NET_REWRITE_TOTAL_BYTES
));
rw->data_bytes = 0;
clib_memset (rw->data, 0xfe, max_size);
rw->data_bytes = 0;
clib_memset (rw->data, 0xfe, max_size);
@@
-129,7
+147,7
@@
vnet_rewrite_set_data_internal (vnet_rewrite_header_t * rw,
int max_size, void *data, int data_bytes)
{
/* Sanity check values carefully for this clib_memset operation */
int max_size, void *data, int data_bytes)
{
/* Sanity check values carefully for this clib_memset operation */
- ASSERT ((max_size > 0) && (max_size < V
LIB_BUFFER_PRE_DATA_SIZE
));
+ ASSERT ((max_size > 0) && (max_size < V
NET_REWRITE_TOTAL_BYTES
));
ASSERT ((data_bytes >= 0) && (data_bytes < max_size));
rw->data_bytes = data_bytes;
ASSERT ((data_bytes >= 0) && (data_bytes < max_size));
rw->data_bytes = data_bytes;
@@
-154,7
+172,7
@@
vnet_rewrite_get_data_internal (vnet_rewrite_header_t * rw, int max_size)
vnet_rewrite_get_data_internal (&((rw).rewrite_header), sizeof ((rw).rewrite_data))
always_inline void
vnet_rewrite_get_data_internal (&((rw).rewrite_header), sizeof ((rw).rewrite_data))
always_inline void
-_vnet_rewrite_one_header (vnet_rewrite_header_t * h0,
+_vnet_rewrite_one_header (
const
vnet_rewrite_header_t * h0,
void *packet0, int most_likely_size)
{
/* 0xfefe => poisoned adjacency => crash */
void *packet0, int most_likely_size)
{
/* 0xfefe => poisoned adjacency => crash */
@@
-172,8
+190,8
@@
_vnet_rewrite_one_header (vnet_rewrite_header_t * h0,
}
always_inline void
}
always_inline void
-_vnet_rewrite_two_headers (vnet_rewrite_header_t * h0,
- vnet_rewrite_header_t * h1,
+_vnet_rewrite_two_headers (
const
vnet_rewrite_header_t * h0,
+
const
vnet_rewrite_header_t * h1,
void *packet0, void *packet1, int most_likely_size)
{
/* 0xfefe => poisoned adjacency => crash */
void *packet0, void *packet1, int most_likely_size)
{
/* 0xfefe => poisoned adjacency => crash */