X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6.h;h=575c6a0eec5251ac7777ba4a3872a307a1dd04c7;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=810fd70ff0c037ad949d10eb81e300d99bec7d31;hpb=33af8c1ed89f15cf0601ee891e9603bef16f2c93;p=vpp.git diff --git a/src/vnet/ip/ip6.h b/src/vnet/ip/ip6.h index 810fd70ff0c..575c6a0eec5 100644 --- a/src/vnet/ip/ip6.h +++ b/src/vnet/ip/ip6.h @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -217,9 +218,6 @@ typedef struct ip6_main_t /** Functions to call when interface to table biding changes. */ ip6_table_bind_callback_t *table_bind_callbacks; - /* Template used to generate IP6 neighbor solicitation packets. */ - vlib_packet_template_t discover_neighbor_packet_template; - /* ip6 lookup table config parameters */ u32 lookup_table_nbuckets; uword lookup_table_size; @@ -302,42 +300,10 @@ ip6_unaligned_destination_matches_route (ip6_main_t * im, return 1; } -extern int ip6_get_ll_address (u32 sw_if_index, ip6_address_t * addr); - -always_inline int -ip6_src_address_for_packet (ip_lookup_main_t * lm, - u32 sw_if_index, - const ip6_address_t * dst, ip6_address_t * src) -{ - if (ip6_address_is_link_local_unicast (dst)) - { - return ip6_get_ll_address (sw_if_index, src); - } - else - { - u32 if_add_index = - lm->if_address_pool_index_by_sw_if_index[sw_if_index]; - if (PREDICT_TRUE (if_add_index != ~0)) - { - ip_interface_address_t *if_add = - pool_elt_at_index (lm->if_address_pool, if_add_index); - ip6_address_t *if_ip = - ip_interface_address_get_address (lm, if_add); - *src = *if_ip; - return (!0); - } - } - - src->as_u64[0] = 0; - src->as_u64[1] = 0; - - return (0); -} - /* Find interface address which matches destination. */ always_inline ip6_address_t * ip6_interface_address_matching_destination (ip6_main_t * im, - ip6_address_t * dst, + const ip6_address_t * dst, u32 sw_if_index, ip_interface_address_t ** result_ia) @@ -376,9 +342,6 @@ ip6_address_t *ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index); int ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2); -clib_error_t *ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst, - u32 sw_if_index, u8 refresh); - uword ip6_udp_register_listener (vlib_main_t * vm, u16 dst_port, u32 next_node_index); @@ -393,74 +356,9 @@ void ip6_local_hop_by_hop_register_protocol (u32 protocol, u32 node_index); serialize_function_t serialize_vnet_ip6_main, unserialize_vnet_ip6_main; -void ip6_ethernet_update_adjacency (vnet_main_t * vnm, - u32 sw_if_index, u32 ai); - -always_inline void -ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip, - u8 * mac) -{ - ip->as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL); - /* Invert the "u" bit */ - ip->as_u8[8] = mac[0] ^ (1 << 1); - ip->as_u8[9] = mac[1]; - ip->as_u8[10] = mac[2]; - ip->as_u8[11] = 0xFF; - ip->as_u8[12] = 0xFE; - ip->as_u8[13] = mac[3]; - ip->as_u8[14] = mac[4]; - ip->as_u8[15] = mac[5]; -} - -always_inline void -ip6_ethernet_mac_address_from_link_local_address (u8 * mac, - ip6_address_t * ip) -{ - /* Invert the previously inverted "u" bit */ - mac[0] = ip->as_u8[8] ^ (1 << 1); - mac[1] = ip->as_u8[9]; - mac[2] = ip->as_u8[10]; - mac[3] = ip->as_u8[13]; - mac[4] = ip->as_u8[14]; - mac[5] = ip->as_u8[15]; -} - int vnet_set_ip6_flow_hash (u32 table_id, flow_hash_config_t flow_hash_config); -clib_error_t *enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index); - -clib_error_t *disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index); - -int ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index); - -clib_error_t *set_ip6_link_local_address (vlib_main_t * vm, - u32 sw_if_index, - ip6_address_t * address); - -typedef int (*ip6_nd_change_event_cb_t) (u32 pool_index, - const mac_address_t * new_mac, - u32 sw_if_index, - const ip6_address_t * address); - -int vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm, - ip6_nd_change_event_cb_t data_callback, - u32 pid, - void *address_arg, - uword node_index, - uword type_opaque, - uword data, int is_add); - -int vnet_ip6_nd_term (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_buffer_t * p0, - ethernet_header_t * eth, - ip6_header_t * ip, u32 sw_if_index, u16 bd_index); - -void send_ip6_na (vlib_main_t * vm, u32 sw_if_index); -void send_ip6_na_w_addr (vlib_main_t * vm, - const ip6_address_t * addr, u32 sw_if_index); - u8 *format_ip6_forward_next_trace (u8 * s, va_list * args); u32 ip6_tcp_udp_icmp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0); @@ -655,21 +553,23 @@ void ip6_hbh_set_next_override (uword next); * @param src - source IP * @param dst - destination IP * @param prot - payload proto + * @param flow_label - flow label * * @return - pointer to start of IP header */ always_inline void * -vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, - ip6_address_t * src, ip6_address_t * dst, int proto) +vlib_buffer_push_ip6_custom (vlib_main_t * vm, vlib_buffer_t * b, + ip6_address_t * src, ip6_address_t * dst, + int proto, u32 flow_label) { ip6_header_t *ip6h; u16 payload_length; /* make some room */ ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t)); - + ASSERT (flow_label < 1 << 20); ip6h->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (0x6 << 28); + clib_host_to_net_u32 ((0x6 << 28) | flow_label); /* calculate ip6 payload length */ payload_length = vlib_buffer_length_in_chain (vm, b); @@ -683,11 +583,31 @@ vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, sizeof (ip6h->src_address)); clib_memcpy_fast (ip6h->dst_address.as_u8, dst->as_u8, sizeof (ip6h->src_address)); - b->flags |= VNET_BUFFER_F_IS_IP6; + vnet_buffer (b)->l3_hdr_offset = (u8 *) ip6h - b->data; + b->flags |= VNET_BUFFER_F_IS_IP6 | VNET_BUFFER_F_L3_HDR_OFFSET_VALID; return ip6h; } +/** + * Push IPv6 header to buffer + * + * @param vm - vlib_main + * @param b - buffer to write the header to + * @param src - source IP + * @param dst - destination IP + * @param prot - payload proto + * + * @return - pointer to start of IP header + */ +always_inline void * +vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, + ip6_address_t * src, ip6_address_t * dst, int proto) +{ + return vlib_buffer_push_ip6_custom (vm, b, src, dst, proto, + 0 /* flow label */ ); + +} #endif /* included_ip_ip6_h */ /*