Changeset 5634

Timestamp:

Jul 28, 2017 9:43:57 AM (7 years ago)

Author:

nanang

Message:

Fix #2033: ICE must use regular nomination when communicating with lite implementations.

File:

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

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

@@ -1093 +1093 @@
 
     /* Detect our role */
-    if (current_ice_role==PJ_ICE_SESS_ROLE_CONTROLLING) {
+    if (pjmedia_sdp_attr_find(rem_sdp->attr_count, rem_sdp->attr,
+                              &STR_ICE_LITE, NULL) != NULL)
+    {
+        /* Remote is ICE lite, set our role as controlling */
         sdp_state->local_role = PJ_ICE_SESS_ROLE_CONTROLLING;
     } else {
-        if (pjmedia_sdp_attr_find(rem_sdp->attr_count, rem_sdp->attr,
-                                  &STR_ICE_LITE, NULL) != NULL)
-        {
-            /* Remote is ICE Lite */
+        if (current_ice_role==PJ_ICE_SESS_ROLE_CONTROLLING) {
             sdp_state->local_role = PJ_ICE_SESS_ROLE_CONTROLLING;
         } else {
@@ -1587 +1587 @@
         }
 
-
         /* start ICE */
+    }
+
+    /* RFC 5245 section 8.1.1:
+     * If its peer has a lite implementation, an agent MUST use
+     * a regular nomination algorithm.
+     */
+    if (pjmedia_sdp_attr_find(rem_sdp->attr_count, rem_sdp->attr,
+                              &STR_ICE_LITE, NULL) != NULL)
+    {
+        pj_ice_sess_options opt;
+        pj_ice_strans_get_options(tp_ice->ice_st, &opt);
+        if (opt.aggressive) {
+            opt.aggressive = PJ_FALSE;
+            pj_ice_strans_set_options(tp_ice->ice_st, &opt);
+            PJ_LOG(4,(tp_ice->base.name, "Forcefully set ICE to use regular "
+                      "nomination as remote is lite implementation"));
+        }
     }