October 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5815 - freeswitch/trunk/src
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 12:09:47 2007 New Revision: 5815 Modified: freeswitch/trunk/src/switch_core_state_machine.c Log: fix (you want this) 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 Fri Oct 5 12:09:47 2007 @@ -374,6 +374,7 @@ while ((state = switch_channel_get_state(session->channel)) != CS_DONE) { uint8_t exception = 0; + midstate = state; if (switch_channel_test_flag(session->channel, CF_REPEAT_STATE)) { switch_channel_clear_flag(session->channel, CF_REPEAT_STATE); exception = 1; @@ -381,7 +382,7 @@ if (state != laststate || state == CS_HANGUP || exception) { int index = 0; int proceed = 1; - + switch (state) { case CS_NEW: /* Just created, Waiting for first instructions */

1 0

[Freeswitch-svn] [commit] r5814 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 11:47:48 2007 New Revision: 5814 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: now support 3pcc Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Oct 5 11:47:48 2007 @@ -41,6 +41,7 @@ #define HAVE_APR #include <switch.h> +#include <switch_version.h> #ifdef SWITCH_HAVE_ODBC #include <switch_odbc.h> #endif @@ -64,7 +65,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH(mod_sofia)" +#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 11:47:48 2007 @@ -1199,10 +1199,9 @@ goto done; } else { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); - switch_set_flag(tech_pvt, TFLAG_LATE_NEGOTIATION); sofia_glue_tech_choose_port(tech_pvt); sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); - + switch_channel_set_state(channel, CS_HIBERNATE); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); @@ -1332,6 +1331,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Error!\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } + if (switch_channel_get_state(channel) == CS_HIBERNATE) { + switch_set_flag_locked(tech_pvt, TFLAG_READY); + switch_channel_set_state(channel, CS_INIT); + } goto done; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Oct 5 11:47:48 2007 @@ -1016,11 +1016,14 @@ switch_status_t sofia_glue_tech_media(private_object_t *tech_pvt, char *r_sdp) { - sdp_parser_t *parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0); + sdp_parser_t *parser = NULL; sdp_session_t *sdp; uint8_t match = 0; assert(tech_pvt != NULL); + assert(r_sdp != NULL); + + parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0); if (switch_strlen_zero(r_sdp)) { return SWITCH_STATUS_FALSE;

1 0

[Freeswitch-svn] [commit] r5813 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 10:08:21 2007 New Revision: 5813 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add line to set port right with sip calls with no sdp in the invite Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 10:08:21 2007 @@ -1200,6 +1200,7 @@ } else { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); switch_set_flag(tech_pvt, TFLAG_LATE_NEGOTIATION); + sofia_glue_tech_choose_port(tech_pvt); sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); nua_respond(tech_pvt->nh, SIP_200_OK,

1 0

[Freeswitch-svn] [commit] r5812 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 09:42:11 2007 New Revision: 5812 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core.c Log: add max_sessions fsctl command Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Oct 5 09:42:11 2007 @@ -1009,7 +1009,8 @@ SCSC_LOGLEVEL, SCSC_SPS, SCSC_LAST_SPS, - SCSC_RECLAIM + SCSC_RECLAIM, + SCSC_MAX_SESSIONS } switch_session_ctl_t; typedef struct apr_pool_t switch_memory_pool_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Oct 5 09:42:11 2007 @@ -121,6 +121,12 @@ switch_core_session_ctl(SCSC_SHUTDOWN, &arg); } else if (!strcasecmp(argv[0], "reclaim_mem")) { switch_core_session_ctl(SCSC_RECLAIM, &arg); + } else if (!strcasecmp(argv[0], "max_sessions")) { + if (argc > 1) { + arg = atoi(argv[1]); + } + switch_core_session_ctl(SCSC_MAX_SESSIONS, &arg); + stream->write_function(stream, "max sessions: %d\n", arg); } else if (!strcasecmp(argv[0], "loglevel")) { if (argc > 1) { if (*argv[1] > 47 && *argv[1] < 58) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Oct 5 09:42:11 2007 @@ -657,6 +657,9 @@ } *val = runtime.hard_log_level; break; + case SCSC_MAX_SESSIONS: + *val = switch_core_session_limit(*val); + break; case SCSC_LAST_SPS: *val = runtime.sps_last; break;

1 0

[Freeswitch-svn] [commit] r5811 - in freeswitch/trunk: conf src/mod/xml_int/mod_xml_cdr src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: xachen Date: Thu Oct 4 23:41:53 2007 New Revision: 5811 Modified: freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add option to mod_xml_curl as well to make libcurl ignore ca cert roots Modified: freeswitch/trunk/conf/xml_curl.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_curl.conf.xml (original) +++ freeswitch/trunk/conf/xml_curl.conf.xml Thu Oct 4 23:41:53 2007 @@ -10,6 +10,10 @@    + +  +  +  </binding> </bindings> </configuration> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Thu Oct 4 23:41:53 2007 @@ -25,6 +25,7 @@ * * Brian West <brian.west(a)mac.com> * Bret McDanel <trixter AT 0xdecafbad.com> + * Justin Cassidy <xachenant(a)hotmail.com> * * mod_xml_cdr.c -- XML CDR Module to files or curl * @@ -41,7 +42,7 @@ uint32_t delay; uint32_t retries; uint32_t shutdown; - int ignore_cacert_check; + uint32_t ignore_cacert_check; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Oct 4 23:41:53 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Justin Cassidy <xachenant(a)hotmail.com> * * mod_xml_curl.c -- CURL XML Gateway * @@ -40,6 +41,7 @@ char *bindings; char *cred; int disable100continue; + uint32_t ignore_cacert_check; }; typedef struct xml_binding xml_binding_t; @@ -126,6 +128,10 @@ curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); } + if (binding->ignore_cacert_check) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); + } + curl_easy_perform(curl_handle); curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); curl_easy_cleanup(curl_handle); @@ -173,6 +179,7 @@ char *bind_cred = NULL; char *bind_mask = NULL; int disable100continue = 0; + uint32_t ignore_cacert_check = 0; for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -186,6 +193,8 @@ bind_cred = val; } else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) { disable100continue = 1; + } else if (!strcasecmp(var, "ignore-cacert-check") && switch_true(val)) { + ignore_cacert_check = 1; } } @@ -210,6 +219,7 @@ } binding->disable100continue = disable100continue; + binding->ignore_cacert_check = ignore_cacert_check; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all");

