Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ikev2: do not send IDi on responder AUTH
[vpp.git]
/
src
/
plugins
/
dhcp
/
dhcp6_ia_na_client_dp.c
diff --git
a/src/plugins/dhcp/dhcp6_ia_na_client_dp.c
b/src/plugins/dhcp/dhcp6_ia_na_client_dp.c
index
8ad7d76
..
c240beb
100644
(file)
--- a/
src/plugins/dhcp/dhcp6_ia_na_client_dp.c
+++ b/
src/plugins/dhcp/dhcp6_ia_na_client_dp.c
@@
-20,7
+20,7
@@
#include <vnet/mfib/ip6_mfib.h>
#include <vnet/fib/fib.h>
#include <vnet/adj/adj_mcast.h>
#include <vnet/mfib/ip6_mfib.h>
#include <vnet/fib/fib.h>
#include <vnet/adj/adj_mcast.h>
-#include <vnet/ip/ip6_
neighbor
.h>
+#include <vnet/ip/ip6_
link
.h>
#include <dhcp/dhcp6_ia_na_client_dp.h>
#include <dhcp/dhcp6_client_common_dp.h>
#include <vnet/ip/ip_types_api.h>
#include <dhcp/dhcp6_ia_na_client_dp.h>
#include <dhcp/dhcp6_client_common_dp.h>
#include <vnet/ip/ip_types_api.h>
@@
-89,16
+89,16
@@
create_buffer_for_client_message (vlib_main_t * vm, u32 sw_if_index,
ip6_header_t *ip;
udp_header_t *udp;
dhcpv6_header_t *dhcp;
ip6_header_t *ip;
udp_header_t *udp;
dhcpv6_header_t *dhcp;
-
ip6_address_t
src_addr;
+
const ip6_address_t *
src_addr;
u32 dhcp_opt_len = 0;
client_state->transaction_start = vlib_time_now (vm);
u32 n_addresses;
u32 i;
/* Get a link-local address */
u32 dhcp_opt_len = 0;
client_state->transaction_start = vlib_time_now (vm);
u32 n_addresses;
u32 i;
/* Get a link-local address */
- src_addr = ip6_
neighbor_
get_link_local_address (sw_if_index);
+ src_addr = ip6_get_link_local_address (sw_if_index);
- if (src_addr
.
as_u8[0] != 0xfe)
+ if (src_addr
->
as_u8[0] != 0xfe)
{
clib_warning ("Could not find source address to send DHCPv6 packet");
return NULL;
{
clib_warning ("Could not find source address to send DHCPv6 packet");
return NULL;
@@
-123,7
+123,7
@@
create_buffer_for_client_message (vlib_main_t * vm, u32 sw_if_index,
udp = (udp_header_t *) (ip + 1);
dhcp = (dhcpv6_header_t *) (udp + 1);
udp = (udp_header_t *) (ip + 1);
dhcp = (dhcpv6_header_t *) (udp + 1);
- ip->src_address = src_addr;
+ ip->src_address =
*
src_addr;
ip->hop_limit = 255;
ip->ip_version_traffic_class_and_flow_label =
clib_host_to_net_u32 (0x6 << 28);
ip->hop_limit = 255;
ip->ip_version_traffic_class_and_flow_label =
clib_host_to_net_u32 (0x6 << 28);
@@
-258,6
+258,9
@@
check_send_client_message (vlib_main_t * vm,
next_index = ip6_rewrite_mcast_node.index;
c0 = vlib_buffer_copy (vm, p0);
next_index = ip6_rewrite_mcast_node.index;
c0 = vlib_buffer_copy (vm, p0);
+ if (c0 == NULL)
+ return client_state->keep_sending_client_message;
+
ci0 = vlib_get_buffer_index (vm, c0);
ip = (ip6_header_t *) vlib_buffer_get_current (c0);
ci0 = vlib_get_buffer_index (vm, c0);
ip = (ip6_header_t *) vlib_buffer_get_current (c0);