- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12164 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mrene Date: Thu Feb 19 08:41:20 2009 New Revision: 12164 Log: those are microseconds Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Feb 19 08:41:20 2009 @@ -869,7 +869,7 @@ if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet); + "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet / 1000); } else { memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error starting timer [%s], async RTP disabled\n", timer_name);

1 0

[commit] r12162 - freeswitch/trunk/src/mod/languages/mod_perl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Thu Feb 19 00:01:53 2009 New Revision: 12162 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Thu Feb 19 00:01:53 2009 @@ -11512,17 +11512,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv);

1 0

[commit] r12161 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: intralanman Date: Wed Feb 18 23:34:35 2009 New Revision: 12161 Log: added fs_curl_debug option which will send XML with no whitespace if not passed (might save a little in transfer bw and time in large XMLs) Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Wed Feb 18 23:34:35 2009 @@ -51,10 +51,10 @@ * @return void */ public function fs_curl() { - openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_USER); + openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_USER); header('Content-Type: text/xml'); - $this -> open_xml(); $this -> generate_request_array(); + $this -> open_xml(); $inc = array('required'=>'libs/fs_pdo.php'); // include an external file. i.e. 'required'=>'important_file.php' $this -> include_files($inc); $this -> connect_db(DEFAULT_DSN, DEFAULT_DSN_LOGIN, DEFAULT_DSN_PASSWORD ); @@ -69,13 +69,13 @@ */ public function connect_db($dsn, $login, $password) { try { - $this -> db = new FS_PDO($dsn, $login, $password); - } catch(Exception $e) { - $this -> comment($e->getMessage()); - $this -> file_not_found(); //program terminates in function file_not_found() - } + $this -> db = new FS_PDO($dsn, $login, $password); + } catch(Exception $e) { + $this -> comment($e->getMessage()); + $this -> file_not_found(); //program terminates in function file_not_found() + } } - + /** * Method to add comments to XML * Adds a comment to be displayed in the final XML @@ -107,8 +107,14 @@ private function open_xml() { $this -> xmlw = new XMLWriter(); $this -> xmlw -> openMemory(); - $this -> xmlw -> setIndent(true); - $this -> xmlw -> setIndentString(' '); + if (array_key_exists('fs_curl_debug', $this -> request) + && $this -> request['fs_curl_debug'] == true) { + $this -> xmlw -> setIndent(true); + $this -> xmlw -> setIndentString(' '); + } else { + $this -> xmlw -> setIndent(false); + $this -> xmlw -> setIndentString(' '); + } $this -> xmlw -> startDocument('1.0', 'UTF-8', 'no'); //set the freeswitch document type $this -> xmlw -> startElement('document'); @@ -138,8 +144,10 @@ $not_found -> writeAttribute('status', 'not found'); $not_found -> endElement(); $not_found -> endElement(); - $not_found -> endElement(); + /* we put the comments inside the root element so we don't + * get complaints about markup outside of it */ $this -> comments2xml($not_found, $this -> comments); + $not_found -> endElement(); echo $not_found -> outputMemory(); exit(); } @@ -181,25 +189,22 @@ * @return void */ public function output_xml() { - $this->comment( + $this->comment( sprintf('Total # of Queries Run: %d', $this->db->counter) ); $this -> comment(sprintf("Estimated Execution Time Is: %s" , (ereg_replace( '^0\.([0-9]+) ([0-9]+)$', '\2.\1', microtime()) - START_TIME) - )); - + )); + + $this -> comments2xml($this -> xmlw, $this -> comments); $this -> close_xml(); - $comment_count = count($this -> comments); - for ($i = 0; $i < $comment_count; $i++) { - $this -> xmlw -> writeComment($this -> comments[$i]); - } $xml_out = $this -> xmlw -> outputMemory(); $this -> debug('---- Start XML Output ----'); $this -> debug(explode("\n", $xml_out)); $this -> debug('---- End XML Output ----'); echo $xml_out; - exit(); + exit(); } /** @@ -269,20 +274,20 @@ switch ($no) { case E_USER_NOTICE: - case E_NOTICE: - break; - case E_USER_WARNING: - case E_WARNING: - if (defined('RETURN_ON_WARN') && RETURN_ON_WARN == true) { + case E_NOTICE: break; - } - case E_ERROR: - case E_USER_ERROR: - default: - $this -> file_not_found(); - } - return true; - } + case E_USER_WARNING: + case E_WARNING: + if (defined('RETURN_ON_WARN') && RETURN_ON_WARN == true) { + break; + } + case E_ERROR: + case E_USER_ERROR: + default: + $this -> file_not_found(); + } + return true; + } /** * Function to print out debugging info @@ -292,41 +297,41 @@ * @param integer $debug_level debug if $debug_level <= FS_CURL_DEBUG * @param integer $spaces */ - public function debug($input, $debug_level=0, $spaces=0) { - if (defined('FS_CURL_DEBUG') && $debug_level <= FS_CURL_DEBUG ) { - if (is_array($input)) { - $this -> debug('Array (', $debug_level, $spaces); - foreach ($input as $key=>$val) { - if (is_array($val) || is_object($val)) { - $this -> debug("[$key] => $val", $debug_level, $spaces+4); - $this -> debug('(', $debug_level, $spaces + 8); - $this -> debug($val, $debug_level, $spaces + 8); - } else { - $this -> debug("[$key] => '$val'", $debug_level, $spaces + 4); - } - } - $this -> debug(")", $debug_level, $spaces); - } else { - $debug_str = sprintf("%s%s" - , str_repeat(' ', $spaces), $input - ); - switch (FS_DEBUG_TYPE) { - case 0: - syslog(LOG_NOTICE, $debug_str); - break; - case 1: - $this -> comment($debug_str); - break; - case 2: - $ptr = fopen(FS_DEBUG_FILE, 'a'); - fputs($ptr, "$debug_str\r\n"); - fclose($ptr); - break; - default: - return; - } - } - } - } -} + public function debug($input, $debug_level=0, $spaces=0) { + if (defined('FS_CURL_DEBUG') && $debug_level <= FS_CURL_DEBUG ) { + if (is_array($input)) { + $this -> debug('Array (', $debug_level, $spaces); + foreach ($input as $key=>$val) { + if (is_array($val) || is_object($val)) { + $this -> debug("[$key] => $val", $debug_level, $spaces+4); + $this -> debug('(', $debug_level, $spaces + 8); + $this -> debug($val, $debug_level, $spaces + 8); + } else { + $this -> debug("[$key] => '$val'", $debug_level, $spaces + 4); + } + } + $this -> debug(")", $debug_level, $spaces); + } else { + $debug_str = sprintf("%s%s" + , str_repeat(' ', $spaces), $input + ); + switch (FS_DEBUG_TYPE) { + case 0: + syslog(LOG_NOTICE, $debug_str); + break; + case 1: + $this -> comment($debug_str); + break; + case 2: + $ptr = fopen(FS_DEBUG_FILE, 'a'); + fputs($ptr, "$debug_str\r\n"); + fclose($ptr); + break; + default: + return; + } + } + } + } + }

