diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-11-16 21:12:25 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:16 +0100 |
| commit | 7a90f85c1a0fb8a28dd222f49a76dd1c87eed825 (patch) | |
| tree | 9c1c70db244e181f204e40a5409059ab79c95be4 /pimd | |
| parent | pimd: Protect log messages with debug in pim_pim.c (diff) | |
| download | frr-7a90f85c1a0fb8a28dd222f49a76dd1c87eed825.tar.xz frr-7a90f85c1a0fb8a28dd222f49a76dd1c87eed825.zip | |
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>
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_mroute.c | 4 | ||||
| -rw-r--r-- | pimd/pimd.c | 1 | ||||
| -rw-r--r-- | pimd/pimd.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 730977454..2557ac971 100644 --- 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 69803a6b5..bc8b88444 100644 --- 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 3f59b36df..75a13a1e6 100644 --- 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 */ |