res_pjsip: New endpoint option "refer_blind_progress"
authorAlexei Gradinari <alex2grad@gmail.com>
Mon, 8 May 2017 20:56:32 +0000 (16:56 -0400)
committerAlexei Gradinari <alex2grad@gmail.com>
Thu, 11 May 2017 15:50:35 +0000 (10:50 -0500)
This option was added to turn off notifying the progress details
on Blind Transfer. If this option is not set then the chan_pjsip
will send NOTIFY "200 OK" immediately after "202 Accepted".

Some SIP phones like Mitel/Aastra or Snom keep the line busy until
receive "200 OK".

ASTERISK-26333 #close

Change-Id: Id606fbff2e02e967c02138457badc399144720f2

CHANGES
configs/samples/pjsip.conf.sample
contrib/ast-db-manage/config/versions/86bb1efa278d_add_ps_endpoints_refer_blind_progress.py [new file with mode: 0644]
include/asterisk/res_pjsip.h
res/res_pjsip.c
res/res_pjsip/pjsip_configuration.c
res/res_pjsip_refer.c

diff --git a/CHANGES b/CHANGES
index 9c8ed5b..a881e75 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,15 @@ app_queue
 --- Functionality changes from Asterisk 14.4.0 to Asterisk 14.5.0 ------------
 ------------------------------------------------------------------------------
 
+res_pjsip
+------------------
+ * A new endpoint option "refer_blind_progress" was added to turn off notifying
+   the progress details on Blind Transfer. If this option is not set then
+   the chan_pjsip will send NOTIFY "200 OK" immediately after "202 Accepted".
+   On default is enabled.
+   Some SIP phones like Mitel/Aastra or Snom keep the line busy until
+   receive "200 OK".
+
 res_rtp_asterisk
 ------------------
  * Added the stun_blacklist option to rtp.conf.  Some multihomed servers have
index 612649e..a992ff8 100644 (file)
                                 ; default is no.
 ;asymmetric_rtp_codec= ; Allow the sending and receiving codec to differ and
                        ; not be automatically matched (default: "no")
+;refer_blind_progress= ; Whether to notifies all the progress details on blind
+                       ; transfer (default: "yes"). The value "no" is useful
+                       ; for some SIP phones (Mitel/Aastra, Snom) which expect
+                       ; a sip/frag "200 OK" after REFER has been accepted.
 
 ;==========================AUTH SECTION OPTIONS=========================
 ;[auth]
