X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fout2in_ed.c;h=f76fc60bda03f5afad301f4592b8da9df0e3360b;hb=ad1f3e148224bced41afd47b0ab1ed158c07f399;hp=dce6c5616c5cda43a04cc9762de7fcb0d95e6534;hpb=37a3a2a08f72310a3f7e898a9b44af7751f2cc9c;p=vpp.git diff --git a/src/plugins/nat/out2in_ed.c b/src/plugins/nat/out2in_ed.c index dce6c5616c5..f76fc60bda0 100644 --- a/src/plugins/nat/out2in_ed.c +++ b/src/plugins/nat/out2in_ed.c @@ -29,6 +29,7 @@ #include #include #include +#include #define foreach_nat_out2in_ed_error \ _(UNSUPPORTED_PROTOCOL, "Unsupported protocol") \ @@ -39,7 +40,8 @@ _(NO_TRANSLATION, "No translation") \ _(MAX_SESSIONS_EXCEEDED, "Maximum sessions exceeded") \ _(DROP_FRAGMENT, "Drop fragment") \ _(MAX_REASS, "Maximum reassemblies exceeded") \ -_(MAX_FRAG, "Maximum fragments per reassembly exceeded") +_(MAX_FRAG, "Maximum fragments per reassembly exceeded")\ +_(NON_SYN, "non-SYN packet try to create session") typedef enum { @@ -172,6 +174,13 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) s->out2in.port, s->in2out.fib_index); + nat_syslog_nat44_sdel (s->user_index, s->in2out.fib_index, + &s->in2out.addr, s->in2out.port, + &s->ext_host_nat_addr, s->ext_host_nat_port, + &s->out2in.addr, s->out2in.port, + &s->ext_host_addr, s->ext_host_port, + s->in2out.protocol, is_twice_nat_session (s)); + if (is_twice_nat_session (s)) { for (i = 0; i < vec_len (sm->twice_nat_addresses); i++) @@ -302,6 +311,19 @@ create_session_for_static_mapping_ed (snat_main_t * sm, &ctx)) nat_log_notice ("in2out-ed key add failed"); + snat_ipfix_logging_nat44_ses_create (s->in2out.addr.as_u32, + s->out2in.addr.as_u32, + s->in2out.protocol, + 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, + &s->ext_host_nat_addr, s->ext_host_nat_port, + &s->out2in.addr, s->out2in.port, + &s->ext_host_addr, s->ext_host_port, + s->in2out.protocol, is_twice_nat_session (s)); + return s; } @@ -471,7 +493,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, clib_bihash_kv_16_8_t kv, value; snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index]; snat_session_t *s = 0; - u8 dont_translate = 0, is_addr_only; + u8 dont_translate = 0, is_addr_only, identity_nat; snat_session_key_t e_key, l_key; icmp = (icmp46_header_t *) ip4_next_header (ip); @@ -496,7 +518,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, e_key.protocol = ip_proto_to_snat_proto (key.proto); e_key.fib_index = rx_fib_index; if (snat_static_mapping_match - (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0)) + (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0, &identity_nat)) { if (!sm->forwarding_enabled) { @@ -533,6 +555,12 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, goto out; } + if (PREDICT_FALSE (identity_nat)) + { + dont_translate = 1; + goto out; + } + /* Create session initiated by host from external network */ s = create_session_for_static_mapping_ed (sm, b, l_key, e_key, node, thread_index, 0, 0, @@ -717,6 +745,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, snat_session_key_t e_key0, l_key0, e_key1, l_key1; lb_nat_type_t lb_nat0, lb_nat1; twice_nat_type_t twice_nat0, twice_nat1; + u8 identity_nat0, identity_nat1; /* Prefetch next iteration. */ { @@ -828,7 +857,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, e_key0.fib_index = rx_fib_index0; if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0, &twice_nat0, &lb_nat0, - &ip0->src_address)) + &ip0->src_address, + &identity_nat0)) { /* * Send DHCP packets to the ipv4 stack, or we won't @@ -864,6 +894,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, goto trace00; } + if (PREDICT_FALSE (identity_nat0)) + goto trace00; + + if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) + { + b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN]; + next0 = NAT44_ED_OUT2IN_NEXT_DROP; + goto trace00; + } + /* Create session initiated by host from external network */ s0 = create_session_for_static_mapping_ed (sm, b0, l_key0, e_key0, node, @@ -1046,7 +1086,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, e_key1.fib_index = rx_fib_index1; if (snat_static_mapping_match (sm, e_key1, &l_key1, 1, 0, &twice_nat1, &lb_nat1, - &ip1->src_address)) + &ip1->src_address, + &identity_nat1)) { /* * Send DHCP packets to the ipv4 stack, or we won't @@ -1082,6 +1123,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, goto trace01; } + if (PREDICT_FALSE (identity_nat1)) + goto trace01; + + if ((proto1 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp1)) + { + b1->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN]; + next1 = NAT44_ED_OUT2IN_NEXT_DROP; + goto trace01; + } + /* Create session initiated by host from external network */ s1 = create_session_for_static_mapping_ed (sm, b1, l_key1, e_key1, node, @@ -1202,6 +1253,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, snat_session_key_t e_key0, l_key0; lb_nat_type_t lb_nat0; twice_nat_type_t twice_nat0; + u8 identity_nat0; /* speculatively enqueue b0 to the current next frame */ bi0 = from[0]; @@ -1297,7 +1349,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, e_key0.fib_index = rx_fib_index0; if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0, &twice_nat0, &lb_nat0, - &ip0->src_address)) + &ip0->src_address, + &identity_nat0)) { /* * Send DHCP packets to the ipv4 stack, or we won't @@ -1333,6 +1386,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, goto trace0; } + if (PREDICT_FALSE (identity_nat0)) + goto trace0; + + if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) + { + b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN]; + next0 = NAT44_ED_OUT2IN_NEXT_DROP; + goto trace0; + } + /* Create session initiated by host from external network */ s0 = create_session_for_static_mapping_ed (sm, b0, l_key0, e_key0, node, @@ -1554,6 +1617,7 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm, snat_session_key_t e_key0, l_key0; lb_nat_type_t lb0; twice_nat_type_t twice_nat0; + u8 identity_nat0; /* speculatively enqueue b0 to the current next frame */ bi0 = from[0]; @@ -1634,7 +1698,8 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm, e_key0.protocol = proto0; e_key0.fib_index = rx_fib_index0; if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0, - &twice_nat0, &lb0, 0)) + &twice_nat0, &lb0, 0, + &identity_nat0)) { /* * Send DHCP packets to the ipv4 stack, or we won't @@ -1674,6 +1739,19 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm, goto trace0; } + if (PREDICT_FALSE (identity_nat0)) + { + reass0->flags |= NAT_REASS_FLAG_ED_DONT_TRANSLATE; + goto trace0; + } + + if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) + { + b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN]; + next0 = NAT44_ED_OUT2IN_NEXT_DROP; + goto trace0; + } + /* Create session initiated by host from external network */ s0 = create_session_for_static_mapping_ed (sm, b0, l_key0, e_key0, node, @@ -1816,17 +1894,16 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm, u32 len = vec_len (fragments_to_loopback); if (len <= VLIB_FRAME_SIZE) { - clib_memcpy (from, fragments_to_loopback, - sizeof (u32) * len); + clib_memcpy_fast (from, fragments_to_loopback, + sizeof (u32) * len); n_left_from = len; vec_reset_length (fragments_to_loopback); } else { - clib_memcpy (from, - fragments_to_loopback + (len - - VLIB_FRAME_SIZE), - sizeof (u32) * VLIB_FRAME_SIZE); + clib_memcpy_fast (from, fragments_to_loopback + + (len - VLIB_FRAME_SIZE), + sizeof (u32) * VLIB_FRAME_SIZE); n_left_from = VLIB_FRAME_SIZE; _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE; }