1 files changed, 8 insertions, 8 deletions

diff --git a/ot_http.c b/ot_http.c
index 2216453..927d618 100644
--- a/ot_http.c
+++ b/ot_http.c
@@ -143,7 +143,7 @@ ssize_t http_issue_error(const int64_t sock, struct ot_workstruct *ws, int code)
 #ifdef _DEBUG_HTTPERROR
   fprintf(stderr, "DEBUG: invalid request was: %s\n", ws->debugbuf);
 #endif
-  stats_issue_event(EVENT_FAILED, FLAG_TCP, code);
+  stats_issue_event(ws, EVENT_FAILED, FLAG_TCP, code);
   http_senddata(sock, ws);
   return ws->reply_size = -2;
 }
@@ -222,7 +222,7 @@ ssize_t http_sendiovecdata(const int64_t sock, struct ot_workstruct *ws, size_t
     cookie->flag &= ~STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER;
   }
 
-  fdstate_set_expiry(sock, g_now_seconds + OT_CLIENT_TIMEOUT_SEND);
+  fdstate_set_expiry(sock, time_future_seconds(OT_CLIENT_TIMEOUT_SEND));
   http_interest_add(sock, cookie, EVENT_OUT);
   return 0;
 }
@@ -359,7 +359,7 @@ static ssize_t http_handle_fullscrape(const int64_t sock, struct ot_workstruct *
     ot_scrape_log this_peer, *new_peer;
     int           exactmatch;
     memcpy(this_peer.ip, cookie->ip, sizeof(ot_ip6));
-    this_peer.last_fullscrape = g_now_seconds;
+    this_peer.last_fullscrape = time_now_seconds();
     pthread_mutex_lock(&g_modest_fullscrape_mutex);
     new_peer = vector_find_or_insert(&g_modest_fullscrape_timeouts, &this_peer, sizeof(ot_scrape_log), sizeof(ot_ip6), &exactmatch);
     if (!new_peer) {
@@ -402,7 +402,7 @@ static ssize_t http_handle_fullscrape(const int64_t sock, struct ot_workstruct *
 #endif
 #endif
 
-  stats_issue_event(EVENT_FULLSCRAPE_REQUEST, 0, (uintptr_t)cookie->ip);
+  stats_issue_event(ws, EVENT_FULLSCRAPE_REQUEST, 0, (uintptr_t)cookie->ip);
 
 #ifdef _DEBUG_HTTPERROR
   fprintf(stderr, "%s", ws->debugbuf);
@@ -474,7 +474,7 @@ static ssize_t http_handle_scrape(const int64_t sock, struct ot_workstruct *ws,
   /* Enough for http header + whole scrape string */
   return_tcp_scrape_for_torrent((const ot_hash *)multiscrape_buf, numwant, &reply, ws->outbuf + G_OUTBUF_SIZE);
   ws->reply_size = reply - ws->reply;
-  stats_issue_event(EVENT_SCRAPE, FLAG_TCP, ws->reply_size);
+  stats_issue_event(ws, EVENT_SCRAPE, FLAG_TCP, ws->reply_size);
   return ws->reply_size;
 }
 
@@ -682,7 +682,7 @@ static ssize_t     http_handle_announce(const int64_t sock, struct ot_workstruct
 #endif
 
   /* XXX DEBUG
-  stats_issue_event( EVENT_ACCEPT, FLAG_TCP, (uintptr_t)ws->reply );
+  stats_issue_event(ws, EVENT_ACCEPT, FLAG_TCP, (uintptr_t)ws->reply );
   */
 
   /* Scanned whole query string */
@@ -694,7 +694,7 @@ static ssize_t     http_handle_announce(const int64_t sock, struct ot_workstruct
   else
     ws->reply_size = add_peer_to_torrent_and_return_peers(FLAG_TCP, ws, numwant);
 
-  stats_issue_event(EVENT_ANNOUNCE, FLAG_TCP, ws->reply_size);
+  stats_issue_event(ws, EVENT_ANNOUNCE, FLAG_TCP, ws->reply_size);
   return ws->reply_size;
 }
 
@@ -710,7 +710,7 @@ ssize_t http_handle_request(const int64_t sock, struct ot_workstruct *ws) {
       log->size = ws->request_size;
       log->data = malloc(ws->request_size);
       log->next = 0;
-      log->time = g_now_seconds;
+      log->time = time_now_seconds();
       memcpy(log->ip, cookie->ip, sizeof(ot_ip6));
       if (log->data) {
         memcpy(log->data, ws->request, ws->request_size);