- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7865 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 17:32:56 2008 New Revision: 7865 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Log: update Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Mar 11 17:32:56 2008 @@ -747,6 +747,10 @@ uint32_t timeout, const char *valid_terminators); +SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, const char *app); +SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session); + + /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 11 17:32:56 2008 @@ -79,6 +79,26 @@ } } +#define BIND_SYNTAX "<key> <app>" +SWITCH_STANDARD_APP(dtmf_bind_function) +{ + char *argv[2] = { 0 }; + int argc; + char *lbuf = NULL; + + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 2) { + int kval = atoi(argv[0]); + if (switch_ivr_bind_dtmf_meta_session(session, kval, argv[1]) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound: %s %s\n", argv[0], argv[1]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", BIND_SYNTAX); + } +} + #define INTERCEPT_SYNTAX "<uuid>" SWITCH_STANDARD_APP(intercept_function) { @@ -1609,6 +1629,7 @@ SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "bind_meta_app", "Bind a key to an application", "Bind a key to an application", dtmf_bind_function, BIND_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "intercept", "intercept", "intercept", intercept_function, INTERCEPT_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "eavesdrop", "eavesdrop on a uuid", "eavesdrop on a uuid", eavesdrop_function, eavesdrop_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "three_way", "three way call with a uuid", "three way call with a uuid", three_way_function, eavesdrop_SYNTAX, SAF_NONE); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 11 17:32:56 2008 @@ -1913,15 +1913,17 @@ switch_time_t uduration = 0, legbillusec = 0, billusec = 0; time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; + if (!(caller_profile = switch_channel_get_caller_profile(channel))) { + return SWITCH_STATUS_FALSE; + } - caller_profile = switch_channel_get_caller_profile(channel); if (!(ocp = switch_channel_get_originatee_caller_profile(channel))) { ocp = switch_channel_get_originator_caller_profile(channel); } if (!switch_strlen_zero(caller_profile->caller_id_name)) { cid_buf = switch_core_session_sprintf(channel->session, "\"%s\" <%s>", caller_profile->caller_id_name, - switch_str_nil(caller_profile->caller_id_number)); + switch_str_nil(caller_profile->caller_id_number)); } else { cid_buf = caller_profile->caller_id_number; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 11 17:32:56 2008 @@ -1258,6 +1258,104 @@ return SWITCH_STATUS_SUCCESS; } +typedef struct { + const char *app; +} dtmf_meta_app_t; + +typedef struct { + dtmf_meta_app_t map[10]; + time_t last_digit; + switch_bool_t meta_on; +} dtmf_meta_data_t; + +#define SWITCH_META_VAR_KEY "__dtmf_meta" + +static switch_status_t meta_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY); + time_t now = switch_timestamp(NULL); + char digit[2] = ""; + int dval; + + if (!md) { + return SWITCH_STATUS_SUCCESS; + } + + if (md->meta_on && now - md->last_digit > 5) { + md->meta_on = SWITCH_FALSE; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Meta digit timeout parsing %c\n", switch_channel_get_name(channel), dtmf->digit); + return SWITCH_STATUS_SUCCESS; + } + + md->last_digit = now; + + if (dtmf->digit == '*') { + if (md->meta_on) { + md->meta_on = SWITCH_FALSE; + return SWITCH_STATUS_SUCCESS; + } else { + md->meta_on = SWITCH_TRUE; + return SWITCH_STATUS_FALSE; + } + } + + if (md->meta_on) { + if (dtmf->digit >= '0' && dtmf->digit <= '9') { + *digit = dtmf->digit; + dval = atoi(digit); + if (md->map[dval].app) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Processing meta digit '%c' [%s]\n", + switch_channel_get_name(channel), dtmf->digit, md->map[dval].app); + switch_ivr_broadcast(switch_core_session_get_uuid(session), md->map[dval].app, SMF_ECHO_ALEG); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Ignoring meta digit '%c' not mapped\n", + switch_channel_get_name(channel), dtmf->digit); + + } + } + md->meta_on = SWITCH_FALSE; + return SWITCH_STATUS_FALSE; + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_private(channel, SWITCH_META_VAR_KEY, NULL); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, const char *app) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY); + + if (key > 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid key %u\n", key); + return SWITCH_STATUS_FALSE; + } + + if (!md) { + md = switch_core_session_alloc(session, sizeof(*md)); + switch_channel_set_private(channel, SWITCH_META_VAR_KEY, md); + switch_core_event_hook_add_recv_dtmf(session, meta_on_dtmf); + } + + if (!switch_strlen_zero(app)) { + md->map[key].app = switch_core_session_strdup(session, app); + } else { + md->map[key].app = NULL; + } + + return SWITCH_STATUS_SUCCESS; +} + + + struct speech_thread_handle { switch_core_session_t *session; switch_asr_handle_t *ah;

