Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Pipes
[vpp.git]
/
src
/
vnet
/
ip
/
ip6_neighbor.c
diff --git
a/src/vnet/ip/ip6_neighbor.c
b/src/vnet/ip/ip6_neighbor.c
index
fe78eae
..
87bda43
100644
(file)
--- a/
src/vnet/ip/ip6_neighbor.c
+++ b/
src/vnet/ip/ip6_neighbor.c
@@
-466,6
+466,8
@@
ip6_nbr_probe (ip_adjacency_t * adj)
h = vlib_packet_template_get_packet (vm,
&im->discover_neighbor_packet_template,
&bi);
h = vlib_packet_template_get_packet (vm,
&im->discover_neighbor_packet_template,
&bi);
+ if (!h)
+ return;
hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
@@
-2633,10
+2635,6
@@
ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
{
if (is_add)
{
{
if (is_add)
{
- vnet_hw_interface_t *hw_if0;
-
- hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
pool_get (nm->if_radv_pool, a);
ri = a - nm->if_radv_pool;
pool_get (nm->if_radv_pool, a);
ri = a - nm->if_radv_pool;
@@
-2670,7
+2668,8
@@
ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
a->send_radv = 1;
/* fill in radv_info for this interface that will be needed later */
a->send_radv = 1;
/* fill in radv_info for this interface that will be needed later */
- a->adv_link_mtu = hw_if0->max_l3_packet_bytes[VLIB_RX];
+ a->adv_link_mtu =
+ vnet_sw_interface_get_mtu (vnm, sw_if_index, VNET_MTU_IP6);
clib_memcpy (a->link_layer_address, eth_if0->address, 6);
clib_memcpy (a->link_layer_address, eth_if0->address, 6);
@@
-3288,6
+3287,8
@@
ip6_discover_neighbor_inline (vlib_main_t * vm,
h0 = vlib_packet_template_get_packet
(vm, &im->discover_neighbor_packet_template, &bi0);
h0 = vlib_packet_template_get_packet
(vm, &im->discover_neighbor_packet_template, &bi0);
+ if (!h0)
+ continue;
/*
* Build ethernet header.
/*
* Build ethernet header.
@@
-4189,6
+4190,7
@@
enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
+ sw_if0->type == VNET_SW_INTERFACE_TYPE_PIPE ||
sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
{
/* make up an interface id */
sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
{
/* make up an interface id */
@@
-5040,6
+5042,9
@@
send_ip6_na_w_addr (vlib_main_t * vm,
vlib_packet_template_get_packet (vm,
&i6m->discover_neighbor_packet_template,
&bi);
vlib_packet_template_get_packet (vm,
&i6m->discover_neighbor_packet_template,
&bi);
+ if (!h)
+ return;
+
ip6_set_reserved_multicast_address (&h->ip.dst_address,
IP6_MULTICAST_SCOPE_link_local,
IP6_MULTICAST_GROUP_ID_all_hosts);
ip6_set_reserved_multicast_address (&h->ip.dst_address,
IP6_MULTICAST_SCOPE_link_local,
IP6_MULTICAST_GROUP_ID_all_hosts);