diff options
| author | Renato Westphal <renato@openbsd.org> | 2017-08-30 22:26:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 22:26:41 -0300 |
| commit | edfb96d21eb0dc5ad4578d74597bc397e22f6e08 (patch) | |
| tree | 367ebc7fff89c83831da677197404b40342fc9b5 | |
| parent | e507137524c8e33dd3275185279ab27469a742a6 (diff) | |
| parent | 2f5b00289db5dd61386874bd9386f7c50cd97e94 (diff) | |
Merge pull request #1077 from donaldsharp/ws
Cleanup some issues in pim
| -rw-r--r-- | pimd/pim_upstream.c | 2 | ||||
| -rw-r--r-- | pimd/pim_vty.c | 4 | ||||
| -rw-r--r-- | pimd/test_igmpv3_join.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 96b9568c61..0bf2ce5d56 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1364,7 +1364,7 @@ static int pim_upstream_register_stop_timer(struct thread *t) pim_upstream_start_register_stop_timer(up, 1); if (((up->channel_oil->cc.lastused / 100) - > PIM_KEEPALIVE_PERIOD) + > pim->keep_alive_time) && (I_am_RP(pim_ifp->pim, up->sg.grp))) { if (PIM_DEBUG_TRACE) zlog_debug( diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 6eb413a4eb..7607bdf13b 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -257,8 +257,8 @@ int pim_interface_config_write(struct vty *vty) if (vrf->vrf_id == VRF_DEFAULT) vty_frame(vty, "interface %s\n", ifp->name); else - vty_out(vty, "interface %s vrf %s\n", ifp->name, - vrf->name); + vty_frame(vty, "interface %s vrf %s\n", + ifp->name, vrf->name); ++writes; if (ifp->info) { diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c index 3d104e7c7c..bf44f3c94a 100644 --- a/pimd/test_igmpv3_join.c +++ b/pimd/test_igmpv3_join.c @@ -139,7 +139,7 @@ int main(int argc, const char *argv[]) printf("%s: waiting...\n", prog_name); if (getchar() == EOF) - fprintf(stderr, "getchar failure\n"); + fprintf(stderr, "getchar failure\n"); close(fd); |