Changeset 4347 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.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-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

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

@@ -378 +378 @@
     puts  ("  --no-force-lr       Allow strict-route to be used (i.e. do not force lr)");
     puts  ("  --accept-redirect=N Specify how to handle call redirect (3xx) response.");
-    puts  ("                      0: reject, 1: follow automatically (default), 2: ask");
+    puts  ("                      0: reject, 1: follow automatically,");
+    puts  ("                      2: follow + replace To header (default), 3: ask");
 
     puts  ("");
@@ -405 +406 @@
     pjsua_transport_config_default(&cfg->rtp_cfg);
     cfg->rtp_cfg.port = 4000;
-    cfg->redir_op = PJSIP_REDIRECT_ACCEPT;
+    cfg->redir_op = PJSIP_REDIRECT_ACCEPT_REPLACE;
     cfg->duration = NO_LIMIT;
     cfg->wav_id = PJSUA_INVALID_ID;
@@ -2242 +2243 @@
 
     /* accept-redirect */
-    if (config->redir_op != PJSIP_REDIRECT_ACCEPT) {
+    if (config->redir_op != PJSIP_REDIRECT_ACCEPT_REPLACE) {
         pj_ansi_sprintf(line, "--accept-redirect %d\n",
                         config->redir_op);
@@ -3052 +3053 @@
 
         PJ_LOG(3,(THIS_FILE, "Call %d is being redirected to %.*s. "
-                  "Press 'Ra' to accept, 'Rr' to reject, or 'Rd' to "
-                  "disconnect.",
+                  "Press 'Ra' to accept+replace To header, 'RA' to accept, "
+                  "'Rr' to reject, or 'Rd' to disconnect.",
                   call_id, len, uristr));
     }
@@ -5382 +5383 @@
             } else if (menuin[1] == 'a') {
                 pjsua_call_process_redirect(current_call, 
+                                            PJSIP_REDIRECT_ACCEPT_REPLACE);
+            } else if (menuin[1] == 'A') {
+                pjsua_call_process_redirect(current_call, 
                                             PJSIP_REDIRECT_ACCEPT);
             } else if (menuin[1] == 'r') {