From d8c9362364cf5488fa2dd7d5028e96f0f2707863 Mon Sep 17 00:00:00 2001 From: claudio Date: Wed, 2 Nov 2022 11:44:19 +0000 Subject: [PATCH] Don't free the addrinfo array after connect and refactor http_finish_connect. In http_connect_done() the addrinfo array was freed but this makes it impossible to show the IP address of the connection in log messages. Also refactor http_finish_connect() to call http_connect_failed() instead of doing the same inline. OK tb@ --- usr.sbin/rpki-client/http.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/usr.sbin/rpki-client/http.c b/usr.sbin/rpki-client/http.c index 171c330f5a1..7c6e443064a 100644 --- a/usr.sbin/rpki-client/http.c +++ b/usr.sbin/rpki-client/http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http.c,v 1.71 2022/11/02 10:41:43 job Exp $ */ +/* $OpenBSD: http.c,v 1.72 2022/11/02 11:44:19 claudio Exp $ */ /* * Copyright (c) 2020 Nils Fisher * Copyright (c) 2020 Claudio Jeker @@ -828,10 +828,6 @@ http_do(struct http_connection *conn, enum res (*f)(struct http_connection *)) static enum res http_connect_done(struct http_connection *conn) { - freeaddrinfo(conn->res0); - conn->res0 = NULL; - conn->res = NULL; - if (proxy.proxyhost != NULL) return proxy_connect(conn); return http_tls_connect(conn); @@ -915,21 +911,15 @@ http_finish_connect(struct http_connection *conn) len = sizeof(error); if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) == -1) { warn("%s: getsockopt SO_ERROR", http_info(conn->req->uri)); - goto fail; + return http_connect_failed(conn); } if (error != 0) { errno = error; warn("%s: connect", http_info(conn->req->uri)); - goto fail; + return http_connect_failed(conn); } return http_connect_done(conn); - -fail: - close(conn->fd); - conn->fd = -1; - - return http_connect(conn); } /* -- 2.20.1