1 0

[commit] r7864 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 17:15:34 2008 New Revision: 7864 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Tue Mar 11 17:15:34 2008 @@ -2515,8 +2515,8 @@ tech_pvt->key = switch_core_session_strdup(session, key); } - channel = switch_core_session_get_channel(session); - + channel = tech_pvt->channel = switch_core_session_get_channel(session); + if (is_auth) { switch_channel_set_variable(channel, "sip_authorized", "true"); }

1 0

[commit] r7863 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: brian Date: Tue Mar 11 15:45:32 2008 New Revision: 7863 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: silence as a hold class means NO MUSIC 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 Tue Mar 11 15:45:32 2008 @@ -1829,7 +1829,7 @@ stream = tech_pvt->profile->hold_music; } - if (stream) { + if (stream && strcasecmp(stream, "silence")) { switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP); } }

1 0

[commit] r7862 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: brian Date: Tue Mar 11 15:05:20 2008 New Revision: 7862 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak default intercom config Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Mar 11 15:05:20 2008 @@ -110,7 +110,10 @@  <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> +  +  <action application="export"><![CDATA[sip_h_Call-Info=<sip:$${domain}>;answer-after=0]]></action> + <action application="export" data="sip_invite_params=intercom=true"/> <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition>

1 0

[commit] r7861 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 14:36:56 2008 New Revision: 7861 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: double sigh 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 Tue Mar 11 14:36:56 2008 @@ -915,6 +915,7 @@ char *rpid_domain = "cluecon.com", *p; const char *priv = "off"; const char *screen = "no"; + const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); @@ -980,11 +981,11 @@ } } - url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, - switch_channel_get_variable(tech_pvt->channel, "sip_invite_params")); + url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE, NULL); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, NULL); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_params); + /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,

1 0

