Merge pull request #472 from qlyoung/rfapi-correct-types

rfapi void * -> struct thread *

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 35994d4f760d338590ba323673ff4873d4b91ffd..9db84b2caede79c6df6ecc00d4f53018ea05cfd4 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -85,7 +85,7 @@ struct bgp_info_extra
       } export;
 
       struct {
-         void *timer;
+         struct thread *timer;
          void *hme;            /* encap monitor, if this is a VPN route */
          struct prefix_rd rd;  /* import: route's route-distinguisher */
          u_char un_family;     /* family of cached un address, 0 if unset */

diff --git a/bgpd/rfapi/rfapi_monitor.h b/bgpd/rfapi/rfapi_monitor.h
index be04b0f09d2d3555222280a04ba33ad4b34a1d2c..c42e57c566e38a7a3139e063881528c157c9e966 100644 (file)
--- a/bgpd/rfapi/rfapi_monitor.h
+++ b/bgpd/rfapi/rfapi_monitor.h
@@ -40,7 +40,7 @@ struct rfapi_monitor_vpn
 #define RFAPI_MON_FLAG_NEEDCALLBACK    0x00000001      /* deferred callback */
 
   //int                                dcount; /* debugging counter */
-  void                         *timer;
+  struct thread                        *timer;
 };
 
 struct rfapi_monitor_encap
@@ -58,7 +58,7 @@ struct rfapi_monitor_eth
   struct rfapi_descriptor      *rfd;   /* which NVE requested the route */
   struct ethaddr               macaddr;
   uint32_t                     logical_net_id;
-  void                         *timer;
+  struct thread                *timer;
 };
 
 /*

diff --git a/bgpd/rfapi/rfapi_rib.h b/bgpd/rfapi/rfapi_rib.h
index 74331a28d021f6865406fb63fb4a12fe055d5e6c..43a5d43ffaf98167e218e35ed04d0fbf04afe154 100644 (file)
--- a/bgpd/rfapi/rfapi_rib.h
+++ b/bgpd/rfapi/rfapi_rib.h
@@ -78,7 +78,7 @@ struct rfapi_info
   struct bgp_tea_options       *tea_options;
   struct rfapi_un_option       *un_options;
   struct rfapi_vn_option       *vn_options;
-  void                         *timer;
+  struct thread                *timer;
 };
 
 /*