Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/sdp.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 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:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/sdp.c (modified) (3 diffs)

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

@@ -409 +409 @@
 
             /* Get the address */
-            pj_scan_get(&scanner, &cs_token, &rtcp->addr);
+            //pj_scan_get(&scanner, &cs_token, &rtcp->addr);
+            pj_scan_get_until_chr(&scanner, "/ \t\r\n", &rtcp->addr);
 
         }
@@ -432 +433 @@
         ATTR_LEN = PJ_INET6_ADDRSTRLEN+16
     };
+    char tmp_addr[PJ_INET6_ADDRSTRLEN];
     pjmedia_sdp_attr *attr;
 
@@ -441 +443 @@
             pj_ansi_snprintf(attr->value.ptr, ATTR_LEN,
                             "%u IN IP4 %s",
-                            pj_ntohs(a->ipv4.sin_port),
-                            pj_inet_ntoa(a->ipv4.sin_addr));
+                            pj_sockaddr_get_port(a),
+                            pj_sockaddr_print(a, tmp_addr, 
+                                              sizeof(tmp_addr), 0));
     } else if (a->addr.sa_family == pj_AF_INET6()) {
-        char tmp_addr[PJ_INET6_ADDRSTRLEN];
         attr->value.slen = 
             pj_ansi_snprintf(attr->value.ptr, ATTR_LEN,