| From f489d50ca5fd8b6a3a622e2521e2ca52787a6608 Mon Sep 17 00:00:00 2001 |
| From: Daniel Stenberg <daniel@haxx.se> |
| Date: Mon, 25 Apr 2022 16:24:33 +0200 |
| Subject: [PATCH] connect: store "conn_remote_port" in the info struct |
| |
| To make it available after the connection ended. |
| |
| Prerequisite for the patches that address CVE-2022-27774. |
| |
| Upstream-Status: Backport [https://github.com/curl/curl/commit/08b8ef4e726ba10f45081ecda5b3cea788d3c839] |
| Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
| --- |
| lib/connect.c | 1 + |
| lib/urldata.h | 6 +++++- |
| 2 files changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/lib/connect.c b/lib/connect.c |
| index 64f9511..7518807 100644 |
| --- a/lib/connect.c |
| +++ b/lib/connect.c |
| @@ -623,6 +623,7 @@ void Curl_persistconninfo(struct Curl_easy *data, struct connectdata *conn, |
| data->info.conn_scheme = conn->handler->scheme; |
| data->info.conn_protocol = conn->handler->protocol; |
| data->info.conn_primary_port = conn->port; |
| + data->info.conn_remote_port = conn->remote_port; |
| data->info.conn_local_port = local_port; |
| } |
| |
| diff --git a/lib/urldata.h b/lib/urldata.h |
| index f92052a..5218f76 100644 |
| --- a/lib/urldata.h |
| +++ b/lib/urldata.h |
| @@ -1160,7 +1160,11 @@ struct PureInfo { |
| reused, in the connection cache. */ |
| |
| char conn_primary_ip[MAX_IPADR_LEN]; |
| - int conn_primary_port; |
| + int conn_primary_port; /* this is the destination port to the connection, |
| + which might have been a proxy */ |
| + int conn_remote_port; /* this is the "remote port", which is the port |
| + number of the used URL, independent of proxy or |
| + not */ |
| char conn_local_ip[MAX_IPADR_LEN]; |
| int conn_local_port; |
| const char *conn_scheme; |