return 0;
fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
+ nat_outside_fib_t *outside_fib;
fib_prefix_t pfx = {
.fp_proto = FIB_PROTOCOL_IP4,
.fp_len = 32,
u32 sw_if_index = fib_entry_get_resolving_interface (fei);
if (sw_if_index == ~0)
{
- fei = fib_table_lookup (sm->outside_fib_index, &pfx);
- if (FIB_NODE_INDEX_INVALID != fei)
- sw_if_index = fib_entry_get_resolving_interface (fei);
+ vec_foreach (outside_fib, sm->outside_fibs)
+ {
+ fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+ if (FIB_NODE_INDEX_INVALID != fei)
+ {
+ sw_if_index = fib_entry_get_resolving_interface (fei);
+ if (sw_if_index != ~0)
+ break;
+ }
+ }
}
+ if (sw_if_index == ~0)
+ return 1;
+
snat_interface_t *i;
pool_foreach (i, sm->interfaces,
({
key0.addr = ip0->src_address;
key0.port = src_port;
key0.protocol = proto0;
- key0.fib_index = sm->outside_fib_index;
+ key0.fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
kv0.key = key0.as_u64;
if (!clib_bihash_search_8_8 (&sm->per_thread_data[thread_index].out2in, &kv0,
key0.addr = ip0->dst_address;
key0.port = dst_port;
key0.protocol = proto0;
- key0.fib_index = sm->inside_fib_index;
kv0.key = key0.as_u64;
if (!clib_bihash_search_8_8 (&sm->per_thread_data[thread_index].in2out, &kv0,
&value0))
clib_bihash_kv_8_8_t kv0;
snat_session_key_t key1;
u32 address_index = ~0;
- u32 outside_fib_index;
- uword * p;
udp_header_t * udp0 = ip4_next_header (ip0);
u8 is_sm = 0;
+ nat_outside_fib_t *outside_fib;
+ fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
+ fib_prefix_t pfx = {
+ .fp_proto = FIB_PROTOCOL_IP4,
+ .fp_len = 32,
+ .fp_addr = {
+ .ip4.as_u32 = ip0->dst_address.as_u32,
+ },
+ };
if (PREDICT_FALSE (maximum_sessions_exceeded(sm, thread_index)))
{
return SNAT_IN2OUT_NEXT_DROP;
}
- p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->outside_vrf_id);
- if (! p)
- {
- b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_OUTSIDE_FIB];
- return SNAT_IN2OUT_NEXT_DROP;
- }
- outside_fib_index = p[0];
-
key1.protocol = key0->protocol;
u = nat_user_get_or_create (sm, &ip0->src_address, rx_fib_index0,
s->in2out = *key0;
s->out2in = key1;
s->out2in.protocol = key0->protocol;
- s->out2in.fib_index = outside_fib_index;
+ s->out2in.fib_index = sm->outside_fib_index;
+ switch (vec_len (sm->outside_fibs))
+ {
+ case 0:
+ s->out2in.fib_index = sm->outside_fib_index;
+ break;
+ case 1:
+ s->out2in.fib_index = sm->outside_fibs[0].fib_index;
+ break;
+ default:
+ vec_foreach (outside_fib, sm->outside_fibs)
+ {
+ fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+ if (FIB_NODE_INDEX_INVALID != fei)
+ {
+ if (fib_entry_get_resolving_interface (fei) != ~0)
+ {
+ s->out2in.fib_index = outside_fib->fib_index;
+ break;
+ }
+ }
+ }
+ break;
+ }
s->ext_host_addr.as_u32 = ip0->dst_address.as_u32;
s->ext_host_port = udp0->dst_port;
*sessionp = s;
u32 old_addr, new_addr;
ip_csum_t sum;
- make_sm_kv (&kv, &ip->dst_address, 0, sm->outside_fib_index, 0);
+ make_sm_kv (&kv, &ip->dst_address, 0, 0, 0);
if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
return;
/* Hairpinning */
if (vnet_buffer(b)->sw_if_index[VLIB_TX] == ~0)
{
+ vnet_buffer(b)->sw_if_index[VLIB_TX] = m->fib_index;
nat_hairpinning_sm_unknown_proto (sm, b, ip);
- vnet_buffer(b)->sw_if_index[VLIB_TX] = sm->outside_fib_index;
}
return 0;
snat_main_t * sm = &snat_main;
f64 now = vlib_time_now (vm);
u32 stats_node_index;
- u32 thread_index = vlib_get_thread_index ();
+ u32 thread_index = vm->thread_index;
stats_node_index = is_slow_path ? snat_in2out_slowpath_node.index :
snat_in2out_node.index;
u32 pkts_processed = 0;
snat_main_t *sm = &snat_main;
f64 now = vlib_time_now (vm);
- u32 thread_index = vlib_get_thread_index ();
+ u32 thread_index = vm->thread_index;
snat_main_per_thread_data_t *per_thread_data =
&sm->per_thread_data[thread_index];
u32 *fragments_to_drop = 0;
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
nat_ed_ses_key_t *key = (nat_ed_ses_key_t *) kv->key;
u32 proto = ip_proto_to_snat_proto (key->proto);
+ nat_outside_fib_t *outside_fib;
+ fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
+ fib_prefix_t pfx = {
+ .fp_proto = FIB_PROTOCOL_IP4,
+ .fp_len = 32,
+ .fp_addr = {
+ .ip4.as_u32 = key->r_addr.as_u32,
+ },
+ };
if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
{
s->out2in = key1;
s->out2in.protocol = key0.protocol;
+ switch (vec_len (sm->outside_fibs))
+ {
+ case 0:
+ s->out2in.fib_index = sm->outside_fib_index;
+ break;
+ case 1:
+ s->out2in.fib_index = sm->outside_fibs[0].fib_index;
+ break;
+ default:
+ vec_foreach (outside_fib, sm->outside_fibs)
+ {
+ fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+ if (FIB_NODE_INDEX_INVALID != fei)
+ {
+ if (fib_entry_get_resolving_interface (fei) != ~0)
+ {
+ s->out2in.fib_index = outside_fib->fib_index;
+ break;
+ }
+ }
+ }
+ break;
+ }
+
/* Add to lookup tables */
kv->value = s - tsm->sessions;
if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, kv, 1))
nat_log_notice ("in2out-ed key add failed");
- make_ed_kv (kv, &key1.addr, &key->r_addr, key->proto, key1.fib_index,
+ make_ed_kv (kv, &key1.addr, &key->r_addr, key->proto, s->out2in.fib_index,
key1.port, key->r_port);
kv->value = s - tsm->sessions;
if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, kv, 1))
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
snat_interface_t *i;
snat_session_t *s;
+ u32 fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
/* src NAT check */
- make_ed_kv (&kv, &ip->src_address, &ip->dst_address, proto,
- sm->outside_fib_index, src_port, dst_port);
+ make_ed_kv (&kv, &ip->src_address, &ip->dst_address, proto, fib_index,
+ src_port, dst_port);
if (!clib_bihash_search_16_8 (&tsm->out2in_ed, &kv, &value))
return 1;
/* dst NAT check */
- make_ed_kv (&kv, &ip->dst_address, &ip->src_address, proto,
- sm->inside_fib_index, dst_port, src_port);
+ make_ed_kv (&kv, &ip->dst_address, &ip->src_address, proto, fib_index,
+ dst_port, src_port);
if (!clib_bihash_search_16_8 (&tsm->in2out_ed, &kv, &value))
{
s = pool_elt_at_index (tsm->sessions, value.value);
sm->outside_fib_index, 0, 0);
if (clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value))
{
- make_sm_kv (&kv, &ip->dst_address, 0, sm->outside_fib_index, 0);
+ make_sm_kv (&kv, &ip->dst_address, 0, 0, 0);
if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
return;
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
u32 elt_index, head_index, ses_index;
snat_session_t * s;
- u32 address_index = ~0;
+ u32 address_index = ~0, outside_fib_index = sm->outside_fib_index;
int i;
u8 is_sm = 0;
+ nat_outside_fib_t *outside_fib;
+ fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
+ fib_prefix_t pfx = {
+ .fp_proto = FIB_PROTOCOL_IP4,
+ .fp_len = 32,
+ .fp_addr = {
+ .ip4.as_u32 = ip->dst_address.as_u32,
+ },
+ };
+ switch (vec_len (sm->outside_fibs))
+ {
+ case 0:
+ outside_fib_index = sm->outside_fib_index;
+ break;
+ case 1:
+ outside_fib_index = sm->outside_fibs[0].fib_index;
+ break;
+ default:
+ vec_foreach (outside_fib, sm->outside_fibs)
+ {
+ fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+ if (FIB_NODE_INDEX_INVALID != fei)
+ {
+ if (fib_entry_get_resolving_interface (fei) != ~0)
+ {
+ outside_fib_index = outside_fib->fib_index;
+ break;
+ }
+ }
+ }
+ break;
+ }
old_addr = ip->src_address.as_u32;
make_ed_kv (&s_kv, &ip->src_address, &ip->dst_address, ip->protocol,
address_index = s->outside_address_index;
make_ed_kv (&s_kv, &s->out2in.addr, &ip->dst_address,
- ip->protocol, sm->outside_fib_index, 0, 0);
+ ip->protocol, outside_fib_index, 0, 0);
if (clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value))
goto create_ses;
for (i = 0; i < vec_len (sm->addresses); i++)
{
make_ed_kv (&s_kv, &sm->addresses[i].addr, &ip->dst_address,
- ip->protocol, sm->outside_fib_index, 0, 0);
+ ip->protocol, outside_fib_index, 0, 0);
if (clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value))
{
new_addr = ip->src_address.as_u32 =
s->flags |= SNAT_SESSION_FLAG_ENDPOINT_DEPENDENT;
s->outside_address_index = address_index;
s->out2in.addr.as_u32 = new_addr;
- s->out2in.fib_index = sm->outside_fib_index;
+ s->out2in.fib_index = outside_fib_index;
s->in2out.addr.as_u32 = old_addr;
s->in2out.fib_index = rx_fib_index;
s->in2out.port = s->out2in.port = ip->protocol;
nat_log_notice ("in2out key add failed");
make_ed_kv (&s_kv, &s->out2in.addr, &ip->dst_address, ip->protocol,
- sm->outside_fib_index, 0, 0);
+ outside_fib_index, 0, 0);
s_kv.value = s - tsm->sessions;
if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &s_kv, 1))
nat_log_notice ("out2in key add failed");
nat44_ed_hairpinning_unknown_proto(sm, b, ip);
if (vnet_buffer(b)->sw_if_index[VLIB_TX] == ~0)
- vnet_buffer(b)->sw_if_index[VLIB_TX] = sm->outside_fib_index;
+ vnet_buffer(b)->sw_if_index[VLIB_TX] = outside_fib_index;
return s;
}
snat_in2out_next_t next_index;
snat_main_t *sm = &snat_main;
f64 now = vlib_time_now (vm);
- u32 thread_index = vlib_get_thread_index ();
+ u32 thread_index = vm->thread_index;
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
stats_node_index = is_slow_path ? nat44_ed_in2out_slowpath_node.index :
u32 pkts_processed = 0;
snat_main_t * sm = &snat_main;
u32 now = (u32) vlib_time_now (vm);
- u32 thread_index = vlib_get_thread_index ();
+ u32 thread_index = vm->thread_index;
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
u32 n_left_to_next_worker = 0, *to_next_worker = 0;
u32 next_worker_index = 0;
u32 current_worker_index = ~0;
- u32 thread_index = vlib_get_thread_index ();
+ u32 thread_index = vm->thread_index;
u32 fq_index;
u32 to_node_index;
vlib_frame_t *d = 0;
}
m_key.addr.as_u32 = dst_addr->as_u32;
- m_key.fib_index = sm->outside_fib_index;
+ m_key.fib_index = 0;
m_key.port = 0;
m_key.protocol = 0;
kv.key = m_key.as_u64;
Code Review / vpp.git / blobdiff