commit 282872127bbeee6ae59ab3f885c09bad601ee0cc
author Neale Ranns <nranns@cisco.com> Mon Dec 16 00:53:11 2019 +0000
committer Damjan Marion <dmarion@me.com> Fri Feb 21 09:54:19 2020 +0000
tree 4f1ef8243b194ca8bf6f1acd62ba4a7d688d371e
parent d057625d499525625d60d2207665eaeb755e380e

ipsec: IPSec protection for multi-point tunnel interfaces

Type: feature

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: Iaba2ab11bfaa1c8db4023434e3043ac39500f938

src/vnet/lisp-gpe/lisp_gpe_adjacency.c

diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
index ffd21a8..8efb972 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
@@ -159,7 +159,7 @@
   fib_protocol_t nh_proto;
   ip46_address_t nh;
 
-  ip_address_to_46 (&ladj->remote_rloc, &nh, &nh_proto);
+  nh_proto = ip_address_to_46 (&ladj->remote_rloc, &nh);
 
   /*
    * walk all the adjacencies on th lisp interface and restack them

src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c

diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
index 4524695..d31fdd7 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
@@ -247,7 +247,7 @@
 
     ladj = lisp_gpe_adjacency_get (paths[ii].lisp_adj);
 
-    ip_address_to_46 (&ladj->remote_rloc, &rpaths[ii].frp_addr, &fp);
+    fp = ip_address_to_46 (&ladj->remote_rloc, &rpaths[ii].frp_addr);
 
     rpaths[ii].frp_proto = fib_proto_to_dpo (fp);
     rpaths[ii].frp_sw_if_index = ladj->sw_if_index;