June 2006 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r1566 - in freeswitch/trunk: . build libs libs/iax/src libs/libspeakup src/include
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Wed Jun 7 20:15:48 2006 New Revision: 1566 Modified: freeswitch/trunk/ (props changed) freeswitch/trunk/build/ (props changed) freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/iax/src/ (props changed) freeswitch/trunk/libs/libspeakup/ (props changed) freeswitch/trunk/src/include/ (props changed) Log: Add more build files to the ignore list.

1 0

[Freeswitch-svn] [commit] r1565 - in freeswitch/trunk/src/mod: . applications applications/mod_bridgecall applications/mod_commands applications/mod_echo applications/mod_ivrtest applications/mod_playback applications/mod_rss applications/mod_skel asr_tts asr_tts/mod_cepstral codecs codecs/mod_g711 codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc codecs/mod_l16 codecs/mod_speex dialplans dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml directories directories/mod_ldap endpoints endpoints/mod_dingal
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 19:55:26 2006 New Revision: 1565 Modified: freeswitch/trunk/src/mod/ (props changed) freeswitch/trunk/src/mod/applications/ (props changed) freeswitch/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/asr_tts/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ (props changed) freeswitch/trunk/src/mod/codecs/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/dialplans/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_exosip/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_test/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/languages/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/loggers/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_syslog/ (props changed) freeswitch/trunk/src/mod/timers/ (props changed) freeswitch/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/trunk/src/mod/xml_int/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) Log: Add more build files to the ignore list.

1 0

[Freeswitch-svn] [commit] r1564 - freeswitch/trunk/libs
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 19:53:04 2006 New Revision: 1564 Modified: freeswitch/trunk/libs/ (props changed) Log: Add more build files to the ignore list.

1 0

[Freeswitch-svn] [commit] r1563 - in freeswitch/trunk: docs src/mod src/mod/applications src/mod/applications/mod_bridgecall src/mod/applications/mod_commands src/mod/applications/mod_echo src/mod/applications/mod_ivrtest src/mod/applications/mod_playback src/mod/applications/mod_rss src/mod/applications/mod_skel src/mod/asr_tts src/mod/asr_tts/mod_cepstral src/mod/codecs src/mod/codecs/mod_g711 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_ilbc src/mod/codecs/mod_l16 src/mod/codecs/mod_
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 18:38:45 2006 New Revision: 1563 Modified: freeswitch/trunk/docs/ (props changed) freeswitch/trunk/src/mod/ (props changed) freeswitch/trunk/src/mod/applications/ (props changed) freeswitch/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/asr_tts/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ (props changed) freeswitch/trunk/src/mod/codecs/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/dialplans/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_exosip/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_test/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/languages/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/loggers/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_syslog/ (props changed) freeswitch/trunk/src/mod/timers/ (props changed) freeswitch/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/trunk/src/mod/xml_int/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) freeswitch/trunk/w32/vsnet/ (props changed) freeswitch/trunk/w32/vsnet/Tools/ (props changed) Log: Add more windows build files to the ignore list.

1 0

[Freeswitch-svn] [commit] r1562 - in freeswitch/trunk: docs libs/codec/gsm libs/codec/ilbc libs/iax libs/libdingaling libs/libteletone libs/srtp libs/srtp/crypto/include src/include src/mod/applications/mod_bridgecall src/mod/applications/mod_commands src/mod/applications/mod_echo src/mod/applications/mod_ivrtest src/mod/applications/mod_playback src/mod/applications/mod_rss src/mod/asr_tts/mod_cepstral src/mod/codecs/mod_g711 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_ilbc src/mod/co
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 18:26:12 2006 New Revision: 1562 Modified: freeswitch/trunk/docs/ (props changed) freeswitch/trunk/libs/codec/gsm/ (props changed) freeswitch/trunk/libs/codec/ilbc/ (props changed) freeswitch/trunk/libs/iax/ (props changed) freeswitch/trunk/libs/libdingaling/ (props changed) freeswitch/trunk/libs/libteletone/ (props changed) freeswitch/trunk/libs/srtp/ (props changed) freeswitch/trunk/libs/srtp/crypto/include/ (props changed) freeswitch/trunk/src/include/ (props changed) freeswitch/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_exosip/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_test/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) freeswitch/trunk/w32/Setup/ (props changed) freeswitch/trunk/w32/vsnet/ (props changed) Log: Add more windows build files to the ignore list.

