- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12153 - in freeswitch/trunk/src: . mod/asr_tts/mod_flite
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 21:46:23 2009 New Revision: 12153 Log: fix build (FSBUILD-126) Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Wed Feb 18 21:46:23 2009 @@ -109,7 +109,7 @@ free_wave(flite->w); } -static switch_status_t flite_speech_read_tts(switch_speech_handle_t *sh, void *data, size_t *datalen, uint32_t *rate, switch_speech_flag_t *flags) +static switch_status_t flite_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, switch_speech_flag_t *flags) { size_t bytes_read; flite_t *flite = (flite_t *) sh->private_info; Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Wed Feb 18 21:46:23 2009 @@ -179,7 +179,7 @@ /* we have to do this as a string because swig and languages can't find an embedded way to pass a big int */ -SWITCH_DECLARE_NONSTD(char *) API::getTime(void) +SWITCH_DECLARE(char *) API::getTime(void) { switch_time_t now = switch_micro_time_now() / 1000; snprintf(time_buf, sizeof(time_buf), "%" SWITCH_TIME_T_FMT, now);

1 0

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

19 Feb '09

Author: silik0n Date: Wed Feb 18 20:54:28 2009 New Revision: 12152 Log: Lets back this out since we should not be using this call for a UPDATE or DELETE query Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Feb 18 20:54:28 2009 @@ -366,57 +366,55 @@ SQLNumResultCols(stmt, &c); SQLRowCount(stmt, &m); - if (m > 0) { - for (t = 0 ;; t++) { - int name_len = 256; - char **names; - char **vals; - int y = 0; - int done = 0; - - result = SQLFetch(stmt); - - if (result != SQL_SUCCESS) { - if (result != SQL_NO_DATA){ - err++; - } - break; - } - - names = calloc(c, sizeof(*names)); - vals = calloc(c, sizeof(*vals)); - - switch_assert(names && vals); - - for (x = 1; x <= c; x++) { - SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLULEN ColumnSize; - names[y] = malloc(name_len); - memset(names[y], 0, name_len); - - SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT) name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); - ColumnSize++; - - vals[y] = malloc(ColumnSize); - memset(vals[y], 0, ColumnSize); - SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *) vals[y], ColumnSize, NULL); - y++; + for (t = 0 ;; t++) { + int name_len = 256; + char **names; + char **vals; + int y = 0; + int done = 0; + + result = SQLFetch(stmt); + + if (result != SQL_SUCCESS) { + if (result != SQL_NO_DATA){ + err++; } + break; + } - if (callback(pdata, y, vals, names)) { - done = 1; - } - - for (x = 0; x < y; x++) { - free(names[x]); - free(vals[x]); - } - free(names); - free(vals); + names = calloc(c, sizeof(*names)); + vals = calloc(c, sizeof(*vals)); + + switch_assert(names && vals); + + for (x = 1; x <= c; x++) { + SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; + SQLULEN ColumnSize; + names[y] = malloc(name_len); + memset(names[y], 0, name_len); + + SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT) name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + ColumnSize++; + + vals[y] = malloc(ColumnSize); + memset(vals[y], 0, ColumnSize); + SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *) vals[y], ColumnSize, NULL); + y++; + } - if (done) { + if (callback(pdata, y, vals, names)) { + done = 1; + } + + for (x = 0; x < y; x++) { + free(names[x]); + free(vals[x]); + } + free(names); + free(vals); + + if (done) { break; - } } }

1 0

[commit] r12151 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mrene Date: Wed Feb 18 18:52:06 2009 New Revision: 12151 Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Wed Feb 18 18:52:06 2009 @@ -278,10 +278,11 @@ switch_set_string(results->acctcode, ""); } + switch_safe_free(sql); #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "mod_easyroute requires core ODBC support. Please refer to the documentation on how to enable this\n"); #endif - switch_safe_free(sql); + if (globals.mutex){ switch_mutex_unlock(globals.mutex); }

1 0

[commit] r12150 - in freeswitch/trunk: debian docs
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 18:46:28 2009 New Revision: 12150 Log: update changelog Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Feb 18 18:46:28 2009 @@ -34,6 +34,7 @@ * core: fix leak in exposed event class serialize method (r:12068) * core: add volume as possible return value from input callback on embedded languages (r:12114) * core: add resampler to seech handles (r:12141) + * core: add api.getTime to embedded languages (r:12149) * freeswitch: allow you to specify -htdocs dir at runtime. (r:11614) * fs_cli: add "debug" command to change the esl debug level at runtime (r:11057) * iksemel: update to 1.3 (r:11645) Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Feb 18 18:46:28 2009 @@ -34,6 +34,7 @@ core: fix leak in exposed event class serialize method (r:12068) core: add volume as possible return value from input callback on embedded languages (r:12114) core: add resampler to seech handles (r:12141) + core: add api.getTime to embedded languages (r:12149) freeswitch: allow you to specify -htdocs dir at runtime. (r:11614) fs_cli: add "debug" command to change the esl debug level at runtime (r:11057) iksemel: update to 1.3 (r:11645)

1 0

