Changeset 6139 for pjproject

Timestamp:

Jan 28, 2020 3:51:50 AM (5 years ago)

Author:

riza

Message:

Close #2263: Add callback to notify when first valid pair is found on ICE negotiation.

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/ice_session.h (modified) (2 diffs)
• src/pjnath/ice_session.c (modified) (2 diffs)

pjproject/trunk/pjnath/include/pjnath/ice_session.h

@@ -469 +469 @@
     /**
      * An optional callback that will be called by the ICE session when
+     * a valid pair has been found during ICE negotiation.
+     *
+     * @param ice           The ICE session.
+     */
+    void        (*on_valid_pair)(pj_ice_sess *ice);
+
+    /**
+     * An optional callback that will be called by the ICE session when
      * ICE negotiation has completed, successfully or with failure.
      *
@@ -626 +634 @@
     pj_bool_t            is_complete;               /**< Complete?          */
     pj_bool_t            is_destroying;             /**< Destroy is called  */
+    pj_bool_t            valid_pair_found;          /**< First pair found   */
     pj_status_t          ice_status;                /**< Error status.      */
     pj_timer_entry       timer;                     /**< ICE timer.         */

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -419 +419 @@
     pj_list_init(&ice->early_check);
 
+    ice->valid_pair_found = PJ_FALSE;
+
     /* Done */
     *p_ice = ice;
@@ -1349 +1351 @@
              (check->nominated ? "  and nominated" : "")));
 
+        /* On the first valid pair, we call the callback, if present */
+        if (ice->valid_pair_found == PJ_FALSE) {
+            ice->valid_pair_found = PJ_TRUE;
+
+            if (ice->cb.on_valid_pair) {
+                (*ice->cb.on_valid_pair)(ice);
+            }
+        }
     }