Ignore:
Timestamp:
Dec 28, 2016 3:40:07 AM (4 years ago)
Author:
nanang
Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp

  • pjproject/branches/projects/uwp/pjmedia/src/pjmedia/sdp.c

    r5193 r5513  
    409409 
    410410            /* Get the address */ 
    411             pj_scan_get(&scanner, &cs_token, &rtcp->addr); 
     411            //pj_scan_get(&scanner, &cs_token, &rtcp->addr); 
     412            pj_scan_get_until_chr(&scanner, "/ \t\r\n", &rtcp->addr); 
    412413 
    413414        } 
     
    432433        ATTR_LEN = PJ_INET6_ADDRSTRLEN+16 
    433434    }; 
     435    char tmp_addr[PJ_INET6_ADDRSTRLEN]; 
    434436    pjmedia_sdp_attr *attr; 
    435437 
     
    441443            pj_ansi_snprintf(attr->value.ptr, ATTR_LEN, 
    442444                            "%u IN IP4 %s", 
    443                             pj_ntohs(a->ipv4.sin_port), 
    444                             pj_inet_ntoa(a->ipv4.sin_addr)); 
     445                            pj_sockaddr_get_port(a), 
     446                            pj_sockaddr_print(a, tmp_addr,  
     447                                              sizeof(tmp_addr), 0)); 
    445448    } else if (a->addr.sa_family == pj_AF_INET6()) { 
    446         char tmp_addr[PJ_INET6_ADDRSTRLEN]; 
    447449        attr->value.slen =  
    448450            pj_ansi_snprintf(attr->value.ptr, ATTR_LEN, 
Note: See TracChangeset for help on using the changeset viewer.