- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8655 - in freeswitch/trunk/src: . mod/applications/mod_voicemail
by Freeswitch SVN 26 May '08

26 May '08

Author: mikej Date: Sun May 25 22:51:34 2008 New Revision: 8655 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_utils.c Log: merge MODAPP-88: Fix Email with no Attachement; Allow Email & Local VM Storage; Add Notify Only Email; Extra, note about missing prompts. Added param "vm-email-only" to make voicemail sent by email only (previously default behavior Added param "vm-mailto-notify" to allow sending an second email to an mobile or other device for notification only Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sun May 25 22:51:34 2008 @@ -952,8 +952,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); } if (switch_channel_ready(channel)) { + /* TODO Rel 1.0 : Add Playback of Prompt <message is too short, please rerecord your message>, then go back at record_file */ goto record_file; } else { + status = SWITCH_STATUS_BREAK; goto end; } } else { @@ -1741,7 +1743,9 @@ switch_file_handle_t fh = { 0 }; switch_input_args_t args = { 0 }; char *email_vm = NULL; + char *email_vm_notify = NULL; int send_mail = 0; + int send_mail_only = 0; cc_t cc = { 0 }; char *read_flags = NORMAL_FLAG_STRING; int priority = 3; @@ -1804,8 +1808,12 @@ if (!strcasecmp(var, "vm-mailto")) { email_vm = switch_core_session_strdup(session, val); + } else if (!strcasecmp(var, "vm-mailto-notify")) { + email_vm_notify = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "email-addr")) { email_addr = val; + } else if (!strcasecmp(var, "vm-email-only")) { + send_mail_only = switch_true(val); } else if (!strcasecmp(var, "vm-email-all-messages")) { send_mail = switch_true(val); } else if (!strcasecmp(var, "vm-delete-file")) { @@ -1944,7 +1952,7 @@ } } - if (!send_mail && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + if (!send_mail_only && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { char *usql; switch_event_t *event; char *mwi_id = NULL; @@ -1979,7 +1987,7 @@ end: - if (send_mail && !switch_strlen_zero(email_vm)) { + if (send_mail && !switch_strlen_zero(email_vm) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { switch_event_t *event; char *from; char *body; @@ -2080,10 +2088,13 @@ } else { switch_simple_email(email_vm, from, header_string, body, NULL); } + if (!switch_strlen_zero(email_vm_notify)) { + switch_simple_email(email_vm_notify, from, header_string, body, NULL); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); switch_safe_free(body); - if (email_delete) { + if (email_delete && send_mail_only) { if (unlink(file_path) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sun May 25 22:51:34 2008 @@ -373,11 +373,10 @@ if ((ifd = open(file, O_RDONLY)) < 1) { return SWITCH_FALSE; } - - switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); - if (!write_buf(fd, buf)) { - return SWITCH_FALSE; - } + } + switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); + if (!write_buf(fd, buf)) { + return SWITCH_FALSE; } if (headers && !write_buf(fd, headers)) @@ -386,15 +385,13 @@ if (!write_buf(fd, "\n\n")) return SWITCH_FALSE; - if (file) { - if (body && switch_stristr("content-type", body)) { - switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound); - } else { - switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); - } - if (!write_buf(fd, buf)) - return SWITCH_FALSE; - } + if (body && switch_stristr("content-type", body)) { + switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound); + } else { + switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); + } + if (!write_buf(fd, buf)) + return SWITCH_FALSE; if (body) { if (!write_buf(fd, body)) { @@ -456,11 +453,9 @@ } - if (file) { - switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); - if (!write_buf(fd, buf)) - return SWITCH_FALSE; - } + switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); + if (!write_buf(fd, buf)) + return SWITCH_FALSE; } if (fd) { @@ -478,7 +473,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", filename); } - if (file) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Emailed file [%s] to [%s]\n", filename, to); } else {

1 0

[commit] r8654 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 May '08

26 May '08

Author: anthm Date: Sun May 25 22:22:37 2008 New Revision: 8654 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: probably fix SFSIP-57 I'm feeling lucky -google 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 Sun May 25 22:22:37 2008 @@ -2086,9 +2086,7 @@ } if (switch_channel_get_state(channel) == CS_HIBERNATE) { switch_set_flag_locked(tech_pvt, TFLAG_READY); - if (switch_channel_get_state(channel) == CS_NEW) { - switch_channel_set_state(channel, CS_INIT); - } + switch_channel_set_state(channel, CS_INIT); switch_set_flag(tech_pvt, TFLAG_SDP); } goto done;

1 0

[commit] r8653 - freeswitch/trunk/src/include
by Freeswitch SVN 26 May '08

26 May '08

Author: stkn Date: Sun May 25 21:56:31 2008 New Revision: 8653 Modified: freeswitch/trunk/src/include/g711.h freeswitch/trunk/src/include/switch_core.h Log: some doxygen fixes Modified: freeswitch/trunk/src/include/g711.h ============================================================================== --- freeswitch/trunk/src/include/g711.h (original) +++ freeswitch/trunk/src/include/g711.h Sun May 25 21:56:31 2008 @@ -369,7 +369,7 @@ uint8_t alaw_to_ulaw(uint8_t alaw); /*! \brief Transcode from u-law to A-law, using the procedure defined in G.711. - \param alaw The u-law sample to transcode. + \param ulaw The u-law sample to transcode. \return The best matching A-law value. */ uint8_t ulaw_to_alaw(uint8_t ulaw); Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun May 25 21:56:31 2008 @@ -728,7 +728,7 @@ \param caller_profile the originator's caller profile \param new_session a NULL pointer to aim at the newly created session \param pool optional existing memory pool to donate to the session - \paeam flags flags to use + \param flags flags to use \return the cause code of the attempted call */ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_opt_ switch_core_session_t *session, @@ -1498,13 +1498,14 @@ /*! \brief Change user and/or group of the running process - \long Several possible combinations: - - user only (group NULL): switch to user and his primary group (and supplementary groups, if supported) - - user and group: switch to user and specified group (only) - - group only (user NULL): switch group only \param user name of the user to switch to (or NULL) \param group name of the group to switch to (or NULL) \return 0 on success, -1 otherwise + + Several possible combinations: + - user only (group NULL): switch to user and his primary group (and supplementary groups, if supported) + - user and group: switch to user and specified group (only) + - group only (user NULL): switch group only */ SWITCH_DECLARE(int32_t) change_user_group(const char *user, const char *group);

1 0

[commit] r8652 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 26 May '08

26 May '08

Author: mikej Date: Sun May 25 20:18:57 2008 New Revision: 8652 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: merge MODLANG-61 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun May 25 20:18:57 2008 @@ -2174,8 +2174,15 @@ CHANNEL_SANITY_CHECK(); if (argc > 1) { - cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - cause = switch_channel_str2cause(cause_name); + if(JSVAL_IS_INT(argv[0])) { + int32 i = 0; + JS_ValueToInt32(cx, argv[0], &i); + cause = i; + } + else { + cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + cause = switch_channel_str2cause(cause_name); + } } switch_channel_hangup(channel, cause); @@ -2424,7 +2431,7 @@ enum session_tinyid { SESSION_NAME, SESSION_STATE, PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST, - SESSION_UUID, SESSION_CAUSE + SESSION_UUID, SESSION_CAUSE, SESSION_CAUSECODE }; static JSFunctionSpec session_methods[] = { @@ -2469,6 +2476,7 @@ {"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT}, {"uuid", SESSION_UUID, JSPROP_READONLY | JSPROP_PERMANENT}, {"cause", SESSION_CAUSE, JSPROP_READONLY | JSPROP_PERMANENT}, + {"causecode", SESSION_CAUSECODE, JSPROP_READONLY | JSPROP_PERMANENT}, {0} }; @@ -2501,6 +2509,11 @@ *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); } break; + case SESSION_CAUSECODE: + if (jss) { + *vp = INT_TO_JSVAL(jss->cause); + } + break; default: *vp = BOOLEAN_TO_JSVAL(JS_FALSE); } @@ -2511,6 +2524,9 @@ case SESSION_CAUSE: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(switch_channel_get_cause(channel)))); break; + case SESSION_CAUSECODE: + *vp = INT_TO_JSVAL(switch_channel_get_cause(channel)); + break; case SESSION_NAME: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel))); break;

1 0

[commit] r8651 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 19:53:23 2008 New Revision: 8651 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Log: whoops Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Sun May 25 19:53:23 2008 @@ -189,7 +189,6 @@ if (*waitobj) WSACloseEvent(*waitobj); #else - su_wait_t w0 = NULL; su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; assert(waitobj != NULL); *waitobj = w0;

1 0

[commit] r8650 - freeswitch/trunk/build
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sun May 25 18:07:31 2008 New Revision: 8650 Modified: freeswitch/trunk/build/modmake.rules.in Log: fix -D_GNU_SOURC typo in build/modmake.rules.in ALL_CXXFLAGS Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sun May 25 18:07:31 2008 @@ -35,7 +35,7 @@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS) -ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC $(OUR_CFLAGS) +ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS) COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)

