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

Merge pull request #1077 from donaldsharp/ws

Browse Source 
Cleanup some issues in pim
This commit is contained in:
Renato Westphal 2017-08-30 22:26:41 -03:00 committed by GitHub
commit edfb96d21e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim_upstream.c
View File

@ -1364,7 +1364,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
pim_upstream_start_register_stop_timer(up, 1); pim_upstream_start_register_stop_timer(up, 1);
if (((up->channel_oil->cc.lastused / 100) if (((up->channel_oil->cc.lastused / 100)
> PIM_KEEPALIVE_PERIOD) > pim->keep_alive_time)
&& (I_am_RP(pim_ifp->pim, up->sg.grp))) { && (I_am_RP(pim_ifp->pim, up->sg.grp))) {
if (PIM_DEBUG_TRACE) if (PIM_DEBUG_TRACE)
zlog_debug( zlog_debug(

4
pimd/pim_vty.c
View File

@ -257,8 +257,8 @@ int pim_interface_config_write(struct vty *vty)
if (vrf->vrf_id == VRF_DEFAULT) if (vrf->vrf_id == VRF_DEFAULT)
vty_frame(vty, "interface %s\n", ifp->name); vty_frame(vty, "interface %s\n", ifp->name);
else else
vty_out(vty, "interface %s vrf %s\n", ifp->name, vty_frame(vty, "interface %s vrf %s\n",
vrf->name); ifp->name, vrf->name);
++writes; ++writes;
if (ifp->info) { if (ifp->info) {

2
pimd/test_igmpv3_join.c
View File

@ -139,7 +139,7 @@ int main(int argc, const char *argv[])
printf("%s: waiting...\n", prog_name); printf("%s: waiting...\n", prog_name);
if (getchar() == EOF) if (getchar() == EOF)
fprintf(stderr, "getchar failure\n"); fprintf(stderr, "getchar failure\n");
close(fd); close(fd);