April 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8125 - freeswitch/trunk/src
by Freeswitch SVN 18 Apr '08

18 Apr '08

Author: anthm Date: Fri Apr 18 11:39:49 2008 New Revision: 8125 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Apr 18 11:39:49 2008 @@ -464,7 +464,7 @@ switch_channel_clear_flag(other_channel, CF_TRANSFER); switch_core_session_reset(session, SWITCH_TRUE); switch_core_session_reset(other_session, SWITCH_TRUE); - + ready_a = switch_channel_ready(channel); ready_b = switch_channel_ready(other_channel); @@ -583,7 +583,7 @@ switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); switch_event_t *event; - if (!switch_channel_ready(peer_channel)) { + if (switch_channel_get_state(peer_channel) >= CS_HANGUP) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); return SWITCH_STATUS_FALSE; }

1 0

[commit] r8124 - in freeswitch/trunk/scripts/contrib/intralanman/PHP: fs_curl fs_sock
by Freeswitch SVN 17 Apr '08

17 Apr '08

Author: intralanman Date: Thu Apr 17 17:43:04 2008 New Revision: 8124 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php Log: couple little bugs i found while testing... Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Thu Apr 17 17:43:04 2008 @@ -170,6 +170,9 @@ } //$this -> debug($app_array); foreach ($app_array as $app) { + if (empty($app['application'])) { + continue; + } $this -> xmlw -> startElement($app['type']); $this -> xmlw -> writeAttribute( 'application', $app['application'] @@ -177,9 +180,9 @@ if (!empty($app['data'])) { if (array_key_exists('is_cdata', $app) && $app['is_cdata'] == true) { - $this -> xmlw -> startElement('data'); + //$this -> xmlw -> startElement('data'); $this -> xmlw -> writeCdata($app['data']); - $this -> xmlw -> endElement(); + //$this -> xmlw -> endElement(); } else { $this -> xmlw -> writeAttribute( 'data', $app['data'] Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php Thu Apr 17 17:43:04 2008 @@ -220,6 +220,8 @@ * @return array */ private function sock_get_length($content_len) { + $len = 0; + $content = null; $this -> debug("calling sock_get_length with length of $content_len"); //for ($i=0; $i<$content_len; $i+=strlen($orig_line)) { while ($orig_line = fgets($this -> sock, BUFFER_SIZE)) { @@ -409,7 +411,7 @@ } else { if (is_array($_SERVER) && array_key_exists('HTTP_HOST', $_SERVER)) { - printf("<pre>%s%s</pre>\r\n" + printf("\r\n" , str_repeat(' ', $spaces) , htmlentities($input) );

1 0

[commit] r8123 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: anthm Date: Wed Apr 16 18:49:36 2008 New Revision: 8123 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: make sure both channels are sip when dereferencing it's guts 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 Wed Apr 16 18:49:36 2008 @@ -3077,7 +3077,7 @@ private_object_t *b_tech_pvt = NULL, *a_tech_pvt = NULL; char message[256] = ""; - if (aleg && bleg) { + if (aleg && bleg && switch_core_session_compare(aleg, bleg)) { a_tech_pvt = (private_object_t *) switch_core_session_get_private(aleg); b_tech_pvt = (private_object_t *) switch_core_session_get_private(bleg);

1 0

