Changeset 2376 for pjproject

Timestamp:

Dec 11, 2008 5:25:50 PM (16 years ago)

Author:

nanang

Message:

Ticket #661: Fixed transport ICE in verifying possibilities of RTCP settings in the SDP.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_ice.c (modified) (5 diffs)
• pjsip-apps/src/test-pjsua/scripts-sendto/200_ice_success_3.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/200_ice_success_4.py (added)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -595 +595 @@
     }
 
+    /* Removing a=rtcp line when there is only one component. */
+    if (comp_cnt == 1) {
+        attr = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_RTCP, NULL);
+        if (attr)
+            pjmedia_sdp_attr_remove(&m->attr_count, m->attr, attr);
+    }
+    
+
     return PJ_SUCCESS;
 }
@@ -749 +757 @@
 {
     const pjmedia_sdp_media *rem_m;
-    const pjmedia_sdp_attr *attr, *ufrag_attr, *pwd_attr;
+    const pjmedia_sdp_attr *ufrag_attr, *pwd_attr;
     const pjmedia_sdp_conn *rem_conn;
-    pj_bool_t comp1_found=PJ_FALSE, comp2_found=PJ_FALSE;
+    pj_bool_t comp1_found=PJ_FALSE, comp2_found=PJ_FALSE, has_rtcp=PJ_FALSE;
     pj_sockaddr rem_conn_addr, rtcp_addr;
     unsigned i;
@@ -768 +776 @@
 
     /* Verify that default target for each component matches one of the 
-     * candidatefor the component. Otherwise stop ICE with ICE ice_mismatch 
+     * candidate for the component. Otherwise stop ICE with ICE ice_mismatch 
      * error.
      */
@@ -794 +802 @@
         return status;
 
-    /* Component 2 is a=rtcp line, if present. */
-    attr = pjmedia_sdp_attr_find(rem_m->attr_count, rem_m->attr, 
-                                 &STR_RTCP, NULL);
-    if (attr && tp_ice->comp_cnt > 1) {
-        pjmedia_sdp_rtcp_attr rtcp_attr;
-
-        status = pjmedia_sdp_attr_get_rtcp(attr, &rtcp_attr);
-        if (status != PJ_SUCCESS) {
-            /* Error parsing a=rtcp attribute */
-            return status;
-        }
-        
-        if (rtcp_attr.addr.slen) {
-            /* Verify address family matches */
-            if ((tp_ice->af==pj_AF_INET() && 
-                 pj_strcmp(&rtcp_attr.addr_type, &STR_IP4)!=0) ||
-                (tp_ice->af==pj_AF_INET6() && 
-                 pj_strcmp(&rtcp_attr.addr_type, &STR_IP6)!=0))
-            {
-                return PJMEDIA_SDP_ETPORTNOTEQUAL;
+    if (tp_ice->comp_cnt > 1) {
+        const pjmedia_sdp_attr *attr;
+
+        /* Get default RTCP candidate from a=rtcp line, if present, otherwise
+         * calculate default RTCP candidate from default RTP target.
+         */
+        attr = pjmedia_sdp_attr_find(rem_m->attr_count, rem_m->attr, 
+                                     &STR_RTCP, NULL);
+        has_rtcp = (attr != NULL);
+
+        if (attr) {
+            pjmedia_sdp_rtcp_attr rtcp_attr;
+
+            status = pjmedia_sdp_attr_get_rtcp(attr, &rtcp_attr);
+            if (status != PJ_SUCCESS) {
+                /* Error parsing a=rtcp attribute */
+                return status;
             }
-
-            /* Assign RTCP address */
-            status = pj_sockaddr_init(tp_ice->af, &rtcp_addr,
-                                      &rtcp_attr.addr,
-                                      (pj_uint16_t)rtcp_attr.port);
-            if (status != PJ_SUCCESS) {
-                return PJMEDIA_SDP_EINRTCP;
+        
+            if (rtcp_attr.addr.slen) {
+                /* Verify address family matches */
+                if ((tp_ice->af==pj_AF_INET() && 
+                     pj_strcmp(&rtcp_attr.addr_type, &STR_IP4)!=0) ||
+                    (tp_ice->af==pj_AF_INET6() && 
+                     pj_strcmp(&rtcp_attr.addr_type, &STR_IP6)!=0))
+                {
+                    return PJMEDIA_SDP_ETPORTNOTEQUAL;
+                }
+
+                /* Assign RTCP address */
+                status = pj_sockaddr_init(tp_ice->af, &rtcp_addr,
+                                          &rtcp_attr.addr,
+                                          (pj_uint16_t)rtcp_attr.port);
+                if (status != PJ_SUCCESS) {
+                    return PJMEDIA_SDP_EINRTCP;
+                }
+            } else {
+                /* Assign RTCP address */
+                status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, 
+                                          NULL, 
+                                          (pj_uint16_t)rtcp_attr.port);
+                if (status != PJ_SUCCESS) {
+                    return PJMEDIA_SDP_EINRTCP;
+                }
+                pj_sockaddr_copy_addr(&rtcp_addr, &rem_conn_addr);
             }
         } else {
-            /* Assign RTCP address */
-            status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, 
-                                      NULL, 
-                                      (pj_uint16_t)rtcp_attr.port);
-            if (status != PJ_SUCCESS) {
-                return PJMEDIA_SDP_EINRTCP;
-            }
-            pj_sockaddr_copy_addr(&rtcp_addr, &rem_conn_addr);
-        }
-
-        sdp_state->match_comp_cnt = 2;
-
-    } else {
-        /* Don't have RTCP component */
-        comp2_found = PJ_TRUE;
-        sdp_state->match_comp_cnt = 1;
-    }
-
-    /* Find the default address in a=candidate attributes. 
+            unsigned rtcp_port;
+        
+            rtcp_port = pj_sockaddr_get_port(&rem_conn_addr) + 1;
+            pj_sockaddr_cp(&rtcp_addr, &rem_conn_addr);
+            pj_sockaddr_set_port(&rtcp_addr, (pj_uint16_t)rtcp_port);
+        }
+    }
+
+    /* Find the default addresses in a=candidate attributes. 
      */
     for (i=0; i<rem_m->attr_count; ++i) {
@@ -864 +879 @@
             pj_sockaddr_cmp(&rem_conn_addr, &cand.addr)==0) 
         {
-            /* Found */
             comp1_found = PJ_TRUE;
-            if (comp1_found && comp2_found)
-                break;
         } else if (!comp2_found && cand.comp_id==COMP_RTCP &&
                     pj_sockaddr_cmp(&rtcp_addr, &cand.addr)==0) 
         {
-            /* Found */
             comp2_found = PJ_TRUE;
-            if (comp1_found && comp2_found)
-                break;
-        }
-
-    }
-
-    if (!comp1_found || !comp2_found) {
-        /* ICE ice_mismatch */
+        }
+
+        if (cand.comp_id == COMP_RTCP)
+            has_rtcp = PJ_TRUE;
+
+        if (comp1_found && (comp2_found || tp_ice->comp_cnt==1))
+            break;
+    }
+
+    /* Check matched component count and ice_mismatch */
+    if (comp1_found && (tp_ice->comp_cnt==1 || !has_rtcp)) {
+        sdp_state->match_comp_cnt = 1;
+        sdp_state->ice_mismatch = PJ_FALSE;
+    } else if (comp1_found && comp2_found) {
+        sdp_state->match_comp_cnt = 2;
+        sdp_state->ice_mismatch = PJ_FALSE;
+    } else {
+        sdp_state->match_comp_cnt = (tp_ice->comp_cnt > 1 && has_rtcp)? 2 : 1;
         sdp_state->ice_mismatch = PJ_TRUE;
-    } else {
-        sdp_state->ice_mismatch = PJ_FALSE;
-    }
+    }
+
 
     /* Detect remote restarting session */