mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-02 21:45:52 +00:00
isisd: Remove weird wrapper function that downgrades time_t to 32 bit
Just use time_t, instead of downgrading time_t to a 32 bit value. We should be using time_t instead of 32 bit unsigned values. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
e81a74a642
commit
75fef2a4da
@ -283,13 +283,6 @@ SNMP_LOCAL_VARIABLES
|
||||
*
|
||||
* 2. I could be replaced in unit test environment
|
||||
*/
|
||||
#ifndef ISIS_SNMP_HAVE_TIME_FUNC
|
||||
static uint32_t isis_snmp_time(void)
|
||||
{
|
||||
return (uint32_t)time(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* ISIS-MIB instances. */
|
||||
static oid isis_oid[] = {ISIS_MIB};
|
||||
@ -2083,7 +2076,7 @@ static uint8_t *isis_snmp_find_circ(struct variable *v, oid *name,
|
||||
struct isis_circuit *circuit;
|
||||
uint32_t up_ticks;
|
||||
uint32_t delta_ticks;
|
||||
uint32_t now_time;
|
||||
time_t now_time;
|
||||
int res;
|
||||
|
||||
*write_method = NULL;
|
||||
@ -2191,7 +2184,7 @@ static uint8_t *isis_snmp_find_circ(struct variable *v, oid *name,
|
||||
return SNMP_INTEGER(0);
|
||||
|
||||
up_ticks = (uint32_t)netsnmp_get_agent_uptime();
|
||||
now_time = isis_snmp_time();
|
||||
now_time = time(NULL);
|
||||
|
||||
if (circuit->last_uptime >= now_time)
|
||||
return SNMP_INTEGER(up_ticks);
|
||||
@ -2501,11 +2494,11 @@ static uint8_t *isis_snmp_find_isadj(struct variable *v, oid *name,
|
||||
oid *oid_idx;
|
||||
size_t oid_idx_len;
|
||||
int res;
|
||||
uint32_t val;
|
||||
time_t val;
|
||||
struct isis_adjacency *adj;
|
||||
uint32_t up_ticks;
|
||||
uint32_t delta_ticks;
|
||||
uint32_t now_time;
|
||||
time_t now_time;
|
||||
|
||||
*write_method = NULL;
|
||||
|
||||
@ -2577,7 +2570,7 @@ static uint8_t *isis_snmp_find_isadj(struct variable *v, oid *name,
|
||||
* It seems that we want remaining timer
|
||||
*/
|
||||
if (adj->last_upd != 0) {
|
||||
val = isis_snmp_time();
|
||||
val = time(NULL);
|
||||
if (val < (adj->last_upd + adj->hold_time))
|
||||
return SNMP_INTEGER(adj->last_upd
|
||||
+ adj->hold_time - val);
|
||||
@ -2594,7 +2587,7 @@ static uint8_t *isis_snmp_find_isadj(struct variable *v, oid *name,
|
||||
|
||||
up_ticks = (uint32_t)netsnmp_get_agent_uptime();
|
||||
|
||||
now_time = isis_snmp_time();
|
||||
now_time = time(NULL);
|
||||
|
||||
if (adj->last_flap >= now_time)
|
||||
return SNMP_INTEGER(up_ticks);
|
||||
@ -2853,7 +2846,7 @@ static int isis_snmp_trap_throttle(oid trap_id)
|
||||
if (isis == NULL || !isis->snmp_notifications || !smux_enabled())
|
||||
return 0;
|
||||
|
||||
time_now = isis_snmp_time();
|
||||
time_now = time(NULL);
|
||||
|
||||
if ((isis_snmp_trap_timestamp[trap_id] + 5) > time_now)
|
||||
/* Throttle trap rate at 1 in 5 secs */
|
||||
|
Loading…
Reference in New Issue
Block a user