Changeset 5471 for pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

Timestamp:

Oct 27, 2016 5:47:06 AM (7 years ago)

Author:

ming

Message:

Fixed #1974: Various fixes for DNS IPv6

File:

• pjproject/trunk/pjsip/src/pjsip/sip_resolve.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -454 +454 @@
 
         /* Resolve DNS AAAA record if address family is not fixed to IPv4 */
-        if (af != pj_AF_INET()) {
+        if (af != pj_AF_INET() && status == PJ_SUCCESS) {
             status = pj_dns_resolver_start_query(resolver->res, 
                                                  &query->naptr[0].name,
@@ -532 +532 @@
             ++srv->count;
         }
-
-    } else {
-
+    }
+    
+    if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];
 
@@ -595 +595 @@
             ++srv->count;
         }
-
-    } else {
-
+    }
+    
+    if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];