pimd: Move pim_mroute.c global data to file local static

Move the qpim_mroute_socket_reader thread to pim_mroute.c
and make it static to the file.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 7309774548030704f1bf9cc9568206159bd91a33..2557ac9710c272bbe5ce3d6c4c0330c48703dc04 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -44,6 +44,8 @@
 /* GLOBAL VARS */
 extern struct zebra_privs_t pimd_privs;
 
+static struct thread *qpim_mroute_socket_reader = NULL;
+
 static void mroute_read_on(void);
 
 static int pim_mroute_set(int fd, int enable)
@@ -554,7 +556,7 @@ static int mroute_read(struct thread *t)
   result = mroute_read_msg(fd);
 
   /* Keep reading */
-  qpim_mroute_socket_reader = 0;
+  qpim_mroute_socket_reader = NULL;
   mroute_read_on();
 
   return result;

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 69803a6b5622f2d68b7c55e1c58b033024005b36..bc8b88444aa0a9700fe7c19291939d30b0ad5d2d 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -50,7 +50,6 @@ struct thread_master     *master = NULL;
 uint32_t                  qpim_debugs = 0;
 int                       qpim_mroute_socket_fd = -1;
 int64_t                   qpim_mroute_socket_creation = 0; /* timestamp of creation */
-struct thread            *qpim_mroute_socket_reader = NULL;
 int                       qpim_mroute_oif_highest_vif_index = -1;
 int                       qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */
 struct zclient           *qpim_zclient_update = NULL;

diff --git a/pimd/pimd.h b/pimd/pimd.h
index 3f59b36df23f81b9f408cbfaeef75cb94eb0db95..75a13a1e6b1ea03afa081b6c8982bb68acc701ee 100644 (file)
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -95,7 +95,6 @@ extern struct thread_master     *master;
 uint32_t                  qpim_debugs;
 int                       qpim_mroute_socket_fd;
 int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
-struct thread            *qpim_mroute_socket_reader;
 int                       qpim_mroute_oif_highest_vif_index;
 struct in_addr            qpim_all_pim_routers_addr;
 int                       qpim_t_periodic; /* Period between Join/Prune Messages */