- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9603 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: anthm Date: Fri Sep 19 15:58:01 2008 New Revision: 9603 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Log: more crazy black magic Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Sep 19 15:58:01 2008 @@ -291,7 +291,8 @@ SMF_ECHO_BLEG = (1 << 2), SMF_FORCE = (1 << 3), SMF_LOOP = (1 << 4), - SMF_HOLD_BLEG = (1 << 5) + SMF_HOLD_BLEG = (1 << 5), + SMF_IMMEDIATE = (1 << 6) } switch_media_flag_enum_t; typedef uint32_t switch_media_flag_t; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Sep 19 15:58:01 2008 @@ -498,6 +498,10 @@ } } + if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { + return SWITCH_STATUS_FALSE; + } + read_codec = switch_core_session_get_read_codec(session); if (!read_codec || !read_codec->implementation) { @@ -906,9 +910,11 @@ if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { status = SWITCH_STATUS_SUCCESS; switch_core_session_receive_message(session, &msg); - - switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL); - switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + + if (!(flags & SMF_IMMEDIATE)) { + switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL); + switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + } if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Sep 19 15:58:01 2008 @@ -651,16 +651,21 @@ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session); + const char *sbv = switch_channel_get_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); + + if (!switch_strlen_zero(sbv) && !strcmp(sbv, switch_core_session_get_uuid(session))) { + + switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - - switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); - switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - if (switch_channel_get_state(other_channel) < CS_HANGUP) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + if (switch_channel_get_state(other_channel) < CS_HANGUP) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } } + + switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); switch_core_session_rwunlock(other_session); } @@ -725,13 +730,17 @@ switch_channel_event_set_data(caller_channel, event); switch_event_fire(&event); } - + switch_channel_set_state_flag(caller_channel, CF_TRANSFER); switch_channel_set_state_flag(peer_channel, CF_TRANSFER); - switch_channel_set_state(caller_channel, CS_HIBERNATE); switch_channel_set_state(peer_channel, CS_HIBERNATE); + + if (switch_channel_test_flag(caller_channel, CF_BRIDGED)) { + switch_channel_set_flag(caller_channel, CF_TRANSFER); + switch_channel_set_flag(peer_channel, CF_TRANSFER); + } return SWITCH_STATUS_SUCCESS; } @@ -901,6 +910,33 @@ return status; } +static void cleanup_proxy_mode(switch_core_session_t *session) +{ + switch_core_session_t *sbsession; + + switch_channel_t *channel = switch_core_session_get_channel(session); + + + if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { + const char *sbv = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Restore media to %s\n", switch_channel_get_name(channel)); + switch_ivr_media(switch_core_session_get_uuid(session), SMF_IMMEDIATE); + + if (!switch_strlen_zero(sbv) && (sbsession = switch_core_session_locate(sbv))) { + switch_channel_t *sbchannel = switch_core_session_get_channel(sbsession); + switch_channel_hangup(sbchannel, SWITCH_CAUSE_ATTENDED_TRANSFER); + switch_core_session_rwunlock(sbsession); + } + } + + switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(channel, SWITCH_BRIDGE_UUID_VARIABLE, NULL); + +} + + SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uuid, const char *originatee_uuid) { switch_core_session_t *originator_session, *originatee_session, *swap_session; @@ -939,6 +975,9 @@ } } + cleanup_proxy_mode(originator_session); + cleanup_proxy_mode(originatee_session); + /* override transmit state for originator_channel to bridge to originatee_channel * install pointer to originatee_session into originator_channel * set CF_TRANSFER on both channels and change state to CS_SOFT_EXECUTE to @@ -961,7 +1000,7 @@ switch_channel_set_variable(originatee_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(originator_session)); switch_channel_set_variable(originatee_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(originator_session)); - + originator_cp = switch_channel_get_caller_profile(originator_channel); originatee_cp = switch_channel_get_caller_profile(originatee_channel); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Sep 19 15:58:01 2008 @@ -1256,7 +1256,7 @@ ret = (int) bytes; goto end; } - + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { const char *tx_host; const char *old_host;

1 0

[commit] r9602 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: anthm Date: Fri Sep 19 15:03:50 2008 New Revision: 9602 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Sep 19 15:03:50 2008 @@ -2417,6 +2417,10 @@ char *uuid = argv[0]; char *format = argv[1]; + if (!format) { + format = "txt"; + } + if ((psession = switch_core_session_locate(uuid))) { switch_channel_t *channel; switch_event_t *event; @@ -2427,7 +2431,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_xml_t xml; switch_channel_event_set_data(channel, event); - if (format && !strcasecmp(format, "xml")) { + if (!strcasecmp(format, "xml")) { if ((xml = switch_event_xmlize(event, "%s", ""))) { buf = switch_xml_toxml(xml, SWITCH_FALSE); switch_xml_free(xml); @@ -2438,7 +2442,7 @@ goto done; } } else { - switch_event_serialize(event, &buf, SWITCH_TRUE); + switch_event_serialize(event, &buf, strcasecmp(format, "plain")); } switch_assert(buf);

1 0

[commit] r9601 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: brian Date: Fri Sep 19 13:59:31 2008 New Revision: 9601 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: this breaks gateways... gotta figureo ut why 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 Fri Sep 19 13:59:31 2008 @@ -550,7 +550,6 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), - SOATAG_ADDRESS(!switch_strlen_zero(profile->extrtpip) ? profile->extrtpip : profile->rtpip), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */

1 0

[commit] r9600 - freeswitch/trunk/src
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: anthm Date: Fri Sep 19 13:05:44 2008 New Revision: 9600 Modified: freeswitch/trunk/src/switch_console.c Log: fix MODAPP-145 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Sep 19 13:05:44 2008 @@ -104,7 +104,7 @@ memcpy((uint8_t *) (handle->data) + handle->data_len, data, datalen); handle->data_len += datalen; handle->end = (uint8_t *) (handle->data) + handle->data_len; - handle->end = NULL; + *(uint8_t *)handle->end = '\0'; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9599 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: brian Date: Fri Sep 19 12:45:21 2008 New Revision: 9599 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix MODENDP-132 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 Fri Sep 19 12:45:21 2008 @@ -550,6 +550,7 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), + SOATAG_ADDRESS(!switch_strlen_zero(profile->extrtpip) ? profile->extrtpip : profile->rtpip), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */

1 0

[commit] r9598 - freeswitch/trunk/debian
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: ctrix Date: Fri Sep 19 12:09:28 2008 New Revision: 9598 Modified: freeswitch/trunk/debian/control Log: Fix for FSBUILD-78 Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Fri Sep 19 12:09:28 2008 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev +Build-Depends: debhelper (>= 5), fakeroot, wget, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev Standards-Version: 3.7.3 Package: freeswitch

1 0

[commit] r9597 - freeswitch/trunk/src
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: anthm Date: Fri Sep 19 11:46:53 2008 New Revision: 9597 Modified: freeswitch/trunk/src/switch_console.c Log: fix MODAPP-145 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Sep 19 11:46:53 2008 @@ -87,18 +87,26 @@ SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { - switch_size_t nwrite; - FILE *out = switch_core_get_console(); + switch_size_t need = handle->data_len + datalen; + + if (need >= handle->data_size) { + void *new_data; + need += handle->alloc_chunk; - if (out) { - nwrite = fwrite(data, datalen, 1, out); - if (nwrite != datalen) { - return SWITCH_STATUS_FALSE; + if (!(new_data = realloc(handle->data, need))) { + return SWITCH_STATUS_MEMERR; } - return SWITCH_STATUS_SUCCESS; + + handle->data = new_data; + handle->data_size = need; } - return SWITCH_STATUS_FALSE; + memcpy((uint8_t *) (handle->data) + handle->data_len, data, datalen); + handle->data_len += datalen; + handle->end = (uint8_t *) (handle->data) + handle->data_len; + handle->end = NULL; + + return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...)

1 0

[commit] r9596 - freeswitch/trunk
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: brian Date: Thu Sep 18 21:19:43 2008 New Revision: 9596 Modified: freeswitch/trunk/freeswitch.spec Log: its conf :) Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Sep 18 21:19:43 2008 @@ -310,7 +310,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/event_multicast.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/event_socket.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/cdr_csv.conf.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/fax.con.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/fax.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/iax.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/ivr.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/java.conf.xml

1 0

[commit] r9595 - freeswitch/trunk
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: cypromis Date: Thu Sep 18 21:18:43 2008 New Revision: 9595 Modified: freeswitch/trunk/freeswitch.spec Log: added modularised openzap module files to specfile Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Sep 18 21:18:43 2008 @@ -310,6 +310,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/event_multicast.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/event_socket.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/cdr_csv.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/fax.con.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/iax.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/ivr.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/java.conf.xml @@ -396,6 +397,12 @@ %{prefix}/mod/mod_xml_cdr.so* %{prefix}/mod/mod_fsv.so %{prefix}/mod/mod_tone_stream.so +%{prefix}/mod/ozmod_analog.so +%{prefix}/mod/ozmod_analog_em.so +%{prefix}/mod/ozmod_isdn.so +%{prefix}/mod/ozmod_ss7_boost.so +%{prefix}/mod/ozmod_wanpipe.so +%{prefix}/mod/ozmod_zt.so %files codec-passthru-amr %defattr(-,freeswitch,daemon)

1 0

[commit] r9594 - freeswitch/trunk/conf/directory
by Freeswitch SVN 19 Sep '08

19 Sep '08

Author: brian Date: Thu Sep 18 20:23:06 2008 New Revision: 9594 Modified: freeswitch/trunk/conf/directory/default.xml Log: really should fix this now too as it'll find you no matter where you are if its setup correctly. Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Thu Sep 18 20:23:06 2008 @@ -2,7 +2,7 @@  <domain name="$${domain}"> <params> - <param name="dial-string" value="{presence_id=${dialed_user}@${dialed_domain},transfer_fallback_extension=${dialed_user}}${sofia_contact(${dialed_domain}/${dialed_user}@${dialed_domain})}"/> + <param name="dial-string" value="{presence_id=${dialed_user}@${dialed_domain},transfer_fallback_extension=${dialed_user}}${sofia_contact(${dialed_user}@${dialed_domain})}"/> </params> <variables>

1 0