- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6334 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: anthm Date: Mon Nov 19 12:09:46 2007 New Revision: 6334 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: omgwtf 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 Mon Nov 19 12:09:46 2007 @@ -1607,6 +1607,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); switch_channel_set_state(nchannel, CS_INIT); + tech_pvt->caller_profile = caller_profile; *new_session = nsession; cause = SWITCH_CAUSE_SUCCESS; if (session) { 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 Mon Nov 19 12:09:46 2007 @@ -629,6 +629,13 @@ from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL); + /* + Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now, + or did he just suggest it to make our lives miserable? + */ + use_from_str = from_str; + from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url_str), SIPTAG_TO_STR(to_str),

1 0

[commit] r6333 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: anthm Date: Mon Nov 19 11:44:57 2007 New Revision: 6333 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: missed one Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Nov 19 11:44:57 2007 @@ -364,7 +364,7 @@ } if (euser && host && - (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where sip_user='%q' and sip_host='%q'", + (sql = switch_mprintf("select sip_user,sip_host,status,rpid,'' from sip_registrations where sip_user='%q' and sip_host='%q'", euser, host)) && (profile = sofia_glue_find_profile(host))) { sofia_glue_execute_sql_callback(profile,

1 0

[commit] r6332 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: anthm Date: Mon Nov 19 11:38:31 2007 New Revision: 6332 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Mon Nov 19 11:38:31 2007 @@ -90,7 +90,7 @@ TFLAG_DESTROY = (1 << 7), TFLAG_ABORT = (1 << 8), TFLAG_SWITCH = (1 << 9), - TFLAG_ANSWER = (1 << 10), + TFLAG_ANSWER = (1 << 10) } TFLAGS; struct woomera_message { @@ -395,6 +395,18 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + for(;;) { + if (!switch_test_flag(tech_pvt, TFLAG_ABORT) || !tech_pvt->udp_socket) { + return SWITCH_STATUS_GENERR; + } + + if (switch_test_flag(tech_pvt, TFLAG_MEDIA)) { + break; + } + switch_yield(1000); + } + + if (!tech_pvt->udp_socket) { return SWITCH_STATUS_GENERR; } @@ -428,10 +440,15 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - - if (!tech_pvt->udp_socket) { + + if (!switch_test_flag(tech_pvt, TFLAG_ABORT) || !tech_pvt->udp_socket) { return SWITCH_STATUS_GENERR; } + + if (!switch_test_flag(tech_pvt, TFLAG_MEDIA)) { + return SWITCH_STATUS_SUCCESS; + } + //pframe = &tech_pvt->frame; len = frame->datalen; if (switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, frame->data, &len) == SWITCH_STATUS_SUCCESS) { @@ -875,8 +892,11 @@ switch_socket_bind(tech_pvt->udp_socket, tech_pvt->udpread); switch_socket_create_pollfd(&tech_pvt->read_poll, tech_pvt->udp_socket, SWITCH_POLLIN | SWITCH_POLLERR, pool); switch_socket_create_pollfd(&tech_pvt->write_poll, tech_pvt->udp_socket, SWITCH_POLLOUT | SWITCH_POLLERR, pool); + switch_set_flag_locked(tech_pvt, TFLAG_MEDIA); + } else { + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); } - + return 0; }

1 0

[commit] r6331 - freeswitch/trunk/build
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:38:21 2007 New Revision: 6331 Modified: freeswitch/trunk/build/modules.conf.in Log: are we there yet... Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Nov 19 10:38:21 2007 @@ -8,7 +8,6 @@ applications/mod_voicemail applications/mod_limit applications/mod_expr -#applications/mod_ivrtest #applications/mod_soundtouch #applications/mod_rss #asr_tts/mod_cepstral @@ -46,13 +45,11 @@ formats/mod_sndfile #formats/mod_shout #formats/mod_local_stream -#languages/mod_perl #languages/mod_python languages/mod_spidermonkey languages/mod_spidermonkey_teletone languages/mod_spidermonkey_core_db #languages/mod_spidermonkey_odbc -#languages/mod_spidermonkey_etpan xml_int/mod_xml_rpc #xml_int/mod_xml_curl xml_int/mod_xml_cdr

1 0

[commit] r6330 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan unsupported/mod_spidermonkey_etpan
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:34:57 2007 New Revision: 6330 Removed: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/ Changes in other areas also in this revision: Added: unsupported/mod_spidermonkey_etpan/ - copied from r6329, /freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/ Log: movin Diffs of changes in other areas also in this revision:

1 0

[commit] r6329 - freeswitch/trunk/src/mod/applications/mod_ivrtest unsupported/mod_ivrtest
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:25:30 2007 New Revision: 6329 Removed: freeswitch/trunk/src/mod/applications/mod_ivrtest/ Changes in other areas also in this revision: Added: unsupported/mod_ivrtest/ - copied from r6328, /freeswitch/trunk/src/mod/applications/mod_ivrtest/ Log: movin Diffs of changes in other areas also in this revision:

1 0

[commit] r6328 - freeswitch/trunk/src/dotnet unsupported/mod_mono/dotnet
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:24:49 2007 New Revision: 6328 Removed: freeswitch/trunk/src/dotnet/ Changes in other areas also in this revision: Added: unsupported/mod_mono/dotnet/ - copied from r6327, /freeswitch/trunk/src/dotnet/ Log: movin Diffs of changes in other areas also in this revision:

1 0

[commit] r6327 - freeswitch/trunk/src/mod/languages/mod_mono unsupported/mod_mono
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:24:19 2007 New Revision: 6327 Removed: freeswitch/trunk/src/mod/languages/mod_mono/ Changes in other areas also in this revision: Added: unsupported/mod_mono/ - copied from r6326, /freeswitch/trunk/src/mod/languages/mod_mono/ Log: movin Diffs of changes in other areas also in this revision:

1 0

[commit] r6326 - freeswitch/trunk/src/mod/event_handlers/mod_cdr unsupported/mod_cdr
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:22:55 2007 New Revision: 6326 Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/ Changes in other areas also in this revision: Added: unsupported/mod_cdr/ - copied from r6325, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/ Log: moving Diffs of changes in other areas also in this revision:

1 0

[commit] r6325 - freeswitch/trunk/src/mod/languages/mod_perl unsupported/mod_perl
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:22:03 2007 New Revision: 6325 Removed: freeswitch/trunk/src/mod/languages/mod_perl/ Changes in other areas also in this revision: Added: unsupported/mod_perl/ - copied from r6324, /freeswitch/trunk/src/mod/languages/mod_perl/ Log: movin Diffs of changes in other areas also in this revision:

1 0