X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-cp%2Fcontrol.c;h=4dc6836ae7e234c055cb8c70d56e3d2a774ab09f;hb=67ec589d231cd27261ccf2265ee8627cfce0fa00;hp=78750b962dfb252bd2bea6f332f43d1f13e70e7f;hpb=f50bac1bb25b02d7f086627c4c0a0709ee0f61d5;p=vpp.git

diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index 78750b962df..4dc6836ae7e 100644
--- a/src/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
@@ -134,14 +134,17 @@ ip_address_to_fib_prefix (const ip_address_t * addr, fib_prefix_t * prefix)
       prefix->fp_len = 32;
       prefix->fp_proto = FIB_PROTOCOL_IP4;
       clib_memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad));
-      memcpy (&prefix->fp_addr.ip4, &addr->ip, sizeof (prefix->fp_addr.ip4));
+      memcpy (&prefix->fp_addr.ip4, &addr->ip.ip4,
+	      sizeof (prefix->fp_addr.ip4));
     }
   else
     {
       prefix->fp_len = 128;
       prefix->fp_proto = FIB_PROTOCOL_IP6;
-      memcpy (&prefix->fp_addr.ip6, &addr->ip, sizeof (prefix->fp_addr.ip6));
+      memcpy (&prefix->fp_addr.ip6, &addr->ip.ip6,
+	      sizeof (prefix->fp_addr.ip6));
     }
+  prefix->___fp___pad = 0;
 }
 
 /**
@@ -1235,12 +1238,6 @@ remove_overlapping_sub_prefixes (lisp_cp_main_t * lcm, gid_address_t * eid,
   vec_free (a.eids_to_be_deleted);
 }
 
-static void
-mapping_delete_timer (lisp_cp_main_t * lcm, u32 mi)
-{
-  timing_wheel_delete (&lcm->wheel, mi);
-}
-
 static int
 is_local_ip (lisp_cp_main_t * lcm, ip_address_t * addr)
 {
@@ -1401,18 +1398,18 @@ vnet_lisp_del_mapping (gid_address_t * eid, u32 * res_map_index)
   gid_address_copy (&m_args->eid, eid);
   m_args->locator_set_index = old_map->locator_set_index;
 
-  /* delete mapping associated from map-cache */
-  vnet_lisp_map_cache_add_del (m_args, 0);
-
   ls_args->is_add = 0;
   ls_args->index = old_map->locator_set_index;
 
+  /* delete timer associated to the mapping if any */
+  if (old_map->timer_set)
+    TW (tw_timer_stop) (&lcm->wheel, old_map->timer_handle);
+
   /* delete locator set */
   vnet_lisp_add_del_locator_set (ls_args, 0);
 
-  /* delete timer associated to the mapping if any */
-  if (old_map->timer_set)
-    mapping_delete_timer (lcm, mi);
+  /* delete mapping associated from map-cache */
+  vnet_lisp_map_cache_add_del (m_args, 0);
 
   /* return old mapping index */
   if (res_map_index)
@@ -2007,8 +2004,8 @@ vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
 	      removed = 1;
 	      remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
 	    }
-	  if (0 == loc->local &&
-	      !gid_address_cmp (&loc->address, &itloc->address))
+	  else if (0 == loc->local &&
+		   !gid_address_cmp (&loc->address, &itloc->address))
 	    {
 	      removed = 1;
 	      remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
@@ -3774,8 +3771,8 @@ remove_expired_mapping (lisp_cp_main_t * lcm, u32 mi)
   if (vnet_lisp_add_del_adjacency (adj_args))
     clib_warning ("failed to del adjacency!");
 
+  TW (tw_timer_stop) (&lcm->wheel, m->timer_handle);
   vnet_lisp_del_mapping (&m->eid, NULL);
-  mapping_delete_timer (lcm, mi);
 }
 
 static void
@@ -3790,7 +3787,7 @@ mapping_start_expiration_timer (lisp_cp_main_t * lcm, u32 mi,
   m = pool_elt_at_index (lcm->mapping_pool, mi);
 
   m->timer_set = 1;
-  timing_wheel_insert (&lcm->wheel, exp_clock_time, mi);
+  m->timer_handle = TW (tw_timer_start) (&lcm->wheel, mi, 0, exp_clock_time);
 }
 
 static void
@@ -4543,8 +4540,9 @@ lisp_cp_init (vlib_main_t * vm)
   hash_set (lcm->table_id_by_vni, 0, 0);
   hash_set (lcm->vni_by_table_id, 0, 0);
 
-  u64 now = clib_cpu_time_now ();
-  timing_wheel_init (&lcm->wheel, now, vm->clib_time.clocks_per_second);
+  TW (tw_timer_wheel_init) (&lcm->wheel, 0 /* no callback */ ,
+			    1e-3 /* timer period 1ms */ ,
+			    ~0 /* max expirations per call */ );
   lcm->nsh_map_index = ~0;
   lcm->map_register_ttl = MAP_REGISTER_DEFAULT_TTL;
   lcm->max_expired_map_registers = MAX_EXPIRED_MAP_REGISTERS_DEFAULT;
@@ -4866,9 +4864,8 @@ send_map_resolver_service (vlib_main_t * vm,
       update_map_register (lcm, period);
       update_rloc_probing (lcm, period);
 
-      u64 now = clib_cpu_time_now ();
-
-      expired = timing_wheel_advance (&lcm->wheel, now, expired, 0);
+      expired = TW (tw_timer_expire_timers_vec) (&lcm->wheel,
+						 vlib_time_now (vm), expired);
       if (vec_len (expired) > 0)
 	{
 	  u32 *mi = 0;