add disable_q850_reason chan var to disable sending Reason header in sip BYE messages...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15850 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 643b55abca75ba451bd0ca652766a906891a2fa3..70176dadefbc6cd67d7b0a60def7451bdf89ce26 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -377,16 +377,20 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
        if (tech_pvt->nh && !sofia_test_flag(tech_pvt, TFLAG_BYE)) {
                char reason[128] = "";
                char *bye_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_BYE_HEADER_PREFIX);
-               
-               if (cause > 0 && cause < 128) {
-                       switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
-               } else if (cause == SWITCH_CAUSE_PICKED_OFF || cause == SWITCH_CAUSE_LOSE_RACE) {
-                       switch_snprintf(reason, sizeof(reason), "SIP;cause=200;text=\"Call completed elsewhere\"");
-               } else {
-                       switch_snprintf(reason, sizeof(reason), "%s;cause=%d;text=\"%s\"",
-                                       tech_pvt->profile->username, 
-                                       cause,
-                                       switch_channel_cause2str(cause));
+               const char* val = NULL;
+
+               val = switch_channel_get_variable(tech_pvt->channel, "disable_q850_reason");
+               if(!val || switch_true(val)) {
+                       if (cause > 0 && cause < 128) {
+                               switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
+                       } else if (cause == SWITCH_CAUSE_PICKED_OFF || cause == SWITCH_CAUSE_LOSE_RACE) {
+                               switch_snprintf(reason, sizeof(reason), "SIP;cause=200;text=\"Call completed elsewhere\"");
+                       } else {
+                               switch_snprintf(reason, sizeof(reason), "%s;cause=%d;text=\"%s\"",
+                                               tech_pvt->profile->username, 
+                                               cause,
+                                               switch_channel_cause2str(cause));
+                       }
                }
 
                if (switch_channel_test_flag(channel, CF_ANSWERED) || sofia_test_flag(tech_pvt, TFLAG_ANS)) {
@@ -396,7 +400,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel));
                        if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
                                nua_bye(tech_pvt->nh, 
-                                               SIPTAG_REASON_STR(reason),
+                                               TAG_IF(!zstr(reason), SIPTAG_REASON_STR(reason)),
                                                TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
                                                TAG_IF(!zstr(bye_headers), SIPTAG_HEADER_STR(bye_headers)),
                                                TAG_END());
@@ -409,7 +413,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
                                }
                                if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
                                        nua_cancel(tech_pvt->nh, 
-                                                          SIPTAG_REASON_STR(reason), 
+                                                          TAG_IF(!zstr(reason), SIPTAG_REASON_STR(reason)),
                                                           TAG_IF(!zstr(bye_headers), SIPTAG_HEADER_STR(bye_headers)),
                                                           TAG_END());
                                }
@@ -420,7 +424,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
                                }
                                if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
                                        nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), 
-                                                               SIPTAG_REASON_STR(reason), 
+                                                           TAG_IF(!zstr(reason), SIPTAG_REASON_STR(reason)),
                                                                SIPTAG_HEADER_STR(generate_pai_str(session)),
                                                                TAG_IF(!zstr(bye_headers), SIPTAG_HEADER_STR(bye_headers)),
                                                                TAG_END());

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index b106ad85dcc2542ae0fc20c99f6e66ef9f101972..6e2f909da02687d106c3e5fae3691264afcf58c5 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4611,9 +4611,15 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                                                                   NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END());
 
                                                                if (b_tech_pvt) {
+                                                                       char* q850 = NULL;
+                                                                       const char* val = NULL;
                                                                        sofia_set_flag_locked(b_tech_pvt, TFLAG_BYE);
+                                                                       val = switch_channel_get_variable(tech_pvt->channel, "disable_q850_reason");
+                                                                       if(!val || switch_true(val)) {
+                                                                               q850 = switch_core_session_sprintf(a_session, "Q.850;cause=16;text=\"normal_clearing\"");
+                                                                       } 
                                                                        nua_bye(b_tech_pvt->nh, 
-                                                                                       SIPTAG_REASON_STR("Q.850;cause=16;text=\"normal_clearing\""),
+                                                                                       TAG_IF(!zstr(q850), SIPTAG_REASON_STR(q850)),
                                                                                        TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
                                                                                        TAG_END());
                                                                }