Merge pull request #104 from opensourcerouting/time-cleanup

[mirror_frr.git] / zebra / zserv.c

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 5a46de9ce9dfb3022e93b3a2e95ce689629bd0ff..6f72ad1758f6668159677e07a707f2f2bd919c48 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -101,7 +101,7 @@ zserv_flush_data(struct thread *thread)
       break;
     }
 
-  client->last_write_time = quagga_monotime();
+  client->last_write_time = monotime(NULL);
   return 0;
 }
 
@@ -135,7 +135,7 @@ zebra_server_send_message(struct zserv *client)
       break;
     }
 
-  client->last_write_time = quagga_monotime();
+  client->last_write_time = monotime(NULL);
   return 0;
 }
 
@@ -825,7 +825,7 @@ zserv_rnh_register (struct zserv *client, int sock, u_short length,
 
   s = client->ibuf;
 
-  client->nh_reg_time = quagga_monotime();
+  client->nh_reg_time = monotime(NULL);
 
   while (l < length)
     {
@@ -913,7 +913,7 @@ zserv_rnh_unregister (struct zserv *client, int sock, u_short length,
       rnh = zebra_lookup_rnh(&p, zvrf_id (zvrf), type);
       if (rnh)
        {
-         client->nh_dereg_time = quagga_monotime();
+         client->nh_dereg_time = monotime(NULL);
          zebra_remove_rnh_client(rnh, client, type);
        }
     }
@@ -1825,7 +1825,7 @@ zebra_client_create (int sock)
   /* Set table number. */
   client->rtm_table = zebrad.rtm_table_default;
 
-  client->connect_time = quagga_monotime();
+  client->connect_time = monotime(NULL);
   /* Initialize flags */
   for (afi = AFI_IP; afi < AFI_MAX; afi++)
     for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
@@ -1951,7 +1951,7 @@ zebra_client_read (struct thread *thread)
     zlog_debug ("zebra message received [%s] %d in VRF %u",
               zserv_command_string (command), length, vrf_id);
 
-  client->last_read_time = quagga_monotime();
+  client->last_read_time = monotime(NULL);
   client->last_read_cmd = command;
 
   zvrf = zebra_vrf_lookup_by_id (vrf_id);
@@ -2265,7 +2265,7 @@ zserv_time_buf(time_t *time1, char *buf, int buflen)
       return (buf);
     }
 
-  now = quagga_monotime();
+  now = monotime(NULL);
   now -= *time1;
   tm = gmtime(&now);