April 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8071 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 18:58:01 2008 New Revision: 8071 Modified: freeswitch/trunk/debian/freeswitch.init Log: work on some debian-like platforms where /lib/init/vars/sh doesn't exist Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Wed Apr 9 18:58:01 2008 @@ -51,7 +51,7 @@ # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions +[ -x /lib/init/vars.sh ] && . /lib/lsb/init-functions # # Function that starts the daemon/service

1 0

[commit] r8070 - freeswitch/trunk/docs
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: anthm Date: Wed Apr 9 16:37:43 2008 New Revision: 8070 Modified: freeswitch/trunk/docs/ChangeLog Log: getting ready fro rc3 Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Apr 9 16:37:43 2008 @@ -1,3 +1,13 @@ +freeswitch (1.0.rc3) + + Fix transport=tls tag incorrectly included in re-invite + Enhance xml menu system + Fixes upstream from sofia-sip library + Enhance mod_fifo + Added close method to ODBC spidermonkey class + Fix multiple bugs in the cpp wrapper used in mod_java and mod_python + Fix hung sip channel issue using respond app or on re-invite with bypass media after 1xx or 2xx responses + freeswitch (1.0.rc2) Fixed speex protocol negotiation issues (8k vs 16k)

1 0

[commit] r8069 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 16:25:26 2008 New Revision: 8069 Modified: freeswitch/trunk/debian/changelog Log: getting ready for rc3 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 9 16:25:26 2008 @@ -1,11 +1,22 @@ freeswitch (1.0~rc3-1) unstable; urgency=low + * Fix transport=tls tag incorrectly included in re-invite + Enhance xml menu system + fixes upstream from sofia-sip library + Enhance mod_fifo + added close method to ODBC spidermonkey class + Fix multiple bugs in the cpp wrapper used in mod_java and mod_python + Fix hung sip channel issue using respond app or on re-invite with bypass media after 1xx or 2xx responses + -- Michael Jerris <mike(a)jerris.com> Wed, 9 Apr 2008 12:58:22 -0400 + freeswitch (1.0~rc2-1) unstable; urgency=low * Fixed speex protocol negotiation issues (8k vs 16k) Fixed mod_iax race conditions Fixed ptime negotiation issues when re-packetizing Added ip based acl lists + -- Michael Jerris <mike(a)jerris.com> Wed, 9 Apr 2008 12:58:22 -0400 + freeswitch (1.0~rc1-1) unstable; urgency=low * loads of fixes new cdr-csv module

1 0

[commit] r8068 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:54:49 2008 New Revision: 8068 Modified: freeswitch/trunk/debian/changelog Log: getting ready for rc3 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 9 15:54:49 2008 @@ -1,3 +1,11 @@ +freeswitch (1.0~rc3-1) unstable; urgency=low + +freeswitch (1.0~rc2-1) unstable; urgency=low + * Fixed speex protocol negotiation issues (8k vs 16k) + Fixed mod_iax race conditions + Fixed ptime negotiation issues when re-packetizing + Added ip based acl lists + freeswitch (1.0~rc1-1) unstable; urgency=low * loads of fixes new cdr-csv module

1 0

