From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 7 Aug 2019 10:49:27 +0000 (+0200)
Subject: quiche: make use of the connection timeout API properly
X-Git-Tag: curl-7_66_0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f145b02d95f42ffba23fa6ea6a867aeba3cbdc1;p=thirdparty%2Fcurl.git

quiche: make use of the connection timeout API properly
---

diff --git a/lib/urldata.h b/lib/urldata.h
index b3b1263c60..eabb1b5c78 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1227,6 +1227,7 @@ typedef enum {
   EXPIRE_SPEEDCHECK,
   EXPIRE_TIMEOUT,
   EXPIRE_TOOFAST,
+  EXPIRE_QUIC,
   EXPIRE_LAST /* not an actual timer, used as a marker only */
 } expire_id;
 
diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c
index 67c2b1b423..c4e7b03fe3 100644
--- a/lib/vquic/quiche.c
+++ b/lib/vquic/quiche.c
@@ -209,6 +209,9 @@ static CURLcode process_ingress(struct connectdata *conn, int sockfd)
   uint8_t *buf = (uint8_t *)data->state.buffer;
   size_t bufsize = data->set.buffer_size;
 
+  /* in case the timeout expired */
+  quiche_conn_on_timeout(qs->conn);
+
   do {
     recvd = recv(sockfd, buf, bufsize, 0);
     if((recvd < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
@@ -241,6 +244,7 @@ static CURLcode flush_egress(struct connectdata *conn, int sockfd)
   ssize_t sent;
   struct quicsocket *qs = &conn->quic;
   static uint8_t out[1200];
+  int64_t timeout_ns;
 
   do {
     sent = quiche_conn_send(qs->conn, out, sizeof(out));
@@ -260,6 +264,12 @@ static CURLcode flush_egress(struct connectdata *conn, int sockfd)
     }
   } while(1);
 
+  /* time until the next timeout event, as nanoseconds. */
+  timeout_ns = quiche_conn_timeout_as_nanos(qs->conn);
+  if(timeout_ns)
+    /* expire uses milliseconds */
+    Curl_expire(conn->data, (timeout_ns + 999999) / 1000000, EXPIRE_QUIC);
+
   return CURLE_OK;
 }