1 0

[Freeswitch-svn] [commit] r1561 - freeswitch/trunk/libs
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 18:20:19 2006 New Revision: 1561 Modified: freeswitch/trunk/libs/ (props changed) Log: add windows dependency libs to ignore list.

1 0

[Freeswitch-svn] [commit] r1560 - in freeswitch/trunk/src: include mod/endpoints/mod_exosip
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 17:55:17 2006 New Revision: 1560 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: merge anthm fix for atoi(NULL) segfault. Thanks jart for identifying the problem. Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Wed Jun 7 17:55:17 2006 @@ -101,7 +101,6 @@ * Additionally, the experimental external modules make use of several external modules: * * mod_Exosip: - * - JRTPlib (http://research.edm.luc.ac.be/jori/jrtplib/jrtplib.html) * - eXoSIP (http://savannah.nongnu.org/projects/exosip/) * * mod_iaxchan: Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Wed Jun 7 17:55:17 2006 @@ -1575,8 +1575,11 @@ } - expires = get_header_value(je, "expires"); - exptime = time(NULL) + atoi(expires) + 20; + if ((expires = get_header_value(je, "expires"))) { + exptime = time(NULL) + atoi(expires) + 20; + } else { + exptime = time(NULL) + 3600; + } if (!find_reg_url(globals.db, je->request->from->url->username, sql, sizeof(sql))) {

1 0

[Freeswitch-svn] [commit] r1559 - freeswitch/branches/jart/src/mod/endpoints/mod_exosip
by anthm＠freeswitch.org 07 Jun '06

07 Jun '06

Author: anthm Date: Wed Jun 7 17:49:24 2006 New Revision: 1559 Modified: freeswitch/branches/jart/src/mod/endpoints/mod_exosip/mod_exosip.c Log: update Modified: freeswitch/branches/jart/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/branches/jart/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/branches/jart/src/mod/endpoints/mod_exosip/mod_exosip.c Wed Jun 7 17:49:24 2006 @@ -1575,8 +1575,11 @@ } - expires = get_header_value(je, "expires"); - exptime = time(NULL) + atoi(expires) + 20; + if ((expires = get_header_value(je, "expires"))) { + exptime = time(NULL) + atoi(expires) + 20; + } else { + exptime = time(NULL) + 3600; + } if (!find_reg_url(globals.db, je->request->from->url->username, sql, sizeof(sql))) {

1 0

[Freeswitch-svn] [commit] r1158 - in freeswitch/trunk: . conf src src/include src/mod/loggers/mod_syslog
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 12:45:31 2006 New Revision: 1158 Added: freeswitch/trunk/src/mod/loggers/mod_syslog/ - copied from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/conf/freeswitch.conf freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: Addition of mod_syslog for *nix. Thanks to James Martelletti. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Fri Apr 14 12:45:31 2006 @@ -20,6 +20,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. + James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) A big THANK YOU goes to: Modified: freeswitch/trunk/conf/freeswitch.conf ============================================================================== --- freeswitch/trunk/conf/freeswitch.conf (original) +++ freeswitch/trunk/conf/freeswitch.conf Fri Apr 14 12:45:31 2006 @@ -18,6 +18,7 @@ ; Loggers (I'd load these first) load => mod_console +load => mod_syslog ; Event Handlers ;load => mod_event_multicast @@ -67,6 +68,23 @@ ; ASR /TTS ;load => mod_cepstral +;---- SYSLOG +;-------------------------------------------------------------------------------- +; emerg - system is unusable +; alert - action must be taken immediately +; crit - critical conditions +; err - error conditions +; warning - warning conditions +; notice - normal, but significant, condition +; info - informational message +; debug - debug-level message +; +[+syslog.conf] +[settings] +ident => freeswitch +facility => user +format => ${time} - ${message} +level => debug,info,warning-alert ;---- IAX PROTOCOL Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Apr 14 12:45:31 2006 @@ -174,6 +174,8 @@ */ SWITCH_DECLARE(char *) switch_cut_path(char *in); +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace); +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len); #ifdef __cplusplus } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Apr 14 12:45:31 2006 @@ -30,6 +30,9 @@ * */ #include <switch.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { @@ -141,6 +144,52 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len) +{ + size_t i; + + for (i = 0; (i < search_len) && (i < string_len); i++) { + if (string[i] != search[i]) { + return SWITCH_STATUS_FALSE; + } + } + + if (i == search_len) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace) +{ + size_t string_len = strlen(string); + size_t search_len = strlen(search); + size_t replace_len = strlen(replace); + size_t i, n; + size_t dest_len = 0; + char *dest; + + dest = (char *)malloc(sizeof(char)); + + for (i = 0; i < string_len; i++) { + if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { + for (n = 0; n < replace_len; n++) { + dest[dest_len] = replace[n]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + i += search_len-1; + } else { + dest[dest_len] = string[i]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + } + + dest[dest_len] = 0; + return dest; +} SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms) {

1 0

[Freeswitch-svn] [commit] r1158 - in freeswitch/trunk: . conf src src/include src/mod/loggers/mod_syslog
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 12:45:31 2006 New Revision: 1158 Added: freeswitch/trunk/src/mod/loggers/mod_syslog/ - copied from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/conf/freeswitch.conf freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: Addition of mod_syslog for *nix. Thanks to James Martelletti. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Fri Apr 14 12:45:31 2006 @@ -20,6 +20,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. + James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) A big THANK YOU goes to: Modified: freeswitch/trunk/conf/freeswitch.conf ============================================================================== --- freeswitch/trunk/conf/freeswitch.conf (original) +++ freeswitch/trunk/conf/freeswitch.conf Fri Apr 14 12:45:31 2006 @@ -18,6 +18,7 @@ ; Loggers (I'd load these first) load => mod_console +load => mod_syslog ; Event Handlers ;load => mod_event_multicast @@ -67,6 +68,23 @@ ; ASR /TTS ;load => mod_cepstral +;---- SYSLOG +;-------------------------------------------------------------------------------- +; emerg - system is unusable +; alert - action must be taken immediately +; crit - critical conditions +; err - error conditions +; warning - warning conditions +; notice - normal, but significant, condition +; info - informational message +; debug - debug-level message +; +[+syslog.conf] +[settings] +ident => freeswitch +facility => user +format => ${time} - ${message} +level => debug,info,warning-alert ;---- IAX PROTOCOL Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Apr 14 12:45:31 2006 @@ -174,6 +174,8 @@ */ SWITCH_DECLARE(char *) switch_cut_path(char *in); +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace); +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len); #ifdef __cplusplus } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Apr 14 12:45:31 2006 @@ -30,6 +30,9 @@ * */ #include <switch.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { @@ -141,6 +144,52 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len) +{ + size_t i; + + for (i = 0; (i < search_len) && (i < string_len); i++) { + if (string[i] != search[i]) { + return SWITCH_STATUS_FALSE; + } + } + + if (i == search_len) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace) +{ + size_t string_len = strlen(string); + size_t search_len = strlen(search); + size_t replace_len = strlen(replace); + size_t i, n; + size_t dest_len = 0; + char *dest; + + dest = (char *)malloc(sizeof(char)); + + for (i = 0; i < string_len; i++) { + if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { + for (n = 0; n < replace_len; n++) { + dest[dest_len] = replace[n]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + i += search_len-1; + } else { + dest[dest_len] = string[i]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + } + + dest[dest_len] = 0; + return dest; +} SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms) {

1 0