Changeset 3547 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

Apr 28, 2011 4:01:40 AM (13 years ago)

Author:

ming

Message:

Fixed #1243: ICE bug: If RTCP is not in use, the agent MUST signal that using b=RS:0 and b=RR:0

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -545 +545 @@
 }
 
+PJ_DEF(pjmedia_sdp_bandw*)
+pjmedia_sdp_bandw_clone (pj_pool_t *pool, 
+                         const pjmedia_sdp_bandw *rhs)
+{
+    pjmedia_sdp_bandw *b = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_bandw);
+    if (!b) return NULL;
+
+    if (!pj_strdup (pool, &b->modifier, &rhs->modifier)) return NULL;
+    b->value = rhs->value;
+
+    return b;
+}
+
+static pj_ssize_t print_bandw(const pjmedia_sdp_bandw *bandw,
+                              char *buf, pj_size_t len)
+{
+    char *p = buf;
+
+    if ((int)len < bandw->modifier.slen + 10 + 5)
+        return -1;
+
+    *p++ = 'b';
+    *p++ = '=';
+    pj_memcpy(p, bandw->modifier.ptr, bandw->modifier.slen);
+    p += bandw->modifier.slen;
+    *p++ = ':';
+    p += pj_utoa(bandw->value, p);
+
+    *p++ = '\r';
+    *p++ = '\n';
+    return p-buf;
+}
+
 static pj_ssize_t print_attr(const pjmedia_sdp_attr *attr, 
                              char *buf, pj_size_t len)
@@ -612 +645 @@
         p += printed;
     }
+    
+    /* print optional bandwidth info. */
+    for (i=0; i<m->bandw_count; ++i) {
+        printed = print_bandw(m->bandw[i], p, end-p);
+        if (printed < 0) {
+            return -1;
+        }
+        p += printed;
+    }
 
     /* print attributes. */
@@ -646 +688 @@
     } else {
         m->conn = NULL;
+    }
+
+    m->bandw_count = rhs->bandw_count;
+    for (i=0; i < rhs->bandw_count; ++i) {
+        m->bandw[i] = pjmedia_sdp_bandw_clone (pool, rhs->bandw[i]);
+        PJ_ASSERT_RETURN(m->bandw[i] != NULL, NULL);
     }
 
@@ -1468 +1516 @@
     }
 
+    m->bandw_count = rhs->bandw_count;
+    for (i=0; i < rhs->bandw_count; ++i) {
+        m->bandw[i] = pjmedia_sdp_bandw_clone (pool, rhs->bandw[i]);
+        PJ_ASSERT_RETURN(m->bandw[i] != NULL, NULL);
+    }
+
     /* And deactivate it */
     pjmedia_sdp_media_deactivate(pool, m);