Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
QoS recording and marking
[vpp.git]
/
src
/
plugins
/
nat
/
dslite_dpo.c
diff --git
a/src/plugins/nat/dslite_dpo.c
b/src/plugins/nat/dslite_dpo.c
index
376d717
..
97ebb18
100644
(file)
--- a/
src/plugins/nat/dslite_dpo.c
+++ b/
src/plugins/nat/dslite_dpo.c
@@
-17,6
+17,7
@@
#include <nat/dslite_dpo.h>
dpo_type_t dslite_dpo_type;
#include <nat/dslite_dpo.h>
dpo_type_t dslite_dpo_type;
+dpo_type_t dslite_ce_dpo_type;
void
dslite_dpo_create (dpo_proto_t dproto, u32 aftr_index, dpo_id_t * dpo)
void
dslite_dpo_create (dpo_proto_t dproto, u32 aftr_index, dpo_id_t * dpo)
@@
-24,6
+25,12
@@
dslite_dpo_create (dpo_proto_t dproto, u32 aftr_index, dpo_id_t * dpo)
dpo_set (dpo, dslite_dpo_type, dproto, aftr_index);
}
dpo_set (dpo, dslite_dpo_type, dproto, aftr_index);
}
+void
+dslite_ce_dpo_create (dpo_proto_t dproto, u32 b4_index, dpo_id_t * dpo)
+{
+ dpo_set (dpo, dslite_ce_dpo_type, dproto, b4_index);
+}
+
u8 *
format_dslite_dpo (u8 * s, va_list * args)
{
u8 *
format_dslite_dpo (u8 * s, va_list * args)
{
@@
-33,6
+40,15
@@
format_dslite_dpo (u8 * s, va_list * args)
return (format (s, "DS-Lite: AFTR:%d", index));
}
return (format (s, "DS-Lite: AFTR:%d", index));
}
+u8 *
+format_dslite_ce_dpo (u8 * s, va_list * args)
+{
+ index_t index = va_arg (*args, index_t);
+ CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
+
+ return (format (s, "DS-Lite: B4:%d", index));
+}
+
static void
dslite_dpo_lock (dpo_id_t * dpo)
{
static void
dslite_dpo_lock (dpo_id_t * dpo)
{
@@
-43,12
+59,28
@@
dslite_dpo_unlock (dpo_id_t * dpo)
{
}
{
}
+static void
+dslite_ce_dpo_lock (dpo_id_t * dpo)
+{
+}
+
+static void
+dslite_ce_dpo_unlock (dpo_id_t * dpo)
+{
+}
+
const static dpo_vft_t dslite_dpo_vft = {
.dv_lock = dslite_dpo_lock,
.dv_unlock = dslite_dpo_unlock,
.dv_format = format_dslite_dpo,
};
const static dpo_vft_t dslite_dpo_vft = {
.dv_lock = dslite_dpo_lock,
.dv_unlock = dslite_dpo_unlock,
.dv_format = format_dslite_dpo,
};
+const static dpo_vft_t dslite_ce_dpo_vft = {
+ .dv_lock = dslite_ce_dpo_lock,
+ .dv_unlock = dslite_ce_dpo_unlock,
+ .dv_format = format_dslite_ce_dpo,
+};
+
const static char *const dslite_ip4_nodes[] = {
"dslite-out2in",
NULL,
const static char *const dslite_ip4_nodes[] = {
"dslite-out2in",
NULL,
@@
-59,16
+91,34
@@
const static char *const dslite_ip6_nodes[] = {
NULL,
};
NULL,
};
+const static char *const dslite_ce_ip4_nodes[] = {
+ "dslite-ce-encap",
+ NULL,
+};
+
+const static char *const dslite_ce_ip6_nodes[] = {
+ "dslite-ce-decap",
+ NULL,
+};
+
const static char *const *const dslite_nodes[DPO_PROTO_NUM] = {
[DPO_PROTO_IP4] = dslite_ip4_nodes,
[DPO_PROTO_IP6] = dslite_ip6_nodes,
[DPO_PROTO_MPLS] = NULL,
};
const static char *const *const dslite_nodes[DPO_PROTO_NUM] = {
[DPO_PROTO_IP4] = dslite_ip4_nodes,
[DPO_PROTO_IP6] = dslite_ip6_nodes,
[DPO_PROTO_MPLS] = NULL,
};
+const static char *const *const dslite_ce_nodes[DPO_PROTO_NUM] = {
+ [DPO_PROTO_IP4] = dslite_ce_ip4_nodes,
+ [DPO_PROTO_IP6] = dslite_ce_ip6_nodes,
+ [DPO_PROTO_MPLS] = NULL,
+};
+
void
dslite_dpo_module_init (void)
{
dslite_dpo_type = dpo_register_new_type (&dslite_dpo_vft, dslite_nodes);
void
dslite_dpo_module_init (void)
{
dslite_dpo_type = dpo_register_new_type (&dslite_dpo_vft, dslite_nodes);
+ dslite_ce_dpo_type = dpo_register_new_type (&dslite_ce_dpo_vft,
+ dslite_ce_nodes);
}
/*
}
/*