1 0

[commit] r8646 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 25 May '08

25 May '08

Author: brian Date: Sun May 25 17:54:02 2008 New Revision: 8646 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Log: tweak 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 Sun May 25 17:54:02 2008 @@ -5,7 +5,7 @@ <menu name="demo_ivr" greet-long="phrase:demo_ivr_main_menu" greet-short="phrase:demo_ivr_main_menu_short" - invalid-sound="voicemail/vm-hello.wav" + invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" exit-sound="voicemail/vm-goodbye.wav" timeout ="10000" inter-digit-timeout="2000" @@ -23,7 +23,7 @@ <menu name="demo_ivr_submenu" greet-long="phrase:demo_ivr_sub_menu" greet-short="phrase:demo_ivr_sub_menu_short" - invalid-sound="voicemail/vm-hello.wav" + invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" exit-sound="voicemail/vm-goodbye.wav" timeout="15000" max-failures="3">

1 0

[commit] r8645 - freeswitch/trunk
by Freeswitch SVN 25 May '08

25 May '08

Author: cypromis Date: Sun May 25 17:51:24 2008 New Revision: 8645 Modified: freeswitch/trunk/freeswitch.spec Log: Changed freeswitch.spec so it only runs bootstrap.sh if Makefile.in does not exist deleted german and french internationalisation until declared stable made lua and perl modules their own packages general cleanups Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sun May 25 17:51:24 2008 @@ -115,6 +115,20 @@ %description spidermonkey +%package lua +Summary: Lua support for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description lua + +%package perl +Summary: Perl support for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description perl + %package lang-en Summary: Provides english language dependand modules and sounds for the FreeSwitch Open Source telephone platform. Group: System/Libraries @@ -123,22 +137,6 @@ %description lang-en English language phrases module and directory structure for say module and voicemail -%package lang-de -Summary: Provides german language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description lang-de -German language phrases module and directory structure for say module and voicemail - -%package lang-fr -Summary: Provides french language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description lang-fr -French language phrases module and directory structure for say module and voicemail - %prep %setup -q @@ -163,15 +161,16 @@ ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap" EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv" FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream" -LANGUAGES_MODULES= +LANGUAGES_MODULES="languages/mod_perl languages/mod_lua" LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" -SAY_MODULES="say/mod_say_en say/mod_say_fr say/mod_say_de" +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" 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" export MODULES=$MYMODULES +rm modules.conf touch modules.conf for i in $MODULES; do echo $i >> modules.conf; done export VERBOSE=yes @@ -179,8 +178,13 @@ export PKG_CONFIG_PATH=/usr/bin/pkg-config:$PKG_CONFIG_PATH export ACLOCAL_FLAGS="-I /usr/share/aclocal" -./bootstrap.sh -%configure -C \ +if test ! -f Makefile.in +then + bootstrap.sh +fi + + + %configure -C \ --prefix=%{prefix} \ --bindir=%{prefix}/bin \ --libdir=%{prefix}/lib \ @@ -205,6 +209,12 @@ %{__make} %install +# delete unsupported langugages for now +rm -rf conf/lang/de +rm -rf conf/lang/fr +rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/de +rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/fr + %{__make} DESTDIR=$RPM_BUILD_ROOT install # Create a log dir @@ -286,6 +296,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.ttml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.conf +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/acl.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/alsa.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/conference.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/console.conf.xml @@ -321,8 +332,8 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/default/* %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/mrcp_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/default/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/outbound/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/external/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/jingle_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/htdocs/* @@ -397,6 +408,19 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/spidermonkey.conf.xml +%files lua +%defattr(-,freeswitch,daemon) +%{prefix}/mod/mod_lua*.so* +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/lua.conf.xml + +%files perl +%defattr(-,freeswitch,daemon) +%{prefix}/mod/mod_perl*.so* +%{prefix}/perl/* +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/perl.conf.xml + %files devel %defattr(-, freeswitch, daemon) %{prefix}/lib/*.a @@ -414,25 +438,13 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/en/vm/*.xml %{prefix}/mod/mod_say_en.so* -%files lang-de -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/demo -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/vm -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/demo/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/vm/*.xml -%{prefix}/mod/mod_say_de.so* - -%files lang-fr -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/demo -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/vm -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/demo/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/vm/*.xml -%{prefix}/mod/mod_say_fr.so* - %changelog +* Thu May 22 2008 - michal.bielicki(a)voiceworks.pl +- disabled beta class language stuff +- bumped revision up to rc6 +- added mod_lua +- added mod_perl +- Only bootstrap if no Makfile.in exists * Mon Feb 04 2008 - michal.bielicki(a)voiceworks.pl - More fixes to specfile - First go at SFE files @@ -443,7 +455,7 @@ * 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 +- put in detail configfiles in to split of spidermonkey configs - created link from /opt/freesxwitch/conf to /etc%{prefix} * Thu Nov 29 2007 - michal.bielicki(a)voiceworks.pl - Added ifdefs for susealities

