Changeset 4347 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Feb 13, 2013 10:19:25 AM (12 years ago)

Author:

nanang

Message:

Close #1614: Added call redirect option PJSIP_REDIRECT_ACCEPT_REPLACE to accept call redirection with replaced 'To' header.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

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

@@ -2330 +2330 @@
     switch (op) {
     case PJSIP_REDIRECT_ACCEPT:
+    case PJSIP_REDIRECT_ACCEPT_REPLACE:
     case PJSIP_REDIRECT_STOP:
         /* Must increment session counter, that's the convention of the 
@@ -2395 +2396 @@
     switch (op) {
     case PJSIP_REDIRECT_ACCEPT:
+    case PJSIP_REDIRECT_ACCEPT_REPLACE:
         /* User accept the redirection. Reset the session and resend the 
          * INVITE request.
@@ -2419 +2421 @@
                   pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
             via->branch_param.slen = 0;
+
+            /* Process PJSIP_REDIRECT_ACCEPT_REPLACE */
+            if (op == PJSIP_REDIRECT_ACCEPT_REPLACE) {
+                pjsip_to_hdr *to;
+                pjsip_dialog *dlg = inv->dlg;
+                enum { TMP_LEN = 128 };
+                char tmp[TMP_LEN];
+                int len;
+
+                /* Replace To header */
+                to = PJSIP_MSG_TO_HDR(tdata->msg);
+                to->uri = (pjsip_uri*)
+                          pjsip_uri_clone(tdata->pool,
+                                          dlg->target_set.current->uri);
+                to->tag.slen = 0;
+                pj_list_init(&to->other_param);
+                
+                /* Re-init dialog remote info */
+                dlg->remote.info = (pjsip_to_hdr*)
+                                   pjsip_hdr_clone(dlg->pool, to);
+
+                /* Remove header param from remote info */
+                if (PJSIP_URI_SCHEME_IS_SIP(dlg->remote.info->uri) ||
+                    PJSIP_URI_SCHEME_IS_SIPS(dlg->remote.info->uri))
+                {
+                    pjsip_sip_uri *sip_uri = (pjsip_sip_uri *) 
+                                   pjsip_uri_get_uri(dlg->remote.info->uri);
+                    if (!pj_list_empty(&sip_uri->header_param)) {
+                        /* Remove all header param */
+                        pj_list_init(&sip_uri->header_param);
+                    }
+                }
+
+                /* Print the remote info. */
+                len = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
+                                      dlg->remote.info->uri, tmp, TMP_LEN);
+                if (len < 1) {
+                    pj_ansi_strcpy(tmp, "<-error: uri too long->");
+                    len = pj_ansi_strlen(tmp);
+                }
+                pj_strdup2_with_null(dlg->pool, &dlg->remote.info_str, tmp);
+
+                /* Secure? */
+                dlg->secure = PJSIP_URI_SCHEME_IS_SIPS(to->uri);
+            }
 
             /* Reset message destination info (see #1248). */