Changeset 5604

Timestamp:

Jun 14, 2017 6:04:12 AM (7 years ago)

Author:

nanang

Message:

Close #2009: Fixed issue no 2:

• Synchronizing PJMEDIA transport ICE and ICE stream transport lifetime using group lock.
• Zeroing callback pointer in ICE stream transport destructor.
• Added few pointer validity checks.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_ice.c (modified) (6 diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -159 +159 @@
                                 pj_status_t status);
 
+/*
+ * Clean up ICE resources.
+ */
+static void tp_ice_on_destroy(void *arg);
+
 
 static pjmedia_transport_op transport_ice_op = 
@@ -289 +294 @@
         *p_tp = NULL;
         return status;
+    }
+
+    /* Sync to ICE */
+    {
+        pj_grp_lock_t *grp_lock = pj_ice_strans_get_grp_lock(tp_ice->ice_st);
+        pj_grp_lock_add_ref(grp_lock);
+        pj_grp_lock_add_handler(grp_lock, pool, tp_ice, &tp_ice_on_destroy);
     }
 
@@ -1789 +1801 @@
 
     tp_ice = (struct transport_ice*) pj_ice_strans_get_user_data(ice_st);
+    if (!tp_ice) {
+        /* Destroy on progress */
+        return;
+    }
 
     if (comp_id==1 && tp_ice->rtp_cb) {
@@ -1926 +1942 @@
 
     tp_ice = (struct transport_ice*) pj_ice_strans_get_user_data(ice_st);
+    if (!tp_ice) {
+        /* Destroy on progress */
+        return;
+    }
 
     pj_perror(5, tp_ice->base.name, result, "ICE operation complete"
@@ -1965 +1985 @@
 }
 
+static void tp_ice_on_destroy(void *arg)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)arg;
+    pj_pool_safe_release(&tp_ice->pool);
+}
 
 /*
@@ -1973 +1998 @@
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
 
+    /* Reset callback and user data */
+    pj_bzero(&tp_ice->cb, sizeof(tp_ice->cb));
+    tp_ice->base.user_data = NULL;
+    tp_ice->rtp_cb = NULL;
+    tp_ice->rtcp_cb = NULL;
+
     if (tp_ice->ice_st) {
+        pj_grp_lock_t *grp_lock = pj_ice_strans_get_grp_lock(tp_ice->ice_st);
         pj_ice_strans_destroy(tp_ice->ice_st);
         tp_ice->ice_st = NULL;
-    }
-
-    pj_pool_safe_release(&tp_ice->pool);
+        pj_grp_lock_dec_ref(grp_lock);
+    } else {
+        tp_ice_on_destroy(tp);
+    }
 
     return PJ_SUCCESS;

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

@@ -863 +863 @@
     pj_log_push_indent();
 
+    /* Reset callback and user data */
+    pj_bzero(&ice_st->cb, sizeof(ice_st->cb));
+    ice_st->user_data = NULL;
+
     pj_grp_lock_acquire(ice_st->grp_lock);
 
@@ -955 +959 @@
     unsigned i;
 
-    /* Ignore if init callback has been called */
-    if (ice_st->cb_called)
+    /* Ignore if ICE is destroying or init callback has been called */
+    if (ice_st->destroy_req || ice_st->cb_called)
         return;