[commit] r7860 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 14:33:49 2008 New Revision: 7860 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: sigh 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 Tue Mar 11 14:33:49 2008 @@ -684,7 +684,7 @@ if (strchr(stripped, ';')) { if (params) { - new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s&%s%s", + new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s;%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), params, uri_only ? "" : ">"); } else { new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", @@ -692,7 +692,7 @@ } } else { if (params) { - new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s&%s%s", + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s;%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), params, uri_only ? "" : ">"); } else { new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", @@ -702,11 +702,7 @@ } } else { if (params) { - if (strchr(stripped, ';')) { - new_uri = switch_core_session_sprintf(session, "%s&%s", stripped, params); - } else { - new_uri = switch_core_session_sprintf(session, "%s;%s", stripped, params); - } + new_uri = switch_core_session_sprintf(session, "%s;%s", stripped, params); } else { new_uri = stripped; }

1 0

[commit] r7859 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 14:19:17 2008 New Revision: 7859 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add sip_invite_params var 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 Tue Mar 11 14:19:17 2008 @@ -529,7 +529,7 @@ void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip); void sofia_glue_sql_close(sofia_profile_t *profile); int sofia_glue_init_sql(sofia_profile_t *profile); -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only); +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only, const char *params); switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile, switch_bool_t master, switch_mutex_t *mutex, 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 Tue Mar 11 14:19:17 2008 @@ -670,7 +670,7 @@ } } -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only) +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only, const char *params) { char *stripped = switch_core_session_strdup(session, uri); char *new_uri = NULL; @@ -681,16 +681,37 @@ if (switch_stristr("port=", stripped)) { new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", stripped, uri_only ? "" : ">"); } else { + if (strchr(stripped, ';')) { - new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + if (params) { + new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s&%s%s", + uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), params, uri_only ? "" : ">"); + } else { + new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", + uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + } } else { - new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + if (params) { + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s&%s%s", + uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), params, uri_only ? "" : ">"); + } else { + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", + uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + } } } } else { - new_uri = stripped; + if (params) { + if (strchr(stripped, ';')) { + new_uri = switch_core_session_sprintf(session, "%s&%s", stripped, params); + } else { + new_uri = switch_core_session_sprintf(session, "%s;%s", stripped, params); + } + } else { + new_uri = stripped; + } } - + return new_uri; } @@ -963,10 +984,11 @@ } } - url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE); - invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE); - from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE); + url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, + switch_channel_get_variable(tech_pvt->channel, "sip_invite_params")); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE, NULL); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, NULL); /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,

1 0

[commit] r7858 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: brian Date: Tue Mar 11 13:02:23 2008 New Revision: 7858 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Log: update portaudio from last commit 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 Tue Mar 11 13:02:23 2008 @@ -552,7 +552,7 @@ globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; - switch_core_timer_check(&globals.timer); + switch_core_timer_check(&globals.timer, SWITCH_TRUE); *frame = &globals.read_frame; if (!switch_test_flag((&globals), GFLAG_MOUTH)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Tue Mar 11 13:02:23 2008 @@ -127,7 +127,7 @@ numBytes -= bytesWritten; p += bytesWritten; if (numBytes > 0) { - if (switch_core_timer_check(timer) == SWITCH_STATUS_SUCCESS) { + if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { PaUtil_FlushRingBuffer(&aStream->outFIFO); return 0; } @@ -151,7 +151,7 @@ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, numBytes); numBytes -= bytesRead; if (numBytes > 0) { - if (switch_core_timer_check(timer) == SWITCH_STATUS_SUCCESS) { + if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { PaUtil_FlushRingBuffer(&aStream->inFIFO); return 0; }

1 0

[commit] r7857 - in freeswitch/trunk/src: . include
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 12:55:58 2008 New Revision: 7857 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_core_timer.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_time.c Log: fix a bunch more stuff that broke from fixing it yesterday! Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Mar 11 12:55:58 2008 @@ -977,12 +977,15 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer); +SWITCH_DECLARE(switch_status_t) switch_core_timer_sync(switch_timer_t *timer); + /*! \brief Check if the current step has been exceeded \param timer the timer to wait on + \param step increment timer if a tick was detected \return the newest sample count */ -SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer); +SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer, switch_bool_t step); /*! \brief Destroy an allocated timer Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Tue Mar 11 12:55:58 2008 @@ -202,12 +202,14 @@ void *private_info; /*! remaining time from last call to _check()*/ switch_size_t diff; + switch_size_t tick; }; typedef enum { SWITCH_TIMER_FUNC_TIMER_INIT, SWITCH_TIMER_FUNC_TIMER_NEXT, SWITCH_TIMER_FUNC_TIMER_STEP, + SWITCH_TIMER_FUNC_TIMER_SYNC, SWITCH_TIMER_FUNC_TIMER_CHECK, SWITCH_TIMER_FUNC_TIMER_DESTROY } switch_timer_func_name_t; @@ -222,8 +224,10 @@ switch_status_t (*timer_next) (switch_timer_t *); /*! function to step the timer one step */ switch_status_t (*timer_step) (switch_timer_t *); + /*! function to reset the timer */ + switch_status_t (*timer_sync) (switch_timer_t *); /*! function to check if the current step has expired */ - switch_status_t (*timer_check) (switch_timer_t *); + switch_status_t (*timer_check) (switch_timer_t *, switch_bool_t); /*! function to deallocate the timer */ switch_status_t (*timer_destroy) (switch_timer_t *); struct switch_timer_interface *next; Modified: freeswitch/trunk/src/switch_core_timer.c ============================================================================== --- freeswitch/trunk/src/switch_core_timer.c (original) +++ freeswitch/trunk/src/switch_core_timer.c Tue Mar 11 12:55:58 2008 @@ -40,7 +40,7 @@ switch_timer_interface_t *timer_interface; switch_status_t status; memset(timer, 0, sizeof(*timer)); - if ((timer_interface = switch_loadable_module_get_timer_interface(timer_name)) == 0) { + if ((timer_interface = switch_loadable_module_get_timer_interface(timer_name)) == 0 || !timer_interface->timer_init) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid timer %s!\n", timer_name); return SWITCH_STATUS_GENERR; } @@ -66,8 +66,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer) { - if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); + if (!timer->timer_interface || !timer->timer_interface->timer_next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not properly configured.\n"); return SWITCH_STATUS_GENERR; } @@ -81,29 +81,40 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer) { - if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); + if (!timer->timer_interface || !timer->timer_interface->timer_step) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not properly configured.\n"); return SWITCH_STATUS_GENERR; } return timer->timer_interface->timer_step(timer); } -SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer) + +SWITCH_DECLARE(switch_status_t) switch_core_timer_sync(switch_timer_t *timer) +{ + if (!timer->timer_interface || !timer->timer_interface->timer_sync) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not properly configured.\n"); + return SWITCH_STATUS_GENERR; + } + + return timer->timer_interface->timer_sync(timer); +} + +SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer, switch_bool_t step) { - if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); + if (!timer->timer_interface || !timer->timer_interface->timer_check) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not properly configured.\n"); return SWITCH_STATUS_GENERR; } - return timer->timer_interface->timer_check(timer); + return timer->timer_interface->timer_check(timer, step); } SWITCH_DECLARE(switch_status_t) switch_core_timer_destroy(switch_timer_t *timer) { - if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); + if (!timer->timer_interface || !timer->timer_interface->timer_destroy) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not properly configured.\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Mar 11 12:55:58 2008 @@ -1057,7 +1057,7 @@ while (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_HOLD)) { switch_yield(10000); } - + tstatus = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(tstatus)) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Mar 11 12:55:58 2008 @@ -1032,7 +1032,6 @@ rtp_session->last_write_ts = rtp_session->dtmf_data.timestamp_dtmf + rtp_session->dtmf_data.out_digit_sub_sofar; rtp_session->sending_dtmf = 0; if (rtp_session->timer.interval) { - switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5; } @@ -1044,7 +1043,6 @@ void *pop; if (rtp_session->timer.interval) { - switch_core_timer_check(&rtp_session->timer); if (rtp_session->timer.samplecount < rtp_session->next_write_samplecount) { return; } @@ -1069,7 +1067,6 @@ rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; if (rtp_session->timer.interval) { - switch_core_timer_check(&rtp_session->timer); offset = rtp_session->timer.samplecount - rtp_session->last_write_samplecount; if (offset > 0) { rtp_session->dtmf_data.timestamp_dtmf = (uint32_t)(rtp_session->dtmf_data.timestamp_dtmf + offset); @@ -1121,6 +1118,11 @@ bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *) &rtp_session->recv_msg, &bytes); + if (bytes < 0) { + ret = (int) bytes; + goto end; + } + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); bytes = 0; @@ -1134,9 +1136,13 @@ ret = (int) bytes; goto end; } - - if (!SWITCH_STATUS_IS_BREAK(status) && rtp_session->timer.interval) { - switch_core_timer_step(&rtp_session->timer); + + if (rtp_session->timer.interval) { + if (bytes) { + check++; + switch_core_timer_sync(&rtp_session->timer); + } + check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS); } if (bytes && rtp_session->recv_msg.header.version != 2) { @@ -1284,14 +1290,7 @@ goto end; } - if (bytes < 0) { - ret = (int) bytes; - goto end; - } - if (rtp_session->timer.interval) { - check = (uint8_t) (switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) { uint8_t data[10] = { 0 }; @@ -1804,7 +1803,6 @@ } if (rtp_session->timer.interval) { - switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; } rtp_session->last_write_ts = this_ts; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Mar 11 12:55:58 2008 @@ -184,6 +184,7 @@ 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; @@ -202,11 +203,32 @@ } timer->samplecount = (uint32_t) samples; - private_info->reference = TIMER_MATRIX[timer->interval].tick + 1; + private_info->reference++; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t timer_sync(switch_timer_t *timer) +{ + timer_private_t *private_info = timer->private_info; + + if (globals.RUNNING != 1 || private_info->ready == 0) { + return SWITCH_STATUS_FALSE; + } + /* sync the clock */ + private_info->reference = timer->tick = TIMER_MATRIX[timer->interval].tick; + + /* apply timestamp */ + if (timer_step(timer) == SWITCH_STATUS_SUCCESS) { + /* push the reference into the future 2 more intervals to prevent collision */ + private_info->reference += 2; + } + return SWITCH_STATUS_SUCCESS; } + static switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; @@ -225,7 +247,7 @@ return SWITCH_STATUS_FALSE; } -static switch_status_t timer_check(switch_timer_t *timer) +static switch_status_t timer_check(switch_timer_t *timer, switch_bool_t step) { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -236,18 +258,21 @@ check_roll(); - if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { - timer->diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; + timer->tick = TIMER_MATRIX[timer->interval].tick; + + if (timer->tick < private_info->reference) { + timer->diff = private_info->reference - timer->tick; } else { timer->diff = 0; } - - if (timer->diff) { + + if (timer->diff) { status = SWITCH_STATUS_FALSE; - } else { + } else if (step) { timer_step(timer); } + return status; } @@ -348,7 +373,7 @@ } index = (current_ms % i == 0) ? i : 0; - + if (TIMER_MATRIX[index].count) { TIMER_MATRIX[index].tick++; if (TIMER_MATRIX[x].tick == MAX_TICK) { @@ -382,6 +407,7 @@ timer_interface->timer_init = timer_init; timer_interface->timer_next = timer_next; timer_interface->timer_step = timer_step; + timer_interface->timer_sync = timer_sync; timer_interface->timer_check = timer_check; timer_interface->timer_destroy = timer_destroy;

