Changeset 3503

Timestamp:

Apr 7, 2011 5:14:26 AM (14 years ago)

Author:

bennylp

Message:

Re #1186: rejecting media did not put c= line, causing PJMEDIA_SDP_EMISSINGCONN error

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/sdp_neg.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/sdp_neg.c

@@ -262 +262 @@
 }
 
+static pjmedia_sdp_media *sdp_media_clone_deactivate(
+                                    pj_pool_t *pool,
+                                    const pjmedia_sdp_media *rem_med,
+                                    const pjmedia_sdp_media *local_med,
+                                    const pjmedia_sdp_session *local_sess)
+{
+    pjmedia_sdp_media *res;
+
+    res = pjmedia_sdp_media_clone_deactivate(pool, rem_med);
+    if (!res)
+        return NULL;
+
+    if (!res->conn && (!local_sess || !local_sess->conn)) {
+        if (local_med && local_med->conn)
+            res->conn = pjmedia_sdp_conn_clone(pool, local_med->conn);
+        else {
+            res->conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
+            res->conn->net_type = pj_str("IN");
+            res->conn->addr_type = pj_str("IP4");
+            res->conn->addr = pj_str("127.0.0.1");
+        }
+    }
+
+    return res;
+}
 
 /*
@@ -342 +367 @@
             pjmedia_sdp_media *m;
 
-            m = pjmedia_sdp_media_clone_deactivate(pool, om);
+            m = sdp_media_clone_deactivate(pool, om, om, local);
 
             pj_array_insert(new_offer->media, sizeof(new_offer->media[0]),
@@ -1055 +1080 @@
 
             /* Generate matching-but-disabled-media for the answer */
-            am = pjmedia_sdp_media_clone_deactivate(pool, offer->media[omi]);
+            am = sdp_media_clone_deactivate(pool, offer->media[omi],
+                                            offer->media[omi], offer);
             answer->media[answer->media_count++] = am;
             ++ami;
@@ -1117 +1143 @@
     /* If offer has zero port, just clone the offer */
     if (offer->desc.port == 0) {
-        answer = pjmedia_sdp_media_clone_deactivate(pool, offer);
+        answer = sdp_media_clone_deactivate(pool, offer, preanswer, NULL);
         *p_answer = answer;
         return PJ_SUCCESS;
@@ -1430 +1456 @@
              * number is zero.
              */
-            am = pjmedia_sdp_media_clone_deactivate(pool, om);
+            am = sdp_media_clone_deactivate(pool, om, om, answer);
         } else {
             /* The answer is in am */