Changeset 4258 for pjproject/trunk

Timestamp:

Sep 18, 2012 8:39:46 AM (12 years ago)

Author:

ming

Message:

Fixed #1583: Unexpected SIP message transmission after transaction has timed-out

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (4 diffs)
• sip_transport_tls.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -74 +74 @@
     PJ_DECL_LIST_MEMBER(struct delayed_tdata);
     pjsip_tx_data_op_key    *tdata_op_key;
+    pj_time_val              timeout;
 };
 
@@ -650 +651 @@
 static void tcp_flush_pending_tx(struct tcp_transport *tcp)
 {
+    pj_time_val now;
+
+    pj_gettickcount(&now);
     pj_lock_acquire(tcp->base.lock);
     while (!pj_list_empty(&tcp->delayed_list)) {
@@ -663 +667 @@
         tdata = pending_tx->tdata_op_key->tdata;
         op_key = (pj_ioqueue_op_key_t*)pending_tx->tdata_op_key;
+
+        if (pending_tx->timeout.sec > 0 &&
+            PJ_TIME_VAL_GT(now, pending_tx->timeout))
+        {
+            on_data_sent(tcp->asock, op_key, -PJ_ETIMEDOUT);
+            continue;
+        }
 
         /* send! */
@@ -1123 +1134 @@
              * connect() is still in progress. Put the transmit data to
              * the delayed list.
+             * Starting from #1583 (https://trac.pjsip.org/repos/ticket/1583),
+             * we also add timeout value for the transmit data. When the
+             * connect() is completed, the timeout value will be checked to
+             * determine whether the transmit data needs to be sent.
              */
-            delayed_tdata = PJ_POOL_ALLOC_T(tdata->pool, 
-                                            struct delayed_tdata);
+            delayed_tdata = PJ_POOL_ZALLOC_T(tdata->pool, 
+                                             struct delayed_tdata);
             delayed_tdata->tdata_op_key = &tdata->op_key;
+            if (tdata->msg && tdata->msg->type == PJSIP_REQUEST_MSG) {
+                pj_gettickcount(&delayed_tdata->timeout);
+                delayed_tdata->timeout.msec += pjsip_cfg()->tsx.td;
+                pj_time_val_normalize(&delayed_tdata->timeout);
+            }
 
             pj_list_push_back(&tcp->delayed_list, delayed_tdata);

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -72 +72 @@
     PJ_DECL_LIST_MEMBER(struct delayed_tdata);
     pjsip_tx_data_op_key    *tdata_op_key;
+    pj_time_val              timeout;
 };
 
@@ -648 +649 @@
 static void tls_flush_pending_tx(struct tls_transport *tls)
 {
+    pj_time_val now;
+
+    pj_gettickcount(&now);
     pj_lock_acquire(tls->base.lock);
     while (!pj_list_empty(&tls->delayed_list)) {
@@ -661 +665 @@
         tdata = pending_tx->tdata_op_key->tdata;
         op_key = (pj_ioqueue_op_key_t*)pending_tx->tdata_op_key;
+
+        if (pending_tx->timeout.sec > 0 &&
+            PJ_TIME_VAL_GT(now, pending_tx->timeout))
+        {
+            on_data_sent(tls->ssock, op_key, -PJ_ETIMEDOUT);
+            continue;
+        }
 
         /* send! */
@@ -1218 +1229 @@
              * connect() is still in progress. Put the transmit data to
              * the delayed list.
+             * Starting from #1583 (https://trac.pjsip.org/repos/ticket/1583),
+             * we also add timeout value for the transmit data. When the
+             * connect() is completed, the timeout value will be checked to
+             * determine whether the transmit data needs to be sent.
              */
-            delayed_tdata = PJ_POOL_ALLOC_T(tdata->pool, 
-                                            struct delayed_tdata);
+            delayed_tdata = PJ_POOL_ZALLOC_T(tdata->pool, 
+                                             struct delayed_tdata);
             delayed_tdata->tdata_op_key = &tdata->op_key;
+            if (tdata->msg && tdata->msg->type == PJSIP_REQUEST_MSG) {
+                pj_gettickcount(&delayed_tdata->timeout);
+                delayed_tdata->timeout.msec += pjsip_cfg()->tsx.td;
+                pj_time_val_normalize(&delayed_tdata->timeout);
+            }
 
             pj_list_push_back(&tls->delayed_list, delayed_tdata);