Changeset 4602 for pjproject

Timestamp:

Sep 25, 2013 4:57:26 AM (11 years ago)

Author:

nanang

Message:

Fix #1700: Added PJ_ICE_CAND_TYPE_MAX to represent the number ICE candidate types.

Location:

pjproject/trunk/pjnath

Files:

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

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

@@ -155 +155 @@
      * TURN server.
      */
-    PJ_ICE_CAND_TYPE_RELAYED
+    PJ_ICE_CAND_TYPE_RELAYED,
+
+    /**
+     * Number of defined ICE candidate types.
+     */
+    PJ_ICE_CAND_TYPE_MAX
 
 } pj_ice_cand_type;

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

@@ -81 +81 @@
 
 /* Candidate type preference */
-static pj_uint8_t cand_type_prefs[4] =
+static pj_uint8_t cand_type_prefs[PJ_ICE_CAND_TYPE_MAX] =
 {
 #if PJ_ICE_CAND_TYPE_PREF_BITS < 8
@@ -546 +546 @@
     unsigned i;
     PJ_ASSERT_RETURN(ice && prefs, PJ_EINVAL);
-    ice->prefs = (pj_uint8_t*) pj_pool_calloc(ice->pool, PJ_ARRAY_SIZE(prefs),
+    ice->prefs = (pj_uint8_t*) pj_pool_calloc(ice->pool, PJ_ICE_CAND_TYPE_MAX,
                                               sizeof(pj_uint8_t));
-    for (i=0; i<4; ++i) {
+    for (i=0; i<PJ_ICE_CAND_TYPE_MAX; ++i) {
 #if PJ_ICE_CAND_TYPE_PREF_BITS < 8
         pj_assert(prefs[i] < (2 << PJ_ICE_CAND_TYPE_PREF_BITS));

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -66 +66 @@
 
 /* The candidate type preference when STUN candidate is used */
-static pj_uint8_t srflx_pref_table[4] = 
+static pj_uint8_t srflx_pref_table[PJ_ICE_CAND_TYPE_MAX] = 
 {
 #if PJNATH_ICE_PRIO_STD