Changeset 733

Timestamp:

Sep 22, 2006 12:48:18 PM (18 years ago)

Author:

bennylp

Message:

In pjsua, outgoing REFER now always put Refer-Sub: false

Location:

pjproject/trunk

Files:

• pjlib/src/pj/config.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/docs/PJSUA-TESTING.txt (modified) (1 diff)
• pjsip/src/pjsip-simple/evsub.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (9 diffs)
• pjsip/src/test-pjsip/test.h (modified) (1 diff)

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

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.7.7";
+const char *PJ_VERSION = "0.5.7.8";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2105 +2105 @@
             } else {
                 int call = current_call;
+                pjsua_msg_data msg_data;
+                pjsip_generic_string_hdr refer_sub;
+                pj_str_t STR_REFER_SUB = { "Refer-Sub", 9 };
+                pj_str_t STR_FALSE = { "false", 5 };
 
                 ui_input_url("Transfer to URL", buf, sizeof(buf), &result);
@@ -2114 +2118 @@
                     continue;
                 }
+
+                /* Add Refer-Sub: false in outgoing REFER request */
+                pjsua_msg_data_init(&msg_data);
+                pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
+                                               &STR_FALSE);
+                pj_list_push_back(&msg_data.hdr_list, &refer_sub);
 
                 if (result.nb_result != NO_NB) {
@@ -2121 +2131 @@
                         pjsua_buddy_info binfo;
                         pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                        pjsua_call_xfer( current_call, &binfo.uri, NULL);
+                        pjsua_call_xfer( current_call, &binfo.uri, &msg_data);
                     }
 
@@ -2127 +2137 @@
                     pj_str_t tmp;
                     tmp = pj_str(result.uri_result);
-                    pjsua_call_xfer( current_call, &tmp, NULL);
+                    pjsua_call_xfer( current_call, &tmp, &msg_data);
                 }
             }

pjproject/trunk/pjsip/docs/PJSUA-TESTING.txt

@@ -17 +17 @@
         - DTMF send/receive
 - IM and typing
+- Call transfer (with and without norefersub)
+- Call Hold
+- Re-Invite
+- DTMF
+- RTCP
 - TCP (if there's UDP route, then Contact will be UDP)
 

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

@@ -880 +880 @@
     pjsip_dlg_inc_lock(sub->dlg);
 
+    /* I think it's pretty safe to disable this check.
+     
     if (sub->pending_tsx) {
         pj_assert(!"Unable to terminate when there's pending tsx");
@@ -885 +887 @@
         return PJ_EINVALIDOP;
     }
+    */
 
     sub->call_cb = notify;

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

@@ -68 +68 @@
                                        pjmedia_sdp_session **p_answer);
 
+/*
+ * Callback called by event framework when the xfer subscription state
+ * has changed.
+ */
+static void xfer_on_evsub_state( pjsip_evsub *sub, pjsip_event *event);
 
 /*
@@ -581 +586 @@
     enum { MAX_RETRY=50 };
     unsigned retry;
-    pjsua_call *call;
-    pj_bool_t has_pjsua_lock;
-    pj_status_t status;
+    pjsua_call *call = NULL;
+    pj_bool_t has_pjsua_lock = PJ_FALSE;
+    pj_status_t status = PJ_SUCCESS;
 
     for (retry=0; retry<MAX_RETRY; ++retry) {
@@ -648 +653 @@
     status = acquire_call("pjsua_call_get_conf_port()", call_id, &call);
     if (status != PJ_SUCCESS)
-        return -1;
+        return PJSUA_INVALID_ID;
 
     port_id = call->conf_slot;
@@ -1050 +1055 @@
     pjsip_tx_data *tdata;
     pjsua_call *call;
+    struct pjsip_evsub_user xfer_cb;
     pj_status_t status;
 
@@ -1056 +1062 @@
                      PJ_EINVAL);
     
-    pjsip_dlg_dec_lock(call->inv->dlg);
     status = acquire_call("pjsua_call_xfer()", call_id, &call);
     if (status != PJ_SUCCESS)
@@ -1062 +1067 @@
 
    
-    /* Create xfer client subscription.
-     * We're not interested in knowing the transfer result, so we
-     * put NULL as the callback.
-     */
-    status = pjsip_xfer_create_uac(call->inv->dlg, NULL, &sub);
+    /* Create xfer client subscription. */
+    pj_bzero(&xfer_cb, sizeof(xfer_cb));
+    xfer_cb.on_evsub_state = &xfer_on_evsub_state;
+
+    status = pjsip_xfer_create_uac(call->inv->dlg, &xfer_cb, &sub);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create xfer", status);
@@ -1121 +1126 @@
     if (status != PJ_SUCCESS)
         return status;
-
-    call = &pjsua_var.calls[call_id];
 
     if (!call->session) {
@@ -2131 +2134 @@
 
     /*
-     * We're only interested when subscription is terminated, to 
-     * clear the xfer_sub member of the inv_data.
+     * When subscription is terminated, clear the xfer_sub member of 
+     * the inv_data.
      */
     if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) {
@@ -2144 +2147 @@
         call->xfer_sub = NULL;
 
-        PJ_LOG(3,(THIS_FILE, "Xfer subscription terminated"));
+        PJ_LOG(4,(THIS_FILE, "Xfer subscription terminated"));
+
+    }
+    /*
+     * When subscription is accepted (got 200/OK to REFER), check if 
+     * subscription suppressed.
+     */
+    else if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_ACCEPTED) {
+
+        pjsip_rx_data *rdata;
+        pjsip_generic_string_hdr *refer_sub;
+        const pj_str_t REFER_SUB = { "Refer-Sub", 9 };
+
+        /* Must be receipt of response message */
+        pj_assert(event->type == PJSIP_EVENT_TSX_STATE && 
+                  event->body.tsx_state.type == PJSIP_EVENT_RX_MSG);
+        rdata = event->body.tsx_state.src.rdata;
+
+        /* Find Refer-Sub header */
+        refer_sub = (pjsip_generic_string_hdr*)
+                    pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, 
+                                               &REFER_SUB, NULL);
+
+        /* Check if subscription is suppressed */
+        if (refer_sub && pj_stricmp2(&refer_sub->hvalue, "false")==0) {
+            /* Yes, subscription is suppressed.
+             * Terminate our subscription now.
+             */
+            PJ_LOG(4,(THIS_FILE, "Xfer subscription suppressed, terminating "
+                                 "event subcription..."));
+            pjsip_evsub_terminate(sub, PJ_TRUE);
+        }
     }
 }

pjproject/trunk/pjsip/src/test-pjsip/test.h

@@ -37 +37 @@
 
 
-#define INCLUDE_MESSAGING_GROUP     1
-#define INCLUDE_TRANSPORT_GROUP     1
-#define INCLUDE_TSX_GROUP           0
+#define INCLUDE_MESSAGING_GROUP     0
+#define INCLUDE_TRANSPORT_GROUP     0
+#define INCLUDE_TSX_GROUP           1
 
 /*