X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fout2in.c;h=3d045a9dc8b0c11481170b10feece14e996b6ed2;hb=34931eb47;hp=18595e9f0ad068f0e69201508768fe0790b9ff12;hpb=a5e73762d585e9fa405b56ebd9f5c78d12c4d1f9;p=vpp.git diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c index 18595e9f0ad..3d045a9dc8b 100755 --- a/src/plugins/nat/out2in.c +++ b/src/plugins/nat/out2in.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -69,10 +70,6 @@ format_snat_out2in_fast_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t snat_out2in_node; -vlib_node_registration_t snat_out2in_fast_node; -vlib_node_registration_t nat44_out2in_reass_node; - #define foreach_snat_out2in_error \ _(UNSUPPORTED_PROTOCOL, "unsupported protocol") \ _(OUT2IN_PACKETS, "good out2in packets processed") \ @@ -114,6 +111,7 @@ typedef enum SNAT_OUT2IN_N_NEXT, } snat_out2in_next_t; +#ifndef CLIB_MARCH_VARIANT int nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg) { @@ -133,7 +131,8 @@ 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_log_warn ("out2in key del failed"); - snat_ipfix_logging_nat44_ses_delete (s->in2out.addr.as_u32, + snat_ipfix_logging_nat44_ses_delete (ctx->thread_index, + s->in2out.addr.as_u32, s->out2in.addr.as_u32, s->in2out.protocol, s->in2out.port, @@ -145,6 +144,10 @@ nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg) &s->out2in.addr, s->out2in.port, s->in2out.protocol); + nat_ha_sdel (&s->out2in.addr, s->out2in.port, &s->ext_host_addr, + s->ext_host_port, s->out2in.protocol, s->out2in.fib_index, + ctx->thread_index); + if (!snat_is_session_static (s)) snat_free_outside_address_and_port (sm->addresses, ctx->thread_index, &s->out2in); @@ -155,6 +158,7 @@ nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg) return 0; } +#endif /** * @brief Create session for static mapping. @@ -203,7 +207,7 @@ create_session_for_static_mapping (snat_main_t * sm, return 0; } - s = nat_session_alloc_or_recycle (sm, u, thread_index); + s = nat_session_alloc_or_recycle (sm, u, thread_index, now); if (!s) { nat44_delete_user_with_no_session (sm, u, thread_index); @@ -237,7 +241,8 @@ create_session_for_static_mapping (snat_main_t * sm, nat_log_notice ("out2in key add failed"); /* log NAT event */ - snat_ipfix_logging_nat44_ses_create (s->in2out.addr.as_u32, + snat_ipfix_logging_nat44_ses_create (thread_index, + s->in2out.addr.as_u32, s->out2in.addr.as_u32, s->in2out.protocol, s->in2out.port, @@ -247,9 +252,16 @@ create_session_for_static_mapping (snat_main_t * sm, &s->in2out.addr, s->in2out.port, &s->out2in.addr, s->out2in.port, s->in2out.protocol); + nat_ha_sadd (&s->in2out.addr, s->in2out.port, &s->out2in.addr, + s->out2in.port, &s->ext_host_addr, s->ext_host_port, + &s->ext_host_nat_addr, s->ext_host_nat_port, + s->in2out.protocol, s->in2out.fib_index, s->flags, + thread_index, 0); + return s; } +#ifndef CLIB_MARCH_VARIANT static_always_inline snat_out2in_error_t icmp_get_key (ip4_header_t * ip0, snat_session_key_t * p_key0) @@ -423,7 +435,9 @@ out: *(snat_session_t **) d = s0; return next0; } +#endif +#ifndef CLIB_MARCH_VARIANT /** * Get address and port values to be used for ICMP packet translation * @@ -497,7 +511,9 @@ out2: *p_dont_translate = dont_translate; return next0; } +#endif +#ifndef CLIB_MARCH_VARIANT u32 icmp_out2in (snat_main_t * sm, vlib_buffer_t * b0, @@ -627,7 +643,7 @@ icmp_out2in (snat_main_t * sm, out: return next0; } - +#endif static inline u32 icmp_out2in_slow_path (snat_main_t * sm, @@ -648,7 +664,7 @@ icmp_out2in_slow_path (snat_main_t * sm, /* Accounting */ nat44_session_update_counters (s0, now, vlib_buffer_length_in_chain - (sm->vlib_main, b0)); + (sm->vlib_main, b0), thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); } @@ -686,9 +702,9 @@ nat_out2in_sm_unknown_proto (snat_main_t * sm, return 0; } -static uword -snat_out2in_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; snat_out2in_next_t next_index; @@ -904,8 +920,8 @@ snat_out2in_node_fn (vlib_main_t * vm, /* Accounting */ nat44_session_update_counters (s0, now, - vlib_buffer_length_in_chain (vm, - b0)); + vlib_buffer_length_in_chain (vm, b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); trace0: @@ -1070,8 +1086,8 @@ snat_out2in_node_fn (vlib_main_t * vm, /* Accounting */ nat44_session_update_counters (s1, now, - vlib_buffer_length_in_chain (vm, - b1)); + vlib_buffer_length_in_chain (vm, b1), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s1, thread_index); trace1: @@ -1273,8 +1289,8 @@ snat_out2in_node_fn (vlib_main_t * vm, /* Accounting */ nat44_session_update_counters (s0, now, - vlib_buffer_length_in_chain (vm, - b0)); + vlib_buffer_length_in_chain (vm, b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); trace00: @@ -1303,19 +1319,19 @@ snat_out2in_node_fn (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_OUT2IN_PACKETS, pkts_processed); - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_TCP_PACKETS, tcp_packets); - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_UDP_PACKETS, udp_packets); - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_ICMP_PACKETS, icmp_packets); - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_OTHER_PACKETS, other_packets); - vlib_node_increment_counter (vm, snat_out2in_node.index, + vlib_node_increment_counter (vm, sm->out2in_node_index, SNAT_OUT2IN_ERROR_FRAGMENTS, fragments); return frame->n_vectors; @@ -1323,7 +1339,6 @@ snat_out2in_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_out2in_node) = { - .function = snat_out2in_node_fn, .name = "nat44-out2in", .vector_size = sizeof (u32), .format_trace = format_snat_out2in_trace, @@ -1346,11 +1361,9 @@ VLIB_REGISTER_NODE (snat_out2in_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_node, snat_out2in_node_fn); - -static uword -nat44_out2in_reass_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (nat44_out2in_reass_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; snat_out2in_next_t next_index; @@ -1532,7 +1545,7 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm, if (PREDICT_FALSE (reass0->sess_index == (u32) ~ 0)) { if (nat_ip4_reass_add_fragment - (reass0, bi0, &fragments_to_drop)) + (thread_index, reass0, bi0, &fragments_to_drop)) { b0->error = node->errors[SNAT_OUT2IN_ERROR_MAX_FRAG]; nat_log_notice @@ -1586,8 +1599,8 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm, /* Accounting */ nat44_session_update_counters (s0, now, - vlib_buffer_length_in_chain (vm, - b0)); + vlib_buffer_length_in_chain (vm, b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); @@ -1643,10 +1656,10 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, nat44_out2in_reass_node.index, + vlib_node_increment_counter (vm, sm->out2in_reass_node_index, SNAT_OUT2IN_ERROR_PROCESSED_FRAGMENTS, pkts_processed); - vlib_node_increment_counter (vm, nat44_out2in_reass_node.index, + vlib_node_increment_counter (vm, sm->out2in_reass_node_index, SNAT_OUT2IN_ERROR_CACHED_FRAGMENTS, cached_fragments); @@ -1661,7 +1674,6 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_out2in_reass_node) = { - .function = nat44_out2in_reass_node_fn, .name = "nat44-out2in-reass", .vector_size = sizeof (u32), .format_trace = format_nat44_reass_trace, @@ -1682,12 +1694,9 @@ VLIB_REGISTER_NODE (nat44_out2in_reass_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_out2in_reass_node, - nat44_out2in_reass_node_fn); - -static uword -snat_out2in_fast_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (snat_out2in_fast_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; snat_out2in_next_t next_index; @@ -1845,7 +1854,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, snat_out2in_fast_node.index, + vlib_node_increment_counter (vm, sm->out2in_fast_node_index, SNAT_OUT2IN_ERROR_OUT2IN_PACKETS, pkts_processed); return frame->n_vectors; @@ -1853,7 +1862,6 @@ snat_out2in_fast_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_out2in_fast_node) = { - .function = snat_out2in_fast_node_fn, .name = "nat44-out2in-fast", .vector_size = sizeof (u32), .format_trace = format_snat_out2in_fast_trace, @@ -1876,9 +1884,6 @@ VLIB_REGISTER_NODE (snat_out2in_fast_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_fast_node, - snat_out2in_fast_node_fn); - /* * fd.io coding-style-patch-verification: ON *