Changeset 2750 for pjproject/trunk

Timestamp:

Jun 4, 2009 10:16:47 PM (15 years ago)

Author:

bennylp

Message:

Ticket #860:

• will send SUBSCRIBE to refresh REFER subscription (not REFER!), only when required (such as when call transfer is running for longer than REFER subscription expiration, hence need to be refreshed)
• replaced hardcoded REFER subscription duration (600s) with a macro, PJSIP_XFER_EXPIRES.
• when NOTIFY with "200 OK" sipfrag body is received and subscription state is not terminated, send SUBSCRIBE with Expires=0 to terminate the REFER subscription
• for transferee, terminate the subscription in CONNECTING state and not in CONFIRMED state. Terminating the subscription in CONFIRMED state causes redundant NOTIFYs with "200 OK" sipfrag body to be sent, one with active subscription and another with terminated state.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_xfer.c (modified) (3 diffs)
• pjsua-lib/pjsua_call.c (modified) (4 diffs)

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

@@ -29 +29 @@
 #include <pj/string.h>
 
+/* Subscription expiration */
+#ifndef PJSIP_XFER_EXPIRES
+#   define PJSIP_XFER_EXPIRES       600
+#endif
+
 
 /*
@@ -155 +160 @@
         return status;
 
-    status = pjsip_evsub_register_pkg( &mod_xfer, &STR_REFER, 300, 1, &accept);
+    status = pjsip_evsub_register_pkg(&mod_xfer, &STR_REFER, 
+                                      PJSIP_XFER_EXPIRES, 1, &accept);
     if (status != PJ_SUCCESS)
         return status;
@@ -587 +593 @@
         pjsip_tx_data *tdata;
 
-        status = pjsip_xfer_initiate(sub, NULL, &tdata);
+        status = pjsip_evsub_initiate(sub, NULL, PJSIP_XFER_EXPIRES, &tdata);
         if (status == PJ_SUCCESS)
             pjsip_xfer_send_request(sub, tdata);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -2902 +2902 @@
         case PJSIP_INV_STATE_CONNECTING:
             st_code = e->body.tsx_state.tsx->status_code;
-            ev_state = PJSIP_EVSUB_STATE_ACTIVE;
+            if (call->inv->state == PJSIP_INV_STATE_CONNECTING)
+                ev_state = PJSIP_EVSUB_STATE_TERMINATED;
+            else
+                ev_state = PJSIP_EVSUB_STATE_ACTIVE;
             break;
 
+#if 0
+/* We don't need this, as we've terminated the subscription in
+ * CONNECTING state.
+ */
         case PJSIP_INV_STATE_CONFIRMED:
             /* When state is confirmed, send the final 200/OK and terminate
@@ -2912 +2919 @@
             ev_state = PJSIP_EVSUB_STATE_TERMINATED;
             break;
+#endif
 
         case PJSIP_INV_STATE_DISCONNECTED:
@@ -3456 +3464 @@
         if (!cont) {
             pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id, NULL);
+        }
+
+        /* If the call transfer has completed but the subscription is
+         * not terminated, terminate it now.
+         */
+        if (status_line.code/100 == 2 && !is_last) {
+            pjsip_tx_data *tdata;
+
+            status = pjsip_evsub_initiate(sub, &pjsip_subscribe_method, 
+                                          0, &tdata);
+            if (status == PJ_SUCCESS)
+                status = pjsip_evsub_send_request(sub, tdata);
         }
     }
@@ -3735 +3755 @@
     }
 
+    if (call->inv == NULL) {
+        /* Shouldn't happen. It happens only when we don't terminate the
+         * server subscription caused by REFER after the call has been
+         * transfered (and this call has been disconnected), and we
+         * receive another REFER for this call.
+         */
+        PJSUA_UNLOCK();
+        return;
+    }
+
     /* Notify application callback first */
     if (pjsua_var.ua_cfg.cb.on_call_tsx_state) {