[commit] r12149 - in freeswitch/trunk/src: . include mod/languages/mod_java mod/languages/mod_java/src/org/freeswitch/swig mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl mod/languages/mod_python
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: anthm Date: Wed Feb 18 18:43:11 2009 New Revision: 12149 Log: add api.getTime() Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/API.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Wed Feb 18 18:43:11 2009 @@ -104,11 +104,13 @@ class API { protected: char *last_data; + char time_buf[64]; public: SWITCH_DECLARE_CONSTRUCTOR API(void); virtual SWITCH_DECLARE_CONSTRUCTOR ~ API(); SWITCH_DECLARE(const char *) execute(const char *command, const char *data); SWITCH_DECLARE(const char *) executeString(const char *command); + SWITCH_DECLARE(char *) getTime(void); }; @@ -398,6 +400,7 @@ void *input, switch_input_type_t itype, void *buf, unsigned int buflen); + #ifdef __cplusplus } #endif Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/API.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/API.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/API.java Wed Feb 18 18:43:11 2009 @@ -45,4 +45,8 @@ return freeswitchJNI.API_executeString(swigCPtr, this, command); } + public String getTime() { + return freeswitchJNI.API_getTime(swigCPtr, this); + } + } Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java Wed Feb 18 18:43:11 2009 @@ -19,6 +19,7 @@ public final static native void delete_API(long jarg1); public final static native String API_execute(long jarg1, API jarg1_, String jarg2, String jarg3); public final static native String API_executeString(long jarg1, API jarg1_, String jarg2); + public final static native String API_getTime(long jarg1, API jarg1_); public final static native void input_callback_state_t_function_set(long jarg1, input_callback_state_t jarg1_, long jarg2); public final static native long input_callback_state_t_function_get(long jarg1, input_callback_state_t jarg1_); public final static native void input_callback_state_t_threadState_set(long jarg1, input_callback_state_t jarg1_, long jarg2); Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp Wed Feb 18 18:43:11 2009 @@ -458,6 +458,21 @@ } +SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_API_1getTime(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + API *arg1 = (API *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(API **)&jarg1; + result = (char *)(arg1)->getTime(); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1function_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { input_callback_state_t *arg1 = (input_callback_state_t *) 0 ; void *arg2 = (void *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Wed Feb 18 18:43:11 2009 @@ -1852,6 +1852,31 @@ } +static int _wrap_API_getTime(lua_State* L) { + int SWIG_arg = -1; + API *arg1 = (API *) 0 ; + char *result = 0 ; + + SWIG_check_num_args("getTime",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("getTime",1,"API *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_API,0))){ + SWIG_fail_ptr("API_getTime",1,SWIGTYPE_p_API); + } + + result = (char *)(arg1)->getTime(); + SWIG_arg=0; + lua_pushstring(L,(const char*)result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static void swig_delete_API(void *obj) { API *arg1 = (API *) obj; delete arg1; @@ -1859,6 +1884,7 @@ static swig_lua_method swig_API_methods[] = { {"execute", _wrap_API_execute}, {"executeString", _wrap_API_executeString}, + {"getTime", _wrap_API_getTime}, {0,0} }; static swig_lua_attribute swig_API_attributes[] = { Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Wed Feb 18 18:43:11 2009 @@ -7120,21 +7120,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_read_tts(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_read_tts(void * jarg1, void * jarg2, void * jarg3, void * jarg4) { int jresult ; switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ; void *arg2 = (void *) 0 ; switch_size_t *arg3 = (switch_size_t *) 0 ; - uint32_t *arg4 = (uint32_t *) 0 ; - switch_speech_flag_t *arg5 = (switch_speech_flag_t *) 0 ; + switch_speech_flag_t *arg4 = (switch_speech_flag_t *) 0 ; switch_status_t result; arg1 = (switch_speech_handle_t *)jarg1; arg2 = (void *)jarg2; arg3 = (switch_size_t *)jarg3; - arg4 = (uint32_t *)jarg4; - arg5 = (switch_speech_flag_t *)jarg5; - result = (switch_status_t)switch_core_speech_read_tts(arg1,arg2,arg3,arg4,arg5); + arg4 = (switch_speech_flag_t *)jarg4; + result = (switch_status_t)switch_core_speech_read_tts(arg1,arg2,arg3,arg4); jresult = result; return jresult; } @@ -14084,10 +14082,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_set(void * jarg1, void * jarg2) { switch_speech_interface *arg1 = (switch_speech_interface *) 0 ; - switch_status_t (*arg2)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *)) 0 ; + switch_status_t (*arg2)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) 0 ; arg1 = (switch_speech_interface *)jarg1; - arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *))jarg2; + arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_read_tts = arg2; } @@ -14096,10 +14094,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_get(void * jarg1) { void * jresult ; switch_speech_interface *arg1 = (switch_speech_interface *) 0 ; - switch_status_t (*result)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *) = 0 ; + switch_status_t (*result)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = 0 ; arg1 = (switch_speech_interface *)jarg1; - result = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *)) ((arg1)->speech_read_tts); + result = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) ((arg1)->speech_read_tts); jresult = (void *)result; return jresult; } @@ -14584,6 +14582,150 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_resampler_set(void * jarg1, void * jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (switch_audio_resampler_t *)jarg2; + if (arg1) (arg1)->resampler = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_resampler_get(void * jarg1) { + void * jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_audio_resampler_t *result = 0 ; + + arg1 = (switch_speech_handle *)jarg1; + result = (switch_audio_resampler_t *) ((arg1)->resampler); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_buffer_set(void * jarg1, void * jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_buffer_t *arg2 = (switch_buffer_t *) 0 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (switch_buffer_t *)jarg2; + if (arg1) (arg1)->buffer = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_buffer_get(void * jarg1) { + void * jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_buffer_t *result = 0 ; + + arg1 = (switch_speech_handle *)jarg1; + result = (switch_buffer_t *) ((arg1)->buffer); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuf_set(void * jarg1, void * jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_byte_t *arg2 = (switch_byte_t *) 0 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (switch_byte_t *)jarg2; + if (arg1) (arg1)->dbuf = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuf_get(void * jarg1) { + void * jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_byte_t *result = 0 ; + + arg1 = (switch_speech_handle *)jarg1; + result = (switch_byte_t *) ((arg1)->dbuf); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_set(void * jarg1, void * jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_speech_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->dbuflen = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_get(void * jarg1) { + void * jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_speech_handle *)jarg1; + result = ((arg1)->dbuflen); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samplerate_set(void * jarg1, unsigned long jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->samplerate = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samplerate_get(void * jarg1) { + unsigned long jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t result; + + arg1 = (switch_speech_handle *)jarg1; + result = (uint32_t) ((arg1)->samplerate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_native_rate_set(void * jarg1, unsigned long jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->native_rate = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_native_rate_get(void * jarg1) { + unsigned long jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t result; + + arg1 = (switch_speech_handle *)jarg1; + result = (uint32_t) ((arg1)->native_rate); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_private_info_set(void * jarg1, void * jarg2) { switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; void *arg2 = (void *) 0 ; @@ -26238,6 +26380,18 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_Api_getTime(void * jarg1) { + char * jresult ; + API *arg1 = (API *) 0 ; + char *result = 0 ; + + arg1 = (API *)jarg1; + result = (char *)(arg1)->getTime(); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_function_set(void * jarg1, void * jarg2) { input_callback_state_t *arg1 = (input_callback_state_t *) 0 ; void *arg2 = (void *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Wed Feb 18 18:43:11 2009 @@ -52,6 +52,11 @@ return ret; } + public string getTime() { + string ret = freeswitchPINVOKE.Api_getTime(swigCPtr); + return ret; + } + } } @@ -1670,8 +1675,8 @@ freeswitchPINVOKE.switch_core_speech_float_param_tts(switch_speech_handle.getCPtr(sh), param, val); } - public static switch_status_t switch_core_speech_read_tts(switch_speech_handle sh, SWIGTYPE_p_void data, SWIGTYPE_p_switch_size_t datalen, SWIGTYPE_p_unsigned_long rate, SWIGTYPE_p_unsigned_long flags) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_speech_read_tts(switch_speech_handle.getCPtr(sh), SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(datalen), SWIGTYPE_p_unsigned_long.getCPtr(rate), SWIGTYPE_p_unsigned_long.getCPtr(flags)); + public static switch_status_t switch_core_speech_read_tts(switch_speech_handle sh, SWIGTYPE_p_void data, SWIGTYPE_p_switch_size_t datalen, SWIGTYPE_p_unsigned_long flags) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_speech_read_tts(switch_speech_handle.getCPtr(sh), SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(datalen), SWIGTYPE_p_unsigned_long.getCPtr(flags)); return ret; } @@ -6066,7 +6071,7 @@ public static extern void switch_core_speech_float_param_tts(HandleRef jarg1, string jarg2, double jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_speech_read_tts")] - public static extern int switch_core_speech_read_tts(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5); + public static extern int switch_core_speech_read_tts(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_speech_close")] public static extern int switch_core_speech_close(HandleRef jarg1, HandleRef jarg2); @@ -7868,6 +7873,42 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_memory_pool_get")] public static extern IntPtr switch_speech_handle_memory_pool_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_resampler_set")] + public static extern void switch_speech_handle_resampler_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_resampler_get")] + public static extern IntPtr switch_speech_handle_resampler_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_buffer_set")] + public static extern void switch_speech_handle_buffer_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_buffer_get")] + public static extern IntPtr switch_speech_handle_buffer_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_dbuf_set")] + public static extern void switch_speech_handle_dbuf_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_dbuf_get")] + public static extern IntPtr switch_speech_handle_dbuf_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_dbuflen_set")] + public static extern void switch_speech_handle_dbuflen_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_dbuflen_get")] + public static extern IntPtr switch_speech_handle_dbuflen_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_samplerate_set")] + public static extern void switch_speech_handle_samplerate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_samplerate_get")] + public static extern uint switch_speech_handle_samplerate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_native_rate_set")] + public static extern void switch_speech_handle_native_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_native_rate_get")] + public static extern uint switch_speech_handle_native_rate_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_private_info_set")] public static extern void switch_speech_handle_private_info_set(HandleRef jarg1, HandleRef jarg2); @@ -10568,6 +10609,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_Api_ExecuteString")] public static extern string Api_ExecuteString(HandleRef jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_Api_getTime")] + public static extern string Api_getTime(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_input_callback_state_t_function_set")] public static extern void input_callback_state_t_function_set(HandleRef jarg1, HandleRef jarg2); @@ -11255,36 +11299,6 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_CoreSession { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_CoreSession(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_CoreSession() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_CoreSession obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.35 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_FILE { private HandleRef swigCPtr; @@ -12935,18 +12949,18 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t { +public class SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t { private HandleRef swigCPtr; - internal SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t() { + protected SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -14435,36 +14449,6 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_SWITCH_DECLARE_CLASS { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_SWITCH_DECLARE_CLASS(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_SWITCH_DECLARE_CLASS() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_SWITCH_DECLARE_CLASS obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.35 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_switch_event_node { private HandleRef swigCPtr; @@ -23607,7 +23591,9 @@ SWITCH_SPEECH_FLAG_PEEK = (1 << 1), SWITCH_SPEECH_FLAG_FREE_POOL = (1 << 2), SWITCH_SPEECH_FLAG_BLOCKING = (1 << 3), - SWITCH_SPEECH_FLAG_PAUSE = (1 << 4) + SWITCH_SPEECH_FLAG_PAUSE = (1 << 4), + SWITCH_SPEECH_FLAG_OPEN = (1 << 5), + SWITCH_SPEECH_FLAG_DONE = (1 << 6) } } @@ -23754,6 +23740,71 @@ } } + public switch_audio_resampler_t resampler { + set { + freeswitchPINVOKE.switch_speech_handle_resampler_set(swigCPtr, switch_audio_resampler_t.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_speech_handle_resampler_get(swigCPtr); + switch_audio_resampler_t ret = (cPtr == IntPtr.Zero) ? null : new switch_audio_resampler_t(cPtr, false); + return ret; + } + } + + public SWIGTYPE_p_switch_buffer buffer { + set { + freeswitchPINVOKE.switch_speech_handle_buffer_set(swigCPtr, SWIGTYPE_p_switch_buffer.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_speech_handle_buffer_get(swigCPtr); + SWIGTYPE_p_switch_buffer ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_buffer(cPtr, false); + return ret; + } + } + + public SWIGTYPE_p_unsigned_char dbuf { + set { + freeswitchPINVOKE.switch_speech_handle_dbuf_set(swigCPtr, SWIGTYPE_p_unsigned_char.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_speech_handle_dbuf_get(swigCPtr); + SWIGTYPE_p_unsigned_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); + return ret; + } + } + + public SWIGTYPE_p_switch_size_t dbuflen { + set { + freeswitchPINVOKE.switch_speech_handle_dbuflen_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_speech_handle_dbuflen_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public uint samplerate { + set { + freeswitchPINVOKE.switch_speech_handle_samplerate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_speech_handle_samplerate_get(swigCPtr); + return ret; + } + } + + public uint native_rate { + set { + freeswitchPINVOKE.switch_speech_handle_native_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_speech_handle_native_rate_get(swigCPtr); + return ret; + } + } + public SWIGTYPE_p_void private_info { set { freeswitchPINVOKE.switch_speech_handle_private_info_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value)); @@ -23855,13 +23906,13 @@ } } - public SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t speech_read_tts { + public SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t speech_read_tts { set { - freeswitchPINVOKE.switch_speech_interface_speech_read_tts_set(swigCPtr, SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t.getCPtr(value)); + freeswitchPINVOKE.switch_speech_interface_speech_read_tts_set(swigCPtr, SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t.getCPtr(value)); } get { IntPtr cPtr = freeswitchPINVOKE.switch_speech_interface_speech_read_tts_get(swigCPtr); - SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_unsigned_long__switch_status_t(cPtr, false); + SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long__switch_status_t(cPtr, false); return ret; } } Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm Wed Feb 18 18:43:11 2009 @@ -122,6 +122,7 @@ *execute = *freeswitchc::API_execute; *executeString = *freeswitchc::API_executeString; +*getTime = *freeswitchc::API_getTime; sub DISOWN { my $self = shift; my $ptr = tied(%$self); 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 Wed Feb 18 18:43:11 2009 @@ -2416,6 +2416,34 @@ } +XS(_wrap_API_getTime) { + { + API *arg1 = (API *) 0 ; + char *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: API_getTime(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_API, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "API_getTime" "', argument " "1"" of type '" "API *""'"); + } + arg1 = reinterpret_cast< API * >(argp1); + result = (char *)(arg1)->getTime(); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_input_callback_state_t_function_set) { { input_callback_state_t *arg1 = (input_callback_state_t *) 0 ; @@ -11045,6 +11073,7 @@ {"freeswitchc::delete_API", _wrap_delete_API}, {"freeswitchc::API_execute", _wrap_API_execute}, {"freeswitchc::API_executeString", _wrap_API_executeString}, +{"freeswitchc::API_getTime", _wrap_API_getTime}, {"freeswitchc::input_callback_state_t_function_set", _wrap_input_callback_state_t_function_set}, {"freeswitchc::input_callback_state_t_function_get", _wrap_input_callback_state_t_function_get}, {"freeswitchc::input_callback_state_t_threadState_set", _wrap_input_callback_state_t_threadState_set}, @@ -11483,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/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/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/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/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/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/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); Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Wed Feb 18 18:43:11 2009 @@ -81,6 +81,7 @@ __del__ = lambda self : None; def execute(*args): return _freeswitch.API_execute(*args) def executeString(*args): return _freeswitch.API_executeString(*args) + def getTime(*args): return _freeswitch.API_getTime(*args) API_swigregister = _freeswitch.API_swigregister API_swigregister(API) Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Wed Feb 18 18:43:11 2009 @@ -3472,6 +3472,28 @@ } +SWIGINTERN PyObject *_wrap_API_getTime(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + API *arg1 = (API *) 0 ; + char *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:API_getTime",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_API, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "API_getTime" "', argument " "1"" of type '" "API *""'"); + } + arg1 = reinterpret_cast< API * >(argp1); + result = (char *)(arg1)->getTime(); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *API_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; @@ -9936,6 +9958,7 @@ { (char *)"delete_API", _wrap_delete_API, METH_VARARGS, NULL}, { (char *)"API_execute", _wrap_API_execute, METH_VARARGS, NULL}, { (char *)"API_executeString", _wrap_API_executeString, METH_VARARGS, NULL}, + { (char *)"API_getTime", _wrap_API_getTime, METH_VARARGS, NULL}, { (char *)"API_swigregister", API_swigregister, METH_VARARGS, NULL}, { (char *)"input_callback_state_t_function_set", _wrap_input_callback_state_t_function_set, METH_VARARGS, NULL}, { (char *)"input_callback_state_t_function_get", _wrap_input_callback_state_t_function_get, METH_VARARGS, NULL}, Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Wed Feb 18 18:43:11 2009 @@ -177,6 +177,17 @@ return last_data; } + +/* we have to do this as a string because swig and languages can't find an embedded way to pass a big int */ +SWITCH_DECLARE_NONSTD(char *) API::getTime(void) +{ + switch_time_t now = switch_micro_time_now() / 1000; + snprintf(time_buf, sizeof(time_buf), "%" SWITCH_TIME_T_FMT, now); + return time_buf; +} + + + SWITCH_DECLARE(const char *) API::executeString(const char *cmd) { char *arg;

