Changeset 2714 for pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c

Timestamp:

May 18, 2009 11:49:46 PM (15 years ago)

Author:

bennylp

Message:

Ticket #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice

File:

• pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)

pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c

@@ -51 +51 @@
  * specify preference among candidates with the same type. Since
  * we don't have the facility to specify that, we'll just set it
- * all to zero.
- */
-#define SRFLX_PREF  0
-#define HOST_PREF   0
-#define RELAY_PREF  0
+ * all to the same value.
+ */
+#if PJNATH_ICE_PRIO_STD
+#   define SRFLX_PREF  65535
+#   define HOST_PREF   65535
+#   define RELAY_PREF  65535
+#else
+#   define SRFLX_PREF  0
+#   define HOST_PREF   0
+#   define RELAY_PREF  0
+#endif
+
 
 /* The candidate type preference when STUN candidate is used */
 static pj_uint8_t srflx_pref_table[4] = 
 {
+#if PJNATH_ICE_PRIO_STD
+    100,    /**< PJ_ICE_HOST_PREF           */
+    126,    /**< PJ_ICE_SRFLX_PREF          */
+    110,    /**< PJ_ICE_PRFLX_PREF          */
+    0       /**< PJ_ICE_RELAYED_PREF    */
+#else
     /* Keep it to 2 bits */
     1,  /**< PJ_ICE_HOST_PREF       */
@@ -65 +78 @@
     3,  /**< PJ_ICE_PRFLX_PREF      */
     0   /**< PJ_ICE_RELAYED_PREF    */
+#endif
 };