diff --git a/contrib/ast-db-manage/config/versions/86bb1efa278d_add_ps_endpoints_refer_blind_progress.py b/contrib/ast-db-manage/config/versions/86bb1efa278d_add_ps_endpoints_refer_blind_progress.py
new file mode 100644 (file)
index 0000000..9b0f6d4
--- /dev/null
@@ -0,0 +1,30 @@
+"""add ps_endpoints.refer_blind_progress
+
+Revision ID: 86bb1efa278d
+Revises: 1d0e332c32af
+Create Date: 2017-05-08 16:52:36.615161
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '86bb1efa278d'
+down_revision = '1d0e332c32af'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ENUM
+
+YESNO_NAME = 'yesno_values'
+YESNO_VALUES = ['yes', 'no']
+
+def upgrade():
+    ############################# Enums ##############################
+
+    # yesno_values have already been created, so use postgres enum object
+    # type to get around "already created" issue - works okay with mysql
+    yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
+
+    op.add_column('ps_endpoints', sa.Column('refer_blind_progress', yesno_values))
+
+def downgrade():
+    op.drop_column('ps_endpoints', 'refer_blind_progress')
index 6f44852..59f1710 100644 (file)
@@ -767,6 +767,8 @@ struct ast_sip_endpoint {
        unsigned int asymmetric_rtp_codec;
        /*! Do we allow overlap dialling? */
        unsigned int allow_overlap;
+       /*! Whether to notifies all the progress details on blind transfer */
+       unsigned int refer_blind_progress;
 };
 
 /*! URI parameter for symmetric transport */
index 9de2176..102bc39 100644 (file)
                                                since they mandate this option's use.
                                        </para></description>
                                </configOption>
+                               <configOption name="refer_blind_progress" default="yes">
+                                       <synopsis>Whether to notifies all the progress details on blind transfer</synopsis>
+                                       <description><para>
+                                               Some SIP phones (Mitel/Aastra, Snom) expect a sip/frag "200 OK"
+                                               after REFER has been accepted. If set to <literal>no</literal> then asterisk
+                                               will not send the progress details, but immediately will send "200 OK".
+                                       </para></description>
+                               </configOption>
                        </configObject>
                        <configObject name="auth">
                                <synopsis>Authentication type</synopsis>
index 02562e7..679c883 100644 (file)
@@ -1939,6 +1939,7 @@ int ast_res_pjsip_initialize_configuration(void)
        ast_sorcery_object_field_register(sip_sorcery, "endpoint", "asymmetric_rtp_codec", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, asymmetric_rtp_codec));
        ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rtcp_mux", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtcp_mux));
        ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allow_overlap", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, allow_overlap));
+       ast_sorcery_object_field_register(sip_sorcery, "endpoint", "refer_blind_progress", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, refer_blind_progress));
 
        if (ast_sip_initialize_sorcery_transport()) {
                ast_log(LOG_ERROR, "Failed to register SIP transport support with sorcery\n");
index 0f4a95c..4629538 100644 (file)
@@ -61,6 +61,8 @@ struct refer_progress {
        char *transferee;
        /*! \brief Non-zero if the 100 notify has been sent */
        int sent_100;
+       /*! \brief Whether to notifies all the progress details on blind transfer */
+       unsigned int refer_blind_progress;
 };
 
 /*! \brief REFER Progress notification structure */
@@ -372,6 +374,8 @@ static int refer_progress_alloc(struct ast_sip_session *session, pjsip_rx_data *
        ast_debug(3, "Created progress monitor '%p' for transfer occurring from channel '%s' and endpoint '%s'\n",
                progress, ast_channel_name(session->channel), ast_sorcery_object_get_id(session->endpoint));
 
+       (*progress)->refer_blind_progress = session->endpoint->refer_blind_progress;
+
        (*progress)->framehook = -1;
 
        /* To prevent a potential deadlock we need the dialog so we can lock/unlock */
@@ -563,6 +567,8 @@ struct refer_blind {
        pjsip_replaces_hdr *replaces;
        /*! \brief Optional Refer-To header */
        pjsip_sip_uri *refer_to;
+       /*! \brief Attended transfer flag */
+       unsigned int attended:1;
 };
 
 /*! \brief Blind transfer callback function */
@@ -577,8 +583,16 @@ static void refer_blind_callback(struct ast_channel *chan, struct transfer_chann
 
        pbx_builtin_setvar_helper(chan, "SIPTRANSFER", "yes");
 
-       /* If progress monitoring is being done attach a frame hook so we can monitor it */
-       if (refer->progress) {
+       if (refer->progress && !refer->attended && !refer->progress->refer_blind_progress) {
+               /* If blind transfer and endpoint doesn't want to receive all the progress details */
+               struct refer_progress_notification *notification = refer_progress_notification_alloc(refer->progress, 200,
+                       PJSIP_EVSUB_STATE_TERMINATED);
+
+               if (notification) {
+                       refer_progress_notify(notification);
+               }
+       } else if (refer->progress) {
+               /* If attended transfer and progress monitoring is being done attach a frame hook so we can monitor it */
                struct ast_framehook_interface hook = {
                        .version = AST_FRAMEHOOK_INTERFACE_VERSION,
                        .event_cb = refer_progress_framehook,
@@ -785,6 +799,7 @@ static int refer_incoming_attended_request(struct ast_sip_session *session, pjsi
                refer.rdata = rdata;
                refer.replaces = replaces;
                refer.refer_to = target_uri;
+               refer.attended = 1;
 
                if (ast_sip_session_defer_termination(session)) {
                        ast_log(LOG_ERROR, "Received REFER for remote session on channel '%s' from endpoint '%s' but could not defer termination, rejecting\n",
@@ -839,6 +854,7 @@ static int refer_incoming_blind_request(struct ast_sip_session *session, pjsip_r
        refer.progress = progress;
        refer.rdata = rdata;
        refer.refer_to = target;
+       refer.attended = 0;
 
        if (ast_sip_session_defer_termination(session)) {
                ast_log(LOG_ERROR, "Channel '%s' from endpoint '%s' attempted blind transfer but could not defer termination, rejecting\n",