proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 21:23:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Donald Sharp 2016-11-16 15:12:25 -05:00
parent def1e80732
commit 7a90f85c1a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_mroute.c
View File

@ -44,6 +44,8 @@
/* GLOBAL VARS */ /* GLOBAL VARS */
extern struct zebra_privs_t pimd_privs; extern struct zebra_privs_t pimd_privs;
static struct thread *qpim_mroute_socket_reader = NULL;
static void mroute_read_on(void); static void mroute_read_on(void);
static int pim_mroute_set(int fd, int enable) 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); result = mroute_read_msg(fd);
/* Keep reading */ /* Keep reading */
qpim_mroute_socket_reader = 0; qpim_mroute_socket_reader = NULL;
mroute_read_on(); mroute_read_on();
return result; return result;

1
pimd/pimd.c
View File

@ -50,7 +50,6 @@ struct thread_master *master = NULL;
uint32_t qpim_debugs = 0; uint32_t qpim_debugs = 0;
int qpim_mroute_socket_fd = -1; int qpim_mroute_socket_fd = -1;
int64_t qpim_mroute_socket_creation = 0; /* timestamp of creation */ 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_mroute_oif_highest_vif_index = -1;
int qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */ int qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */
struct zclient *qpim_zclient_update = NULL; struct zclient *qpim_zclient_update = NULL;

1
pimd/pimd.h
View File

@ -95,7 +95,6 @@ extern struct thread_master *master;
uint32_t qpim_debugs; uint32_t qpim_debugs;
int qpim_mroute_socket_fd; int qpim_mroute_socket_fd;
int64_t qpim_mroute_socket_creation; /* timestamp of creation */ int64_t qpim_mroute_socket_creation; /* timestamp of creation */
struct thread *qpim_mroute_socket_reader;
int qpim_mroute_oif_highest_vif_index; int qpim_mroute_oif_highest_vif_index;
struct in_addr qpim_all_pim_routers_addr; struct in_addr qpim_all_pim_routers_addr;
int qpim_t_periodic; /* Period between Join/Prune Messages */ int qpim_t_periodic; /* Period between Join/Prune Messages */