Changeset 5425
- Timestamp:
- Aug 23, 2016 6:22:27 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_resolve.c
r5369 r5425 345 345 svr_addr.entry[0].weight = 0; 346 346 svr_addr.entry[0].type = type; 347 svr_addr.entry[0].addr_len = pj_sockaddr_get_len(&svr_addr.entry[0].addr); 347 svr_addr.entry[0].addr_len = 348 pj_sockaddr_get_len(&svr_addr.entry[0].addr); 348 349 (*cb)(status, token, &svr_addr); 349 350 … … 383 384 query->req.def_port = 5060; 384 385 385 if (type == PJSIP_TRANSPORT_TLS ) {386 if (type == PJSIP_TRANSPORT_TLS || type == PJSIP_TRANSPORT_TLS6) { 386 387 query->naptr[0].res_type = pj_str("_sips._tcp."); 387 388 query->req.def_port = 5061; 388 } else if (type == PJSIP_TRANSPORT_TCP )389 } else if (type == PJSIP_TRANSPORT_TCP || type == PJSIP_TRANSPORT_TCP6) 389 390 query->naptr[0].res_type = pj_str("_sip._tcp."); 390 else if (type == PJSIP_TRANSPORT_UDP )391 else if (type == PJSIP_TRANSPORT_UDP || type == PJSIP_TRANSPORT_UDP6) 391 392 query->naptr[0].res_type = pj_str("_sip._udp."); 392 393 else { … … 587 588 srv->entry[srv->count].priority = 0; 588 589 srv->entry[srv->count].weight = 0; 589 srv->entry[srv->count].addr_len = sizeof(pj_sockaddr_in );590 srv->entry[srv->count].addr_len = sizeof(pj_sockaddr_in6); 590 591 pj_sockaddr_init(pj_AF_INET6(), &srv->entry[srv->count].addr, 591 592 0, (pj_uint16_t)query->req.def_port); … … 651 652 srv.entry[srv.count].priority = rec->entry[i].priority; 652 653 srv.entry[srv.count].weight = rec->entry[i].weight; 653 srv.entry[srv.count].addr_len = sizeof(pj_sockaddr_in);654 654 pj_sockaddr_init(s->addr[j].af, 655 655 &srv.entry[srv.count].addr, … … 659 659 else 660 660 srv.entry[srv.count].addr.ipv4.sin_addr = s->addr[j].ip.v4; 661 srv.entry[srv.count].addr_len = 662 pj_sockaddr_get_len(&srv.entry[srv.count].addr); 661 663 662 664 /* Update transport type if this is IPv6 */
Note: See TracChangeset
for help on using the changeset viewer.