1 0

[commit] r12148 - freeswitch/trunk/debian
by FreeSWITCH SVN 18 Feb '09

18 Feb '09

Author: mikej Date: Wed Feb 18 16:42:38 2009 New Revision: 12148 Log: add debian changelog Modified: freeswitch/trunk/debian/changelog Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Feb 18 16:42:38 2009 @@ -1,3 +1,135 @@ +freeswitch (1.0.3-1) unstable; urgency=low + + * build: add targets cd-sounds[-install] and cd-moh[-install] for 48k sounds (r:11151) + * build: autoconf detect odbc library (FSBUILD-8) + * build: fix sound install on windows build (r:11635,11638) + * build: fix configure --sysconfdir (FSBUILD-84) + * build: fix uclibc build (MODLANG-99) + * build: fix adduser in debian (FSBUILD-122, FSBUILD-102) + * core: fix buffering issues (r:11101,11145,11152-11157,11162,11191,11200) + * core: fix c leg no hangup when converting attended to blind transfer before b leg answers (MODENDP-165/r:11061) + * core: fix codec and media handling issues (r:11104) + * core: fix double close of file handles and add recording of native files (r:11108-11113,11482,11483) + * core: fix file resampling issue (r:11090) + * core: fix incorrect call progress timestamps in timetable (r:11186-11187/FSCORE-268) + * core: fix media handling issues (r:11079-11082) + * core: fix multiple 2833 dtmf handling issues (r:11149,11261,11262,11266,11293,11294,11338/FSCORE-266,FSCORE-273) + * core: send more event types verbos bridge,unbridge,park,unpark (r:11097-11098) + * core: Prevent media setup on failed originates (r:11462/FSCORE-279) + * core: fix recorded soundfiles had random data at end of file (r:11491/MODAPP-205) + * core: fix user for windows service (r:11538/FSCORE-277) + * core: modify variable expansion code to expand in more places and to fix potential security issue from injecting variables (r:11569,11570) + * core: look for soundfiles in more locations based on rate (r:11601/MODFORM-23) + * core: state machine veto behavior changed (r:11610) + * core: add enable_file_write_buffering variable (r:11677) + * core: fix garbled audio on media bug during bridge using stateful codecs (FSCORE-288) + * core: fix tone detect running multiple bugs when detecting multiple tones + * core: add {instant_ringback=true} to make ringback not wait for indication to generate ringback + * core: fix segfault from race condition on multiple reloadxml calls (MOODAPP-211) + * core: modify xml locking so phrases do not lock the xml for the duration of playing them + * core: replace resampler with the speexdsp resampler + * core: fix windows calling convention on threads launched that return a value to fix shutdown segfault (FSCORE-298) + * core: do not auto-export origination_caller_id_* to avoid confusion (r:12052) + * core: API visibility support (GCC/SUNCC) (FSCORE-264) + * core: fix leak in exposed event class serialize method (r:12068) + * core: add volume as possible return value from input callback on embedded languages (r:12114) + * core: add resampler to seech handles (r:12141) + * freeswitch: allow you to specify -htdocs dir at runtime. (r:11614) + * fs_cli: add "debug" command to change the esl debug level at runtime (r:11057) + * iksemel: update to 1.3 (r:11645) + * libesl: fix disconnect failure (r:11078,11083) + * libesl: fix solaris build (r:11067,11068) + * libesl: add c++ wrapper and swigged wrappers for multiple scripting languages + * libg722_1: fix dct4.h code generator to include the "f" (r:11188-11189,11367) + * libilbc: update to new library from Steve Underwood + * mod_amrwb: add amr wideband passthrough codec (r:11971) + * mod_cepstral: fix failure return code handling (MODASRTTS-9) + * mod_conference: add 'conference xml_list' and 'conference [conf_name] xml_list' (r:11062-11063) + * mod_conference: make conference verbose-events param to control if events have all the channel data or not (r:11073-11077) + * mod_conference: add MINTWO flag to end conference when down to 1 participant (r:11523) + * mod_conference: refactor conference record function (r:11626) + * mod_conference: add conference list summary command (MODAPP-197) + * mod_conference: fix Deadlock or coredump on conference commands play, transfer (MODAPP-209) + * mod_dahdi_codec: added (MODCODEC-7) + * mod_dialplan_xml: make previous auto hunt feature optional and off by defaule use auto_hunt=true session or global variable to enable (r:12144) + * mod_dptools: Add failure_causes channel variable (r:12058) + * mod_easyroute: add configuration file example for custom-query (r:11055) + * mod_easyroute: add custom-query configuration option (r:11054) + * mod_easyroute: fix build error when not configured for odbc (r:11478) + * mod_easyroute: fix memory leak (r:11611) + * mod_erlang_event: add ability to spawn a process (module/function) outbound on a specified node. (r:11460,11477) + * mod_erlang_event: Fix some issues with standing up a new outbound listener and cleaning up after a failed session (r:11479) + * mod_erlang_event: Fix setting up a listener for an outbound session if one doesn't already exist (r:11488) + * mod_erlang_event: add "erlang" fscli command (r:11488) + * mod_erlang_event: Monitor spawned outbound processes for premature exits (r:11489) + * mod_erlang_event: Allow the event encoding strategy to be configurable; choices are string or binary (r:11495) + * mod_erlang_event: Allow certain tuple elements to be binaries or strings, to reduce conversion requirements on the erlang side (r:11496) + * mod_erlang_event: Support sending a message to a registered process to request a pid (when spawning won't cut it) (r:11499) + * mod_erlang_event: Ensure events received while a pid session is being created aren't discarded but are queued instead (r:11500) + * mod_erlang_event: Add freeswitch.erl - An erlang module to make talking to mod_erlang_event more painless (r:11525) + * mod_erlang_event: use rpc:call instead of spawn and to make the registered process argument to handlecall optional (r:11542) + * mod_event_socket: add ability to use a comma sep list of events on event-sink create-listener (r:11056) + * mod_event_socket: add debug logging to event-sink (r:11060) + * mod_event_socket: fix race condition (r:11680,12146) + * mod_dptools: add all modifier to break command (r:11557,11558) + * mod_dptools: add sound_test application (r:11658) + * mod_fax: Dont hangup after sending/receiving faxes + * mod_fifo: pause media bugs while not in a bridge (r:11466,11490) + * mod_fifo: allow unpark during chime list playing (r:11555/MODAPP-206) + * mod_fifo: fix outbound fifos doesn't check if the consumer is in the fifo in question. (r:11561/MODAPP-207) + * mod_fifo: Fix segfault when no argument were supplied to fifo_member call (MODAPP-210) + * mod_lcr: added (r:11180,11184,11532,11609) + * mod_limit: fix memory corruption caused by race condition when using limit hash (r:11070-11071) + * mod_limit: Fix transfer bug, fix leak and make the channel hangup if the extension is \!hangup_cause (r:11604,11932) + * mod_limit: add write different channel variables per realm_id (r:11608) + * mod_limit: Make max argument optional on the limit app, set the limit_usage variable to current count after inserting call in the db (r:11955) + * mod_lua: Create empty argv table when no args are passed to a Lua script (r:11559) + * mod_lua: use dll for lua windows build (FSCORE-299) + * mod_openmrcp: removed (r:11176-11179) + * mod_opal: added + * mod_pocketsphinx: fix leak (r:11974) + * mod_portaudio: fix stuck channels on outbound calls (r:11160,11470,11471,11472,11475,11476,11485) + * mod_python: fix build when site dir is not /usr/lib/python2.4 (r:12070) + * mod_say_en: add short form date/time (MODAPP-180) + * mod_sofia: add auto-rtp-bugs profile option to make rtp bug compensation configurable (r :11146-11147) + * mod_sofia: add support in sdp for a=maxptime (r:11103) + * mod_sofia: fix codec change race condition (r:11143) + * mod_sofia: fix notify event wasn't allowing content-length 0 (r:11106/MODENDP-167) + * mod_sofia: fix sending extra sdp in 200 OK when using 100rel in violation of sdp o/a protocol draft-ietf-sipping-sip-offeranswer-10 (r:11088) + * mod_sofia: fix sip_auto_answer=true (r:11069) + * mod_sofia: improve outbound registration error message (r:11059) + * mod_sofia: reset media timeout on re-invite (r:11161) + * mod_sofia: fix segfault due to missing contact header in invite (r:11463/MODENDP-177) + * mod_sofia: allow <params> tag in gateways as well as <variables> with direction inbound/outbound (default both) and call counter (r:11468) + * mod_sofia: add support or SLA, works with Polycom and Snom(Sylantro mode). (r:11562/MODENDP-179) + * mod_sofia: tolerate missing user in the request uri (r:11636) + * mod_sofia: Add purpose=gateways and profile=[name] so xml_curl requests make sense (MDXMLINT-46) + * mod_sofia: Add disable-srv and disable-naptr params to sip profiles (default false) (MODENDP-183) + * mod_sofia: add outbound-proxy param (MODENDP-184) + * mod_sofia: fix segfault with stun-enabled=false (SFSIP-120) + * mod_sofia: Profile Name in Expire Event is incorrect (MODENDP-185) + * mod_sofia: add "scrooge" mode to "inbound-codec-negotiation" (r:11881) + * mod_sofia: Add context to reconfig_sofia (r:12080) + * mod_sofia: fix segfault when calling from a Cisco 7940 using bypass_media (FSCORE-301) + * mod_sofia: ilbc to default to 30 if no mode= fmtp is defined on the inbound (r:12110) + * mod_sofia: fix challenge-realm (r:12113) + * mod_sofia: Segmentation fault when running killgw command on sofia profile without specifying a gateway (MODENDP-189) + * mod_sofia: gateways will inherit the context from its parent unless manually provided (r:12138) + * mod_sndfile: Add IMA ADPCM support (MODFORM-22) + * mod_spidermonkey: fix loading of spidermonkey modules (r:11084-11085) + * mod_spidermonkey: block some unwanted behaviours in session.originate + * mod_spidermonkey_socket: fix gc blocking (MODLANG-97) + * mod_xml_rpc: fixed authentication using @domain syntax (r:11064) + * mod_xml_rpc: fix http content types sent in responses (r:11099,11148,11150) + * mod_voicemail: voicemail insert into the proper fields (MODAPP-190) + * mod_voipcodecs: add G.726 24k (r:12083) + * sofia-sip: update to current sofia-sip repository + * spandsp: sync to latest snapshot and fix windows build + * speex: updated to 1.2rc1 + * sqlite: fix random assert on windows (FSCORE-292) + + -- Mike Jerris <mike(a)jerris.com> Mon, 18 Feb 2009 17:39:00 -0500 + freeswitch (1.0.2-1) unstable; urgency=low * all: don't add module interfaces before returning from error conditions in module load functions (MDXMLINT-36)

