X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_forward.c;h=252bdf975be695facf1602de442493ad165bc651;hb=e7eba48937c52478d3844745ebb63a4b9ce8d681;hp=74f51fa912fa40e74ca6916fb8885d9e33ed0543;hpb=3ce72b28cfb1b1ed2d1e0a5e3fb1b28a1f89845a;p=vpp.git diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index 74f51fa912f..252bdf975be 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -60,22 +60,53 @@ #define OI_DECAP 0x80000000 static void -ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index, - ip6_main_t * im, u32 fib_index, - ip_interface_address_t * a) +ip6_add_interface_prefix_routes (ip6_main_t * im, + u32 sw_if_index, + u32 fib_index, + ip6_address_t * address, u32 address_length) { ip_lookup_main_t *lm = &im->lookup_main; - ip6_address_t *address = ip_interface_address_get_address (lm, a); - fib_prefix_t pfx = { - .fp_len = a->address_length, - .fp_proto = FIB_PROTOCOL_IP6, - .fp_addr.ip6 = *address, + ip_interface_prefix_t *if_prefix; + + ip_interface_prefix_key_t key = { + .prefix = { + .fp_len = address_length, + .fp_proto = FIB_PROTOCOL_IP6, + .fp_addr.ip6 = { + .as_u64 = { + address->as_u64[0] & + im->fib_masks[address_length]. + as_u64[0], + address-> + as_u64[1] & + im->fib_masks[address_length]. + as_u64[1], + }, + }, + }, + .sw_if_index = sw_if_index, }; - if (a->address_length < 128) + /* If prefix already set on interface, just increment ref count & return */ + if_prefix = ip_get_interface_prefix (lm, &key); + if (if_prefix) { - fib_table_entry_update_one_path (fib_index, - &pfx, + if_prefix->ref_count += 1; + return; + } + + /* New prefix - allocate a pool entry, initialize it, add to the hash */ + pool_get (lm->if_prefix_pool, if_prefix); + if_prefix->ref_count = 1; + clib_memcpy (&if_prefix->key, &key, sizeof (key)); + mhash_set (&lm->prefix_to_if_prefix_index, &key, + if_prefix - lm->if_prefix_pool, 0 /* old value */ ); + + /* length < 128 - add glean */ + if (address_length < 128) + { + /* set the glean route for the prefix */ + fib_table_entry_update_one_path (fib_index, &key.prefix, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_ATTACHED), @@ -84,9 +115,27 @@ ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index, NULL, sw_if_index, /* invalid FIB index */ ~0, 1, - /* no label stack */ + /* no out-label stack */ NULL, FIB_ROUTE_PATH_FLAG_NONE); } +} + +static void +ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index, + ip6_main_t * im, u32 fib_index, + ip_interface_address_t * a) +{ + ip_lookup_main_t *lm = &im->lookup_main; + ip6_address_t *address = ip_interface_address_get_address (lm, a); + fib_prefix_t pfx = { + .fp_len = a->address_length, + .fp_proto = FIB_PROTOCOL_IP6, + .fp_addr.ip6 = *address, + }; + + /* set special routes for the prefix if needed */ + ip6_add_interface_prefix_routes (im, sw_if_index, fib_index, + address, a->address_length); pfx.fp_len = 128; if (sw_if_index < vec_len (lm->classify_table_index_by_sw_if_index)) @@ -121,23 +170,73 @@ ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index, } static void -ip6_del_interface_routes (ip6_main_t * im, +ip6_del_interface_prefix_routes (ip6_main_t * im, + u32 sw_if_index, + u32 fib_index, + ip6_address_t * address, u32 address_length) +{ + ip_lookup_main_t *lm = &im->lookup_main; + ip_interface_prefix_t *if_prefix; + + ip_interface_prefix_key_t key = { + .prefix = { + .fp_len = address_length, + .fp_proto = FIB_PROTOCOL_IP6, + .fp_addr.ip6 = { + .as_u64 = { + address->as_u64[0] & + im->fib_masks[address_length]. + as_u64[0], + address-> + as_u64[1] & + im->fib_masks[address_length]. + as_u64[1], + }, + }, + }, + .sw_if_index = sw_if_index, + }; + + if_prefix = ip_get_interface_prefix (lm, &key); + if (!if_prefix) + { + clib_warning ("Prefix not found while deleting %U", + format_ip4_address_and_length, address, address_length); + return; + } + + /* If not deleting last intf addr in prefix, decrement ref count & return */ + if_prefix->ref_count -= 1; + if (if_prefix->ref_count > 0) + return; + + /* length <= 30, delete glean route */ + if (address_length <= 128) + { + /* remove glean route for prefix */ + fib_table_entry_delete (fib_index, &key.prefix, FIB_SOURCE_INTERFACE); + + } + + mhash_unset (&lm->prefix_to_if_prefix_index, &key, 0 /* old_value */ ); + pool_put (lm->if_prefix_pool, if_prefix); +} + +static void +ip6_del_interface_routes (u32 sw_if_index, ip6_main_t * im, u32 fib_index, ip6_address_t * address, u32 address_length) { fib_prefix_t pfx = { - .fp_len = address_length, + .fp_len = 128, .fp_proto = FIB_PROTOCOL_IP6, .fp_addr.ip6 = *address, }; - if (pfx.fp_len < 128) - { - fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE); + /* delete special routes for the prefix if needed */ + ip6_del_interface_prefix_routes (im, sw_if_index, fib_index, + address, address_length); - } - - pfx.fp_len = 128; fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE); } @@ -278,6 +377,13 @@ ip6_add_del_interface_address (vlib_main_t * vm, address, address_length)) { + /* an intf may have >1 addr from the same prefix */ + if ((sw_if_index == sif->sw_if_index) && + (ia->address_length == address_length) && + !ip6_address_is_equal (x, address)) + continue; + + /* error if the length or intf was different */ vnm->api_errno = VNET_API_ERROR_DUPLICATE_IF_ADDRESS; return clib_error_create @@ -311,7 +417,8 @@ ip6_add_del_interface_address (vlib_main_t * vm, ip6_sw_interface_enable_disable (sw_if_index, !is_del); if (is_del) - ip6_del_interface_routes (im, ip6_af.fib_index, address, address_length); + ip6_del_interface_routes (sw_if_index, + im, ip6_af.fib_index, address, address_length); else ip6_add_interface_routes (vnm, sw_if_index, im, ip6_af.fib_index, @@ -361,7 +468,7 @@ ip6_sw_interface_admin_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags) im, fib_index, ia); else - ip6_del_interface_routes (im, fib_index, + ip6_del_interface_routes (sw_if_index, im, fib_index, a, ia->address_length); })); /* *INDENT-ON* */ @@ -952,10 +1059,18 @@ ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, } n_bytes_left = n_this_buffer = payload_length_host_byte_order; - if (p0 && n_this_buffer + headers_size > p0->current_length) - n_this_buffer = - p0->current_length > - headers_size ? p0->current_length - headers_size : 0; + + if (p0) + { + u32 n_ip_bytes_this_buffer = + p0->current_length - (((u8 *) ip0 - p0->data) - p0->current_data); + if (n_this_buffer + headers_size > n_ip_bytes_this_buffer) + { + n_this_buffer = p0->current_length > headers_size ? + n_ip_bytes_this_buffer - headers_size : 0; + } + } + while (1) { sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer); @@ -1025,7 +1140,7 @@ ip6_urpf_loose_check (ip6_main_t * im, vlib_buffer_t * b, ip6_header_t * i) (vnet_buffer (b)->sw_if_index[VLIB_TX] == (u32) ~ 0) ? fib_index : vnet_buffer (b)->sw_if_index[VLIB_TX]; - lbi = ip6_fib_table_fwding_lookup (im, fib_index, &i->src_address); + lbi = ip6_fib_table_fwding_lookup (fib_index, &i->src_address); lb0 = load_balance_get (lbi); return (fib_urpf_check_size (lb0->lb_urpf)); @@ -1433,6 +1548,16 @@ ip6_register_protocol (u32 protocol, u32 node_index) vlib_node_add_next (vm, ip6_local_node.index, node_index); } +void +ip6_unregister_protocol (u32 protocol) +{ + ip6_main_t *im = &ip6_main; + ip_lookup_main_t *lm = &im->lookup_main; + + ASSERT (protocol < ARRAY_LEN (lm->local_next_by_ip_protocol)); + lm->local_next_by_ip_protocol[protocol] = IP_LOCAL_NEXT_PUNT; +} + clib_error_t * ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst, u32 sw_if_index, u8 refresh)