X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4.h;h=b5bc2e2c33ff9f3552403a7e42d5d0e5c997dc5a;hb=59f71132edffcfa1b94c400736575bd55bdbd7d7;hp=9cb54bdfc418627567acd92907d2276476374ba2;hpb=c8352bc43dfa02707e8806e1ae5b310bbdb4d302;p=vpp.git diff --git a/src/vnet/ip/ip4.h b/src/vnet/ip/ip4.h index 9cb54bdfc41..b5bc2e2c33f 100644 --- a/src/vnet/ip/ip4.h +++ b/src/vnet/ip/ip4.h @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -74,6 +75,15 @@ typedef struct uword function_opaque; } ip4_add_del_interface_address_callback_t; +typedef void (ip4_enable_disable_interface_function_t) + (struct ip4_main_t * im, uword opaque, u32 sw_if_index, u32 is_enable); + +typedef struct +{ + ip4_enable_disable_interface_function_t *function; + uword function_opaque; +} ip4_enable_disable_interface_callback_t; + typedef void (ip4_table_bind_function_t) (struct ip4_main_t * im, uword opaque, u32 sw_if_index, u32 new_fib_index, u32 old_fib_index); @@ -129,6 +139,10 @@ typedef struct ip4_main_t ip4_add_del_interface_address_callback_t * add_del_interface_address_callbacks; + /** Functions to call when interface becomes IPv4 enabled/disable. */ + ip4_enable_disable_interface_callback_t + * enable_disable_interface_callbacks; + /** Functions to call when interface to table biding changes. */ ip4_table_bind_callback_t *table_bind_callbacks; @@ -165,6 +179,7 @@ typedef struct ip4_main_t /** Global ip4 main structure. */ extern ip4_main_t ip4_main; +extern char *ip4_error_strings[]; /** Global ip4 input node. Errors get attached to ip4 input node. */ extern vlib_node_registration_t ip4_input_node; @@ -176,6 +191,7 @@ extern vlib_node_registration_t ip4_rewrite_local_node; extern vlib_node_registration_t ip4_arp_node; extern vlib_node_registration_t ip4_glean_node; extern vlib_node_registration_t ip4_midchain_node; +extern vlib_node_registration_t ip4_punt_node; always_inline uword ip4_destination_matches_route (const ip4_main_t * im, @@ -217,7 +233,7 @@ ip4_src_address_for_packet (ip_lookup_main_t * lm, /* Find interface address which matches destination. */ always_inline ip4_address_t * ip4_interface_address_matching_destination (ip4_main_t * im, - ip4_address_t * dst, + const ip4_address_t * dst, u32 sw_if_index, ip_interface_address_t ** result_ia) @@ -258,23 +274,15 @@ void ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable); int ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2); -/* Send an ARP request to see if given destination is reachable on given interface. */ -clib_error_t *ip4_probe_neighbor (vlib_main_t * vm, ip4_address_t * dst, - u32 sw_if_index, u8 refresh); - -clib_error_t *ip4_set_arp_limit (u32 arp_limit); - uword ip4_udp_register_listener (vlib_main_t * vm, u16 dst_port, u32 next_node_index); -void -ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type, u32 node_index); - u16 ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, ip4_header_t * ip0); void ip4_register_protocol (u32 protocol, u32 node_index); +void ip4_unregister_protocol (u32 protocolx); serialize_function_t serialize_vnet_ip4_main, unserialize_vnet_ip4_main; @@ -288,6 +296,9 @@ void ip4_punt_policer_add_del (u8 is_add, u32 policer_index); void ip4_punt_redirect_add (u32 rx_sw_if_index, u32 tx_sw_if_index, ip46_address_t * nh); +void ip4_punt_redirect_add_paths (u32 rx_sw_if_index, + fib_route_path_t * paths); + void ip4_punt_redirect_del (u32 rx_sw_if_index); /* Compute flow hash. We'll use it to select which adjacency to use for this @@ -308,7 +319,6 @@ ip4_compute_flow_hash (const ip4_header_t * ip, a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1; b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2; - b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0; t1 = is_tcp_udp ? tcp->src : 0; t2 = is_tcp_udp ? tcp->dst : 0; @@ -316,6 +326,23 @@ ip4_compute_flow_hash (const ip4_header_t * ip, t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0; t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0; + if (flow_hash_config & IP_FLOW_HASH_SYMMETRIC) + { + if (b < a) + { + c = a; + a = b; + b = c; + } + if (t2 < t1) + { + t2 += t1; + t1 = t2 - t1; + t2 = t2 - t1; + } + } + + b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0; c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? (t1 << 16) | t2 : (t2 << 16) | t1; @@ -337,23 +364,10 @@ u32 ip4_tcp_udp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0); #define IP_DF 0x4000 /* don't fragment */ -/** - * Push IPv4 header to buffer - * - * This does not support fragmentation. - * - * @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_ip4 (vlib_main_t * vm, vlib_buffer_t * b, - ip4_address_t * src, ip4_address_t * dst, int proto, - u8 csum_offload) +vlib_buffer_push_ip4_custom (vlib_main_t * vm, vlib_buffer_t * b, + ip4_address_t * src, ip4_address_t * dst, + int proto, u8 csum_offload, u8 is_df) { ip4_header_t *ih; @@ -365,26 +379,58 @@ vlib_buffer_push_ip4 (vlib_main_t * vm, vlib_buffer_t * b, ih->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b)); /* No fragments */ - ih->flags_and_fragment_offset = clib_host_to_net_u16 (IP_DF); + ih->flags_and_fragment_offset = is_df ? clib_host_to_net_u16 (IP_DF) : 0; ih->ttl = 255; ih->protocol = proto; ih->src_address.as_u32 = src->as_u32; ih->dst_address.as_u32 = dst->as_u32; + vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data; + b->flags |= VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_L3_HDR_OFFSET_VALID; + /* Offload ip4 header checksum generation */ if (csum_offload) { ih->checksum = 0; - b->flags |= VNET_BUFFER_F_OFFLOAD_IP_CKSUM | VNET_BUFFER_F_IS_IP4; - vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data; - vnet_buffer (b)->l4_hdr_offset = vnet_buffer (b)->l3_hdr_offset + - sizeof (*ih); + b->flags |= VNET_BUFFER_F_OFFLOAD_IP_CKSUM; } else ih->checksum = ip4_header_checksum (ih); return ih; } + +/** + * Push IPv4 header to buffer + * + * This does not support fragmentation. + * + * @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_ip4 (vlib_main_t * vm, vlib_buffer_t * b, + ip4_address_t * src, ip4_address_t * dst, int proto, + u8 csum_offload) +{ + return vlib_buffer_push_ip4_custom (vm, b, src, dst, proto, csum_offload, + 1 /* is_df */ ); +} + +always_inline u32 +vlib_buffer_get_ip4_fib_index (vlib_buffer_t * b) +{ + u32 fib_index, sw_if_index; + sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX]; + fib_index = vnet_buffer (b)->sw_if_index[VLIB_TX]; + return (fib_index == (u32) ~ 0) ? + vec_elt (ip4_main.fib_index_by_sw_if_index, sw_if_index) : fib_index; +} #endif /* included_ip_ip4_h */ /*