Changeset 5907 for pjproject

Timestamp:

Nov 7, 2018 4:34:01 AM (5 years ago)

Author:

ming

Message:

Fixed #2160: stuck issue in ioqueue when detaching UDP media transport

• Fixed transport_udp so it won't call another read operation when being stopped.
• Add robustness checks (assertion) in ioqueue recv, recvfrom, and accept to prevent the same op key being used twice.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ioqueue_common_abs.c (modified) (3 diffs)
• pjmedia/src/pjmedia/transport_udp.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

@@ -720 +720 @@
 
     read_op = (struct read_operation*)op_key;
+    PJ_ASSERT_RETURN(read_op->op == PJ_IOQUEUE_OP_NONE, PJ_EPENDING);
     read_op->op = PJ_IOQUEUE_OP_NONE;
 
@@ -793 +794 @@
 
     read_op = (struct read_operation*)op_key;
+    PJ_ASSERT_RETURN(read_op->op == PJ_IOQUEUE_OP_NONE, PJ_EPENDING);
     read_op->op = PJ_IOQUEUE_OP_NONE;
 
@@ -1128 +1130 @@
 
     accept_op = (struct accept_operation*)op_key;
+    PJ_ASSERT_RETURN(accept_op->op == PJ_IOQUEUE_OP_NONE, PJ_EPENDING);
     accept_op->op = PJ_IOQUEUE_OP_NONE;
 

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -466 +466 @@
     PJ_UNUSED_ARG(op_key);
 
+    if (-bytes_read == PJ_ECANCELLED) return;
+
     udp = (struct transport_udp*) pj_ioqueue_get_user_data(key);
 
@@ -585 +587 @@
 
     PJ_UNUSED_ARG(op_key);
+
+    if (-bytes_read == PJ_ECANCELLED) return;
 
     udp = (struct transport_udp*) pj_ioqueue_get_user_data(key);