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: convert remaining clib_warning to nat_log_*
[vpp.git]
/
src
/
plugins
/
nat
/
nat64.c
diff --git
a/src/plugins/nat/nat64.c
b/src/plugins/nat/nat64.c
index
0b7536f
..
8396bd1
100644
(file)
--- a/
src/plugins/nat/nat64.c
+++ b/
src/plugins/nat/nat64.c
@@
-20,6
+20,7
@@
#include <nat/nat64.h>
#include <nat/nat64_db.h>
#include <nat/nat_reass.h>
#include <nat/nat64.h>
#include <nat/nat64_db.h>
#include <nat/nat_reass.h>
+#include <nat/nat_inlines.h>
#include <vnet/fib/ip4_fib.h>
#include <vppinfra/crc32.h>
#include <vnet/fib/ip4_fib.h>
#include <vppinfra/crc32.h>
@@
-230,7
+231,6
@@
nat64_init (vlib_main_t * vm)
nm->icmp_timeout = SNAT_ICMP_TIMEOUT;
nm->tcp_trans_timeout = SNAT_TCP_TRANSITORY_TIMEOUT;
nm->tcp_est_timeout = SNAT_TCP_ESTABLISHED_TIMEOUT;
nm->icmp_timeout = SNAT_ICMP_TIMEOUT;
nm->tcp_trans_timeout = SNAT_TCP_TRANSITORY_TIMEOUT;
nm->tcp_est_timeout = SNAT_TCP_ESTABLISHED_TIMEOUT;
- nm->tcp_incoming_syn_timeout = SNAT_TCP_INCOMING_SYN;
nm->total_enabled_count = 0;
nm->total_enabled_count = 0;
@@
-264,7
+264,7
@@
nat64_set_hash (u32 bib_buckets, u32 bib_memory_size, u32 st_buckets,
{
if (nat64_db_init (db, bib_buckets, bib_memory_size, st_buckets,
st_memory_size, nat64_free_out_addr_and_port))
{
if (nat64_db_init (db, bib_buckets, bib_memory_size, st_buckets,
st_memory_size, nat64_free_out_addr_and_port))
-
clib_warning
("NAT64 DB init failed");
+
nat_log_err
("NAT64 DB init failed");
}
/* *INDENT-ON* */
}
}
/* *INDENT-ON* */
}
@@
-506,7
+506,6
@@
nat64_alloc_out_addr_and_port (u32 fib_index, snat_protocol_t proto,
nat64_main_t *nm = &nat64_main;
snat_main_t *sm = nm->sm;
snat_session_key_t k;
nat64_main_t *nm = &nat64_main;
snat_main_t *sm = nm->sm;
snat_session_key_t k;
- u32 ai;
u32 worker_index = 0;
int rv;
u32 worker_index = 0;
int rv;
@@
-516,7
+515,7
@@
nat64_alloc_out_addr_and_port (u32 fib_index, snat_protocol_t proto,
worker_index = thread_index - sm->first_worker_index;
rv =
worker_index = thread_index - sm->first_worker_index;
rv =
- sm->alloc_addr_and_port (nm->addr_pool, fib_index, thread_index, &k,
&ai,
+ sm->alloc_addr_and_port (nm->addr_pool, fib_index, thread_index, &k,
sm->port_per_thread, worker_index);
if (!rv)
sm->port_per_thread, worker_index);
if (!rv)
@@
-557,7
+556,7
@@
nat64_free_out_addr_and_port (struct nat64_db_s *db, ip4_address_t * addr,
foreach_snat_protocol
#undef _
default:
foreach_snat_protocol
#undef _
default:
-
clib_warning
("unknown protocol");
+
nat_log_notice
("unknown protocol");
return;
}
break;
return;
}
break;
@@
-572,7
+571,7
@@
nat64_static_bib_worker_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
vlib_frame_t * f)
{
nat64_main_t *nm = &nat64_main;
vlib_frame_t * f)
{
nat64_main_t *nm = &nat64_main;
- u32 thread_index = v
lib_get_thread_index ()
;
+ u32 thread_index = v
m->thread_index
;
nat64_db_t *db = &nm->db[thread_index];
nat64_static_bib_to_update_t *static_bib;
nat64_db_bib_entry_t *bibe;
nat64_db_t *db = &nm->db[thread_index];
nat64_static_bib_to_update_t *static_bib;
nat64_db_bib_entry_t *bibe;
@@
-756,8
+755,6
@@
nat64_set_udp_timeout (u32 timeout)
if (timeout == 0)
nm->udp_timeout = SNAT_UDP_TIMEOUT;
if (timeout == 0)
nm->udp_timeout = SNAT_UDP_TIMEOUT;
- else if (timeout < SNAT_UDP_TIMEOUT_MIN)
- return VNET_API_ERROR_INVALID_VALUE;
else
nm->udp_timeout = timeout;
else
nm->udp_timeout = timeout;
@@
-794,7
+791,7
@@
nat64_get_icmp_timeout (void)
}
int
}
int
-nat64_set_tcp_timeouts (u32 trans, u32 est
, u32 incoming_syn
)
+nat64_set_tcp_timeouts (u32 trans, u32 est)
{
nat64_main_t *nm = &nat64_main;
{
nat64_main_t *nm = &nat64_main;
@@
-808,11
+805,6
@@
nat64_set_tcp_timeouts (u32 trans, u32 est, u32 incoming_syn)
else
nm->tcp_est_timeout = est;
else
nm->tcp_est_timeout = est;
- if (incoming_syn == 0)
- nm->tcp_incoming_syn_timeout = SNAT_TCP_INCOMING_SYN;
- else
- nm->tcp_incoming_syn_timeout = incoming_syn;
-
return 0;
}
return 0;
}
@@
-832,14
+824,6
@@
nat64_get_tcp_est_timeout (void)
return nm->tcp_est_timeout;
}
return nm->tcp_est_timeout;
}
-u32
-nat64_get_tcp_incoming_syn_timeout (void)
-{
- nat64_main_t *nm = &nat64_main;
-
- return nm->tcp_incoming_syn_timeout;
-}
-
void
nat64_session_reset_timeout (nat64_db_st_entry_t * ste, vlib_main_t * vm)
{
void
nat64_session_reset_timeout (nat64_db_st_entry_t * ste, vlib_main_t * vm)
{
@@
-1068,7
+1052,7
@@
nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
ip6->as_u32[3] = ip4->as_u32;
break;
default:
ip6->as_u32[3] = ip4->as_u32;
break;
default:
-
clib_warning
("invalid prefix length");
+
nat_log_notice
("invalid prefix length");
break;
}
}
break;
}
}
@@
-1141,7
+1125,7
@@
nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
ip4->as_u32 = ip6->as_u32[3];
break;
default:
ip4->as_u32 = ip6->as_u32[3];
break;
default:
-
clib_warning
("invalid prefix length");
+
nat_log_notice
("invalid prefix length");
break;
}
}
break;
}
}
@@
-1154,7
+1138,7
@@
nat64_expire_worker_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
vlib_frame_t * f)
{
nat64_main_t *nm = &nat64_main;
vlib_frame_t * f)
{
nat64_main_t *nm = &nat64_main;
- u32 thread_index = v
lib_get_thread_index ()
;
+ u32 thread_index = v
m->thread_index
;
nat64_db_t *db = &nm->db[thread_index];
u32 now = (u32) vlib_time_now (vm);
nat64_db_t *db = &nm->db[thread_index];
u32 now = (u32) vlib_time_now (vm);
@@
-1222,7
+1206,7
@@
nat64_expire_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
case NAT64_CLEANER_RESCHEDULE:
break;
default:
case NAT64_CLEANER_RESCHEDULE:
break;
default:
-
clib_warning
("unknown event %u", event_type);
+
nat_log_notice
("unknown event %u", event_type);
break;
}
break;
}