1 0

[commit] r12147 - freeswitch/trunk/docs
by FreeSWITCH SVN 18 Feb '09

18 Feb '09

Author: mikej Date: Wed Feb 18 16:28:19 2009 New Revision: 12147 Log: update changelog for 1.0.3 Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Feb 18 16:28:19 2009 @@ -1,3 +1,134 @@ +freeswitch (1.0.3) + + build: add targets cd-sounds[-install] and cd-moh[-install] for 48k sounds (r:11151) + build: autoconf detect odbc library (FSBUILD-8) + build: fix sound install on windows build (r:11635,11638) + build: fix configure --sysconfdir (FSBUILD-84) + build: fix uclibc build (MODLANG-99) + build: fix adduser in debian (FSBUILD-122, FSBUILD-102) + core: fix buffering issues (r:11101,11145,11152-11157,11162,11191,11200) + core: fix c leg no hangup when converting attended to blind transfer before b leg answers (MODENDP-165/r:11061) + core: fix codec and media handling issues (r:11104) + core: fix double close of file handles and add recording of native files (r:11108-11113,11482,11483) + core: fix file resampling issue (r:11090) + core: fix incorrect call progress timestamps in timetable (r:11186-11187/FSCORE-268) + core: fix media handling issues (r:11079-11082) + core: fix multiple 2833 dtmf handling issues (r:11149,11261,11262,11266,11293,11294,11338/FSCORE-266,FSCORE-273) + core: send more event types verbos bridge,unbridge,park,unpark (r:11097-11098) + core: Prevent media setup on failed originates (r:11462/FSCORE-279) + core: fix recorded soundfiles had random data at end of file (r:11491/MODAPP-205) + core: fix user for windows service (r:11538/FSCORE-277) + core: modify variable expansion code to expand in more places and to fix potential security issue from injecting variables (r:11569,11570) + core: look for soundfiles in more locations based on rate (r:11601/MODFORM-23) + core: state machine veto behavior changed (r:11610) + core: add enable_file_write_buffering variable (r:11677) + core: fix garbled audio on media bug during bridge using stateful codecs (FSCORE-288) + core: fix tone detect running multiple bugs when detecting multiple tones + core: add {instant_ringback=true} to make ringback not wait for indication to generate ringback + core: fix segfault from race condition on multiple reloadxml calls (MOODAPP-211) + core: modify xml locking so phrases do not lock the xml for the duration of playing them + core: replace resampler with the speexdsp resampler + core: fix windows calling convention on threads launched that return a value to fix shutdown segfault (FSCORE-298) + core: do not auto-export origination_caller_id_* to avoid confusion (r:12052) + core: API visibility support (GCC/SUNCC) (FSCORE-264) + core: fix leak in exposed event class serialize method (r:12068) + core: add volume as possible return value from input callback on embedded languages (r:12114) + core: add resampler to seech handles (r:12141) + freeswitch: allow you to specify -htdocs dir at runtime. (r:11614) + fs_cli: add "debug" command to change the esl debug level at runtime (r:11057) + iksemel: update to 1.3 (r:11645) + libesl: fix disconnect failure (r:11078,11083) + libesl: fix solaris build (r:11067,11068) + libesl: add c++ wrapper and swigged wrappers for multiple scripting languages + libg722_1: fix dct4.h code generator to include the "f" (r:11188-11189,11367) + libilbc: update to new library from Steve Underwood + mod_amrwb: add amr wideband passthrough codec (r:11971) + mod_cepstral: fix failure return code handling (MODASRTTS-9) + mod_conference: add 'conference xml_list' and 'conference [conf_name] xml_list' (r:11062-11063) + mod_conference: make conference verbose-events param to control if events have all the channel data or not (r:11073-11077) + mod_conference: add MINTWO flag to end conference when down to 1 participant (r:11523) + mod_conference: refactor conference record function (r:11626) + mod_conference: add conference list summary command (MODAPP-197) + mod_conference: fix Deadlock or coredump on conference commands play, transfer (MODAPP-209) + mod_dahdi_codec: added (MODCODEC-7) + mod_dialplan_xml: make previous auto hunt feature optional and off by defaule use auto_hunt=true session or global variable to enable (r:12144) + mod_dptools: Add failure_causes channel variable (r:12058) + mod_easyroute: add configuration file example for custom-query (r:11055) + mod_easyroute: add custom-query configuration option (r:11054) + mod_easyroute: fix build error when not configured for odbc (r:11478) + mod_easyroute: fix memory leak (r:11611) + mod_erlang_event: add ability to spawn a process (module/function) outbound on a specified node. (r:11460,11477) + mod_erlang_event: Fix some issues with standing up a new outbound listener and cleaning up after a failed session (r:11479) + mod_erlang_event: Fix setting up a listener for an outbound session if one doesn't already exist (r:11488) + mod_erlang_event: add "erlang" fscli command (r:11488) + mod_erlang_event: Monitor spawned outbound processes for premature exits (r:11489) + mod_erlang_event: Allow the event encoding strategy to be configurable; choices are string or binary (r:11495) + mod_erlang_event: Allow certain tuple elements to be binaries or strings, to reduce conversion requirements on the erlang side (r:11496) + mod_erlang_event: Support sending a message to a registered process to request a pid (when spawning won't cut it) (r:11499) + mod_erlang_event: Ensure events received while a pid session is being created aren't discarded but are queued instead (r:11500) + mod_erlang_event: Add freeswitch.erl - An erlang module to make talking to mod_erlang_event more painless (r:11525) + mod_erlang_event: use rpc:call instead of spawn and to make the registered process argument to handlecall optional (r:11542) + mod_event_socket: add ability to use a comma sep list of events on event-sink create-listener (r:11056) + mod_event_socket: add debug logging to event-sink (r:11060) + mod_event_socket: fix race condition (r:11680,12146) + mod_dptools: add all modifier to break command (r:11557,11558) + mod_dptools: add sound_test application (r:11658) + mod_fax: Dont hangup after sending/receiving faxes + mod_fifo: pause media bugs while not in a bridge (r:11466,11490) + mod_fifo: allow unpark during chime list playing (r:11555/MODAPP-206) + mod_fifo: fix outbound fifos doesn't check if the consumer is in the fifo in question. (r:11561/MODAPP-207) + mod_fifo: Fix segfault when no argument were supplied to fifo_member call (MODAPP-210) + mod_lcr: added (r:11180,11184,11532,11609) + mod_limit: fix memory corruption caused by race condition when using limit hash (r:11070-11071) + mod_limit: Fix transfer bug, fix leak and make the channel hangup if the extension is \!hangup_cause (r:11604,11932) + mod_limit: add write different channel variables per realm_id (r:11608) + mod_limit: Make max argument optional on the limit app, set the limit_usage variable to current count after inserting call in the db (r:11955) + mod_lua: Create empty argv table when no args are passed to a Lua script (r:11559) + mod_lua: use dll for lua windows build (FSCORE-299) + mod_openmrcp: removed (r:11176-11179) + mod_opal: added + mod_pocketsphinx: fix leak (r:11974) + mod_portaudio: fix stuck channels on outbound calls (r:11160,11470,11471,11472,11475,11476,11485) + mod_python: fix build when site dir is not /usr/lib/python2.4 (r:12070) + mod_say_en: add short form date/time (MODAPP-180) + mod_sofia: add auto-rtp-bugs profile option to make rtp bug compensation configurable (r :11146-11147) + mod_sofia: add support in sdp for a=maxptime (r:11103) + mod_sofia: fix codec change race condition (r:11143) + mod_sofia: fix notify event wasn't allowing content-length 0 (r:11106/MODENDP-167) + mod_sofia: fix sending extra sdp in 200 OK when using 100rel in violation of sdp o/a protocol draft-ietf-sipping-sip-offeranswer-10 (r:11088) + mod_sofia: fix sip_auto_answer=true (r:11069) + mod_sofia: improve outbound registration error message (r:11059) + mod_sofia: reset media timeout on re-invite (r:11161) + mod_sofia: fix segfault due to missing contact header in invite (r:11463/MODENDP-177) + mod_sofia: allow <params> tag in gateways as well as <variables> with direction inbound/outbound (default both) and call counter (r:11468) + mod_sofia: add support or SLA, works with Polycom and Snom(Sylantro mode). (r:11562/MODENDP-179) + mod_sofia: tolerate missing user in the request uri (r:11636) + mod_sofia: Add purpose=gateways and profile=[name] so xml_curl requests make sense (MDXMLINT-46) + mod_sofia: Add disable-srv and disable-naptr params to sip profiles (default false) (MODENDP-183) + mod_sofia: add outbound-proxy param (MODENDP-184) + mod_sofia: fix segfault with stun-enabled=false (SFSIP-120) + mod_sofia: Profile Name in Expire Event is incorrect (MODENDP-185) + mod_sofia: add "scrooge" mode to "inbound-codec-negotiation" (r:11881) + mod_sofia: Add context to reconfig_sofia (r:12080) + mod_sofia: fix segfault when calling from a Cisco 7940 using bypass_media (FSCORE-301) + mod_sofia: ilbc to default to 30 if no mode= fmtp is defined on the inbound (r:12110) + mod_sofia: fix challenge-realm (r:12113) + mod_sofia: Segmentation fault when running killgw command on sofia profile without specifying a gateway (MODENDP-189) + mod_sofia: gateways will inherit the context from its parent unless manually provided (r:12138) + mod_sndfile: Add IMA ADPCM support (MODFORM-22) + mod_spidermonkey: fix loading of spidermonkey modules (r:11084-11085) + mod_spidermonkey: block some unwanted behaviours in session.originate + mod_spidermonkey_socket: fix gc blocking (MODLANG-97) + mod_xml_rpc: fixed authentication using @domain syntax (r:11064) + mod_xml_rpc: fix http content types sent in responses (r:11099,11148,11150) + mod_voicemail: voicemail insert into the proper fields (MODAPP-190) + mod_voipcodecs: add G.726 24k (r:12083) + sofia-sip: update to current sofia-sip repository + spandsp: sync to latest snapshot and fix windows build + speex: updated to 1.2rc1 + sqlite: fix random assert on windows (FSCORE-292) + + freeswitch (1.0.2) all: don't add module interfaces before returning from error conditions in module load functions (MDXMLINT-36)

