lib-http: client: Fixed i_unreached() failure occurring when a host's list of IPs...

In that case, the IP of the pending connection may no longer be associated with that host.
If the IP was not found anymore, the i_unreached() error occurred.

diff --git a/src/lib-http/http-client-private.h b/src/lib-http/http-client-private.h
index e22407a2ed1abe243d10f1a4239973fd0f1c18af..83c755c0757e9d4b99693027115335bbc537bc5f 100644 (file)
--- a/src/lib-http/http-client-private.h
+++ b/src/lib-http/http-client-private.h
@@ -516,17 +516,19 @@ void http_client_queue_switch_ioloop(struct http_client_queue *queue);
  * Host
  */
 
-static inline unsigned int
+static inline bool
 http_client_host_get_ip_idx(struct http_client_host *host,
-                           const struct ip_addr *ip)
+                           const struct ip_addr *ip, unsigned int *idx_r)
 {
        unsigned int i;
 
        for (i = 0; i < host->ips_count; i++) {
-               if (net_ip_compare(&host->ips[i], ip))
-                       return i;
+               if (net_ip_compare(&host->ips[i], ip)) {
+                       *idx_r = i;
+                       return TRUE;
+               }
        }
-       i_unreached();
+       return FALSE;
 }
 
 struct http_client_host *

diff --git a/src/lib-http/http-client-queue.c b/src/lib-http/http-client-queue.c
index ba3e668d5f6bcb2c04ab9279d1e662d3da943890..6aa1893fbffe66806bb32d8e0e8d72466649815b 100644 (file)
--- a/src/lib-http/http-client-queue.c
+++ b/src/lib-http/http-client-queue.c
@@ -430,8 +430,11 @@ http_client_queue_connection_success(struct http_client_queue *queue,
        if (queue->host->dns_lookup == NULL &&
                queue->addr.type != HTTP_CLIENT_PEER_ADDR_UNIX) {
                /* we achieved at least one connection the the addr->ip */
-               queue->ips_connect_start_idx =
-                       http_client_host_get_ip_idx(queue->host, &addr->a.tcp.ip);
+               if (!http_client_host_get_ip_idx(queue->host,
+                       &addr->a.tcp.ip, &queue->ips_connect_start_idx)) {
+                       /* list of IPs changed during connect */
+                       queue->ips_connect_start_idx = 0;
+               }
        }
 
        /* reset attempt counter */