Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: ipfix logging separation & refactor
[vpp.git]
/
src
/
plugins
/
nat
/
out2in.c
diff --git
a/src/plugins/nat/out2in.c
b/src/plugins/nat/out2in.c
index
c830c0c
..
99a4bb4
100644
(file)
--- a/
src/plugins/nat/out2in.c
+++ b/
src/plugins/nat/out2in.c
@@
-25,7
+25,7
@@
#include <vnet/ethernet/ethernet.h>
#include <vnet/fib/ip4_fib.h>
#include <nat/nat.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/fib/ip4_fib.h>
#include <nat/nat.h>
-#include <nat/
nat_
ipfix_logging.h>
+#include <nat/
lib/
ipfix_logging.h>
#include <nat/nat_inlines.h>
#include <nat/nat44/inlines.h>
#include <nat/nat_syslog.h>
#include <nat/nat_inlines.h>
#include <nat/nat44/inlines.h>
#include <nat/nat_syslog.h>
@@
-119,13
+119,13
@@
nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
if (clib_bihash_add_del_8_8 (&tsm->in2out, &s_kv, 0))
nat_elog_warn ("out2in key del failed");
if (clib_bihash_add_del_8_8 (&tsm->in2out, &s_kv, 0))
nat_elog_warn ("out2in key del failed");
-
s
nat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
-
s->in2out.addr.as_u32,
-
s->out2in.addr.as_u32,
-
s->nat_proto,
-
s->in2out.port,
-
s->out2in.port,
-
s->in2out.fib_index);
+ nat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
+ s->in2out.addr.as_u32,
+ s->out2in.addr.as_u32,
+ s->nat_proto,
+ s->in2out.port,
+ s->out2in.port,
+ s->in2out.fib_index);
nat_syslog_nat44_apmdel (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,
nat_syslog_nat44_apmdel (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,
@@
-235,12
+235,12
@@
create_session_for_static_mapping (snat_main_t * sm,
nat_elog_notice ("out2in key add failed");
/* log NAT event */
nat_elog_notice ("out2in key add failed");
/* log NAT event */
-
s
nat_ipfix_logging_nat44_ses_create (thread_index,
-
s->in2out.addr.as_u32,
-
s->out2in.addr.as_u32,
-
s->nat_proto,
-
s->in2out.port,
-
s->out2in.port, s->in2out.fib_index);
+ nat_ipfix_logging_nat44_ses_create (thread_index,
+ s->in2out.addr.as_u32,
+ s->out2in.addr.as_u32,
+ s->nat_proto,
+ s->in2out.port,
+ s->out2in.port, s->in2out.fib_index);
nat_syslog_nat44_apmadd (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port, &s->out2in.addr,
nat_syslog_nat44_apmadd (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port, &s->out2in.addr,