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
/
in2out_ed.c
diff --git
a/src/plugins/nat/in2out_ed.c
b/src/plugins/nat/in2out_ed.c
index
e4870d2
..
f52026b
100644
(file)
--- a/
src/plugins/nat/in2out_ed.c
+++ b/
src/plugins/nat/in2out_ed.c
@@
-25,7
+25,7
@@
#include <vnet/udp/udp.h>
#include <vppinfra/error.h>
#include <nat/nat.h>
#include <vnet/udp/udp.h>
#include <vppinfra/error.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>
@@
-118,13
+118,13
@@
nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
if (snat_is_unk_proto_session (s))
goto delete;
if (snat_is_unk_proto_session (s))
goto delete;
-
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_sdel (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,
nat_syslog_nat44_sdel (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,
@@
-284,7
+284,7
@@
nat_ed_alloc_addr_and_port (snat_main_t * sm, u32 rx_fib_index,
#undef _
/* Totally out of translations to use... */
#undef _
/* Totally out of translations to use... */
-
s
nat_ipfix_logging_addresses_exhausted (thread_index, 0);
+ nat_ipfix_logging_addresses_exhausted (thread_index, 0);
return 1;
}
return 1;
}
@@
-468,12
+468,12
@@
slow_path_ed (snat_main_t * sm,
*sessionp = s;
/* log NAT event */
*sessionp = s;
/* 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_sadd (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,
nat_syslog_nat44_sadd (s->user_index, s->in2out.fib_index,
&s->in2out.addr, s->in2out.port,