Changeset 1126 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Apr 2, 2007 11:30:14 AM (17 years ago)

Author:

bennylp

Message:

ICE: work in progress

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (15 diffs)

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

@@ -89 +89 @@
 
 
-
+/*
+ * Create ICE media transport.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_create(pjmedia_endpt *endpt,
                                        const char *name,
@@ -132 +134 @@
 
 
+/*
+ * Destroy ICE media transport.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_destroy(pjmedia_transport *tp)
 {
@@ -138 +143 @@
     if (tp_ice->ice_st) {
         pj_ice_strans_destroy(tp_ice->ice_st);
-        //Must not touch tp_ice after ice_st is destroyed!
-        //(it has the pool)
-        //tp_ice->ice_st = NULL;
+        /*Must not touch tp_ice after ice_st is destroyed!
+         (it has the pool)
+         tp_ice->ice_st = NULL;
+         */
     }
 
@@ -147 +153 @@
 
 
+/*
+ * Start media transport initialization.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_start_init( pjmedia_transport *tp,
                                             unsigned options,
@@ -186 +195 @@
 
 
+/*
+ * Get the status of media transport initialization.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_get_init_status(pjmedia_transport *tp)
 {
@@ -193 +205 @@
 
 
+/*
+ * Get the component for the specified component ID.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_get_comp( pjmedia_transport *tp,
                                           unsigned comp_id,
@@ -205 +220 @@
 }
 
-PJ_DEF(pj_ice_strans*) pjmedia_ice_get_ice_st(pjmedia_transport *tp)
-{
-    struct transport_ice *tp_ice = (struct transport_ice*)tp;
-    return tp_ice->ice_st;
-}
-
-
+
+/*
+ * Create ICE! This happens when:
+ *  - UAC is ready to send offer
+ *  - UAS have just received an offer.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_init_ice(pjmedia_transport *tp,
                                          pj_ice_sess_role role,
@@ -222 +236 @@
 
 
+/*
+ * For both UAC and UAS, pass in the SDP before sending it to remote.
+ * This will add ICE attributes to the SDP.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_modify_sdp(pjmedia_transport *tp,
                                            pj_pool_t *pool,
@@ -306 +324 @@
 
 
+/* Parse a=candidate line */
 static pj_status_t parse_cand(pj_pool_t *pool,
                               const pj_str_t *orig_input,
@@ -391 +410 @@
 }
 
-static void set_no_ice(struct transport_ice *tp_ice)
+
+/* Disable ICE when SDP from remote doesn't contain a=candidate line */
+static void set_no_ice(struct transport_ice *tp_ice, const char *reason)
 {
     PJ_LOG(4,(tp_ice->ice_st->obj_name, 
-              "Remote does not support ICE, disabling local ICE"));
+              "Disabling local ICE, reason=%s", reason));
     pjmedia_ice_stop_ice(&tp_ice->base);
 }
 
 
+/*
+ * Start ICE checks when both offer and answer are available.
+ */
 PJ_DEF(pj_status_t) pjmedia_ice_start_ice(pjmedia_transport *tp,
                                           pj_pool_t *pool,
@@ -410 +434 @@
     const pjmedia_sdp_media *sdp_med;
     pj_bool_t remote_is_lite = PJ_FALSE;
+    pj_bool_t ice_mismatch = PJ_FALSE;
     const pj_str_t STR_CANDIDATE = {"candidate", 9};
     const pj_str_t STR_ICE_LITE = {"ice-lite", 8};
+    const pj_str_t STR_ICE_MISMATCH = {"ice-mismatch", 12};
     pj_str_t uname, pass;
     pj_status_t status;
@@ -428 +454 @@
                                       "ice-ufrag", NULL);
         if (attr == NULL) {
-            set_no_ice(tp_ice);
+            set_no_ice(tp_ice, "ice-ufrag attribute not found");
             return PJ_SUCCESS;
         }
@@ -442 +468 @@
                                       "ice-pwd", NULL);
         if (attr == NULL) {
-            set_no_ice(tp_ice);
+            set_no_ice(tp_ice, "ice-pwd attribute not found");
             return PJ_SUCCESS;
         }
@@ -455 +481 @@
         attr = sdp_med->attr[i];
 
-        if (pj_strcmp(&attr->name, &STR_ICE_LITE)==0)
+        if (pj_strcmp(&attr->name, &STR_ICE_LITE)==0) {
             remote_is_lite = PJ_TRUE;
+            continue;
+        }
+
+        if (pj_strcmp(&attr->name, &STR_ICE_MISMATCH)==0) {
+            ice_mismatch = PJ_TRUE;
+            continue;
+        }
 
         if (pj_strcmp(&attr->name, &STR_CANDIDATE)!=0)
@@ -466 +499 @@
 
         cand_cnt++;
+    }
+
+    /* Handle ice-mismatch case */
+    if (ice_mismatch) {
+        set_no_ice(tp_ice, "ice-mismatch detected");
+        return PJ_SUCCESS;
     }