Changeset 4409

Timestamp:

Mar 1, 2013 3:04:16 AM (12 years ago)

Author:

riza

Message:

Re #1604: backported to 1.x

File:

• pjproject/branches/1.x/pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)

pjproject/branches/1.x/pjnath/src/pjnath/ice_strans.c

@@ -710 +710 @@
 PJ_DEF(pj_status_t) pj_ice_strans_destroy(pj_ice_strans *ice_st)
 {
-    char obj_name[PJ_MAX_OBJ_NAME];
-
     PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
-
+    sess_add_ref(ice_st);
     ice_st->destroy_req = PJ_TRUE;
-    if (pj_atomic_get(ice_st->busy_cnt) > 0) {
+    if (sess_dec_ref(ice_st)) {
         PJ_LOG(5,(ice_st->obj_name, 
                   "ICE strans object is busy, will destroy later"));
         return PJ_EPENDING;
     }
-    
-    pj_memcpy(obj_name, ice_st->obj_name, PJ_MAX_OBJ_NAME);
-    destroy_ice_st(ice_st);
-
-    PJ_LOG(4,(obj_name, "ICE stream transport destroyed"));
     return PJ_SUCCESS;
 }
@@ -746 +739 @@
     pj_assert(count >= 0);
     if (count==0 && ice_st->destroy_req) {
-        pj_ice_strans_destroy(ice_st);
+        destroy_ice_st(ice_st);
         return PJ_FALSE;
     } else {