moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

quiche: make use of the connection timeout API properly

This commit is contained in:
Daniel Stenberg 2019-08-07 12:49:27 +02:00
parent 7a83e1d1d4
commit 1f145b02d9
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/urldata.h
View File

@ -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;

10
lib/vquic/quiche.c
View File

@ -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;
}