Changeset 2355 for pjproject/trunk

Timestamp:

Oct 21, 2008 5:38:42 PM (16 years ago)

Author:

nanang

Message:

Ticket #662: Updated pjmedia transport ICE to handle missing IP address part in SDP a=rtcp attribute.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)

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

@@ -806 +806 @@
         }
         
-        /* 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;
+        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);
         }