Changeset 5931 for pjproject

Timestamp:

Jan 21, 2019 8:48:02 AM (6 years ago)

Author:

ming

Message:

Fixed #2175: Make sure that last ACK has been sent before retransmitting it.

Also update the doc that the callback can now be called more than once.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -260 +260 @@
      * Once it has sent the ACK request, the framework will keep 
      * this ACK request in the cache. Subsequent receipt of 2xx response
-     * will not cause this callback to be called, and instead automatic
-     * retransmission of this ACK request from the cache will be done
-     * by the framework.
+     * will not cause this callback to be called (but see exception below),
+     * and instead automatic retransmission of this ACK request from
+     * the cache will be done by the framework.
+     * Exception: if app has created the ACK but has not sent it,
+     * while it receives a retransmission of 2xx response, this callback
+     * will be called again.
      *
      * This callback is optional.

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -453 +453 @@
               pjsip_rx_data_get_info(rdata)));
 
-    /* Check if we have cached ACK request. Must not use the cached ACK
-     * if it's still marked as pending by transport (#1011)
+    /* Check if we have cached ACK request and if we have sent it.
+     * Must not use the cached ACK if it's still marked as pending
+     * by transport (#1011).
      */
     if (inv->last_ack && rdata->msg_info.cseq->cseq == inv->last_ack_cseq &&
+        inv->last_ack->tp_info.transport != NULL &&
         !inv->last_ack->is_pending)
     {