- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6561 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: mikej Date: Thu Dec 6 22:57:48 2007 New Revision: 6561 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: don't use < > on request uri's. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Dec 6 22:57:48 2007 @@ -468,7 +468,7 @@ void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip); void sofia_glue_sql_close(sofia_profile_t *profile); int sofia_glue_init_sql(sofia_profile_t *profile); -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport); +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only); switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile, switch_bool_t master, switch_mutex_t *mutex, 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 Thu Dec 6 22:57:48 2007 @@ -447,7 +447,7 @@ return SWITCH_STATUS_SUCCESS; } -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport) +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only) { char *stripped = switch_core_session_strdup(session, uri); char *new_uri = NULL; @@ -455,12 +455,12 @@ stripped = sofia_glue_get_url_from_contact(stripped, 0); if (transport && strcasecmp(transport, "udp")) { if (switch_stristr("port=", stripped)) { - new_uri = switch_core_session_sprintf(session, "<%s>", stripped); + new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", stripped, uri_only ? "" : ">"); } else { if (strchr(stripped, ';')) { - new_uri = switch_core_session_sprintf(session, "<%s&transport=%s>", stripped, transport); + new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">"); } else { - new_uri = switch_core_session_sprintf(session, "<%s;transport=%s>", stripped, transport); + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">"); } } } else { @@ -593,10 +593,10 @@ } } - url_str = sofia_overcome_sip_uri_weakness(session, url, transport); - invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport); - 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); + url_str = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport, SWITCH_FALSE); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL, SWITCH_FALSE); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL, SWITCH_FALSE); /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,

1 0

[commit] r6560 - freeswitch/trunk/src
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: mikej Date: Thu Dec 6 21:04:23 2007 New Revision: 6560 Modified: freeswitch/trunk/src/switch_core.c Log: don't blow up on shutdown in -nc mode. Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Dec 6 21:04:23 2007 @@ -999,7 +999,7 @@ - if (runtime.console != stdout && runtime.console != stderr) { + if (runtime.console && runtime.console != stdout && runtime.console != stderr) { fclose(runtime.console); runtime.console = NULL; }

1 0

[commit] r6559 - freeswitch/trunk/src
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: mikej Date: Thu Dec 6 21:03:55 2007 New Revision: 6559 Modified: freeswitch/trunk/src/switch.c Log: cleanup pid file on orderly exit. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Dec 6 21:03:55 2007 @@ -214,6 +214,7 @@ int known_opt; int high_prio = 0; switch_core_flag_t flags = SCF_USE_SQL; + int status; #ifdef WIN32 SERVICE_TABLE_ENTRY dispatchTable[] = { @@ -428,11 +429,16 @@ } fprintf(f, "%d", pid = getpid()); - fclose(f); + fflush(f); switch_core_runtime_loop(nc); - return switch_core_destroy(); + status = switch_core_destroy(); + + fclose(f); + unlink(pid_path); + + return status; } /* For Emacs:

1 0

[commit] r6558 - freeswitch/trunk/src
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: anthm Date: Thu Dec 6 20:57:30 2007 New Revision: 6558 Modified: freeswitch/trunk/src/switch_core_io.c Log: doh Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Dec 6 20:57:30 2007 @@ -547,12 +547,6 @@ write_frame->rate = session->write_resampler->to_rate; } - if (!do_bugs) { - do_write = 1; - write_frame = frame; - goto done; - } - if (session->bugs) { switch_media_bug_t *bp, *dp, *last = NULL; @@ -608,6 +602,12 @@ switch_thread_rwlock_unlock(session->bug_rwlock); } + if (do_bugs) { + do_write = 1; + write_frame = frame; + goto done; + } + if (session->write_codec) { if (write_frame->datalen == session->write_codec->implementation->bytes_per_frame) { perfect = TRUE;

1 0

[commit] r6557 - freeswitch/trunk/conf/lang/en
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: brian Date: Thu Dec 6 19:19:09 2007 New Revision: 6557 Modified: freeswitch/trunk/conf/lang/en/en.xml Log: we will default to callie Modified: freeswitch/trunk/conf/lang/en/en.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/en.xml (original) +++ freeswitch/trunk/conf/lang/en/en.xml Thu Dec 6 19:19:09 2007 @@ -1,5 +1,5 @@ <include> - <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> + <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="callie"> <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>  <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/>

1 0

[commit] r6556 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 06 Dec '07

06 Dec '07

Author: brian Date: Thu Dec 6 18:19:58 2007 New Revision: 6556 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 6 18:19:58 2007 @@ -32,7 +32,7 @@ <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> <anti-action application="set" data="continue_on_fail=true"/> - <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/> + <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension>

1 0

[commit] r6555 - freeswitch/trunk
by Freeswitch SVN 06 Dec '07

06 Dec '07

Author: cypromis Date: Thu Dec 6 18:13:23 2007 New Revision: 6555 Modified: freeswitch/trunk/freeswitch.spec Log: I shouldn't do this at night .. the typos get worse and worse Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Dec 6 18:13:23 2007 @@ -239,7 +239,7 @@ install -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch # Add monit file -install -D -m 644 -o root -g root build/freeswitch.monitrc $RPM_BUILD_ROOT/etc/monit.d/freeswitch.monitrc +install -D -m 644 build/freeswitch.monitrc $RPM_BUILD_ROOT/etc/monit.d/freeswitch.monitrc # Add a freeswitch user with group daemon %pre @@ -261,7 +261,7 @@ %files %defattr(-,freeswitch,daemon) -%dir %attr(775,root,daemon) /etc/monit.d +%dir %attr(750,freeswitch,daemon) /etc/monit.d %dir %attr(750,freeswitch,daemon) /opt/freeswitch/db %dir %attr(750,freeswitch,daemon) /opt/freeswitch/log %dir %attr(750,freeswitch,daemon) /opt/freeswitch/log/xml_cdr @@ -288,7 +288,7 @@ %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/enum.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_conf/cdr_csv.conf.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/iax.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/ivr.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/java.conf.xml

1 0

[commit] r6554 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 06 Dec '07

06 Dec '07

Author: anthm Date: Thu Dec 6 17:57:45 2007 New Revision: 6554 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: typo Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Thu Dec 6 17:57:45 2007 @@ -273,7 +273,7 @@ } if ((settings = switch_xml_child(xml, "mappings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { + for (param = switch_xml_child(settings, "map"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value");

1 0

[commit] r6553 - freeswitch/trunk/src
by Freeswitch SVN 06 Dec '07

06 Dec '07

Author: brian Date: Thu Dec 6 17:54:40 2007 New Revision: 6553 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: as per tony via phone Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Dec 6 17:54:40 2007 @@ -334,6 +334,8 @@ case SWITCH_ABC_TYPE_CLOSE: break; case SWITCH_ABC_TYPE_WRITE: + break; + case SWITCH_ABC_TYPE_READ_PING: if (ep->buffer) { if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { switch_buffer_lock(ep->buffer);

1 0

[commit] r6552 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 06 Dec '07

06 Dec '07

Author: anthm Date: Thu Dec 6 17:36:02 2007 New Revision: 6552 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: default to log Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Thu Dec 6 17:36:02 2007 @@ -3,6 +3,7 @@  <load module="mod_console"/> + <load module="mod_logfile"/>

1 0