January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7301 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: anthm Date: Sat Jan 19 16:54:11 2008 New Revision: 7301 Modified: freeswitch/trunk/src/switch_regex.c freeswitch/trunk/src/switch_utils.c Log: update Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Sat Jan 19 16:54:11 2008 @@ -95,7 +95,7 @@ &erroffset, /* for error offset */ NULL); /* use default character tables */ if (error) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "COMPILE ERROR: %d [%s]\n", erroffset, error); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "COMPILE ERROR: %d [%s][%s]\n", erroffset, error, expression); switch_regex_safe_free(re); goto end; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat Jan 19 16:54:11 2008 @@ -35,7 +35,7 @@ #include <arpa/inet.h> #endif #include "private/switch_core_pvt.h" - +#define ESCAPE_META '\\' SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char close) { @@ -1017,7 +1017,7 @@ static char unescape_char(char escaped) { char unescaped; - + printf("WTF [%c]\n", escaped); switch (escaped) { case 'n': unescaped = '\n'; @@ -1052,16 +1052,25 @@ } for (start = dest = ptr; *ptr; ++ptr) { - if (*ptr == '\\') { - ++ptr; - *dest++ = unescape_char(*ptr); - end = dest; - } else if (*ptr == '\'') { - inside_quotes = (1 - inside_quotes); - } else { - *dest++ = *ptr; - if (*ptr != ' ' || inside_quotes) { + char e; + int esc = 0; + + if (*ptr == ESCAPE_META) { + if ((e = unescape_char(*(ptr+1))) != e) { + ++ptr; + *dest++ = e; end = dest; + esc++; + } + } + if (!esc) { + if (*ptr == '\'') { + inside_quotes = (1 - inside_quotes); + } else { + *dest++ = *ptr; + if (*ptr != ' ' || inside_quotes) { + end = dest; + } } } } @@ -1093,7 +1102,7 @@ case FIND_DELIM: /* escaped characters are copied verbatim to the destination string */ - if (*ptr == '\\') { + if (*ptr == ESCAPE_META) { ++ptr; } else if (*ptr == '\'') { inside_quotes = (1 - inside_quotes); @@ -1143,7 +1152,7 @@ break; case FIND_DELIM: - if (*ptr == '\\') { + if (*ptr == ESCAPE_META) { ++ptr; } else if (*ptr == '\'') { inside_quotes = (1 - inside_quotes);

1 0