1 0

[commit] r8644 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sun May 25 17:37:40 2008 New Revision: 8644 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: Add mod_lua to modules.conf.xml as requested by pressureman 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 Sun May 25 17:37:40 2008 @@ -76,6 +76,7 @@    +

1 0

[commit] r8643 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 17:22:35 2008 New Revision: 8643 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add NTATAG_SERVER_RPORT(2) that will act like there is always a rport in the via. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Sun May 25 17:22:35 2008 @@ -987,7 +987,7 @@ void *smime = agent->sa_smime; uint32_t flags = agent->sa_flags; int rport = agent->sa_rport; - int server_rport = agent->sa_server_rport; + unsigned server_rport = agent->sa_server_rport; int tcp_rport = agent->sa_tcp_rport; unsigned preload = agent->sa_preload; unsigned threadpool = agent->sa_tport_threadpool; @@ -2579,7 +2579,7 @@ rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port)); msg_header_replace_param(msg_home(msg), v->v_common, rport); } - else { + else if (agent->sa_server_rport == 2) { rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port)); msg_header_replace_param(msg_home(msg), v->v_common, rport); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Sun May 25 17:22:35 2008 @@ -226,7 +226,7 @@ /** If true, use rport at client */ unsigned sa_rport:1; /** If true, use rport at server */ - unsigned sa_server_rport:1; + unsigned sa_server_rport:2; /** If true, use rport with tcp, too */ unsigned sa_tcp_rport:1; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Sun May 25 17:22:35 2008 @@ -1334,7 +1334,7 @@ * * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via */ -tag_typedef_t ntatag_server_rport = BOOLTAG_TYPEDEF(server_rport); +tag_typedef_t ntatag_server_rport = UINTTAG_TYPEDEF(server_rport); /**@def NTATAG_TCP_RPORT(x) 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 Sun May 25 17:22:35 2008 @@ -544,6 +544,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)), NTATAG_UDP_MTU(65536), + NTATAG_SERVER_RPORT(2), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ @@ -586,6 +587,7 @@ node->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ + NTATAG_SERVER_RPORT(2), NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua,

1 0