Changeset 1126 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

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

Author:

bennylp

Message:

ICE: work in progress

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (5 diffs)

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

@@ -66 +66 @@
 
 /* Utility: print error */
-#if PJ_LOG_MAX_LEVEL >= 3
-static void ice_st_perror(pj_ice_strans *ice_st, const char *title, 
-                          pj_status_t status)
-{
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-    PJ_LOG(3,(ice_st->obj_name, "%s: %s", title, errmsg));
-}
-#else
-#   define ice_st_perror(ice_st, title, status)
-#endif
-
+#define ice_st_perror(ice_st,msg,rc) pjnath_perror(ice_st->obj_name,msg,rc)
 
 /* 
@@ -345 +333 @@
             pj_sockaddr_in cand_addr;
             pj_bool_t set_default;
+            pj_uint16_t local_pref;
 
             /* Ignore 127.0.0.0/24 address */
@@ -359 +348 @@
             if (ifs[i].s_addr == comp->local_addr.ipv4.sin_addr.s_addr) {
                 set_default = PJ_TRUE;
+                local_pref = 65535;
             } else {
                 set_default = PJ_FALSE;
+                local_pref = 0;
             }
 
             status = add_cand(ice_st, comp, comp_id, 
                               PJ_ICE_CAND_TYPE_HOST, 
-                              (pj_uint16_t)(65535-i), &cand_addr,
-                              set_default);
+                              local_pref, &cand_addr, set_default);
             if (status != PJ_SUCCESS)
                 goto on_error;
@@ -760 +750 @@
     unsigned i;
     pj_ice_sess_cb ice_cb;
+    const pj_uint8_t srflx_prio[4] = { 100, 126, 110, 0 };
 
     /* Check arguments */
@@ -783 +774 @@
     /* Associate user data */
     ice_st->ice->user_data = (void*)ice_st;
+
+    /* If default candidate for components are SRFLX one, upload a custom
+     * type priority to ICE session so that SRFLX candidates will get
+     * checked first.
+     */
+    if (ice_st->comp[0]->default_cand >= 0 &&
+        ice_st->comp[0]->cand_list[ice_st->comp[0]->default_cand].type 
+            == PJ_ICE_CAND_TYPE_SRFLX)
+    {
+        pj_ice_sess_set_prefs(ice_st->ice, srflx_prio);
+    }
+
 
     /* Add candidates */