[commit] r7300 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: anthm Date: Sat Jan 19 16:25:18 2008 New Revision: 7300 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix FSCORE-90 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Jan 19 16:25:18 2008 @@ -837,10 +837,30 @@ context->lame_ready = 1; } - if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, mp3buf, sizeof(mp3buf))) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); - return SWITCH_STATUS_FALSE; - } + if (handle->channels == 2) { + int16_t l[4096] = {0}; + int16_t r[4096] = {0}; + int i, j = 0; + + for(i = 0; i < nsamples; i++) { + l[i] = audio[j++]; + r[i] = audio[j++]; + } + + if ((rlen = lame_encode_buffer(context->gfp, l, r, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); + return SWITCH_STATUS_FALSE; + } + + } else if (handle->channels == 1) { + if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); + return SWITCH_STATUS_FALSE; + } + } else { + rlen = 0; + } + if (rlen) { if (fwrite(mp3buf, 1, rlen, context->fp) < 0) { return SWITCH_STATUS_FALSE;

1 0

[commit] r7299 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: brian Date: Sat Jan 19 14:08:33 2008 New Revision: 7299 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak this dialplan Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Jan 19 14:08:33 2008 @@ -260,20 +260,13 @@ </extension> <extension name="hold_music"> - <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> + <condition field="destination_number" expression="^9999$"/> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$"> <action application="answer"/> <action application="execute_extension" data="is_secure XML default"/> - </condition> - <condition field="destination_number" expression="^9999$"> - <action application="answer"/> <action application="playback" data="$${moh_uri}"/> - </condition> - </extension> - - <extension name="is_secure"> - <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never"> - <action application="sleep" data="1000"/> - <action application="gentones" data="${bong-ring}"/> + <anti-action application="answer"/> + <anti-action application="playback" data="$${moh_uri}"/> </condition> </extension> @@ -281,9 +274,16 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="answer"/> <action application="transfer" data="$1 enum"/> </condition> </extension> + + <extension name="is_secure"> + <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never"> + <action application="sleep" data="1000"/> + <action application="gentones" data="${bong-ring}"/> + </condition> + </extension> + </context> </include>

1 0

[commit] r7298 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: brian Date: Sat Jan 19 14:03:22 2008 New Revision: 7298 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: wip Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Jan 19 14:03:22 2008 @@ -589,7 +589,11 @@ lame_set_num_channels(context->gfp, handle->channels); lame_set_in_samplerate(context->gfp, handle->samplerate); lame_set_brate(context->gfp, 24); - lame_set_mode(context->gfp, 3); + if (handle->channels == 2) { + lame_set_mode(context->gfp, STEREO); + } else { + lame_set_mode(context->gfp, MONO); + } lame_set_quality(context->gfp, 2); /* 2=high 5 = medium 7=low */ lame_set_errorf(context->gfp, log_error);

1 0

[commit] r7297 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: anthm Date: Fri Jan 18 21:27:26 2008 New Revision: 7297 Modified: freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_rtp.c Log: avoiding racelock Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Fri Jan 18 21:27:26 2008 @@ -621,6 +621,9 @@ SWITCH_DECLARE(switch_status_t) switch_socket_sendto(switch_socket_t * sock, switch_sockaddr_t * where, int32_t flags, const char *buf, switch_size_t *len) { + if (!where || !buf || !len || !*len) { + return SWITCH_STATUS_GENERR; + } return apr_socket_sendto(sock, where, flags, buf, len); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 18 21:27:26 2008 @@ -500,15 +500,18 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { + switch_sockaddr_t *remote_addr; *err = "Success"; - - if (switch_sockaddr_info_get(&rtp_session->remote_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) - != SWITCH_STATUS_SUCCESS || !rtp_session->remote_addr) { + + if (switch_sockaddr_info_get(&remote_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !remote_addr) { *err = "Remote Address Error!"; return SWITCH_STATUS_FALSE; } + switch_mutex_lock(rtp_session->write_mutex); + rtp_session->remote_addr = remote_addr; rtp_session->remote_port = port; + switch_mutex_unlock(rtp_session->write_mutex); return SWITCH_STATUS_SUCCESS; } @@ -796,7 +799,8 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) { - return (rtp_session != NULL && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->ready == 2) ? 1 : 0; + return (rtp_session != NULL && + switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->remote_addr && rtp_session->ready == 2) ? 1 : 0; } SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)

1 0

[commit] r7296 - freeswitch/trunk
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: cypromis Date: Fri Jan 18 20:48:23 2008 New Revision: 7296 Modified: freeswitch/trunk/freeswitch.spec Log: YAY a working spec file Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Fri Jan 18 20:48:23 2008 @@ -2,7 +2,7 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 1.0.beta3 +Version: 1.0.rc1 Release: 1 URL: http://www.freeswitch.org/ Packager: Michal Bielicki @@ -51,15 +51,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch. It can be used as a simple switching engine, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow. +FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice +and chat driven products scaling from a soft-phone up to a soft-switch. It can be used as a +simple switching engine, a media gateway or a media server to host IVR applications using +simple scripts or XML to control the callflow. + +We support various communication technologies such as SIP, H.323, IAX2 and GoogleTalk making +it easy to interface with other open source PBX systems such as sipX, OpenPBX, Bayonne, YATE or Asterisk. + +We also support both wide and narrow band codecs making it an ideal solution to bridge legacy +devices to the future. The voice channels and the conference bridge module all can operate +at 8, 16 or 32 kilohertz and can bridge channels of different rates. -We support various communication technologies such as SIP, H.323, IAX2 and GoogleTalk making it easy to interface with other open source PBX systems such as sipX, OpenPBX, Bayonne, YATE or Asterisk. +FreeSWITCH runs on several operating systems including Windows, Max OS X, Linux, BSD and Solaris +on both 32 and 64 bit platforms. -We also support both wide and narrow band codecs making it an ideal solution to bridge legacy devices to the future. The voice channels and the conference bridge module all can operate at 8, 16 or 32 kilohertz and can bridge channels of different rates. - -FreeSWITCH runs on several operating systems including Windows, Max OS X, Linux, BSD and Solaris on both 32 and 64 bit platforms. - -Our developers are heavily involved in open source and have donated code and other resources to other telephony projects including sipX, Asterisk and OpenPBX. +Our developers are heavily involved in open source and have donated code and other resources to +other telephony projects including sipXecs, OpenSER, Asterisk, CodeWeaver and OpenPBX. %if 0%{?suse_version} > 100 %debug_package @@ -165,7 +173,7 @@ export CFLAGS="$CFLAGS -fstack-protector" %endif PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr" -SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" +SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail" ASR_TTS_MODULES="asr_tts/mod_openmrcp" CODECS_MODULES="codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 codecs/mod_gsm codecs/mod_ilbc codecs/mod_h26x codecs/mod_l16 codecs/mod_speex" @@ -177,9 +185,9 @@ FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile" LANGUAGES_MODULES= LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" -SAY_MODULES="say/mod_say_de say/mod_say_en say/mod_say_fr" +SAY_MODULES="say/mod_say_en" TIMERS_MODULES= -DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl" +DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl say/mod_say_fr say/mod_say_de" XML_INT_MODULES="xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr" MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES" @@ -261,65 +269,73 @@ %files %defattr(-,freeswitch,daemon) -%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 -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/htdocs -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/scripts -#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/grammer -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/dialplan -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/directory -%dir %attr(750,freeswitch.daemon) /opt/freeswitch/conf/directory/default -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/jingle_profiles -%config(noreplace) %attr(644,freeswitch,daemon) /etc/monit.d/freeswitch.monitrc -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/mime.types -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/*.tpl -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/*.conf -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/alsa.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/cdr.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/conference.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/console.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/dingaling.conf.xml -%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_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 -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/limit.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/logfile.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/modules.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/rss.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/sofia.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/switch.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/syslog.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/woomera.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/dialplan/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/directory/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/directory/default/* -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/jingle_profiles/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/htdocs/* +%dir %attr(0750, freeswitch, daemon) /etc/monit.d +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/db +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/log +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/log/xml_cdr +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/htdocs +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/scripts +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/dialplan +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/directory +%dir %attr(0750, freeswitch. daemon) /opt/freeswitch/conf/directory/default +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/mrcp_profiles +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/nat +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/dialplan/extensions +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/default +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/outbound +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/jingle_profiles +%config(noreplace) %attr(0644, freeswitch, daemon) /etc/monit.d/freeswitch.monitrc +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/mime.types +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/*.tpl +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/*.ttml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/*.conf +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/alsa.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/conference.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/console.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/enum.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/iax.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/ivr.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/java.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/limit.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/logfile.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/modules.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/rss.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/sofia.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/switch.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/syslog.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/woomera.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/dialplan/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/directory/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/directory/default/* +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/mrcp_profiles/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/default/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/outbound/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/sip_profiles/nat/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/jingle_profiles/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/htdocs/* /etc/ld.so.conf.d/* -/opt/freeswitch/bin/freeswitch +/opt/freeswitch/bin/* /etc/init.d/freeswitch /etc/sysconfig/freeswitch %if 0%{?suse_version} > 100 @@ -338,7 +354,6 @@ /opt/freeswitch/mod/mod_fifo.so* /opt/freeswitch/mod/mod_limit.so* /opt/freeswitch/mod/mod_rss.so* -#/opt/freeswitch/mod/mod_soundtouch.so* /opt/freeswitch/mod/mod_voicemail.so* /opt/freeswitch/mod/mod_openmrcp.so* /opt/freeswitch/mod/mod_g711.so* @@ -387,11 +402,11 @@ /opt/freeswitch/lib/libnspr4.so /opt/freeswitch/lib/libplds4.so /opt/freeswitch/lib/libplc4.so -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml %files devel -%defattr(-,freeswitch,daemon) +%defattr(-, freeswitch, daemon) /opt/freeswitch/lib/*.a /opt/freeswitch/lib/*.la /opt/freeswitch/mod/*.a @@ -399,12 +414,12 @@ /opt/freeswitch/include/*.h %files lang-en -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm/*.xml +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/en +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/en/demo +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/en/vm +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/en/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/en/demo/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/en/vm/*.xml /opt/freeswitch/mod/mod_say_en.so* #%files lang-it @@ -427,12 +442,12 @@ %files lang-de -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm/*.xml +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/de +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/de/demo +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/de/vm +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/de/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/de/demo/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/de/vm/*.xml /opt/freeswitch/mod/mod_say_de.so* #%files lang-nl @@ -445,15 +460,17 @@ #/opt/freeswitch/mod/mod_say_nl.so* %files lang-fr -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm/*.xml +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/fr +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/fr/demo +%dir %attr(0750, freeswitch, daemon) /opt/freeswitch/conf/lang/fr/vm +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/fr/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/fr/demo/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) /opt/freeswitch/conf/lang/fr/vm/*.xml /opt/freeswitch/mod/mod_say_fr.so* %changelog +* Fri Jan 18 2008 - michal.bielicki(a)voiceworks.pl +- fixes, fixes and more fixes in preparation for rc1 * Thu Dec 5 2007 - michal.bielicki(a)voiceworks.pl - put in detail configfiles in to split of spidermonkey configs - created link from /opt/freesxwitch/conf to /etc/opt/freeswitch

1 0

[commit] r7295 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: mikej Date: Fri Jan 18 20:48:21 2008 New Revision: 7295 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: push tls tweaks to force rebuild Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Jan 18 20:48:21 2008 @@ -1 +1 @@ -Sun Jan 6 15:11:42 EST 2008 +Sat Jan 19 01:47:55 GMT 2008

1 0

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

19 Jan '08

Author: stkn Date: Fri Jan 18 20:28:36 2008 New Revision: 7294 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Ouput a second line with tls_url and (TLS) in sofia status for tls enabled profiles 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 Fri Jan 18 20:28:36 2008 @@ -1260,6 +1260,12 @@ } else { stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u)\n", profile->name, "profile", profile->url, sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); + + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u) (TLS)\n", profile->name, "profile", profile->tls_url, + sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); + } + c++; for (gp = profile->gateways; gp; gp = gp->next) {

1 0

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

19 Jan '08

Author: stkn Date: Fri Jan 18 20:12:48 2008 New Revision: 7293 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Show TLS urls in sofia status profile output 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 Fri Jan 18 20:12:48 2008 @@ -1214,6 +1214,10 @@ } stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + } stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_str_nil(profile->hold_music)); stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te);

