October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9891 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 10:22:55 2008 New Revision: 9891 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c Log: tweak evnts Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 8 10:22:55 2008 @@ -1128,6 +1128,27 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", switch_str_nil(codec->implementation->iananame)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); } + + /* Index Caller's Profile */ + if (caller_profile) { + switch_caller_profile_event_set_data(caller_profile, "Caller", event); + } + + if (originator_caller_profile && originatee_caller_profile) { + /* Index Originator's Profile */ + switch_caller_profile_event_set_data(originator_caller_profile, "Originator", event); + + /* Index Originatee's Profile */ + switch_caller_profile_event_set_data(originatee_caller_profile, "Originatee", event); + } else { + /* Index Originator's Profile */ + if (originator_caller_profile) { + switch_caller_profile_event_set_data(originator_caller_profile, "Other-Leg", event); + } else if (originatee_caller_profile) { /* Index Originatee's Profile */ + switch_caller_profile_event_set_data(originatee_caller_profile, "Other-Leg", event); + } + } + if (switch_test_flag(channel, CF_VERBOSE_EVENTS) || event->event_id == SWITCH_EVENT_CHANNEL_ORIGINATE || @@ -1137,28 +1158,10 @@ event->event_id == SWITCH_EVENT_CHANNEL_HANGUP || event->event_id == SWITCH_EVENT_REQUEST_PARAMS || event->event_id == SWITCH_EVENT_CHANNEL_DATA || + event->event_id == SWITCH_EVENT_SESSION_HEARTBEAT || event->event_id == SWITCH_EVENT_CUSTOM ) { - /* Index Caller's Profile */ - if (caller_profile) { - switch_caller_profile_event_set_data(caller_profile, "Caller", event); - } - - if (originator_caller_profile && originatee_caller_profile) { - /* Index Originator's Profile */ - switch_caller_profile_event_set_data(originator_caller_profile, "Originator", event); - - /* Index Originatee's Profile */ - switch_caller_profile_event_set_data(originatee_caller_profile, "Originatee", event); - } else { - /* Index Originator's Profile */ - if (originator_caller_profile) { - switch_caller_profile_event_set_data(originator_caller_profile, "Other-Leg", event); - } else if (originatee_caller_profile) { /* Index Originatee's Profile */ - switch_caller_profile_event_set_data(originatee_caller_profile, "Other-Leg", event); - } - } x = 0; /* Index Variables */ if (channel->variables) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Oct 8 10:22:55 2008 @@ -106,7 +106,6 @@ switch_status_t status; int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; - switch_event_header_t *hi; switch_assert(session != NULL); @@ -131,26 +130,6 @@ switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); switch_channel_event_set_data(session->channel, event); - if (!switch_channel_test_flag(session->channel, CF_VERBOSE_EVENTS)) { - if ((hi = switch_channel_variable_first(session->channel))) { - for (; hi; hi = hi->next) { - char buf[1024] = ""; - char *vvar = NULL, *vval = NULL; - - if (strncasecmp(hi->name, "hb_", 3)) { - continue; - } - - vvar = (char *) hi->name; - vval = (char *) hi->value; - - switch_assert(vvar && vval); - switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, buf, vval); - } - switch_channel_variable_last(session->channel); - } - } switch_event_fire(&event); } else { session->read_frame_count--;

1 0

[commit] r9890 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Tue Oct 7 21:25:42 2008 New Revision: 9890 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak 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 Tue Oct 7 21:25:42 2008 @@ -232,7 +232,7 @@ switch_core_session_rwunlock(session); } } - printf("WTF [%s\n", input); + expanded = switch_event_expand_headers(event, input); stream->write_function(stream, "%s", expanded);

1 0