1 0

[commit] r12160 - freeswitch/trunk
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:32:49 2009 New Revision: 12160 Log: fix fs_cli build on solaris Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed Feb 18 23:32:49 2009 @@ -259,7 +259,7 @@ ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) - APR_ADDTO(ESL_LDFLAGS, -lnsl) + APR_ADDTO(ESL_LDFLAGS, -lnsl -lsocket) ;; *bsd*) APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include)

1 0

[commit] r12159 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: intralanman Date: Wed Feb 18 23:29:33 2009 New Revision: 12159 Log: get rid of a couple of undefined variable warnings in XML generation Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Wed Feb 18 23:29:33 2009 @@ -116,11 +116,11 @@ $ce = $row['condition_expression']; //$rcd = $row['re_cdata']; $cc = empty($row['cond_break']) ? '0' : $row['cond_break']; - $dp_array[$ct]["$et;$ec"]["$cf;$ce;$cc;$rcd"][] = array( + $dp_array[$ct]["$et;$ec"]["$cf;$ce;$cc"][] = array( 'type'=>$type, 'application'=>$app, 'data'=>$data, - 'is_cdata'=>$app_cdata + 'is_cdata'=>(empty($app_cdata) ? '' : $app_cdata) ); } return $dp_array;

1 0

[commit] r12158 - in freeswitch/trunk/libs/ilbc: . config doc localtests src tests
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:08:16 2009 New Revision: 12158 Log: remove generated files from tree Removed: freeswitch/trunk/libs/ilbc/Makefile.in freeswitch/trunk/libs/ilbc/aclocal.m4 freeswitch/trunk/libs/ilbc/config/config.guess freeswitch/trunk/libs/ilbc/config/config.sub freeswitch/trunk/libs/ilbc/config/ltmain.sh freeswitch/trunk/libs/ilbc/doc/Makefile.in freeswitch/trunk/libs/ilbc/localtests/Makefile.in freeswitch/trunk/libs/ilbc/src/Makefile.in freeswitch/trunk/libs/ilbc/tests/Makefile.in

1 0

