Changeset 6155 for pjproject

Timestamp:

Feb 4, 2020 5:37:21 AM (4 years ago)

Author:

ming

Message:

Re #2229: Check to send pending data in the buffer even if the send completes immediately, since buffer may have been filled by then.

File:

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

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

@@ -137 +137 @@
 /* Forward decls */
 static pj_bool_t on_data_sent(pj_ice_strans *ice_st, pj_ssize_t sent);
+static void check_pending_send(pj_ice_strans *ice_st);
 static void ice_st_on_destroy(void *obj);
 static void destroy_ice_st(pj_ice_strans *ice_st);
@@ -1630 +1631 @@
     if (comp->default_cand >= comp->cand_cnt) {
         status = PJ_EINVALIDOP;
-        goto on_return;
+        if (call_cb)
+            on_data_sent(ice_st, -status);
+        return status;
     }
 
@@ -1742 +1745 @@
         on_data_sent(ice_st, (status == PJ_SUCCESS? data_len: -status));
     } else {
-        pj_grp_lock_acquire(ice_st->grp_lock);
-        if (ice_st->num_buf > 0) {
-            ice_st->buf_idx = (ice_st->buf_idx + 1) % ice_st->num_buf;
-            pj_assert (ice_st->buf_idx == ice_st->empty_idx);
-        }
-        ice_st->is_pending = PJ_FALSE;
-        pj_grp_lock_release(ice_st->grp_lock);
+        check_pending_send(ice_st);
     }
 
@@ -2015 +2012 @@
 }
 
-/* Notifification when asynchronous send operation via STUN/TURN
- * has completed.
- */
-static pj_bool_t on_data_sent(pj_ice_strans *ice_st, pj_ssize_t sent)
-{
-    if (ice_st->destroy_req || !ice_st->is_pending)
-        return PJ_TRUE;
-
-    if (ice_st->call_send_cb && ice_st->cb.on_data_sent) {
-        (*ice_st->cb.on_data_sent)(ice_st, sent);
-    }
-
+static void check_pending_send(pj_ice_strans *ice_st)
+{
     pj_grp_lock_acquire(ice_st->grp_lock);
 
@@ -2033 +2020 @@
     
     if (ice_st->num_buf > 0 && ice_st->buf_idx != ice_st->empty_idx) {
-        /* There's still more pending send. Send it one by one. */
+        /* There's some pending send. Send it one by one. */
         pending_send *ps = &ice_st->send_buf[ice_st->buf_idx];
 
@@ -2043 +2030 @@
         pj_grp_lock_release(ice_st->grp_lock);
     }
+}
+
+/* Notifification when asynchronous send operation via STUN/TURN
+ * has completed.
+ */
+static pj_bool_t on_data_sent(pj_ice_strans *ice_st, pj_ssize_t sent)
+{
+    if (ice_st->destroy_req || !ice_st->is_pending)
+        return PJ_TRUE;
+
+    if (ice_st->call_send_cb && ice_st->cb.on_data_sent) {
+        (*ice_st->cb.on_data_sent)(ice_st, sent);
+    }
+
+    check_pending_send(ice_st);
 
     return PJ_TRUE;