Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Protocol Independent IP Neighbors
[vpp.git]
/
src
/
vnet
/
ip
/
ip4.h
diff --git
a/src/vnet/ip/ip4.h
b/src/vnet/ip/ip4.h
index
31ca10f
..
a7e05a4
100644
(file)
--- a/
src/vnet/ip/ip4.h
+++ b/
src/vnet/ip/ip4.h
@@
-74,6
+74,15
@@
typedef struct
uword function_opaque;
} ip4_add_del_interface_address_callback_t;
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);
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
+138,10
@@
typedef struct ip4_main_t
ip4_add_del_interface_address_callback_t
* add_del_interface_address_callbacks;
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;
/** Functions to call when interface to table biding changes. */
ip4_table_bind_callback_t *table_bind_callbacks;
@@
-217,7
+230,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,
/* 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)
u32 sw_if_index,
ip_interface_address_t **
result_ia)
@@
-258,23
+271,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);
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);
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);
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;
serialize_function_t serialize_vnet_ip4_main, unserialize_vnet_ip4_main;
@@
-288,6
+293,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 (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
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
@@
-387,14
+395,14
@@
vlib_buffer_push_ip4 (vlib_main_t * vm, vlib_buffer_t * b,
ih->src_address.as_u32 = src->as_u32;
ih->dst_address.as_u32 = dst->as_u32;
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;
/* 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);
}
else
ih->checksum = ip4_header_checksum (ih);