Changeset 1126 for pjproject/trunk/pjnath/include/pjnath/ice_session.h

Timestamp:

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

Author:

bennylp

Message:

ICE: work in progress

File:

• pjproject/trunk/pjnath/include/pjnath/ice_session.h (modified) (6 diffs)

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

@@ -97 +97 @@
 } pj_ice_cand_type;
 
-
-/**
- * This enumeration describes the default preference for the ICE
- * candidate types as described by ICE standard.
- */
-enum pj_ice_type_pref
-{
-    PJ_ICE_HOST_PREF        = 126,  /**< Preference value for host.     */
-    PJ_ICE_SRFLX_PREF       = 100,  /**< Preference value for SRFLX.    */
-    PJ_ICE_PRFLX_PREF       = 110,  /**< Preference value for PRFLX     */
-    PJ_ICE_RELAYED_PREF     = 0     /**< Preference value for relay     */
-};
 
 /** Forward declaration for pj_ice_sess */
@@ -274 +262 @@
      * Check priority.
      */
-    pj_uint64_t          prio;
+    pj_timestamp         prio;
 
     /**
@@ -446 +434 @@
     pj_ice_sess_role     role;                      /**< ICE role.          */
     pj_timestamp         tie_breaker;               /**< Tie breaker value  */
+    pj_uint8_t          *prefs;                     /**< Type preference.   */
     pj_bool_t            is_complete;               /**< Complete?          */
     pj_status_t          ice_status;                /**< Error status.      */
@@ -567 +556 @@
 
 /**
+ * Assign a custom preference values for ICE candidate types. By assigning
+ * custom preference value, application can control the order of candidates
+ * to be checked first. The default preference settings is to use 126 for 
+ * host candidates, 100 for server reflexive candidates, 110 for peer 
+ * reflexive candidates, an 0 for relayed candidates.
+ *
+ * Note that this function must be called before any candidates are added
+ * to the ICE session.
+ *
+ * @param ice           The ICE session.
+ * @param prefs         Array of candidate preference value. The values are
+ *                      put in the array indexed by the candidate type as
+ *                      specified in pj_ice_cand_type.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pj_ice_sess_set_prefs(pj_ice_sess *ice,
+                                           const pj_uint8_t prefs[4]);
+
+
+
+/**
  * Add a candidate to this ICE session. Application must add candidates for
  * each components ID before it can start pairing the candidates and 
@@ -596 +607 @@
                                           unsigned *p_cand_id);
 
+#if 0
+/* Temporarily disabled to reduce size, since we don't need this yet */
+
 /**
  * Find default candidate for the specified component ID, using this
@@ -613 +627 @@
                                                    unsigned comp_id,
                                                    int *p_cand_id);
+#endif
 
 /**