Changeset 275

Timestamp:

Mar 3, 2006 10:23:35 AM (18 years ago)

Author:

bennylp

Message:

Terminate pending SUBSCRIBE if application sends another one (e.g. to unsubscribe)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -212 +212 @@
     pj_timer_entry        timer;        /**< Internal timer.                */
     int                   pending_tsx;  /**< Number of pending transactions.*/
+    pjsip_transaction    *pending_sub;  /**< Pending UAC SUBSCRIBE tsx.     */
 
     void                 *mod_data[PJSIP_MAX_MODULE];   /**< Module data.   */
@@ -1298 +1299 @@
     sub->pending_tsx++;
 
+    /* Special case for outgoing/UAC SUBSCRIBE/REFER transaction. 
+     * We can only have one pending UAC SUBSCRIBE/REFER, so if another 
+     * transaction is started while previous one still alive, terminate
+     * the older one.
+     *
+     * Sample scenario:
+     *  - subscribe sent to destination that doesn't exist, transaction
+     *    is still retransmitting request, then unsubscribe is sent.
+     */
+    if (tsx->role == PJSIP_ROLE_UAC &&
+        tsx->state == PJSIP_TSX_STATE_CALLING &&
+        pjsip_method_cmp(&tsx->method, &sub->method) == 0) 
+    {
+
+        if (sub->pending_sub && 
+            sub->pending_sub->state < PJSIP_TSX_STATE_COMPLETED) 
+        {
+            PJ_LOG(4,(sub->obj_name, 
+                      "Cancelling pending %.*s request",
+                      (int)sub->method.name.slen, sub->method.name.ptr));
+
+            /* By convention, we use 490 (Request Updated) status code.
+             * When transaction handler (below) see this status code, it
+             * will ignore the transaction.
+             */
+            pjsip_tsx_terminate(sub->pending_sub, PJSIP_SC_REQUEST_UPDATED);
+        }
+
+        sub->pending_sub = tsx;
+
+    } else if (tsx == sub->pending_sub &&
+               tsx->state >= PJSIP_TSX_STATE_COMPLETED)
+    {
+        sub->pending_sub = NULL;
+    }
+
     return sub;
 }
@@ -1505 +1542 @@
             if (sub->state == PJSIP_EVSUB_STATE_TERMINATED) {
                 /* Ignore, has been handled before */
+                return;
+            }
+
+            /* Ignore 490 (Request Updated) status. 
+             * This happens when application sends SUBSCRIBE/REFER while 
+             * another one is still in progress.
+             */
+            if (tsx->status_code == PJSIP_SC_REQUEST_UPDATED) {
                 return;
             }