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

bgpd, ldpd: No need for an explicit NULL check for thread_timer_remain_second

Browse Source 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-07-18 16:42:23 +03:00
parent 13bcc010e3
commit 1f37d8c2d3
5 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/rfapi/rfapi_monitor.c
View File

@ -744,7 +744,6 @@ static void rfapiMonitorTimerExpire(struct thread *t)
static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m) static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m)
{ {
if (m->timer) {
unsigned long remain = thread_timer_remain_second(m->timer); unsigned long remain = thread_timer_remain_second(m->timer);
/* unexpected case, but avoid wraparound problems below */ /* unexpected case, but avoid wraparound problems below */
@ -755,8 +754,7 @@ static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m)
if (m->rfd->response_lifetime - remain < 2) if (m->rfd->response_lifetime - remain < 2)
return; return;
thread_cancel(&m->timer); THREAD_OFF(m->timer);
}
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -766,7 +764,7 @@ static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m)
rfapi_ntop(m->p.family, m->p.u.val, buf, BUFSIZ), rfapi_ntop(m->p.family, m->p.u.val, buf, BUFSIZ),
m->rfd->response_lifetime); m->rfd->response_lifetime);
} }
m->timer = NULL;
thread_add_timer(bm->master, rfapiMonitorTimerExpire, m, thread_add_timer(bm->master, rfapiMonitorTimerExpire, m,
m->rfd->response_lifetime, &m->timer); m->rfd->response_lifetime, &m->timer);
} }
@ -1054,7 +1052,6 @@ static void rfapiMonitorEthTimerExpire(struct thread *t)
static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m) static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m)
{ {
if (m->timer) {
unsigned long remain = thread_timer_remain_second(m->timer); unsigned long remain = thread_timer_remain_second(m->timer);
/* unexpected case, but avoid wraparound problems below */ /* unexpected case, but avoid wraparound problems below */
@ -1065,8 +1062,7 @@ static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m)
if (m->rfd->response_lifetime - remain < 2) if (m->rfd->response_lifetime - remain < 2)
return; return;
thread_cancel(&m->timer); THREAD_OFF(m->timer);
}
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -1076,7 +1072,7 @@ static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m)
rfapiEthAddr2Str(&m->macaddr, buf, BUFSIZ), rfapiEthAddr2Str(&m->macaddr, buf, BUFSIZ),
m->rfd->response_lifetime); m->rfd->response_lifetime);
} }
m->timer = NULL;
thread_add_timer(bm->master, rfapiMonitorEthTimerExpire, m, thread_add_timer(bm->master, rfapiMonitorEthTimerExpire, m,
m->rfd->response_lifetime, &m->timer); m->rfd->response_lifetime, &m->timer);
} }

10
bgpd/rfapi/rfapi_vty.c
View File

@ -928,12 +928,9 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match)
} else } else
fp(out, "%-15s %-15s", "", ""); fp(out, "%-15s %-15s", "", "");
buf_remain[0] = 0; buf_remain[0] = 0;
if (m->timer) {
rfapiFormatSeconds( rfapiFormatSeconds(
thread_timer_remain_second( thread_timer_remain_second(m->timer),
m->timer),
buf_remain, BUFSIZ); buf_remain, BUFSIZ);
}
fp(out, " %-15s %-10s\n", fp(out, " %-15s %-10s\n",
inet_ntop(m->p.family, &m->p.u.prefix, inet_ntop(m->p.family, &m->p.u.prefix,
buf_pfx, BUFSIZ), buf_pfx, BUFSIZ),
@ -1005,12 +1002,9 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match)
} else } else
fp(out, "%-15s %-15s", "", ""); fp(out, "%-15s %-15s", "", "");
buf_remain[0] = 0; buf_remain[0] = 0;
if (mon_eth->timer) { rfapiFormatSeconds(thread_timer_remain_second(
rfapiFormatSeconds(
thread_timer_remain_second(
mon_eth->timer), mon_eth->timer),
buf_remain, BUFSIZ); buf_remain, BUFSIZ);
}
fp(out, " %-17s %10d %-10s\n", fp(out, " %-17s %10d %-10s\n",
rfapi_ntop(pfx_mac.family, &pfx_mac.u.prefix, rfapi_ntop(pfx_mac.family, &pfx_mac.u.prefix,
buf_pfx, BUFSIZ), buf_pfx, BUFSIZ),

4
ldpd/adjacency.c
View File

@ -386,9 +386,7 @@ adj_to_ctl(struct adj *adj)
} }
actl.holdtime = adj->holdtime; actl.holdtime = adj->holdtime;
actl.holdtime_remaining = actl.holdtime_remaining =
thread_is_scheduled(adj->inactivity_timer) thread_timer_remain_second(adj->inactivity_timer);
? thread_timer_remain_second(adj->inactivity_timer)
: 0;
actl.trans_addr = adj->trans_addr; actl.trans_addr = adj->trans_addr;
actl.ds_tlv = adj->ds_tlv; actl.ds_tlv = adj->ds_tlv;

3
ldpd/interface.c
View File

@ -543,11 +543,8 @@ ldp_sync_to_ctl(struct iface *iface)
ictl.wait_time = if_get_wait_for_sync_interval(); ictl.wait_time = if_get_wait_for_sync_interval();
ictl.timer_running = iface->ldp_sync.wait_for_sync_timer ? true : false; ictl.timer_running = iface->ldp_sync.wait_for_sync_timer ? true : false;
if (iface->ldp_sync.wait_for_sync_timer)
ictl.wait_time_remaining = ictl.wait_time_remaining =
thread_timer_remain_second(iface->ldp_sync.wait_for_sync_timer); thread_timer_remain_second(iface->ldp_sync.wait_for_sync_timer);
else
ictl.wait_time_remaining = 0;
memset(&ictl.peer_ldp_id, 0, sizeof(ictl.peer_ldp_id)); memset(&ictl.peer_ldp_id, 0, sizeof(ictl.peer_ldp_id));

3
ldpd/neighbor.c
View File

@ -847,11 +847,8 @@ nbr_to_ctl(struct nbr *nbr)
nctl.stats = nbr->stats; nctl.stats = nbr->stats;
nctl.flags = nbr->flags; nctl.flags = nbr->flags;
nctl.max_pdu_len = nbr->max_pdu_len; nctl.max_pdu_len = nbr->max_pdu_len;
if (nbr->keepalive_timer)
nctl.hold_time_remaining = nctl.hold_time_remaining =
thread_timer_remain_second(nbr->keepalive_timer); thread_timer_remain_second(nbr->keepalive_timer);
else
nctl.hold_time_remaining = 0;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if (nbr->state == NBR_STA_OPER) { if (nbr->state == NBR_STA_OPER) {