Enable DNS NAPTR+SRV+A

DNS lookup for proxy: Works for NAPTR+SRV+A. Socket transport address:port updated according to the DNS lookup.

assigned to @wenpeng.song

changed the description

marked this merge request as ready

requested review from @Yalu

changed title from Enable DNS NAPTR+SRV, update the port of server_uri based on SRV if avaliable to Enable DNS NAPTR+SRV, update the port of request server_uri based on SRV if avaliable

added 1 commit

• 8ec2efb0 - rm extra handling for server_uri port

Compare with previous version

changed title from Enable DNS NAPTR+SRV, update the port of request server_uri based on SRV if avaliable to Enable DNS NAPTR+SRV+A

changed the description

It is not so clear what the actual changes are from Web GUI here. I checked out your branch locally and make a differ. Is it all change below in the MR?

~/git/voip/asterisk$ git diff -bB c2c8e82929e4f07522c47ab73dae2ed916bab6db 46e043a88626fb475d05ec7e5b5cdb4e3f4eaf72
diff --git a/res/res_pjsip/pjsip_resolver.c b/res/res_pjsip/pjsip_resolver.c
index 2babfe40de..ee8c684104 100644
--- a/res/res_pjsip/pjsip_resolver.c
+++ b/res/res_pjsip/pjsip_resolver.c
@@ -544,8 +544,7 @@ static void sip_resolve(pjsip_resolver_t *resolver, pj_pool_t *pool, const pjsip
 
        ast_debug(2, "[%p] Created resolution tracking for target '%s'\n", resolve, host);
 
-       /* If no port has been specified we can do NAPTR + SRV */
-       if (!target->addr.port) {
+       /* NAPTR + SRV */
        char srv[NI_MAXHOST];
 
        /* When resolving addresses PJSIP can request an explicit transport type. It will explicitly
@@ -585,8 +584,7 @@ static void sip_resolve(pjsip_resolver_t *resolver, pj_pool_t *pool, const pjsip
                                type == PJSIP_TRANSPORT_UNSPECIFIED ? PJSIP_TRANSPORT_UDP : type, 0);
                }
        }
-       }
-
+       /* AAAA + A */
        if ((type == PJSIP_TRANSPORT_UNSPECIFIED && sip_transport_is_available(PJSIP_TRANSPORT_UDP6)) ||
                ((type & PJSIP_TRANSPORT_IPV6) && sip_transport_is_available(type))) {
                res |= sip_resolve_add(resolve, host, T_AAAA, C_IN, (type == PJSIP_TRANSPORT_UNSPECIFIED ? PJSIP_TRANSPORT_UDP6 : type), target->addr.port);

resolved all threads

merged

Please remove those unused branches, e.g. dns-test