From c2787a42ffb40c667941723bb847d7ac64e19109 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 6 Sep 2016 16:29:34 +0200 Subject: VPP-386 Fix map-server output in lisp-cp-lookup trace Change-Id: I67dd7896932b8ea96062b9ff074959c172b51ba4 Signed-off-by: Florin Coras (cherry picked from commit 5a1c11b53f60f4339e893b1a24cfc6515d2b08f7) --- vnet/vnet/lisp-cp/control.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c index c4b0fe1cce4..dfa5cf29571 100644 --- a/vnet/vnet/lisp-cp/control.c +++ b/vnet/vnet/lisp-cp/control.c @@ -3018,12 +3018,8 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node, memset (tr, 0, sizeof (*tr)); gid_address_copy (&tr->dst_eid, &dst); - if (vec_len (lcm->map_resolvers) > 0) - { - clib_memcpy (&tr->map_resolver_ip, - vec_elt_at_index (lcm->map_resolvers, 0), - sizeof (ip_address_t)); - } + ip_address_copy (&tr->map_resolver_ip, + &lcm->active_map_resolver); } gid_address_free (&dst); gid_address_free (&src); @@ -3342,6 +3338,7 @@ lisp_cp_init (vlib_main_t * vm) lcm->vnet_main = vnet_get_main (); lcm->mreq_itr_rlocs = ~0; lcm->lisp_pitr = 0; + memset (&lcm->active_map_resolver, 0, sizeof (lcm->active_map_resolver)); lcm->pending_map_request_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES); -- cgit 1.2.3-korg