proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 04:47:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: use quagga_monotime() for zserv and rnh

Browse Source 
quagga_time() will disappear with the next commit, this is the last
remaining user of it.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Christian Franke 2016-07-28 17:23:39 +02:00 committed by Donald Sharp
parent 833a7ff9cc
commit 2176b7c3d2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/zebra_rnh.c
View File

@ -921,7 +921,7 @@ send_client (struct rnh *rnh, struct zserv *client, rnh_type_t type, vrf_id_t vr
} }
stream_putw_at (s, 0, stream_get_endp (s)); stream_putw_at (s, 0, stream_get_endp (s));
client->nh_last_upd_time = quagga_time(NULL); client->nh_last_upd_time = quagga_monotime();
client->last_write_cmd = cmd; client->last_write_cmd = cmd;
return zebra_server_send_message(client); return zebra_server_send_message(client);
} }

14
zebra/zserv.c
View File

@ -97,7 +97,7 @@ zserv_flush_data(struct thread *thread)
break; break;
} }
client->last_write_time = quagga_time(NULL); client->last_write_time = quagga_monotime();
return 0; return 0;
} }
@ -131,7 +131,7 @@ zebra_server_send_message(struct zserv *client)
break; break;
} }
client->last_write_time = quagga_time(NULL); client->last_write_time = quagga_monotime();
return 0; return 0;
} }
@ -864,7 +864,7 @@ zserv_rnh_register (struct zserv *client, int sock, u_short length,
s = client->ibuf; s = client->ibuf;
client->nh_reg_time = quagga_time(NULL); client->nh_reg_time = quagga_monotime();
while (l < length) while (l < length)
{ {
@ -952,7 +952,7 @@ zserv_rnh_unregister (struct zserv *client, int sock, u_short length,
rnh = zebra_lookup_rnh(&p, zvrf->vrf_id, type); rnh = zebra_lookup_rnh(&p, zvrf->vrf_id, type);
if (rnh) if (rnh)
{ {
client->nh_dereg_time = quagga_time(NULL); client->nh_dereg_time = quagga_monotime();
zebra_remove_rnh_client(rnh, client, type); zebra_remove_rnh_client(rnh, client, type);
} }
} }
@ -1889,7 +1889,7 @@ zebra_client_create (int sock)
/* Set table number. */ /* Set table number. */
client->rtm_table = zebrad.rtm_table_default; client->rtm_table = zebrad.rtm_table_default;
client->connect_time = quagga_time(NULL); client->connect_time = quagga_monotime();
/* Initialize flags */ /* Initialize flags */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
@ -2015,7 +2015,7 @@ zebra_client_read (struct thread *thread)
zlog_debug ("zebra message received [%s] %d in VRF %u", zlog_debug ("zebra message received [%s] %d in VRF %u",
zserv_command_string (command), length, vrf_id); zserv_command_string (command), length, vrf_id);
client->last_read_time = quagga_time(NULL); client->last_read_time = quagga_monotime();
client->last_read_cmd = command; client->last_read_cmd = command;
zvrf = zebra_vrf_lookup (vrf_id); zvrf = zebra_vrf_lookup (vrf_id);
@ -2325,7 +2325,7 @@ zserv_time_buf(time_t *time1, char *buf, int buflen)
return (buf); return (buf);
} }
now = quagga_time(NULL); now = quagga_monotime();
now -= *time1; now -= *time1;
tm = gmtime(&now); tm = gmtime(&now);