[commit] r8122 - in freeswitch/trunk/src: . include
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: anthm Date: Wed Apr 16 18:02:06 2008 New Revision: 8122 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_time.c Log: time sync stuff for vps Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Apr 16 18:02:06 2008 @@ -1597,6 +1597,7 @@ SWITCH_DECLARE(time_t) switch_timestamp(time_t *t); SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload); SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip(const char *ip_str, const char *list_name); +SWITCH_DECLARE(void) switch_time_set_monotonic(switch_bool_t enable); ///\} Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Apr 16 18:02:06 2008 @@ -898,6 +898,8 @@ runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val); } else if (!strcasecmp(var, "sessions-per-second")) { switch_core_sessions_per_second(atoi(val)); + } else if (!strcasecmp(var, "disable-monotonic-timing")) { + switch_time_set_monotonic(SWITCH_FALSE); } else if (!strcasecmp(var, "max-sessions")) { switch_core_session_limit(atoi(val)); } Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed Apr 16 18:02:06 2008 @@ -101,6 +101,13 @@ static int MONO = 0; #endif + +SWITCH_DECLARE(void) switch_time_set_monotonic(switch_bool_t enable) +{ + MONO = enable ? 1 : 0; + switch_time_sync(); +} + static switch_time_t time_now(int64_t offset) { switch_time_t now; @@ -112,7 +119,7 @@ now = ts.tv_sec * APR_USEC_PER_SEC + (ts.tv_nsec/1000) + offset; } else { #endif - now = switch_time_now(); + now = switch_time_now(); #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) } @@ -179,12 +186,12 @@ return SWITCH_STATUS_MEMERR; } -#define check_roll() if (private_info->roll < TIMER_MATRIX[timer->interval].roll) {\ - private_info->roll++;\ - private_info->reference = private_info->start = TIMER_MATRIX[timer->interval].tick;\ - }\ - - +#define check_roll() if (private_info->roll < TIMER_MATRIX[timer->interval].roll) { \ + private_info->roll++; \ + private_info->reference = private_info->start = TIMER_MATRIX[timer->interval].tick; \ + } \ + + static switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; @@ -193,7 +200,7 @@ if (globals.RUNNING != 1 || private_info->ready == 0) { return SWITCH_STATUS_FALSE; } - + check_roll(); samples = timer->samples * (private_info->reference - private_info->start); @@ -326,18 +333,23 @@ ts = 0; last = 0; fwd_errs = rev_errs = 0; - + while (globals.RUNNING == 1) { runtime.reference += STEP_MIC; while ((ts = time_now(runtime.offset)) < runtime.reference) { if (ts < last) { - int64_t diff = (int64_t)(ts - last); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Reverse Clock Skew Detected!\n"); - runtime.reference = switch_time_now(); - current_ms = 0; - tick = 0; - runtime.initiated += diff; - rev_errs++; + if (MONO) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Virtual Migration Detected! Syncing Clock\n"); + switch_time_sync(); + } else { + int64_t diff = (int64_t)(ts - last); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Reverse Clock Skew Detected!\n"); + runtime.reference = switch_time_now(); + current_ms = 0; + tick = 0; + runtime.initiated += diff; + rev_errs++; + } } else { rev_errs = 0; } @@ -347,13 +359,18 @@ if (ts > (runtime.reference + too_late)) { - switch_time_t diff = ts - runtime.reference - STEP_MIC; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Forward Clock Skew Detected!\n"); - fwd_errs++; - runtime.reference = switch_time_now(); - current_ms = 0; - tick = 0; - runtime.initiated += diff; + if (MONO) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Virtual Migration Detected! Syncing Clock\n"); + switch_time_sync(); + } else { + switch_time_t diff = ts - runtime.reference - STEP_MIC; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Forward Clock Skew Detected!\n"); + fwd_errs++; + runtime.reference = switch_time_now(); + current_ms = 0; + tick = 0; + runtime.initiated += diff; + } } else { fwd_errs = 0; }

1 0

[commit] r8121 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: mikej Date: Wed Apr 16 17:43:51 2008 New Revision: 8121 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: don't hang channels (MODENDP-106) Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Apr 16 17:43:51 2008 @@ -539,13 +539,12 @@ return SWITCH_STATUS_SUCCESS; } - switch_mutex_lock(globals.device_lock); get_samples: + switch_mutex_lock(globals.device_lock); if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame, &globals.timer)) == 0) { - switch_mutex_unlock(globals.device_lock); switch_yield(1000); goto get_samples; } else {

1 0

