Commit 8c901de562 for asterisk.org

commit 8c901de562749ab001f1ed5c470772b4ea867734
Author: Mehrdad Seifzadeh <mehrdad.seifzadeh@gmail.com>
Date:   Thu Jun 4 15:34:59 2026 +0330

    res_pjsip_endpoint_identifier_ip: Clarify identify DNS warning

    When two DNS-based identify matches resolve to the same address, the first
    match makes the resolved address available for identify matching and the
    second match adds no new match address. The existing warning treated this as
    a DNS resolution failure and reported that the hostname did not resolve.

    Clarify the warning path so a hostname that resolves but only returns
    addresses already present for matching is not reported as unresolved.

    Fixes: #1723

diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c
index 4c48760eed..3aebcbc816 100644
--- a/res/res_pjsip_endpoint_identifier_ip.c
+++ b/res/res_pjsip_endpoint_identifier_ip.c
@@ -412,7 +412,7 @@ static struct ast_sip_endpoint_identifier request_identifier = {
 };

 /*! \brief Helper function which performs a host lookup and adds result to identify match */
-static int ip_identify_match_host_lookup(struct ip_identify_match *identify, const char *host)
+static int ip_identify_match_host_lookup(struct ip_identify_match *identify, const char *host, int *resolved)
 {
 	struct ast_sockaddr *addrs;
 	int num_addrs = 0, error = 0, i;
@@ -422,6 +422,7 @@ static int ip_identify_match_host_lookup(struct ip_identify_match *identify, con
 	if (!num_addrs) {
 		return -1;
 	}
+	*resolved = 1;

 	for (i = 0; i < num_addrs; ++i) {
 		/* Check if the address is already in the list, if so don't add it again */
@@ -446,7 +447,8 @@ static int ip_identify_match_host_lookup(struct ip_identify_match *identify, con
 }

 /*! \brief Helper function which performs an SRV lookup and then resolves the hostname */
-static int ip_identify_match_srv_lookup(struct ip_identify_match *identify, const char *prefix, const char *host, int results)
+static int ip_identify_match_srv_lookup(struct ip_identify_match *identify, const char *prefix, const char *host, int results,
+	int *resolved)
 {
 	char service[NI_MAXHOST];
 	struct srv_context *context = NULL;
@@ -462,7 +464,7 @@ static int ip_identify_match_srv_lookup(struct ip_identify_match *identify, cons
 		/* In the case of the SRV lookup we don't care if it fails, we will output a log message
 		 * when we fallback to a normal lookup.
 		 */
-		hosts = ip_identify_match_host_lookup(identify, srvhost);
+		hosts = ip_identify_match_host_lookup(identify, srvhost, resolved);
 		if (hosts == -1) {
 			results = -1;
 			break;
@@ -642,6 +644,7 @@ static int ip_identify_apply(const struct ast_sorcery *sorcery, void *obj)
 	i = ao2_iterator_init(identify->hosts, 0);
 	while ((current_string = ao2_iterator_next(&i))) {
 		int results = 0;
+		int resolved = 0;
 		char *colon = strrchr(current_string, ':');

 		/* We skip SRV lookup if a colon is present, assuming a port was specified */
@@ -649,32 +652,36 @@ static int ip_identify_apply(const struct ast_sorcery *sorcery, void *obj)
 			/* No port, and we know this is not an IP address, so perform SRV resolution on it */
 			if (identify->srv_lookups) {
 				results = ip_identify_match_srv_lookup(identify, "_sip._udp", current_string,
-					results);
+					results, &resolved);
 				if (results != -1) {
 					results = ip_identify_match_srv_lookup(identify, "_sip._tcp",
-						current_string, results);
+						current_string, results, &resolved);
 				}
 				if (results != -1) {
 					results = ip_identify_match_srv_lookup(identify, "_sips._tcp",
-						current_string, results);
+						current_string, results, &resolved);
 				}
 			}
 		}

 		/* If SRV fails fall back to a normal lookup on the host itself */
 		if (!results) {
-			results = ip_identify_match_host_lookup(identify, current_string);
+			results = ip_identify_match_host_lookup(identify, current_string, &resolved);
 		}

-		if (results == 0) {
-			ast_log(LOG_WARNING, "Identify '%s' provided address '%s' did not resolve to any address\n",
-				ast_sorcery_object_get_id(identify), current_string);
-		} else if (results == -1) {
+		if (results == -1) {
 			ast_log(LOG_ERROR, "Identify '%s' failed when adding resolution results of '%s'\n",
 				ast_sorcery_object_get_id(identify), current_string);
 			ao2_ref(current_string, -1);
 			ao2_iterator_destroy(&i);
 			return -1;
+		} else if (!results && resolved) {
+			ast_log(LOG_WARNING, "Identify '%s' provided address '%s' resolved, "
+			"but resolved addresses are already present for matching\n",
+			ast_sorcery_object_get_id(identify), current_string);
+		} else if (!results) {
+			ast_log(LOG_WARNING, "Identify '%s' provided address '%s' did not resolve to any address\n",
+				ast_sorcery_object_get_id(identify), current_string);
 		}

 		ao2_ref(current_string, -1);