Changeset 1108 for pjproject

Timestamp:

Mar 27, 2007 11:00:38 AM (18 years ago)

Author:

bennylp

Message:

ICE: added media index in pjmedia when handling SDP containing ICE candidates

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport_ice.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_ice.c (modified) (3 diffs)
• pjnath/src/pjnath-test/ice_test.c (modified) (3 diffs)
• pjnath/src/pjnath-test/test.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport_ice.h

@@ -67 +67 @@
 PJ_DECL(pj_status_t) pjmedia_ice_start_ice(pjmedia_transport *tp,
                                            pj_pool_t *pool,
-                                           pjmedia_sdp_session *rem_sdp);
+                                           pjmedia_sdp_session *rem_sdp,
+                                           unsigned media_index);
 PJ_DECL(pj_status_t) pjmedia_ice_stop_ice(pjmedia_transport *tp);
 

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

@@ -401 +401 @@
 PJ_DEF(pj_status_t) pjmedia_ice_start_ice(pjmedia_transport *tp,
                                           pj_pool_t *pool,
-                                          pjmedia_sdp_session *rem_sdp)
+                                          pjmedia_sdp_session *rem_sdp,
+                                          unsigned media_index)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -407 +408 @@
     unsigned i, cand_cnt;
     pj_ice_cand cand[PJ_ICE_MAX_CAND];
+    pjmedia_sdp_media *sdp_med;
     pj_str_t uname, pass;
     pj_status_t status;
 
-    /* Find ice-ufrag attribute */
+    PJ_ASSERT_RETURN(tp && pool && rem_sdp, PJ_EINVAL);
+    PJ_ASSERT_RETURN(media_index < rem_sdp->media_count, PJ_EINVAL);
+
+    sdp_med = rem_sdp->media[media_index];
+
+    /* Find ice-ufrag attribute in session descriptor */
     attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
                                   "ice-ufrag", NULL);
     if (attr == NULL) {
-        set_no_ice(tp_ice);
-        return PJ_SUCCESS;
+        /* Find in media descriptor */
+        attr = pjmedia_sdp_attr_find2(sdp_med->attr_count, sdp_med->attr,
+                                      "ice-ufrag", NULL);
+        if (attr == NULL) {
+            set_no_ice(tp_ice);
+            return PJ_SUCCESS;
+        }
     }
     uname = attr->value;
 
-    /* Find ice-pwd attribute */
+    /* Find ice-pwd attribute in session descriptor */
     attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
                                   "ice-pwd", NULL);
     if (attr == NULL) {
-        set_no_ice(tp_ice);
-        return PJ_SUCCESS;
+        /* Not found, find in media descriptor */
+        attr = pjmedia_sdp_attr_find2(sdp_med->attr_count, sdp_med->attr,
+                                      "ice-pwd", NULL);
+        if (attr == NULL) {
+            set_no_ice(tp_ice);
+            return PJ_SUCCESS;
+        }
     }
     pass = attr->value;
@@ -430 +447 @@
     /* Get all candidates */
     cand_cnt = 0;
-    for (i=0; i<rem_sdp->media[0]->attr_count; ++i) {
+    for (i=0; i<sdp_med->attr_count; ++i) {
         pjmedia_sdp_attr *attr;
 
-        attr = rem_sdp->media[0]->attr[i];
+        attr = sdp_med->attr[i];
         if (pj_strcmp2(&attr->name, "candidate")!=0)
             continue;

pjproject/trunk/pjnath/src/pjnath-test/ice_test.c

@@ -460 +460 @@
     pj_stun_config_init(&stun_cfg, mem, 0, ioqueue, timer_heap);
 
-    //pj_log_set_level(4);
+#if 1
+    pj_log_set_level(5);
+#endif
+
+    goto test;
 
     /* Basic create/destroy */
@@ -488 +492 @@
 
     /* Direct communication with two components */
+test:
     rc = perform_ice_test("With two components (RTP and RTCP)", PJ_TRUE, 2, PJ_TRUE, D1, D2, 0, NULL, 0, NULL);
     if (rc != 0)
         goto on_return;
+
+    goto on_return;
 
     /* Direct communication with mismatch number of components */
@@ -502 +509 @@
 
 on_return:
-    //pj_log_set_level(3);
+    pj_log_set_level(3);
     pj_ioqueue_destroy(stun_cfg.ioqueue);
     pj_pool_release(pool);

pjproject/trunk/pjnath/src/pjnath-test/test.c

@@ -50 +50 @@
     mem = &caching_pool.factory;
 
+#if 0
     pj_log_set_level(3);
     pj_log_set_decor(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | 
                      PJ_LOG_HAS_MICRO_SEC);
+#endif
 
     rc = pj_init();

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -823 +823 @@
         if (pjsua_var.media_cfg.enable_ice) {
             status = pjmedia_ice_start_ice(call->med_tp, call->inv->pool, 
-                                           remote_sdp);
+                                           remote_sdp, 0);
             if (status != PJ_SUCCESS)
                 return status;