- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11025 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: gmaruzz Date: Wed Dec 31 12:00:30 2008 New Revision: 11025 Log: skypiax: let's switch_channel_mark_answered the channel when it's actually answered, after having been pre_answered Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Dec 31 12:00:30 2008 @@ -542,6 +542,7 @@ switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); + switch_channel_mark_pre_answered(channel); return SWITCH_CAUSE_SUCCESS; } Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Wed Dec 31 12:00:30 2008 @@ -1668,6 +1668,8 @@ switch_core_session_destroy(&session); } } + WARNINGA("skype_call: %s, answered\n", SKYPIAX_P_LOG, id); + switch_channel_mark_answered(channel); } else { switch_core_session_t *session = NULL; private_t *tech_pvt = NULL; @@ -1677,7 +1679,8 @@ //session = tech_pvt->session; session = global_session; channel = switch_core_session_get_channel(session); - switch_channel_mark_pre_answered(channel); + WARNINGA("skype_call: %s, answered\n", SKYPIAX_P_LOG, id); + switch_channel_mark_answered(channel); //switch_channel_set_state(channel, CS_EXECUTE);

1 0

[commit] r11024 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: silik0n Date: Wed Dec 31 12:00:12 2008 New Revision: 11024 Log: lets use a more common default password 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 Dec 31 12:00:12 2008 @@ -136,7 +136,7 @@ set_global_db_username("root"); } if (!globals.db_password) { - set_global_db_password("land99rover"); + set_global_db_password("password"); } if (!globals.db_dsn) { set_global_db_dsn("easyroute");

1 0

[commit] r11023 - in freeswitch/trunk/libs/esl: . src src/include
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 11:52:11 2008 New Revision: 11023 Log: cleanup debug handling Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/esl.c freeswitch/trunk/libs/esl/src/include/esl.h freeswitch/trunk/libs/esl/testclient.c freeswitch/trunk/libs/esl/testserver.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Wed Dec 31 11:52:11 2008 @@ -107,6 +107,13 @@ } else if (!strcasecmp(type, "text/disconnect-notice")) { running = thread_running = 0; known++; + } else if (!strcasecmp(type, "text/event-plain")) { + char *foo; + esl_event_serialize(handle->last_ievent, &foo, ESL_FALSE); + printf("RECV EVENT\n%s\n", foo); + free(foo); + + known++; } } @@ -313,7 +320,6 @@ signal(SIGINT, handle_SIGINT); - handle.debug = 0; esl_global_set_default_logger(6); /* default debug level to 6 (info) */ for(;;) { Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Wed Dec 31 11:52:11 2008 @@ -370,10 +370,8 @@ esl_event_serialize(handle->last_ievent, &txt, ESL_TRUE); - if (handle->debug) { - esl_log(ESL_LOG_DEBUG, "SEND EVENT\n%s\n", txt); - } - + esl_log(ESL_LOG_DEBUG, "SEND EVENT\n%s\n", txt); + send(handle->sock, "sendevent\n", 10, 0); send(handle->sock, txt, strlen(txt), 0); send(handle->sock, "\n\n", 2, 0); @@ -699,9 +697,7 @@ if (hname && hval) { esl_url_decode(hval); - if (handle->debug > 1) { - esl_log(ESL_LOG_DEBUG, "RECV HEADER [%s] = [%s]\n", hname, hval); - } + esl_log(ESL_LOG_DEBUG, "RECV HEADER [%s] = [%s]\n", hname, hval); esl_event_add_header_string(revent, ESL_STACK_BOTTOM, hname, hval); } @@ -793,10 +789,7 @@ if (hname && hval) { esl_url_decode(hval); - - if (handle->debug > 1) { - esl_log(ESL_LOG_DEBUG, "RECV INNER HEADER [%s] = [%s]\n", hname, hval); - } + esl_log(ESL_LOG_DEBUG, "RECV INNER HEADER [%s] = [%s]\n", hname, hval); esl_event_add_header_string(handle->last_ievent, ESL_STACK_BOTTOM, hname, hval); } @@ -825,8 +818,8 @@ handle->last_ievent->body = body; } - - if (handle->debug) { + + if (esl_log_level >= 7) { char *foo; esl_event_serialize(handle->last_ievent, &foo, ESL_FALSE); esl_log(ESL_LOG_DEBUG, "RECV EVENT\n%s\n", foo); @@ -834,7 +827,7 @@ } } - if (handle->debug) { + if (esl_log_level >= 7) { char *foo; esl_event_serialize(revent, &foo, ESL_FALSE); esl_log(ESL_LOG_DEBUG, "RECV MESSAGE\n%s\n", foo); @@ -857,9 +850,7 @@ { const char *e = cmd + strlen(cmd) -1; - if (handle->debug) { - esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd); - } + esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd); if (send(handle->sock, cmd, strlen(cmd), 0) != (int)strlen(cmd)) { strerror_r(handle->errnum, handle->err, sizeof(handle->err)); Modified: freeswitch/trunk/libs/esl/src/include/esl.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl.h Wed Dec 31 11:52:11 2008 @@ -256,7 +256,6 @@ esl_event_t *last_sr_event; esl_event_t *last_ievent; esl_event_t *info_event; - int debug; int connected; struct sockaddr_in addr; esl_mutex_t *mutex; Modified: freeswitch/trunk/libs/esl/testclient.c ============================================================================== --- freeswitch/trunk/libs/esl/testclient.c (original) +++ freeswitch/trunk/libs/esl/testclient.c Wed Dec 31 11:52:11 2008 @@ -7,8 +7,6 @@ { esl_handle_t handle = {{0}}; - handle.debug = 1; - esl_connect(&handle, "localhost", 8021, "ClueCon"); esl_send_recv(&handle, "api status\n\n"); Modified: freeswitch/trunk/libs/esl/testserver.c ============================================================================== --- freeswitch/trunk/libs/esl/testserver.c (original) +++ freeswitch/trunk/libs/esl/testserver.c Wed Dec 31 11:52:11 2008 @@ -13,7 +13,6 @@ esl_attach_handle(&handle, client_sock, addr); - handle.debug = 2; printf("Connected! %d\n", handle.sock);

1 0

[commit] r11022 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: brian Date: Wed Dec 31 11:23:24 2008 New Revision: 11022 Log: add date header to 200OK on register Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Dec 31 11:23:24 2008 @@ -1064,6 +1064,8 @@ if (regtype == REG_REGISTER) { char exp_param[128] = ""; + char date[80] = ""; + s_event = NULL; if (exptime) { @@ -1086,7 +1088,12 @@ } } - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), TAG_IF(path_val, SIPTAG_PATH_STR(path_val)), NUTAG_WITH_THIS(nua), TAG_END()); + switch_rfc822_date(date, switch_timestamp_now()); + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), + TAG_IF(path_val, SIPTAG_PATH_STR(path_val)), + NUTAG_WITH_THIS(nua), + SIPTAG_DATE_STR(date), + TAG_END()); if (s_event) { switch_event_fire(&s_event);

1 0

[commit] r11021 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 11:06:49 2008 New Revision: 11021 Log: add mutex to crash prot Modified: freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Dec 31 11:06:49 2008 @@ -206,6 +206,7 @@ //static switch_hash_t *stack_table = NULL; static Hash stack_table; +static switch_mutex_t *stack_mutex = NULL; #if defined (__GNUC__) && defined (LINUX) && defined (HAVE_EXECINFO_H) #include <execinfo.h> @@ -244,9 +245,14 @@ switch_thread_id_t thread_id; jmp_buf *env; - if (sig && (thread_id = switch_thread_self()) - && (env = (jmp_buf *) sqlite3HashFind(&stack_table, &thread_id, sizeof(thread_id)))) { - //&& (env = (jmp_buf *) switch_core_hash_find(stack_table, (char *)&thread_id, sizeof(thread_id)))) { + if (!sig) return; + + thread_id = switch_thread_self(); + switch_mutex_lock(stack_mutex); + env = (jmp_buf *) sqlite3HashFind(&stack_table, &thread_id, sizeof(thread_id)); + switch_mutex_unlock(stack_mutex); + + if (thread_id && env) { print_trace(); longjmp(*env, sig); } else { @@ -259,7 +265,10 @@ { if (switch_test_flag((&runtime), SCF_CRASH_PROT)) { + switch_mutex_init(&stack_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_lock(stack_mutex); sqlite3HashInit(&stack_table, SQLITE_HASH_BINARY, 0); + switch_mutex_unlock(stack_mutex); } } @@ -328,8 +337,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel)); switch_channel_hangup(session->channel, SWITCH_CAUSE_CRASH); } else { + switch_mutex_lock(stack_mutex); sqlite3HashInsert(&stack_table, &thread_id, sizeof(thread_id), (void *) &env); - //apr_hash_set(stack_table, &thread_id, sizeof(thread_id), &env); + switch_mutex_unlock(stack_mutex); } }

1 0

[commit] r11020 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: mikej Date: Wed Dec 31 10:34:27 2008 New Revision: 11020 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 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 Dec 31 10:34:27 2008 @@ -2600,6 +2600,302 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_set(void * jarg1, unsigned long jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->T38MaxBitRate = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_get(void * jarg1) { + unsigned long jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (uint32_t) ((arg1)->T38MaxBitRate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_set(void * jarg1, int jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (switch_bool_t)jarg2; + if (arg1) (arg1)->T38FaxFillBitRemoval = arg2; + +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_get(void * jarg1) { + int jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (switch_bool_t) ((arg1)->T38FaxFillBitRemoval); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_set(void * jarg1, int jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (switch_bool_t)jarg2; + if (arg1) (arg1)->T38FaxTranscodingMMR = arg2; + +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_get(void * jarg1) { + int jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (switch_bool_t) ((arg1)->T38FaxTranscodingMMR); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_set(void * jarg1, int jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (switch_bool_t)jarg2; + if (arg1) (arg1)->T38FaxTranscodingJBIG = arg2; + +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_get(void * jarg1) { + int jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + switch_bool_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (switch_bool_t) ((arg1)->T38FaxTranscodingJBIG); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_set(void * jarg1, char * jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->T38FaxRateManagement = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->T38FaxRateManagement, (const char *)arg2); + } else { + arg1->T38FaxRateManagement = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_get(void * jarg1) { + char * jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *result = 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + result = (char *) ((arg1)->T38FaxRateManagement); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_set(void * jarg1, unsigned long jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->T38FaxMaxBuffer = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_get(void * jarg1) { + unsigned long jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (uint32_t) ((arg1)->T38FaxMaxBuffer); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_set(void * jarg1, unsigned long jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->T38FaxMaxDatagram = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_get(void * jarg1) { + unsigned long jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (uint32_t) ((arg1)->T38FaxMaxDatagram); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_set(void * jarg1, char * jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->T38FaxUdpEC = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->T38FaxUdpEC, (const char *)arg2); + } else { + arg1->T38FaxUdpEC = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_get(void * jarg1) { + char * jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *result = 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + result = (char *) ((arg1)->T38FaxUdpEC); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_set(void * jarg1, char * jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->T38VendorInfo = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->T38VendorInfo, (const char *)arg2); + } else { + arg1->T38VendorInfo = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_get(void * jarg1) { + char * jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *result = 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + result = (char *) ((arg1)->T38VendorInfo); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_ip_set(void * jarg1, char * jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->ip = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->ip, (const char *)arg2); + } else { + arg1->ip = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_ip_get(void * jarg1) { + char * jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + char *result = 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + result = (char *) ((arg1)->ip); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_port_set(void * jarg1, unsigned long jarg2) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_t38_options_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->port = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_port_get(void * jarg1) { + unsigned long jresult ; + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + uint32_t result; + + arg1 = (switch_t38_options_t *)jarg1; + result = (uint32_t) ((arg1)->port); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_t38_options_t() { + void * jresult ; + switch_t38_options_t *result = 0 ; + + result = (switch_t38_options_t *)new switch_t38_options_t(); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_t38_options_t(void * jarg1) { + switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ; + + arg1 = (switch_t38_options_t *)jarg1; + delete arg1; + +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_input_callback_set(void * jarg1, void * jarg2) { switch_input_args_t *arg1 = (switch_input_args_t *) 0 ; switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ; @@ -21449,13 +21745,15 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unbind_dtmf_meta_session(void * jarg1) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unbind_dtmf_meta_session(void * jarg1, unsigned long jarg2) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + uint32_t arg2 ; switch_status_t result; arg1 = (switch_core_session_t *)jarg1; - result = (switch_status_t)switch_ivr_unbind_dtmf_meta_session(arg1); + arg2 = (uint32_t)jarg2; + result = (switch_status_t)switch_ivr_unbind_dtmf_meta_session(arg1,arg2); jresult = result; return jresult; } @@ -22410,6 +22708,16 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_intentional_bugs(void * jarg1, int jarg2) { + switch_rtp_t *arg1 = (switch_rtp_t *) 0 ; + switch_rtp_bug_flag_t arg2 ; + + arg1 = (switch_rtp_t *)jarg1; + arg2 = (switch_rtp_bug_flag_t)jarg2; + switch_rtp_intentional_bugs(arg1,arg2); +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_data_set(void * jarg1, char * jarg2) { switch_log_node_t *arg1 = (switch_log_node_t *) 0 ; char *arg2 = (char *) 0 ; @@ -23548,6 +23856,24 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user_in_domain(char * jarg1, void * jarg2, void * jarg3, void * jarg4) { + int jresult ; + char *arg1 = (char *) 0 ; + switch_xml_t arg2 = (switch_xml_t) 0 ; + switch_xml_t *arg3 = (switch_xml_t *) 0 ; + switch_xml_t *arg4 = (switch_xml_t *) 0 ; + switch_status_t result; + + arg1 = (char *)jarg1; + arg2 = (switch_xml_t)jarg2; + arg3 = (switch_xml_t *)jarg3; + arg4 = (switch_xml_t *)jarg4; + result = (switch_status_t)switch_xml_locate_user_in_domain((char const *)arg1,arg2,arg3,arg4); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_open_cfg(char * jarg1, void * jarg2, void * jarg3) { void * jresult ; char *arg1 = (char *) 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 Dec 31 10:34:27 2008 @@ -3278,8 +3278,8 @@ return ret; } - public static switch_status_t switch_ivr_unbind_dtmf_meta_session(SWIGTYPE_p_switch_core_session session) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_unbind_dtmf_meta_session(SWIGTYPE_p_switch_core_session.getCPtr(session)); + public static switch_status_t switch_ivr_unbind_dtmf_meta_session(SWIGTYPE_p_switch_core_session session, uint key) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_unbind_dtmf_meta_session(SWIGTYPE_p_switch_core_session.getCPtr(session), key); return ret; } @@ -3540,6 +3540,10 @@ return ret; } + public static void switch_rtp_intentional_bugs(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_bug_flag_t bugs) { + freeswitchPINVOKE.switch_rtp_intentional_bugs(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)bugs); + } + public static switch_status_t switch_log_init(SWIGTYPE_p_apr_pool_t pool, switch_bool_t colorize) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_log_init(SWIGTYPE_p_apr_pool_t.getCPtr(pool), (int)colorize); return ret; @@ -3750,6 +3754,11 @@ return ret; } + public static switch_status_t switch_xml_locate_user_in_domain(string user_name, switch_xml domain, SWIGTYPE_p_p_switch_xml user, SWIGTYPE_p_p_switch_xml ingroup) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_xml_locate_user_in_domain(user_name, switch_xml.getCPtr(domain), SWIGTYPE_p_p_switch_xml.getCPtr(user), SWIGTYPE_p_p_switch_xml.getCPtr(ingroup)); + return ret; + } + public static switch_xml switch_xml_open_cfg(string file_path, SWIGTYPE_p_p_switch_xml node, switch_event arg2) { IntPtr cPtr = freeswitchPINVOKE.switch_xml_open_cfg(file_path, SWIGTYPE_p_p_switch_xml.getCPtr(node), switch_event.getCPtr(arg2)); switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false); @@ -4954,6 +4963,78 @@ [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_rtp_hdr_t")] public static extern void delete_switch_rtp_hdr_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38MaxBitRate_set")] + public static extern void switch_t38_options_t_T38MaxBitRate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38MaxBitRate_get")] + public static extern uint switch_t38_options_t_T38MaxBitRate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxFillBitRemoval_set")] + public static extern void switch_t38_options_t_T38FaxFillBitRemoval_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxFillBitRemoval_get")] + public static extern int switch_t38_options_t_T38FaxFillBitRemoval_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxTranscodingMMR_set")] + public static extern void switch_t38_options_t_T38FaxTranscodingMMR_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxTranscodingMMR_get")] + public static extern int switch_t38_options_t_T38FaxTranscodingMMR_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_set")] + public static extern void switch_t38_options_t_T38FaxTranscodingJBIG_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_get")] + public static extern int switch_t38_options_t_T38FaxTranscodingJBIG_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxRateManagement_set")] + public static extern void switch_t38_options_t_T38FaxRateManagement_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxRateManagement_get")] + public static extern string switch_t38_options_t_T38FaxRateManagement_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxMaxBuffer_set")] + public static extern void switch_t38_options_t_T38FaxMaxBuffer_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxMaxBuffer_get")] + public static extern uint switch_t38_options_t_T38FaxMaxBuffer_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxMaxDatagram_set")] + public static extern void switch_t38_options_t_T38FaxMaxDatagram_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxMaxDatagram_get")] + public static extern uint switch_t38_options_t_T38FaxMaxDatagram_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxUdpEC_set")] + public static extern void switch_t38_options_t_T38FaxUdpEC_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38FaxUdpEC_get")] + public static extern string switch_t38_options_t_T38FaxUdpEC_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38VendorInfo_set")] + public static extern void switch_t38_options_t_T38VendorInfo_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_T38VendorInfo_get")] + public static extern string switch_t38_options_t_T38VendorInfo_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_ip_set")] + public static extern void switch_t38_options_t_ip_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_ip_get")] + public static extern string switch_t38_options_t_ip_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_port_set")] + public static extern void switch_t38_options_t_port_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_port_get")] + public static extern uint switch_t38_options_t_port_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_t38_options_t")] + public static extern IntPtr new_switch_t38_options_t(); + + [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_t38_options_t")] + public static extern void delete_switch_t38_options_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_input_args_t_input_callback_set")] public static extern void switch_input_args_t_input_callback_set(HandleRef jarg1, HandleRef jarg2); @@ -9359,7 +9440,7 @@ public static extern int switch_ivr_bind_dtmf_meta_session(HandleRef jarg1, uint jarg2, uint jarg3, string jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_unbind_dtmf_meta_session")] - public static extern int switch_ivr_unbind_dtmf_meta_session(HandleRef jarg1); + public static extern int switch_ivr_unbind_dtmf_meta_session(HandleRef jarg1, uint jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_soft_hold")] public static extern int switch_ivr_soft_hold(HandleRef jarg1, string jarg2, string jarg3, string jarg4); @@ -9574,6 +9655,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_stun_ping")] public static extern int switch_rtp_activate_stun_ping(HandleRef jarg1, string jarg2, ushort jarg3, uint jarg4, int jarg5); + [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_intentional_bugs")] + public static extern void switch_rtp_intentional_bugs(HandleRef jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_log_node_t_data_set")] public static extern void switch_log_node_t_data_set(HandleRef jarg1, string jarg2); @@ -9823,6 +9907,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_locate_user")] public static extern int switch_xml_locate_user(string jarg1, string jarg2, string jarg3, string jarg4, HandleRef jarg5, HandleRef jarg6, HandleRef jarg7, HandleRef jarg8, HandleRef jarg9); + [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_locate_user_in_domain")] + public static extern int switch_xml_locate_user_in_domain(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); + [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_open_cfg")] public static extern IntPtr switch_xml_open_cfg(string jarg1, HandleRef jarg2, HandleRef jarg3); @@ -16113,7 +16200,8 @@ SBF_DIAL_BLEG = (1 << 2), SBF_EXEC_BLEG = (1 << 3), SBF_EXEC_OPPOSITE = (1 << 4), - SBF_EXEC_SAME = (1 << 5) + SBF_EXEC_SAME = (1 << 5), + SBF_ONCE = (1 << 6) } } @@ -18513,6 +18601,7 @@ SWITCH_MESSAGE_INDICATE_DISPLAY, SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY, SWITCH_MESSAGE_INDICATE_AUDIO_SYNC, + SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA, SWITCH_MESSAGE_INVALID } @@ -22622,6 +22711,23 @@ namespace FreeSWITCH.Native { +public enum switch_rtp_bug_flag_t { + RTP_BUG_NONE = 0, + RTP_BUG_CISCO_SKIP_MARK_BIT_2833 = (1 << 0), + RTP_BUG_SONUS_SEND_INVALID_TIMESTAMP_2833 = (1 << 1) +} + +} +/* ---------------------------------------------------------------------------- + * 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 { + public enum switch_rtp_crypto_direction_t { SWITCH_RTP_CRYPTO_SEND, SWITCH_RTP_CRYPTO_RECV, @@ -24047,6 +24153,163 @@ namespace FreeSWITCH.Native { +using System; +using System.Runtime.InteropServices; + +public class switch_t38_options_t : IDisposable { + private HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal switch_t38_options_t(IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new HandleRef(this, cPtr); + } + + internal static HandleRef getCPtr(switch_t38_options_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } + + ~switch_t38_options_t() { + Dispose(); + } + + public virtual void Dispose() { + lock(this) { + if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { + swigCMemOwn = false; + freeswitchPINVOKE.delete_switch_t38_options_t(swigCPtr); + } + swigCPtr = new HandleRef(null, IntPtr.Zero); + GC.SuppressFinalize(this); + } + } + + public uint T38MaxBitRate { + set { + freeswitchPINVOKE.switch_t38_options_t_T38MaxBitRate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_t38_options_t_T38MaxBitRate_get(swigCPtr); + return ret; + } + } + + public switch_bool_t T38FaxFillBitRemoval { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxFillBitRemoval_set(swigCPtr, (int)value); + } + get { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_t38_options_t_T38FaxFillBitRemoval_get(swigCPtr); + return ret; + } + } + + public switch_bool_t T38FaxTranscodingMMR { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxTranscodingMMR_set(swigCPtr, (int)value); + } + get { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_t38_options_t_T38FaxTranscodingMMR_get(swigCPtr); + return ret; + } + } + + public switch_bool_t T38FaxTranscodingJBIG { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxTranscodingJBIG_set(swigCPtr, (int)value); + } + get { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_t38_options_t_T38FaxTranscodingJBIG_get(swigCPtr); + return ret; + } + } + + public string T38FaxRateManagement { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxRateManagement_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_t38_options_t_T38FaxRateManagement_get(swigCPtr); + return ret; + } + } + + public uint T38FaxMaxBuffer { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxMaxBuffer_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_t38_options_t_T38FaxMaxBuffer_get(swigCPtr); + return ret; + } + } + + public uint T38FaxMaxDatagram { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxMaxDatagram_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_t38_options_t_T38FaxMaxDatagram_get(swigCPtr); + return ret; + } + } + + public string T38FaxUdpEC { + set { + freeswitchPINVOKE.switch_t38_options_t_T38FaxUdpEC_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_t38_options_t_T38FaxUdpEC_get(swigCPtr); + return ret; + } + } + + public string T38VendorInfo { + set { + freeswitchPINVOKE.switch_t38_options_t_T38VendorInfo_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_t38_options_t_T38VendorInfo_get(swigCPtr); + return ret; + } + } + + public string ip { + set { + freeswitchPINVOKE.switch_t38_options_t_ip_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_t38_options_t_ip_get(swigCPtr); + return ret; + } + } + + public uint port { + set { + freeswitchPINVOKE.switch_t38_options_t_port_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_t38_options_t_port_get(swigCPtr); + return ret; + } + } + + public switch_t38_options_t() : this(freeswitchPINVOKE.new_switch_t38_options_t(), true) { + } + +} + +} +/* ---------------------------------------------------------------------------- + * 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 { + public enum switch_text_channel_t { SWITCH_CHANNEL_ID_LOG, SWITCH_CHANNEL_ID_LOG_CLEAN,

1 0

[commit] r11019 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: andrew Date: Tue Dec 30 23:47:58 2008 New Revision: 11019 Log: send the call's uniqueid, if any, as the first element of the event's parameter list. unlock the session returned by core_session_locate like I should've been doing. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Dec 30 23:47:58 2008 @@ -271,6 +271,8 @@ static void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event) { int i; + char *uuid = switch_event_get_header(event, "unique-id"); + switch_event_header_t *hp; for (i = 0, hp = event->headers; hp; hp = hp->next, i++); @@ -278,7 +280,13 @@ if (event->body) i++; - ei_x_encode_list_header(ebuf, i); + ei_x_encode_list_header(ebuf, i+1); + + if (uuid) { + ei_x_encode_string(ebuf, switch_event_get_header(event, "unique-id")); + } else { + ei_x_encode_atom(ebuf, "undefined"); + } for (hp = event->headers; hp; hp = hp->next) { ei_x_encode_tuple_header(ebuf, 2); @@ -983,7 +991,9 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badmem"); } - /* switch_core_session_rwunlock(session); */ /* XXX is this needed? */ + + /* release the lock returned by switch_core_locate_session */ + switch_core_session_rwunlock(session); break; sendmsg_fail:

1 0

[commit] r11018 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: andrew Date: Tue Dec 30 23:40:20 2008 New Revision: 11018 Log: Merge in some recent event_socket changes, mainly the new log data structure Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Dec 30 23:40:20 2008 @@ -142,25 +142,28 @@ switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) { - char *data = strdup(node->data); - if (data) { - if (switch_queue_trypush(l->log_queue, data) == SWITCH_STATUS_SUCCESS) { - if (l->lost_logs) { - int ll = l->lost_logs; - switch_event_t *event; - l->lost_logs = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll); - if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll); - switch_event_fire(&event); - } + + switch_log_node_t *dnode = malloc(sizeof(*node)); + switch_assert(dnode); + *dnode = *node; + dnode->data = strdup(node->data); + switch_assert(dnode->data); + + if (switch_queue_trypush(l->log_queue, dnode) == SWITCH_STATUS_SUCCESS) { + if (l->lost_logs) { + int ll = l->lost_logs; + switch_event_t *event; + l->lost_logs = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll); + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll); + switch_event_fire(&event); } - } else { - switch_safe_free(data); - l->lost_logs++; } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + switch_safe_free(dnode->data); + switch_safe_free(dnode); + l->lost_logs++; } } } @@ -936,7 +939,7 @@ } switch_core_session_t *session; - if ((session = switch_core_session_locate(uuid))) { + if (!switch_strlen_zero(uuid) && (session = switch_core_session_locate(uuid))) { } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); @@ -980,6 +983,7 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badmem"); } + /* switch_core_session_rwunlock(session); */ /* XXX is this needed? */ break; sendmsg_fail: @@ -1262,20 +1266,48 @@ /* send out any pending crap in the log queue */ if (switch_test_flag(listener, LFLAG_LOG)) { if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { - char *data = (char *) pop; + switch_log_node_t *dnode = (switch_log_node_t *) pop; - if (data) { + if (dnode->data) { ei_x_buff lbuf; ei_x_new_with_version(&lbuf); ei_x_encode_tuple_header(&lbuf, 2); ei_x_encode_atom(&lbuf, "log"); - ei_x_encode_string(&lbuf, data); + ei_x_encode_list_header(&lbuf, 6); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "level"); + ei_x_encode_char(&lbuf, (unsigned char)dnode->level); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "text_channel"); + ei_x_encode_char(&lbuf, (unsigned char)dnode->level); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "file"); + ei_x_encode_string(&lbuf, dnode->file); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "func"); + ei_x_encode_string(&lbuf, dnode->func); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "line"); + ei_x_encode_ulong(&lbuf, (unsigned long)dnode->line); + + ei_x_encode_tuple_header(&lbuf, 2); + ei_x_encode_atom(&lbuf, "data"); + ei_x_encode_string(&lbuf, dnode->data); + + ei_x_encode_empty_list(&lbuf); switch_mutex_lock(listener->sock_mutex); ei_send(listener->sockfd, &listener->log_pid, lbuf.buff, lbuf.index); switch_mutex_unlock(listener->sock_mutex); ei_x_free(&lbuf); + free(dnode->data); + free(dnode); } } }

