mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-15 06:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

connect: get local port + ip also when reusing connections

Browse Source 
Regression. In d6a37c23a3 (7.75.0) we removed the duplicated storage
(connection + easy handle), so this info needs be extracted again even
for re-used connections.

Add test 435 to verify

Reported-by: Max Dymond
Fixes #7660
Closes #7662
This commit is contained in:
Daniel Stenberg 2021-09-02 15:57:25 +02:00
parent 1b70748e86
commit 424051d78b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 74 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/connect.c
View File

@ -751,10 +751,9 @@ void Curl_updateconninfo(struct Curl_easy *data, struct connectdata *conn,
int local_port = -1;
if(conn->transport == TRNSPRT_TCP) {
if(!conn->bits.reuse && !conn->bits.tcp_fastopen) {
if(!conn->bits.reuse && !conn->bits.tcp_fastopen)
Curl_conninfo_remote(data, conn, sockfd);
Curl_conninfo_local(data, sockfd, local_ip, &local_port);
}
Curl_conninfo_local(data, sockfd, local_ip, &local_port);
} /* end of TCP-only section */
/* persist connection info in session handle */

2
tests/data/Makefile.inc
View File

@ -67,7 +67,7 @@ test392 test393 test394 test395 test396 test397 \
test400 test401 test402 test403 test404 test405 test406 test407 test408 \
test409 test410 \
\
test430 test431 test432 test433 test434 \
test430 test431 test432 test433 test434 test435 \
\
test490 test491 test492 test493 test494 \
\

71
tests/data/test435 Normal file
View File

@ -0,0 +1,71 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
</keywords>
</info>
#
# Server-side
<reply>
<data nocheck="yes">
HTTP/1.1 200 OK
Content-Length: 0
</data>
</reply>
#
# Client-side
<client>
<server>
http
</server>
<name>
verify -w local/remote port+ip after connecton re-use
</name>
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'local port == %{local_port}\nlocal ip == %{local_ip}\nremote_ip == %{remote_ip}\nremote_port == %{remote_port}\n'
</command>
</client>
#
# Verify data after the test has been "shot"
<verify>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
</protocol>
# replace the number with a fixed string since the port number is not
# known to the test script but it should always be a decimal number
<stripfile>
s/local port == (\d+)/local port == [digits]/
</stripfile>
<stdout>
HTTP/1.1 200 OK
Content-Length: 0
local port == [digits]
local ip == 127.0.0.1
remote_ip == %HOSTIP
remote_port == %HTTPPORT
HTTP/1.1 200 OK
Content-Length: 0
local port == [digits]
local ip == 127.0.0.1
remote_ip == %HOSTIP
remote_port == %HTTPPORT
</stdout>
</verify>
</testcase>