1 0

[commit] r7292 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: stkn Date: Fri Jan 18 19:20:31 2008 New Revision: 7292 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Log: Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks MikeJ). This one converts all ERR_print_errors() calls Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Fri Jan 18 19:20:31 2008 @@ -50,7 +50,6 @@ #include <sofia-sip/su_types.h> #include <sofia-sip/su.h> #include <sofia-sip/su_wait.h> -#include <sofia-sip/su_debug.h> #include <assert.h> #include <stdio.h> @@ -62,6 +61,7 @@ #endif #include "tport_tls.h" +#include "tport_internal.h" char const tls_version[] = OPENSSL_VERSION_TEXT; @@ -71,7 +71,6 @@ SSL_CTX *ctx; SSL *con; BIO *bio_con; - BIO *bio_err; int type; int verified; @@ -92,6 +91,13 @@ enum { tls_buffer_size = 16384 }; static +int tls_print_errors(const char *str, size_t len, void *u) +{ + SU_DEBUG_1((str)); + return 0; +} + +static tls_t *tls_create(int type) { tls_t *tls = calloc(1, sizeof(*tls)); @@ -159,7 +165,7 @@ if (ti->configured > 1) { SU_DEBUG_1(("%s: cannot open randFile %s\n", "tls_init_context", ti->randFile)); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); } /* errno = EIO; */ /* return -1; */ @@ -171,9 +177,6 @@ signal(SIGPIPE, SIG_IGN); #endif - if (tls->bio_err == NULL) - tls->bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); - if (tls->ctx == NULL) { SSL_METHOD *meth; @@ -189,7 +192,7 @@ } if (tls->ctx == NULL) { - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -200,7 +203,7 @@ if (ti->configured > 0) { SU_DEBUG_1(("%s: invalid certificate: %s\n", "tls_init_context", ti->cert)); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); #if require_client_certificate errno = EIO; return -1; @@ -212,7 +215,7 @@ ti->key, SSL_FILETYPE_PEM)) { if (ti->configured > 0) { - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); #if require_client_certificate errno = EIO; return -1; @@ -234,7 +237,7 @@ ti->CAfile, ti->CApath)) { if (ti->configured > 0) - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -248,7 +251,7 @@ if (!SSL_CTX_set_cipher_list(tls->ctx, ti->cipher)) { SU_DEBUG_1(("error setting cipher list\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -275,9 +278,6 @@ if (tls->bio_con != NULL) BIO_free(tls->bio_con); - if (tls->bio_err != NULL && tls->type != tls_slave) - BIO_free(tls->bio_err); - for (k = 0; k < TLS_MAX_HOSTS; k++) free(tls->hosts[k]), tls->hosts[k] = NULL; @@ -332,7 +332,7 @@ if (tls->bio_con == NULL) { SU_DEBUG_1(("tls_init_master: BIO_new_socket failed\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); tls_free(tls); errno = EIO; return NULL; @@ -364,7 +364,7 @@ SU_DEBUG_1(("SSL_connect failed: %d %s\n", err, ERR_error_string(err, NULL))); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); return -1; } } @@ -399,7 +399,6 @@ if (tls) { tls->ctx = master->ctx; - tls->bio_err = master->bio_err; if (!(tls->read_buffer = malloc(tls_buffer_size))) free(tls), tls = NULL; @@ -414,7 +413,7 @@ if (tls->con == NULL) { SU_DEBUG_1(("tls_clone: SSL_new failed\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); tls_free(tls); errno = EIO; return NULL; @@ -596,7 +595,7 @@ default: SU_DEBUG_1(("%s: %s failed (%d): %s\n", who, operation, err, ERR_error_string(err, errorbuf))); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; }

1 0