[commit] r9889 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Tue Oct 7 21:25:30 2008 New Revision: 9889 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_io.c Log: tweak 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 Tue Oct 7 21:25:30 2008 @@ -232,7 +232,7 @@ switch_core_session_rwunlock(session); } } - + printf("WTF [%s\n", input); expanded = switch_event_expand_headers(event, input); stream->write_function(stream, "%s", expanded); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 7 21:25:30 2008 @@ -126,7 +126,7 @@ if (session->read_codec && session->track_duration) { if (session->read_frame_count == 0) { switch_event_t *event; - session->read_frame_count = (session->read_codec->implementation->samples_per_second / + session->read_frame_count = (session->read_codec->implementation->actual_samples_per_second / session->read_codec->implementation->samples_per_frame) * session->track_duration; switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT);

1 0

[commit] r9888 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 18:58:24 2008 New Revision: 9888 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: zigged where we should have zagged Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Oct 7 18:58:24 2008 @@ -1994,7 +1994,7 @@ } if (!auth) { - if (switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { + if (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { auth++; } else if (!thepass) { auth++;

1 0

[commit] r9887 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 18:33:03 2008 New Revision: 9887 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Oct 7 18:33:03 2008 @@ -1944,7 +1944,14 @@ if (!ok) { goto end; + } else { + const char *x_box = switch_xml_attr(x_user, "mailbox"); + + if (x_box) { + myid = switch_core_session_strdup(session, x_box); + } } + } if (!mypass) {

1 0

[commit] r9886 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: mikej Date: Tue Oct 7 18:18:40 2008 New Revision: 9886 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: cleanup 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 Tue Oct 7 18:18:40 2008 @@ -470,7 +470,6 @@ switch_assert(sql != NULL); sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); - //sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); auth_str = switch_mprintf("Digest realm=\"%q\", nonce=\"%q\",%s algorithm=MD5, qop=\"auth\"", realm, uuid_str, stale ? " stale=\"true\"," : ""); @@ -501,7 +500,6 @@ char contact_str[1024] = ""; int nat_hack = 0; uint8_t multi_reg = 0, avoid_multi_reg = 0; - //char buf[512]; uint8_t stale = 0, forbidden = 0; auth_res_t auth_res; long exptime = 60; @@ -756,7 +754,7 @@ return 0; } - call_id = sip->sip_call_id->i_id; //sip_header_as_string(profile->home, (void *) sip->sip_call_id); + call_id = sip->sip_call_id->i_id; switch_assert(call_id); /* Does this profile supports multiple registrations ? */ @@ -1025,7 +1023,7 @@ if (sofia_private && sofia_private->gateway) { switch (status) { case 200: - if (sip && sip->sip_contact) { // && sip->sip_contact->m_expires + if (sip && sip->sip_contact) { sip_contact_t *contact = sip->sip_contact; const char *new_expires; uint32_t expi;

1 0

[commit] r9885 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: mikej Date: Tue Oct 7 18:15:51 2008 New Revision: 9885 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: handle multi contact register responses and register timeout better 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 Oct 7 18:15:51 2008 @@ -958,7 +958,7 @@ gateway->freq, name); gateway->freq = 3600; } - gateway->freq -= 2; + gateway->next = profile->gateways; profile->gateways = gateway; 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 Tue Oct 7 18:15:51 2008 @@ -119,7 +119,12 @@ break; case REG_STATE_REGISTER: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "registered %s\n", gateway_ptr->name); - gateway_ptr->expires = now + gateway_ptr->freq; + if (gateway_ptr->expires > 60) { + gateway_ptr->expires = now + (gateway_ptr->freq - 15); + } else { + gateway_ptr->expires = now + (gateway_ptr->freq - 2); + } + gateway_ptr->state = REG_STATE_REGED; gateway_ptr->status = SOFIA_GATEWAY_UP; break; @@ -1025,9 +1030,14 @@ const char *new_expires; uint32_t expi; if (contact->m_next) { - //const char *sipip = profile->extsipip ? profile->extsipip : profile->sipip; - //find the contact + const char *sipip = profile->extsipip ? profile->extsipip : profile->sipip; + for ( ; contact && strcasecmp(contact->m_url->url_host, sipip); contact = contact->m_next); } + + if (!contact) { + contact = sip->sip_contact; + } + if (contact->m_expires) { new_expires = contact->m_expires; expi = (uint32_t) atoi(new_expires);

1 0

[commit] r9884 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: mikej Date: Tue Oct 7 17:55:58 2008 New Revision: 9884 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: wip 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 Tue Oct 7 17:55:58 2008 @@ -1020,16 +1020,24 @@ if (sofia_private && sofia_private->gateway) { switch (status) { case 200: - if (sip && sip->sip_contact && sip->sip_contact->m_expires) { - char *new_expires = (char *) sip->sip_contact->m_expires; - uint32_t expi = (uint32_t) atoi(new_expires); - - if (expi != sofia_private->gateway->freq) { - sofia_private->gateway->freq = expi; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Changing expire time to %d by request of proxy %s\n", expi, sofia_private->gateway->register_proxy); + if (sip && sip->sip_contact) { // && sip->sip_contact->m_expires + sip_contact_t *contact = sip->sip_contact; + const char *new_expires; + uint32_t expi; + if (contact->m_next) { + //const char *sipip = profile->extsipip ? profile->extsipip : profile->sipip; + //find the contact + } + if (contact->m_expires) { + new_expires = contact->m_expires; + expi = (uint32_t) atoi(new_expires); + + if (expi != sofia_private->gateway->freq) { + sofia_private->gateway->freq = expi; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "Changing expire time to %d by request of proxy %s\n", expi, sofia_private->gateway->register_proxy); + } } - } sofia_private->gateway->state = REG_STATE_REGISTER; break;

1 0

[commit] r9883 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 17:42:31 2008 New Revision: 9883 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Log: more heartbeat work 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 Tue Oct 7 17:42:31 2008 @@ -2321,6 +2321,57 @@ return SWITCH_STATUS_SUCCESS; } +#define HEARTBEAT_SYNTAX "<uuid> <on|off|<seconds>>" +SWITCH_STANDARD_API(uuid_session_heartbeat_function) +{ + char *mycmd = NULL, *argv[2] = { 0 }; + uint32_t seconds = 60; + int argc, tmp; + switch_core_session_t *l_session = NULL; + + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { + goto error; + } + + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc != 2) { + goto error; + } + + if (!(l_session = switch_core_session_locate(argv[0]))) { + stream->write_function(stream, "-ERR Usage: cannot locate session.\n"); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_is_number(argv[1])) { + tmp = atoi(argv[1]); + if (tmp > 0) { + seconds = tmp; + } + } else if (!switch_true(argv[1])) { + seconds = 0; + } + + if (seconds) { + switch_core_session_enable_heartbeat(l_session, seconds); + } else { + switch_core_session_disable_heartbeat(l_session); + } + + switch_core_session_rwunlock(l_session); + + switch_safe_free(mycmd); + stream->write_function(stream, "+OK\n"); + return SWITCH_STATUS_SUCCESS; + + error: + switch_safe_free(mycmd); + stream->write_function(stream, "-ERR Usage: uuid_session_heartbeat %s", HEARTBEAT_SYNTAX); + return SWITCH_STATUS_SUCCESS; + +} + #define SETVAR_SYNTAX "<uuid> <var> <value>" SWITCH_STANDARD_API(uuid_setvar_function) { @@ -2694,6 +2745,7 @@ switch_console_set_complete("add alias add"); switch_console_set_complete("add alias del"); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, ""); + SWITCH_ADD_API(commands_api_interface, "uuid_session_heartbeat", "uuid_session_heartbeat", uuid_session_heartbeat_function, HEARTBEAT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Oct 7 17:42:31 2008 @@ -1633,7 +1633,7 @@ if (switch_is_number(var)) { tmp = atoi(var); - if (tmp > 10) { + if (tmp > 0) { seconds = tmp; } } else if (!switch_true(var)) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 7 17:42:31 2008 @@ -783,14 +783,21 @@ SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).", + + if (seconds < 10) { + seconds = 60; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).\n", switch_channel_get_name(session->channel), seconds); session->track_duration = seconds; + session->read_frame_count = 0; } SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session) { switch_assert(session != NULL); + session->read_frame_count = 0; session->track_duration = 0; }

1 0

[commit] r9882 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 17:03:37 2008 New Revision: 9882 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_event.c Log: add session heartbeat feature 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 Tue Oct 7 17:03:37 2008 @@ -146,6 +146,8 @@ uint8_t raw_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; uint8_t enc_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_codec_t bug_codec; + uint32_t read_frame_count; + uint32_t track_duration; }; struct switch_media_bug { Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Oct 7 17:03:37 2008 @@ -119,6 +119,9 @@ ///\{ +SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds); +SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session); + /*! \brief Add a media bug to the session \param session the session to add the bug to Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 7 17:03:37 2008 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE "enable_heartbeat_events" #define SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE "bypass_media_after_bridge" #define SWITCH_READ_RESULT_VARIABLE "read_result" #define SWITCH_COPY_XML_CDR_VARIABLE "copy_xml_cdr" @@ -1133,6 +1134,7 @@ SWITCH_EVENT_CHANNEL_DATA, SWITCH_EVENT_GENERAL, SWITCH_EVENT_COMMAND, + SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Oct 7 17:03:37 2008 @@ -1627,6 +1627,24 @@ switch_core_session_rwunlock(other_session); } + if ((var = switch_channel_get_variable(channel, SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE))) { + uint32_t seconds = 60; + int tmp; + + if (switch_is_number(var)) { + tmp = atoi(var); + if (tmp > 10) { + seconds = tmp; + } + } else if (!switch_true(var)) { + seconds = 0; + } + + if (seconds) { + switch_core_session_enable_heartbeat(channel->session, seconds); + } + } + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name); if ((var = switch_channel_get_variable(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE)) && !switch_strlen_zero(var)) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 7 17:03:37 2008 @@ -106,6 +106,7 @@ switch_status_t status; int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; + switch_event_header_t *hi; switch_assert(session != NULL); @@ -122,6 +123,41 @@ *frame = NULL; + if (session->read_codec && session->track_duration) { + if (session->read_frame_count == 0) { + switch_event_t *event; + session->read_frame_count = (session->read_codec->implementation->samples_per_second / + session->read_codec->implementation->samples_per_frame) * session->track_duration; + + switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); + switch_channel_event_set_data(session->channel, event); + if (!switch_channel_test_flag(session->channel, CF_VERBOSE_EVENTS)) { + if ((hi = switch_channel_variable_first(session->channel))) { + for (; hi; hi = hi->next) { + char buf[1024] = ""; + char *vvar = NULL, *vval = NULL; + + if (strncasecmp(hi->name, "hb_", 3)) { + continue; + } + + vvar = (char *) hi->name; + vval = (char *) hi->value; + + switch_assert(vvar && vval); + switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, buf, vval); + } + switch_channel_variable_last(session->channel); + } + } + switch_event_fire(&event); + } else { + session->read_frame_count--; + } + } + + if (switch_channel_test_flag(session->channel, CF_HOLD)) { status = SWITCH_STATUS_BREAK; goto even_more_done; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 7 17:03:37 2008 @@ -780,6 +780,20 @@ } +SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) +{ + switch_assert(session != NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).", + switch_channel_get_name(session->channel), seconds); + session->track_duration = seconds; +} + +SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session) +{ + switch_assert(session != NULL); + session->track_duration = 0; +} + static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t *thread, void *obj) { switch_core_session_t *session = obj; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 7 17:03:37 2008 @@ -165,6 +165,7 @@ "CHANNEL_DATA", "GENERAL", "COMMAND", + "SESSION_HEARTBEAT", "ALL" };

1 0