1 0

[commit] r7856 - freeswitch/trunk/src
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 10:08:33 2008 New Revision: 7856 Modified: freeswitch/trunk/src/switch_core_state_machine.c Log: revert some accidential changes in the last commit 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 Tue Mar 11 10:08:33 2008 @@ -113,14 +113,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Route, Aborting\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } - end: if (expanded && dpstr && expanded != dpstr) { free(expanded); } - } static void switch_core_standard_on_execute(switch_core_session_t *session) @@ -297,7 +295,7 @@ #define STATE_MACRO(__STATE, __STATE_STR) do { \ midstate = state; \ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR); \ - if (!driver_state_handler->on_##__STATE || ( driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ + if (!driver_state_handler->on_##__STATE || (driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ && midstate == switch_channel_get_state(session->channel))) { \ while (do_extra_handlers && (application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \ if (!application_state_handler || !application_state_handler->on_##__STATE \ @@ -328,7 +326,7 @@ switch_core_standard_on_##__STATE(session); \ } \ } \ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State end %s %s %s\n", switch_channel_get_name(session->channel), __STATE_STR, switch_channel_state_name(midstate), switch_channel_state_name(switch_channel_get_state(session->channel))); \ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s going to sleep\n", switch_channel_get_name(session->channel), __STATE_STR); \ } while (silly) SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) @@ -434,14 +432,9 @@ } goto done; case CS_INIT: /* Basic setup tasks */ - assert(driver_state_handler->on_init); - //switch_core_session_signal_lock(session); - if (0) STATE_MACRO(init, "INIT"); - //switch_core_session_signal_unlock(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT\n", switch_channel_get_name(session->channel)); - driver_state_handler->on_init(session); - assert( switch_channel_get_state(session->channel) != CS_INIT); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT-END\n", switch_channel_get_name(session->channel)); + switch_core_session_signal_lock(session); + STATE_MACRO(init, "INIT"); + switch_core_session_signal_unlock(session); break; case CS_RING: /* Look for a dialplan and find something to do */ switch_core_session_signal_lock(session); @@ -489,8 +482,6 @@ if (endstate == CS_NEW) { switch_yield(1000); } else { - assert( switch_channel_get_state(session->channel) != CS_INIT); - assert( switch_channel_get_running_state(session->channel) != CS_INIT); switch_thread_cond_wait(session->cond, session->mutex); } }

1 0