[commit] r8120 - freeswitch/trunk/src
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: anthm Date: Wed Apr 16 17:29:57 2008 New Revision: 8120 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix originate timeout issue Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Apr 16 17:29:57 2008 @@ -68,6 +68,7 @@ }; typedef enum { + IDX_TIMEOUT = -3, IDX_CANCEL = -2, IDX_NADA = -1 } abort_t; @@ -919,7 +920,7 @@ if ((switch_timestamp(NULL) - start) > (time_t) timelimit_sec) { to++; - idx = IDX_CANCEL; + idx = IDX_TIMEOUT; goto notready; } @@ -1039,7 +1040,7 @@ // When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { - idx = IDX_CANCEL; + idx = IDX_TIMEOUT; goto notready; } @@ -1120,7 +1121,7 @@ switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)))) { switch_core_session_reset(session, SWITCH_FALSE); } - + for (i = 0; i < and_argc; i++) { if (!peer_channels[i]) { continue; @@ -1135,20 +1136,18 @@ if (i != idx) { const char *holding = NULL; - - if (idx == IDX_CANCEL) { - if (to) { - reason = SWITCH_CAUSE_NO_ANSWER; - } else { - reason = SWITCH_CAUSE_ORIGINATOR_CANCEL; - } + + if (idx == IDX_TIMEOUT || to) { + reason = SWITCH_CAUSE_NO_ANSWER; } else { - if (to) { - reason = SWITCH_CAUSE_NO_ANSWER; - } else if (and_argc > 1) { - reason = SWITCH_CAUSE_LOSE_RACE; + if (idx == IDX_CANCEL) { + reason = SWITCH_CAUSE_ORIGINATOR_CANCEL; } else { - reason = SWITCH_CAUSE_NO_ANSWER; + if (and_argc > 1) { + reason = SWITCH_CAUSE_LOSE_RACE; + } else { + reason = SWITCH_CAUSE_NO_ANSWER; + } } }

1 0

[commit] r8119 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: anthm Date: Wed Apr 16 17:29:08 2008 New Revision: 8119 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Apr 16 17:29:08 2008 @@ -1969,7 +1969,7 @@ while (mod_sofia_globals.threads) { switch_yield(1000); - if (++sanity >= 5000) { + if (++sanity >= 10000) { break; } } 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 Wed Apr 16 17:29:08 2008 @@ -2345,28 +2345,28 @@ sofia_profile_t *pptr; switch_mutex_lock(mod_sofia_globals.hash_mutex); - - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); - if ((pptr = (sofia_profile_t *) val) && pptr == profile) { - aliases[i++] = strdup((char *) var); - if (i == 512) { - abort(); + if (mod_sofia_globals.profile_hash) { + for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + if ((pptr = (sofia_profile_t *) val) && pptr == profile) { + aliases[i++] = strdup((char *) var); + if (i == 512) { + abort(); + } } } - } - for (j = 0; j < i && j < 512; j++) { - switch_core_hash_delete(mod_sofia_globals.profile_hash, aliases[j]); - free(aliases[j]); - } + for (j = 0; j < i && j < 512; j++) { + switch_core_hash_delete(mod_sofia_globals.profile_hash, aliases[j]); + free(aliases[j]); + } - for (gp = profile->gateways; gp; gp = gp->next) { - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->name); - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_from); - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_contact); + for (gp = profile->gateways; gp; gp = gp->next) { + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->name); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_from); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_contact); + } } - switch_mutex_unlock(mod_sofia_globals.hash_mutex); }

1 0

[commit] r8118 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: brian Date: Wed Apr 16 10:12:40 2008 New Revision: 8118 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Apr 16 10:12:40 2008 @@ -141,7 +141,7 @@ <anti-action application="bind_meta_app" data="3 a a execute_extension::cf XML features"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> - <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> +  <anti-action application="set" data="hangup_after_bridge=true"/>  <anti-action application="set" data="continue_on_fail=true"/>

1 0

[commit] r8117 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: brian Date: Tue Apr 15 23:05:15 2008 New Revision: 8117 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: add this new option to the config commented out Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Apr 15 23:05:15 2008 @@ -53,6 +53,7 @@ <param name="inbound-codec-negotiation" value="generous"/>   +   <param name="tls" value="false"/>

1 0

[commit] r8116 - freeswitch/trunk/src
by Freeswitch SVN 15 Apr '08

15 Apr '08

Author: anthm Date: Tue Apr 15 14:43:12 2008 New Revision: 8116 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Apr 15 14:43:12 2008 @@ -569,6 +569,8 @@ ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retries")) { ok = 1; + } else if (!strcasecmp((char *)hi->name, "originate_timeout")) { + ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retry_sleep_ms")) { ok = 1; } else if (!strcasecmp((char *)hi->name, "origination_caller_id_name")) { @@ -652,6 +654,13 @@ return_ring_ready = 1; } + if ((var_val = switch_event_get_header(var_event, "originate_timeout")) && switch_true(var_val)) { + int tmp = atoi(var_val); + if (tmp > 0) { + timelimit_sec = (uint32_t) tmp; + } + } + if ((var_val = switch_event_get_header(var_event, "originate_retries")) && switch_true(var_val)) { int32_t tmp; tmp = atoi(var_val);

1 0