[commit] r12157 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:06:04 2009 New Revision: 12157 Log: fix suncc visibility support Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Wed Feb 18 23:06:04 2009 @@ -79,7 +79,7 @@ #pragma warning(disable:4706) #endif -int16_t TELETONE_SINES[SINE_TABLE_MAX] = { +TELETONE_API int16_t TELETONE_SINES[SINE_TABLE_MAX] = { 0x00c9, 0x025b, 0x03ed, 0x057f, 0x0711, 0x08a2, 0x0a33, 0x0bc4, 0x0d54, 0x0ee4, 0x1073, 0x1201, 0x138f, 0x151c, 0x16a8, 0x1833, 0x19be, 0x1b47, 0x1cd0, 0x1e57, 0x1fdd, 0x2162, 0x22e5, 0x2467, Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Wed Feb 18 23:06:04 2009 @@ -137,7 +137,7 @@ /* 3.02 represents twice the power */ #define DBM0_MAX_POWER (3.14f + 3.02f) -extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; +TELETONE_API extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; static __inline__ int32_t teletone_dds_phase_rate(teletone_process_t tone, uint32_t rate) {

1 0

[commit] r12156 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:00:52 2009 New Revision: 12156 Log: fix suncc visibility support in libteletone Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Wed Feb 18 23:00:52 2009 @@ -255,7 +255,7 @@ \param ... up to TELETONE_MAX_TONES frequencies terminated by 0.0 \return 0 */ -int teletone_set_tone(teletone_generation_session_t *ts, int index, ...); +TELETONE_API int teletone_set_tone(teletone_generation_session_t *ts, int index, ...); /*! \brief Assign a set of tones to a single tone map @@ -263,7 +263,7 @@ \param ... up to TELETONE_MAX_TONES frequencies terminated by 0.0 \return 0 */ -int teletone_set_map(teletone_tone_map_t *map, ...); +TELETONE_API int teletone_set_map(teletone_tone_map_t *map, ...); /*! \brief Initilize a tone generation session @@ -273,14 +273,14 @@ \param user_data optional user data to send \return 0 */ -int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data); +TELETONE_API int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data); /*! \brief Free the buffer allocated by a tone generation session \param ts the tone generation session to destroy \return 0 */ -int teletone_destroy_session(teletone_generation_session_t *ts); +TELETONE_API int teletone_destroy_session(teletone_generation_session_t *ts); /*! \brief Execute a single tone generation instruction @@ -288,7 +288,7 @@ \param map the tone mapping to use for the frequencies \return 0 */ -int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map); +TELETONE_API int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map); /*! \brief Execute a tone generation script and call callbacks after each instruction @@ -296,7 +296,7 @@ \param cmd the script to execute \return 0 */ -int teletone_run(teletone_generation_session_t *ts, const char *cmd); +TELETONE_API int teletone_run(teletone_generation_session_t *ts, const char *cmd); #ifdef __cplusplus }

1 0

[commit] r12155 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 22:57:50 2009 New Revision: 12155 Log: fix suncc visibility support in libteletone Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Wed Feb 18 22:57:50 2009 @@ -202,7 +202,7 @@ \param mt the multi-frequency tone descriptor \param map a representation of the multi-frequency tone */ - void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map); +TELETONE_API void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map); /*! \brief Check a sample buffer for the presence of the mulit-frequency tone described by mt @@ -211,7 +211,7 @@ \param samples the number of samples present in sample_buffer \return true when the tone was detected or false when it is not */ - int teletone_multi_tone_detect (teletone_multi_tone_t *mt, +TELETONE_API int teletone_multi_tone_detect (teletone_multi_tone_t *mt, int16_t sample_buffer[], int samples); @@ -220,7 +220,7 @@ \param dtmf_detect_state the DTMF detection state to initilize \param sample_rate the desired sample rate */ - void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate); +TELETONE_API void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate); /*! \brief Check a sample buffer for the presence of DTMF digits @@ -229,7 +229,7 @@ \param samples the number of samples present in sample_buffer \return true when DTMF was detected or false when it is not */ - int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, int16_t sample_buffer[], int samples); /*! @@ -239,7 +239,7 @@ \param max the maximum length of buf \return the number of characters written to buf */ - int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, char *buf, int max); @@ -249,7 +249,7 @@ \param sample_buffer an array aof 16 bit signed linear samples \param samples the number of samples present in sample_buffer */ - void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, +TELETONE_API void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, int16_t sample_buffer[], int samples);

1 0

[commit] r12154 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 22:41:38 2009 New Revision: 12154 Log: fix suncc visibility support in libteletone Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Wed Feb 18 22:41:38 2009 @@ -110,7 +110,7 @@ #define teletone_assert(expr) assert(expr) #endif -#if (defined(__GNUC__) || defined(__SUNCC__)) && defined(HAVE_VISIBILITY) +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) #define TELETONE_API __attribute__((visibility("default"))) #else #define TELETONE_API

1 0