[commit] r8067 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:16:14 2008 New Revision: 8067 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix transport= tag on re-invite (FSCORE-113) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Apr 9 15:16:14 2008 @@ -2674,7 +2674,8 @@ transport_url = sip->sip_contact->m_url; } - transport = sofia_glue_url2transport(transport_url); + transport = sofia_glue_url2transport(transport_url); + tech_pvt->transport = transport; url_set_chanvars(session, sip->sip_to->a_url, sip_to); if (switch_channel_get_variable(channel, "sip_to_uri")) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Apr 9 15:16:14 2008 @@ -952,7 +952,7 @@ * Ignore transport chanvar and uri parameter for gateway connections * since all of them have been already taken care of in mod_sofia.c:sofia_outgoing_channel() */ - if (switch_strlen_zero(tech_pvt->gateway_name)) { + if (tech_pvt->transport == SOFIA_TRANSPORT_UNKNOWN && switch_strlen_zero(tech_pvt->gateway_name)) { if ((p = (char *)switch_stristr("port=", url))) { p += 5; tech_pvt->transport = sofia_glue_str2transport( p );

1 0

[commit] r8066 - freeswitch/trunk/src
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:15:38 2008 New Revision: 8066 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: build tweak Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Wed Apr 9 15:15:38 2008 @@ -316,11 +316,11 @@ switch_ivr_phrase_macro(session, menu->confirm_macro, menu->buf, NULL, ap); - if (menu->confirm_key && switch_strlen_zero(buf)) { + if (menu->confirm_key && *buf == '\0') { switch_ivr_collect_digits_count(session, buf, sizeof(buf), 1, "#", &terminator_key, menu->timeout, 0, 0); } - if (menu->confirm_key && !switch_strlen_zero(buf)) { + if (menu->confirm_key && *buf != '\0') { if (*menu->confirm_key == *buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "approving digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key);

1 0

[commit] r8065 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/applications/mod_fifo
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: anthm Date: Wed Apr 9 14:15:15 2008 New Revision: 8065 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add soft_hold Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Apr 9 14:15:15 2008 @@ -750,6 +750,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, switch_bool_t dial_b, switch_bool_t exec_b, const char *app); SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *session, const char *unhold_key, const char *moh_a, const char *moh_b); /** @} */ Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Apr 9 14:15:15 2008 @@ -79,6 +79,21 @@ } } +#define SOFT_HOLD_SYNTAX "<unhold key> [<moh_a>] [<moh_b>]" +SWITCH_STANDARD_APP(soft_hold_function) +{ + char *argv[3] = { 0 }; + int argc; + char *lbuf = NULL; + + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + switch_ivr_soft_hold(session, argv[0], argv[1], argv[2]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SOFT_HOLD_SYNTAX); + } +} + #define BIND_SYNTAX "<key> [a|b] [a|b] <app>" SWITCH_STANDARD_APP(dtmf_bind_function) { @@ -1816,6 +1831,7 @@ SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "soft_hold", "Put a bridged channel on hold", "Put a bridged channel on hold", soft_hold_function, SOFT_HOLD_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "bind_meta_app", "Bind a key to an application", "Bind a key to an application", dtmf_bind_function, BIND_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "intercept", "intercept", "intercept", intercept_function, INTERCEPT_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "eavesdrop", "eavesdrop on a uuid", "eavesdrop on a uuid", eavesdrop_function, eavesdrop_SYNTAX, SAF_NONE); Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Apr 9 14:15:15 2008 @@ -53,6 +53,8 @@ typedef struct fifo_node fifo_node_t; + + static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { switch_core_session_t *bleg = (switch_core_session_t *) buf; @@ -61,13 +63,31 @@ case SWITCH_INPUT_TYPE_DTMF: { switch_dtmf_t *dtmf = (switch_dtmf_t *) input; + switch_channel_t *bchan = switch_core_session_get_channel(bleg); + switch_channel_t *channel = switch_core_session_get_channel(session); + if (switch_channel_test_flag(switch_core_session_get_channel(session), CF_ORIGINATOR)) { + if (dtmf->digit == '*') { + switch_channel_hangup(bchan, SWITCH_CAUSE_NORMAL_CLEARING); + return SWITCH_STATUS_BREAK; + } else if (dtmf->digit == '0') { + const char *moh_a = NULL, *moh_b = NULL; + + if (!(moh_b = switch_channel_get_variable(bchan, "fifo_music"))) { + moh_b = switch_channel_get_variable(bchan, "hold_music"); + } + + if (!(moh_a = switch_channel_get_variable(channel, "fifo_hold_music"))) { + if (!(moh_a = switch_channel_get_variable(channel, "fifo_music"))) { + moh_a = switch_channel_get_variable(channel, "hold_music"); + } + } + + switch_ivr_soft_hold(session, "0", moh_a, moh_b); - if (dtmf->digit == '*') { - if (switch_channel_test_flag(switch_core_session_get_channel(session), CF_ORIGINATOR)) { - switch_channel_hangup(switch_core_session_get_channel(bleg), SWITCH_CAUSE_NORMAL_CLEARING); - return SWITCH_STATUS_BREAK; - } - } + + return SWITCH_STATUS_IGNORE; + } + } } break; default: Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Apr 9 14:15:15 2008 @@ -1802,8 +1802,8 @@ channel = switch_core_session_get_channel(session); if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", - switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s][%s] already broadcasting...broadcast aborted\n", + switch_channel_get_name(channel), path); switch_core_session_rwunlock(session); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Apr 9 14:15:15 2008 @@ -189,7 +189,7 @@ if (cb_status == SWITCH_STATUS_IGNORE) { send_dtmf = 0; - } if (cb_status != SWITCH_STATUS_SUCCESS) { + } else if (cb_status != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ended call via DTMF\n", switch_channel_get_name(chan_a)); switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); goto end_of_bridge_loop; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Apr 9 14:15:15 2008 @@ -1746,6 +1746,88 @@ return status; } + +static switch_status_t hold_on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) +{ + char *stop_key = (char *) buf; + + switch (itype) { + case SWITCH_INPUT_TYPE_DTMF: + { + switch_dtmf_t *dtmf = (switch_dtmf_t *) input; + if (dtmf->digit == *stop_key) { + return SWITCH_STATUS_BREAK; + } + } + break; + default: + break; + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *session, const char *unhold_key, const char *moh_a, const char *moh_b) +{ + switch_channel_t *channel, *other_channel; + switch_core_session_t *other_session; + const char *other_uuid, *moh = NULL; + int moh_br = 0; + switch_input_args_t args = { 0 }; + args.input_callback = hold_on_dtmf; + args.buf = (void *) unhold_key; + args.buflen = strlen(unhold_key); + + switch_assert(session != NULL); + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + + + if ((other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + if ((other_session = switch_core_session_locate(other_uuid))) { + other_channel = switch_core_session_get_channel(other_session); + + if (moh_b) { + moh = moh_b; + } else { + moh = switch_channel_get_variable(other_channel, "hold_music"); + } + + if (!switch_strlen_zero(moh) && strcasecmp(moh, "silence") && !switch_channel_test_flag(other_channel, CF_BROADCAST)) { + switch_ivr_broadcast(other_uuid, moh, SMF_ECHO_ALEG | SMF_LOOP); + moh_br++; + } + + if (moh_a) { + moh = moh_a; + } else { + moh = switch_channel_get_variable(channel, "hold_music"); + } + + if (!switch_strlen_zero(moh) && strcasecmp(moh, "silence")) { + switch_ivr_play_file(session, NULL, moh, &args); + } else { + switch_ivr_collect_digits_callback(session, &args, 0); + } + + if (moh_br) { + switch_channel_stop_broadcast(other_channel); + } + + switch_core_session_rwunlock(other_session); + + + return SWITCH_STATUS_SUCCESS; + } + + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel %s is not in a bridge\n", switch_channel_get_name(channel)); + return SWITCH_STATUS_FALSE; + +} + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r8064 - in freeswitch/trunk/conf: autoload_configs lang/en/demo
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: brian Date: Wed Apr 9 14:13:28 2008 New Revision: 8064 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Log: commit work in progress on demo IVR to show up the new features. Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 9 14:13:28 2008 @@ -7,16 +7,22 @@ greet-short="phrase:demo_ivr_main_menu_short" invalid-sound="voicemail/vm-hello.wav" exit-sound="voicemail/vm-goodbye.wav" - timeout ="15" - max-failures="3"> + timeout ="10000" + inter-digit-timeout="2000" + max-failures="3" + confirm-macro="demo_ivr_count" + confirm-key="1" + confirm-attempts="3" + digit-len="4" + > <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML default"/> <entry action="menu-top" digits="9" param="demo_ivr"/>  </menu> -  <menu name="demo_ivr_submenu" greet-long="phrase:demo_ivr_sub_menu" @@ -26,7 +32,10 @@ max-failures="3"> <entry action="menu-top" digits="*"/> </menu> + </menus> + + </configuration> Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Wed Apr 9 14:13:28 2008 @@ -1,5 +1,16 @@ <include> + + <macro name="demo_ivr_count"> + <input pattern="^(\d+)$"> + <match> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-messages.wav"/> + </match> + </input> + </macro> + <macro name="demo_ivr_main_menu">  <input pattern="(.*)"> <match>

1 0

[commit] r8063 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 14:04:13 2008 New Revision: 8063 Modified: freeswitch/trunk/debian/files Log: getting ready for rc3 Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Wed Apr 9 14:04:13 2008 @@ -1,9 +1,9 @@ -freeswitch_1.0~rc1-1_i386.deb net extra -freeswitch-spidermonkey_1.0~rc1-1_i386.deb net extra -freeswitch-dev_1.0~rc1-1_i386.deb net extra -freeswitch-codec-passthru-g7231_1.0~rc1-1_i386.deb net extra -freeswitch-codec-passthru-amr_1.0~rc1-1_i386.deb net extra -freeswitch-codec-passthru-g729_1.0~rc1-1_i386.deb net extra -freeswitch-lang-en_1.0~rc1-1_i386.deb net extra -freeswitch-lang-de_1.0~rc1-1_i386.deb net extra -freeswitch-lang-fr_1.0~rc1-1_i386.deb net extra +freeswitch_1.0~rc3-1_i386.deb net extra +freeswitch-spidermonkey_1.0~rc3-1_i386.deb net extra +freeswitch-dev_1.0~rc3-1_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~rc3-1_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~rc3-1_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~rc3-1_i386.deb net extra +freeswitch-lang-en_1.0~rc3-1_i386.deb net extra +freeswitch-lang-de_1.0~rc3-1_i386.deb net extra +freeswitch-lang-fr_1.0~rc3-1_i386.deb net extra

1 0

[commit] r8062 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 12:27:01 2008 New Revision: 8062 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix hung channels when using respond app with 1xx or 2xx responses or on re-invite in proxy/bypass media with 1xx and 2xx responses Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Apr 9 12:27:01 2008 @@ -948,12 +948,9 @@ } if (!reason && code != 407) { - reason = "Call Refused"; - if (!reason) { - reason = sip_status_phrase(code); - if (switch_strlen_zero(reason)) { - reason = "Because"; - } + reason = sip_status_phrase(code); + if (switch_strlen_zero(reason)) { + reason = "Because"; } } @@ -985,7 +982,9 @@ nua_respond(tech_pvt->nh, code, reason, TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); + if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d %s\n", code, reason); @@ -1005,7 +1004,9 @@ } else { nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); } - switch_set_flag_locked(tech_pvt, TFLAG_BYE); + if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + } } }

1 0