1 0

[commit] r12146 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 18 Feb '09

18 Feb '09

Author: anthm Date: Wed Feb 18 15:50:33 2009 New Revision: 12146 Log: fix race in event socket Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Feb 18 15:50:33 2009 @@ -1159,7 +1159,7 @@ } } - if (channel && !switch_channel_ready(channel) && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { + if (channel && switch_channel_get_state(channel) >= CS_HANGUP && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { switch_set_flag_locked(listener, LFLAG_HANDLE_DISCO); if (switch_test_flag(listener, LFLAG_LINGER)) { char message[128] = "";

1 0

[commit] r12145 - freeswitch/trunk/scripts/lua
by FreeSWITCH SVN 18 Feb '09

18 Feb '09

Author: brian Date: Wed Feb 18 15:06:36 2009 New Revision: 12145 Log: elaborate on this example more and show off flite usage but its commented out by default Modified: freeswitch/trunk/scripts/lua/callback.lua Modified: freeswitch/trunk/scripts/lua/callback.lua ============================================================================== --- freeswitch/trunk/scripts/lua/callback.lua (original) +++ freeswitch/trunk/scripts/lua/callback.lua Wed Feb 18 15:06:36 2009 @@ -1,55 +1,65 @@ function all_done(s, how) - io.write("done: " .. how .. "\n"); + freeswitch.console_log("info", "done: " .. how .. "\n"); end function my_cb(s, type, obj, arg) if (arg) then - io.write("type: " .. type .. "\n" .. "arg: " .. arg .. "\n"); + freeswitch.console_log("info", "\ntype: " .. type .. "\n" .. "arg: " .. arg .. "\n"); else - io.write("type: " .. type .. "\n"); + freeswitch.console_log("info", "\ntype: " .. type .. "\n"); end if (type == "dtmf") then - io.write("digit: [" .. obj['digit'] .. "]\nduration: [" .. obj['duration'] .. "]\n"); + freeswitch.console_log("info", "\ndigit: [" .. obj['digit'] .. "]\nduration: [" .. obj['duration'] .. "]\n"); if (obj['digit'] == "1") then - return "seek:-3000"; + --session:speak("seek backwards"); + return "seek:-9000"; end if (obj['digit'] == "3") then - return "seek:+3000"; + --session:speak("seek forward"); + return "seek:+9000"; end if (obj['digit'] == "4") then + --session:speak("speed faster"); return "speed:+1"; end if (obj['digit'] == "5") then + --session:speak("speed normal"); return "speed:0"; end if (obj['digit'] == "6") then + --session:speak("speed slower"); return "speed:-1"; end if (obj['digit'] == "7") then + --session:speak("volume up"); return "volume:+1"; end if (obj['digit'] == "8") then + --session:speak("volume normal"); return "volume:0"; end if (obj['digit'] == "9") then + --session:speak("volume down"); return "volume:-1"; end if (obj['digit'] == "*") then + --session:speak("stop"); return "stop"; end if (obj['digit'] == "0") then + --session:speak("pause"); return "pause"; end @@ -58,12 +68,14 @@ end else - io.write(obj:serialize("xml")); + freeswitch.console_log("info", obj:serialize("xml")); end end blah = "args"; +---session:set_tts_parms("flite", "kal"); session:setHangupHook("all_done"); session:setInputCallback("my_cb", "blah"); session:streamFile("/ram/swimp.raw"); +--session:speak("Thank you, good bye!");

1 0

[commit] r12144 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by FreeSWITCH SVN 18 Feb '09

18 Feb '09

Author: anthm Date: Wed Feb 18 14:23:10 2009 New Revision: 12144 Log: make previous auto hunt feature optional and off by defaule use auto_hunt=true session or global variable to enable Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Wed Feb 18 14:23:10 2009 @@ -215,8 +215,9 @@ { switch_caller_extension_t *extension = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_xml_t alt_root = NULL, cfg, xml = NULL, xcontext, xexten; + switch_xml_t alt_root = NULL, cfg, xml = NULL, xcontext, xexten = NULL; char *alt_path = (char *) arg; + const char *hunt = NULL; if (!caller_profile) { if (!(caller_profile = switch_channel_get_caller_profile(channel))) { @@ -264,7 +265,11 @@ } } - if (!(xexten = switch_xml_find_child(xcontext, "extension", "name", caller_profile->destination_number))) { + if ((hunt = switch_channel_get_variable(channel, "auto_hunt")) && switch_true(hunt)) { + xexten = switch_xml_find_child(xcontext, "extension", "name", caller_profile->destination_number); + } + + if (!xexten) { xexten = switch_xml_child(xcontext, "extension"); }

1 0