Changeset 2714 for pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_session.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_session.c (modified) (4 diffs)

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

@@ -30 +30 @@
 #include <pj/string.h>
 
-
 /* String names for candidate types */
 static const char *cand_type_names[] =
@@ -243 +242 @@
                                     const pj_sockaddr *base_addr)
 {
-#if 0
+#if PJNATH_ICE_PRIO_STD
     char buf[64];
     pj_uint32_t val;
@@ -659 +658 @@
                                   pj_uint32_t comp_id)
 {
-#if 0
+#if PJNATH_ICE_PRIO_STD
     return ((ice->prefs[type] & 0xFF) << 24) + 
            ((local_pref & 0xFFFF)    << 8) +
@@ -1638 +1637 @@
 
     /* Add PRIORITY */
+#if PJNATH_ICE_PRIO_STD
+    prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX, 65535, 
+                          lcand->comp_id);
+#else
     prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX, 0, 
                           lcand->comp_id);
+#endif
     pj_stun_msg_add_uint_attr(check->tdata->pool, check->tdata->msg, 
                               PJ_STUN_ATTR_PRIORITY, prio);