Changeset 5425 for pjproject

Timestamp:

Aug 23, 2016 6:22:27 AM (8 years ago)

Author:

nanang

Message:

Fixed #1955: Fixed assertions in DNS SRV resolution with IPv6 TCP/TLS target.

File:

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

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

@@ -345 +345 @@
         svr_addr.entry[0].weight = 0;
         svr_addr.entry[0].type = type;
-        svr_addr.entry[0].addr_len = pj_sockaddr_get_len(&svr_addr.entry[0].addr);
+        svr_addr.entry[0].addr_len = 
+                                pj_sockaddr_get_len(&svr_addr.entry[0].addr);
         (*cb)(status, token, &svr_addr);
 
@@ -383 +384 @@
         query->req.def_port = 5060;
 
-        if (type == PJSIP_TRANSPORT_TLS) {
+        if (type == PJSIP_TRANSPORT_TLS || type == PJSIP_TRANSPORT_TLS6) {
             query->naptr[0].res_type = pj_str("_sips._tcp.");
             query->req.def_port = 5061;
-        } else if (type == PJSIP_TRANSPORT_TCP)
+        } else if (type == PJSIP_TRANSPORT_TCP || type == PJSIP_TRANSPORT_TCP6)
             query->naptr[0].res_type = pj_str("_sip._tcp.");
-        else if (type == PJSIP_TRANSPORT_UDP)
+        else if (type == PJSIP_TRANSPORT_UDP || type == PJSIP_TRANSPORT_UDP6)
             query->naptr[0].res_type = pj_str("_sip._udp.");
         else {
@@ -587 +588 @@
             srv->entry[srv->count].priority = 0;
             srv->entry[srv->count].weight = 0;
-            srv->entry[srv->count].addr_len = sizeof(pj_sockaddr_in);
+            srv->entry[srv->count].addr_len = sizeof(pj_sockaddr_in6);
             pj_sockaddr_init(pj_AF_INET6(), &srv->entry[srv->count].addr,
                              0, (pj_uint16_t)query->req.def_port);
@@ -651 +652 @@
             srv.entry[srv.count].priority = rec->entry[i].priority;
             srv.entry[srv.count].weight = rec->entry[i].weight;
-            srv.entry[srv.count].addr_len = sizeof(pj_sockaddr_in);
             pj_sockaddr_init(s->addr[j].af,
                              &srv.entry[srv.count].addr,
@@ -659 +659 @@
             else
                 srv.entry[srv.count].addr.ipv4.sin_addr = s->addr[j].ip.v4;
+            srv.entry[srv.count].addr_len =
+                            pj_sockaddr_get_len(&srv.entry[srv.count].addr);
 
             /* Update transport type if this is IPv6 */