urldata: remove the duplicate 'ip_addr_str' field

... as the numerical IP address is already stored and kept in 'primary_ip'.

Closes #6534
This commit is contained in:
Daniel Stenberg 2021-01-26 10:46:49 +01:00
parent 32766cb4db
commit 642d78026f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 4 additions and 11 deletions

View File

@ -700,7 +700,6 @@ void Curl_conninfo_remote(struct Curl_easy *data,
errno, Curl_strerror(errno, buffer, sizeof(buffer)));
return;
}
memcpy(conn->ip_addr_str, conn->primary_ip, MAX_IPADR_LEN);
#else
(void)data;
(void)conn;

View File

@ -1819,7 +1819,7 @@ static char *control_address(struct connectdata *conn)
if(conn->bits.tunnel_proxy || conn->bits.socksproxy)
return conn->host.name;
#endif
return conn->ip_addr_str;
return conn->primary_ip;
}
static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,

View File

@ -1176,9 +1176,9 @@ ConnectionExists(struct Curl_easy *data,
}
if(Curl_resolver_asynch()) {
/* ip_addr_str[0] is NUL only if the resolving of the name hasn't
/* primary_ip[0] is NUL only if the resolving of the name hasn't
completed yet and until then we don't re-use this connection */
if(!check->ip_addr_str[0]) {
if(!check->primary_ip[0]) {
infof(data,
"Connection #%ld is still name resolving, can't reuse\n",
check->connection_id);
@ -1491,7 +1491,7 @@ void Curl_verboseconnect(struct Curl_easy *data,
#endif
conn->bits.conn_to_host ? conn->conn_to_host.dispname :
conn->host.dispname,
conn->ip_addr_str, conn->port, conn->connection_id);
conn->primary_ip, conn->port, conn->connection_id);
}
#endif

View File

@ -939,11 +939,6 @@ struct connectdata {
struct Curl_addrinfo *ip_addr;
struct Curl_addrinfo *tempaddr[2]; /* for happy eyeballs */
/* 'ip_addr_str' is the ip_addr data as a human readable string.
It remains available as long as the connection does, which is longer than
the ip_addr itself. */
char ip_addr_str[MAX_IPADR_LEN];
unsigned int scope_id; /* Scope id for IPv6 */
enum {

View File

@ -255,7 +255,6 @@ CURLcode Curl_quic_connect(struct Curl_easy *data,
SOCKERRNO, Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
return CURLE_BAD_FUNCTION_ARGUMENT;
}
memcpy(conn->ip_addr_str, conn->primary_ip, MAX_IPADR_LEN);
Curl_persistconninfo(data, conn);
/* for connection reuse purposes: */