1 0

[Freeswitch-svn] [commit] r5810 - in freeswitch/trunk: conf src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: xachen Date: Thu Oct 4 23:26:42 2007 New Revision: 5810 Modified: freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: add option to mod_xml_cdr to ignore ca root checks on https urls Modified: freeswitch/trunk/conf/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/xml_cdr.conf.xml Thu Oct 4 23:26:42 2007 @@ -20,5 +20,9 @@   +  +  +  + </settings> </configuration> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Thu Oct 4 23:26:42 2007 @@ -41,6 +41,7 @@ uint32_t delay; uint32_t retries; uint32_t shutdown; + int ignore_cacert_check; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); @@ -133,6 +134,10 @@ curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + if (globals.ignore_cacert_check) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); + } + /* these were used for testing, optionally they may be enabled if someone desires curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level @@ -257,6 +262,8 @@ globals.err_log_dir = switch_mprintf("%s/%s", SWITCH_GLOBAL_dirs.log_dir, val); } } + } else if (!strcasecmp(var, "ignore-cacert-check") && switch_true(val)) { + globals.ignore_cacert_check = 1; } if (switch_strlen_zero(globals.err_log_dir)) {

1 0

[Freeswitch-svn] [commit] r5809 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Thu Oct 4 20:05:41 2007 New Revision: 5809 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_ivr.c Log: fix echo Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 4 20:05:41 2007 @@ -949,7 +949,7 @@ int len = atoi(val); if (len < 100 || len > 1000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] myst be between 100 and 1000\n", len); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] must be between 100 and 1000\n", len); } else { int qlen; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 4 20:05:41 2007 @@ -1521,8 +1521,8 @@ uint32_t interval, samples; uint32_t ts = 0; - if (delay_ms < 100 || delay_ms > 10000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] myst be between 100 and 10000\n", delay_ms); + if (delay_ms < 1 || delay_ms > 10000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid delay [%d] must be between 1 and 10000\n", delay_ms); return; }

1 0

[Freeswitch-svn] [commit] r5805 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 04 Oct '07

04 Oct '07

Author: anthm Date: Thu Oct 4 17:39:00 2007 New Revision: 5805 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: switch sleep to switch_yield Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Thu Oct 4 17:39:00 2007 @@ -140,7 +140,7 @@ for (cur_try = 0; cur_try < globals.retries; cur_try++) { if (cur_try > 0) { - sleep(globals.delay); + switch_yield(globals.delay * 1000000); } curl_easy_perform(curl_handle); curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);

1 0

[Freeswitch-svn] [commit] r5804 - in freeswitch/trunk/src: . include include/private mod/applications/mod_commands
by Freeswitch SVN 04 Oct '07

04 Oct '07

Author: anthm Date: Thu Oct 4 17:35:50 2007 New Revision: 5804 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/softtimer.c freeswitch/trunk/src/switch_core.c Log: add sps count to the status output Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu Oct 4 17:35:50 2007 @@ -156,6 +156,7 @@ switch_mutex_t *throttle_mutex; uint32_t sps_total; int32_t sps; + int32_t sps_last; switch_log_level_t hard_log_level; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Oct 4 17:35:50 2007 @@ -1008,6 +1008,7 @@ SCSC_CHECK_RUNNING, SCSC_LOGLEVEL, SCSC_SPS, + SCSC_LAST_SPS, SCSC_RECLAIM } switch_session_ctl_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Oct 4 17:35:50 2007 @@ -44,6 +44,7 @@ uint8_t html = 0; switch_core_time_duration_t duration; char *http = NULL; + int sps, last_sps; if (session) { return SWITCH_STATUS_FALSE; @@ -68,7 +69,9 @@ duration.mms == 1 ? "" : "s"); stream->write_function(stream, "%"SWITCH_SIZE_T_FMT" sessions since startup\n", switch_core_session_id() - 1 ); - stream->write_function(stream, "%d sessions\n", switch_core_session_count()); + switch_core_session_ctl(SCSC_LAST_SPS, &last_sps); + switch_core_session_ctl(SCSC_SPS, &sps); + stream->write_function(stream, "%d session(s) %d/%d\n", switch_core_session_count(), last_sps, sps); if (html) { stream->write_function(stream, "</b>\n"); @@ -130,6 +133,9 @@ } switch_core_session_ctl(SCSC_LOGLEVEL, &arg); stream->write_function(stream, "log level: %s [%d]\n", switch_log_level2str(arg), arg); + } else if (!strcasecmp(argv[0], "last_sps")) { + switch_core_session_ctl(SCSC_LAST_SPS, &arg); + stream->write_function(stream, "last sessions per second: %d\n", arg); } else if (!strcasecmp(argv[0], "sps")) { if (argc > 1) { arg = atoi(argv[1]); Modified: freeswitch/trunk/src/softtimer.c ============================================================================== --- freeswitch/trunk/src/softtimer.c (original) +++ freeswitch/trunk/src/softtimer.c Thu Oct 4 17:35:50 2007 @@ -206,7 +206,7 @@ uint32_t current_ms = 0; uint32_t x, tick = 0; switch_time_t ts = 0; - + memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); @@ -229,6 +229,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Over Session Rate of %d!\n", runtime.sps_total); } switch_mutex_lock(runtime.throttle_mutex); + runtime.sps_last = runtime.sps_total - runtime.sps; runtime.sps = runtime.sps_total; switch_mutex_unlock(runtime.throttle_mutex); tick = 0; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 4 17:35:50 2007 @@ -657,6 +657,9 @@ } *val = runtime.hard_log_level; break; + case SCSC_LAST_SPS: + *val = runtime.sps_last; + break; case SCSC_SPS: switch_mutex_lock(runtime.throttle_mutex); if (*val > 0) {

1 0

[Freeswitch-svn] [commit] r5803 - freeswitch/trunk/src
by Freeswitch SVN 04 Oct '07

04 Oct '07

Author: anthm Date: Thu Oct 4 17:15:08 2007 New Revision: 5803 Modified: freeswitch/trunk/src/softtimer.c freeswitch/trunk/src/switch_log.c Log: sigh Modified: freeswitch/trunk/src/softtimer.c ============================================================================== --- freeswitch/trunk/src/softtimer.c (original) +++ freeswitch/trunk/src/softtimer.c Thu Oct 4 17:15:08 2007 @@ -39,7 +39,7 @@ #define MAX_TICK UINT32_MAX - 1024 -struct switch_runtime runtime; + static switch_memory_pool_t *module_pool = NULL; static struct { Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu Oct 4 17:15:08 2007 @@ -31,7 +31,7 @@ */ #include <switch.h> #include "private/switch_core_pvt.h" -struct switch_runtime runtime; + static const char *LEVELS[] = { "CONSOLE",

1 0