1 0

[commit] r11017 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: brian Date: Tue Dec 30 23:33:30 2008 New Revision: 11017 Log: now that anoys me :) Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 30 23:33:30 2008 @@ -346,7 +346,7 @@ <action application="set" data="conference_auto_outcall_flags=mute"/> <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 intercept::${uuid}'}"/> <action application="set" data="sip_exclude_contact=${network_addr}"/> - <action application="conference_set_auto_outcall" data="loopback/9999" + <action application="conference_set_auto_outcall" data="loopback/9999"/> <action application="conference" data="madboss_intercom2@default+flags{endconf|deaf}"/> </condition> </extension>

1 0

[commit] r11016 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: brian Date: Tue Dec 30 23:33:07 2008 New Revision: 11016 Log: go forth and anoy less Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 30 23:33:07 2008 @@ -346,8 +346,7 @@ <action application="set" data="conference_auto_outcall_flags=mute"/> <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 intercept::${uuid}'}"/> <action application="set" data="sip_exclude_contact=${network_addr}"/> - <action application="conference_set_auto_outcall" data="sofia/gateway/$${default_provider}/19184238080"/> - <action application="conference_set_auto_outcall" data="sofia/default/888(a)conference.freeswitch.org"/> + <action application="conference_set_auto_outcall" data="loopback/9999" <action application="conference" data="madboss_intercom2@default+flags{endconf|deaf}"/> </condition> </extension> @@ -362,8 +361,7 @@ <action application="set" data="conference_auto_outcall_flags=none"/>   - <action application="conference_set_auto_outcall" data="sofia/gateway/$${default_provider}/19184238080"/> - <action application="conference_set_auto_outcall" data="sofia/default/888(a)conference.freeswitch.org"/> + <action application="conference_set_auto_outcall" data="loopback/9999"/> <action application="conference" data="madboss3@default"/> </condition> </extension>

1 0