From: Nao Yonashiro <owan.orisano@gmail.com>
Date: Fri, 29 Jul 2022 08:43:01 +0000 (+0900)
Subject: quiche: fix build failure
X-Git-Tag: curl-7_85_0~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2086b69b5787dffbdfdf29223322119885546bb5;p=thirdparty%2Fcurl.git

quiche: fix build failure

Reviewed-by: Alessandro Ghedini
Closes #9223
---

diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c
index 9a2b74310a..9ebfdf7a81 100644
--- a/lib/vquic/quiche.c
+++ b/lib/vquic/quiche.c
@@ -258,6 +258,7 @@ CURLcode Curl_quic_connect(struct Curl_easy *data,
   struct quicsocket *qs = &conn->hequic[sockindex];
   char ipbuf[40];
   int port;
+  int rv;
 
 #ifdef DEBUG_QUICHE
   /* initialize debug log callback only once */
@@ -303,8 +304,16 @@ CURLcode Curl_quic_connect(struct Curl_easy *data,
   if(result)
     return result;
 
+  qs->local_addrlen = sizeof(qs->local_addr);
+  rv = getsockname(sockfd, (struct sockaddr *)&qs->local_addr,
+                   &qs->local_addrlen);
+  if(rv == -1)
+    return CURLE_QUIC_CONNECT_ERROR;
+
   qs->conn = quiche_conn_new_with_tls((const uint8_t *) qs->scid,
-                                      sizeof(qs->scid), NULL, 0, addr, addrlen,
+                                      sizeof(qs->scid), NULL, 0,
+                                      (struct sockaddr *)&qs->local_addr,
+                                      qs->local_addrlen, addr, addrlen,
                                       qs->cfg, qs->ssl, false);
   if(!qs->conn) {
     failf(data, "can't create quiche connection");
@@ -478,6 +487,8 @@ static CURLcode process_ingress(struct Curl_easy *data, int sockfd,
 
     recv_info.from = (struct sockaddr *) &from;
     recv_info.from_len = from_len;
+    recv_info.to = (struct sockaddr *) &qs->local_addr;
+    recv_info.to_len = qs->local_addrlen;
 
     recvd = quiche_conn_recv(qs->conn, buf, recvd, &recv_info);
     if(recvd == QUICHE_ERR_DONE)
diff --git a/lib/vquic/quiche.h b/lib/vquic/quiche.h
index de68089451..2da65f5f48 100644
--- a/lib/vquic/quiche.h
+++ b/lib/vquic/quiche.h
@@ -49,6 +49,8 @@ struct quicsocket {
   SSL_CTX *sslctx;
   SSL *ssl;
   bool h3_recving; /* TRUE when in h3-body-reading state */
+  struct sockaddr_storage local_addr;
+  socklen_t local_addrlen;
 };
 
 #endif