- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7182 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: mikej Date: Fri Jan 11 17:16:20 2008 New Revision: 7182 Modified: freeswitch/trunk/src/switch_rtp.c Log: type tweaks for windows build. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 17:16:20 2008 @@ -868,7 +868,7 @@ 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 += offset; + rtp_session->dtmf_data.timestamp_dtmf = (uint32_t)(rtp_session->dtmf_data.timestamp_dtmf + offset); } } @@ -1087,7 +1087,7 @@ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; int end = packet[1] & 0x80 ? 1 : 0; - int duration = (packet[2] << 8) + packet[3]; + uint16_t duration = (packet[2] << 8) + packet[3]; char key = switch_rfc2833_to_char(packet[0]); uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq);

1 0

[commit] r7181 - in freeswitch/trunk: conf/autoload_configs conf/dialplan src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: anthm Date: Fri Jan 11 16:59:17 2008 New Revision: 7181 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/src/switch_rtp.c Log: it's better to receive than to give Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Fri Jan 11 16:59:17 2008 @@ -74,7 +74,7 @@   -  + <load module="mod_spidermonkey"/>    Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 11 16:59:17 2008 @@ -248,6 +248,7 @@ </condition> </extension> + <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> <extension name="enum"> @@ -256,6 +257,6 @@ <action application="transfer" data="$1 enum"/> </condition> </extension> - + </context> </include> Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 16:59:17 2008 @@ -103,12 +103,15 @@ char out_digit; unsigned char out_digit_packet[4]; unsigned int out_digit_sofar; + unsigned int out_digit_sub_sofar; unsigned int out_digit_dur; uint16_t in_digit_seq; + uint32_t in_digit_ts; uint32_t timestamp_dtmf; + uint16_t last_duration; + uint32_t flip; + char first_digit; char last_digit; - unsigned int dc; - time_t last_digit_time; switch_queue_t *dtmf_inqueue; switch_mutex_t *dtmf_mutex; }; @@ -127,7 +130,6 @@ uint32_t autoadj_tally; uint16_t seq; - uint32_t ssrc; uint8_t sending_dtmf; switch_payload_t payload; switch_payload_t rpayload; @@ -538,7 +540,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } - rtp_session->ssrc = ssrc; rtp_session->seq = (uint16_t) rand(); rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; @@ -801,20 +802,20 @@ if (rtp_session->dtmf_data.out_digit_dur > 0) { int x, loops = 1; rtp_session->dtmf_data.out_digit_sofar += samples; + rtp_session->dtmf_data.out_digit_sub_sofar += samples; - if (rtp_session->dtmf_data.out_digit_sofar > 0xFFFF) { - rtp_session->dtmf_data.out_digit_sofar = samples; + if (rtp_session->dtmf_data.out_digit_sub_sofar > 0xFFFF) { + rtp_session->dtmf_data.out_digit_sub_sofar = samples; rtp_session->dtmf_data.timestamp_dtmf += 0xFFFF; } if (rtp_session->dtmf_data.out_digit_sofar >= rtp_session->dtmf_data.out_digit_dur) { rtp_session->dtmf_data.out_digit_packet[1] |= 0x80; - rtp_session->dtmf_data.out_digit_dur = 0; loops = 3; } - rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (rtp_session->dtmf_data.out_digit_sofar >> 8); - rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sofar; + rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (rtp_session->dtmf_data.out_digit_sub_sofar >> 8); + rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sub_sofar; for (x = 0; x < loops; x++) { @@ -825,14 +826,23 @@ rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, &flags); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%u dur=%d seq=%d\n", - loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_sofar, rtp_session->seq); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n", + loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, + rtp_session->dtmf_data.timestamp_dtmf, + rtp_session->dtmf_data.out_digit_sofar, + rtp_session->dtmf_data.out_digit_sub_sofar, + rtp_session->dtmf_data.out_digit_dur, + rtp_session->seq); } if (loops != 1) { - rtp_session->last_write_ts = rtp_session->dtmf_data.timestamp_dtmf + rtp_session->dtmf_data.out_digit_sofar; + 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->dtmf_data.out_digit_dur = 0; } } @@ -841,17 +851,27 @@ if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_dtmf_t *rdigit = pop; + int64_t offset; rtp_session->sending_dtmf = 1; memset(rtp_session->dtmf_data.out_digit_packet, 0, 4); rtp_session->dtmf_data.out_digit_sofar = samples; + rtp_session->dtmf_data.out_digit_sub_sofar = samples; rtp_session->dtmf_data.out_digit_dur = rdigit->duration; rtp_session->dtmf_data.out_digit = rdigit->digit; rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; 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 += offset; + } + } + switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, @@ -861,14 +881,14 @@ rtp_session->dtmf_data.timestamp_dtmf, &flags); - switch_log_printf(SWITCH_CHANNEL_LOG, - SWITCH_LOG_DEBUG, - "Send start packet for [%c] ts=%u dur=%d seq=%d\n", - rtp_session->dtmf_data.out_digit, - rtp_session->dtmf_data.timestamp_dtmf, + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send start packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n", + rtp_session->dtmf_data.out_digit, + rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, + rtp_session->dtmf_data.out_digit_sub_sofar, + rtp_session->dtmf_data.out_digit_dur, rtp_session->seq); - + free(rdigit); } } @@ -1059,40 +1079,57 @@ rtp_session->rpayload = (switch_payload_t) rtp_session->recv_msg.header.pt; - /* RFC2833 ... TBD try harder to honor the duration etc. */ - if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) - && rtp_session->recv_msg.header.pt == rtp_session->te) { + /* RFC2833 ... like all RFC RE: VoIP, guarenteed to drive you to insanity! + We know the real rules here, but if we enforce them, it's an interop nightmare so, + we put up with as much as we can so we don't have to deal with being punished for + doing it right. Nice guys finish last! + */ + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; - int end = packet[1] & 0x80; + int end = packet[1] & 0x80 ? 1 : 0; int duration = (packet[2] << 8) + packet[3]; char key = switch_rfc2833_to_char(packet[0]); uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); - - /* SHEESH.... Curse you RFC2833 inventors!!!! */ - if ((switch_timestamp(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { - rtp_session->dtmf_data.last_digit = 0; - rtp_session->dtmf_data.dc = 0; - rtp_session->dtmf_data.in_digit_seq = 0; - } + if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { + uint32_t ts = htonl(rtp_session->recv_msg.header.ts); + //int m = rtp_session->recv_msg.header.m; + rtp_session->dtmf_data.in_digit_seq = in_digit_seq; - if (duration && end) { - if (key != rtp_session->dtmf_data.last_digit) { + + //printf("%c %u %u %u\n", key, in_digit_seq, ts, duration); + + if (rtp_session->dtmf_data.last_duration > duration && ts == rtp_session->dtmf_data.in_digit_ts) { + rtp_session->dtmf_data.flip++; + } + + if (end) { + if (rtp_session->dtmf_data.in_digit_ts) { switch_dtmf_t dtmf = { key, duration }; - switch_timestamp(&rtp_session->dtmf_data.last_digit_time); + + if (ts > rtp_session->dtmf_data.in_digit_ts) { + dtmf.duration += (ts - rtp_session->dtmf_data.in_digit_ts); + } + if (rtp_session->dtmf_data.flip) { + dtmf.duration += rtp_session->dtmf_data.flip * 0xFFFF; + rtp_session->dtmf_data.flip = 0; + //printf("you're welcome!\n"); + } + + //printf("done digit=%c ts=%u start_ts=%u dur=%u ddur=%u\n", + //dtmf.digit, ts, rtp_session->dtmf_data.in_digit_ts, duration, dtmf.duration); switch_rtp_queue_rfc2833_in(rtp_session, &dtmf); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + rtp_session->dtmf_data.last_digit = rtp_session->dtmf_data.first_digit; } - if (++rtp_session->dtmf_data.dc >= 3) { - rtp_session->dtmf_data.last_digit = 0; - rtp_session->dtmf_data.dc = 0; - } + rtp_session->dtmf_data.in_digit_ts = 0; + } else if (!rtp_session->dtmf_data.in_digit_ts) { + rtp_session->dtmf_data.in_digit_ts = ts; + rtp_session->dtmf_data.first_digit = key; + } + + rtp_session->dtmf_data.last_duration = duration; - rtp_session->dtmf_data.last_digit = key; - } else { - rtp_session->dtmf_data.last_digit = 0; - rtp_session->dtmf_data.dc = 0; - } } goto do_continue; } @@ -1302,7 +1339,6 @@ if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; } - send_msg->header.ssrc = htonl(rtp_session->ssrc); } else { uint8_t m = 0;

1 0

[commit] r7180 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: brian Date: Fri Jan 11 13:55:38 2008 New Revision: 7180 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: tweak tones Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Fri Jan 11 13:55:38 2008 @@ -68,9 +68,9 @@  <param name="moh-sound" value="$${moh_uri}"/>  - <param name="enter-sound" value="tone_stream://%(500,0,500,600)"/> + <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>  - <param name="exit-sound" value="tone_stream://%(500,0,300,200)"/> + <param name="exit-sound" value="tone_stream://%(200,0,300,200,100)"/>  <param name="kicked-sound" value="conference/conf-kicked.wav"/>

1 0

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

11 Jan '08

Author: anthm Date: Fri Jan 11 13:46:22 2008 New Revision: 7179 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr_menu.c Log: fix for FSCORE-85 Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Jan 11 13:46:22 2008 @@ -719,7 +719,7 @@ *\return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_add_custom(switch_ivr_menu_xml_ctx_t * xml_menu_ctx, - char *name, switch_ivr_menu_action_function_t * function); + const char *name, switch_ivr_menu_action_function_t * function); /*! *\param xml_menu_ctx A pointer of a XML menu parser context to be created Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Fri Jan 11 13:46:22 2008 @@ -468,7 +468,7 @@ int autocreated; }; -static switch_ivr_menu_xml_map_t *switch_ivr_menu_stack_xml_find(switch_ivr_menu_xml_ctx_t * xml_ctx, char *name) +static switch_ivr_menu_xml_map_t *switch_ivr_menu_stack_xml_find(switch_ivr_menu_xml_ctx_t * xml_ctx, const char *name) { switch_ivr_menu_xml_map_t *map = (xml_ctx != NULL ? xml_ctx->map : NULL); int rc = -1; @@ -480,7 +480,7 @@ return (rc == 0 ? map : NULL); } -static switch_status_t switch_ivr_menu_stack_xml_add(switch_ivr_menu_xml_ctx_t * xml_ctx, char *name, int action, +static switch_status_t switch_ivr_menu_stack_xml_add(switch_ivr_menu_xml_ctx_t * xml_ctx, const char *name, int action, switch_ivr_menu_action_function_t * function) { switch_status_t status = SWITCH_STATUS_FALSE; @@ -512,6 +512,44 @@ return status; } + +static struct iam_s { + const char *name; + switch_ivr_action_t action; +} iam[] = { + { "menu-exit", SWITCH_IVR_ACTION_DIE }, + { "menu-sub", SWITCH_IVR_ACTION_EXECMENU}, + { "menu-exec-app", SWITCH_IVR_ACTION_EXECAPP}, + { "menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND}, + { "menu-say-text", SWITCH_IVR_ACTION_SAYTEXT}, + { "menu-say-phrase", SWITCH_IVR_ACTION_SAYPHRASE}, + { "menu-back", SWITCH_IVR_ACTION_BACK}, + { "menu-top", SWITCH_IVR_ACTION_TOMAIN}, + { "menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER}, + { NULL, 0} +}; + + +static switch_bool_t is_valid_action(const char *action) +{ + int i; + + if (!switch_strlen_zero(action)) { + for(i = 0;;i++) { + if (!iam[i].name) { + break; + } + + if (!strcmp(iam[i].name, action)) { + return SWITCH_TRUE; + } + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Action [%s]\n", switch_str_nil(action)); + return SWITCH_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_xml_ctx_t ** xml_menu_ctx, switch_memory_pool_t *pool) { switch_status_t status = SWITCH_STATUS_FALSE; @@ -537,20 +575,6 @@ } // build the standard/default xml menu handler mappings if (status == SWITCH_STATUS_SUCCESS && xml_menu_ctx != NULL && *xml_menu_ctx != NULL) { - struct iam_s { - char *name; - switch_ivr_action_t action; - } iam[] = { - { - "menu-exit", SWITCH_IVR_ACTION_DIE}, { - "menu-sub", SWITCH_IVR_ACTION_EXECMENU}, { - "menu-exec-app", SWITCH_IVR_ACTION_EXECAPP}, { - "menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND}, { - "menu-say-text", SWITCH_IVR_ACTION_SAYTEXT}, { - "menu-say-phrase", SWITCH_IVR_ACTION_SAYPHRASE}, { - "menu-back", SWITCH_IVR_ACTION_BACK}, { - "menu-top", SWITCH_IVR_ACTION_TOMAIN}, { - "menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER},}; int iam_qty = (sizeof(iam) / sizeof(iam[0])); int i; @@ -563,7 +587,7 @@ } SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_add_custom(switch_ivr_menu_xml_ctx_t * xml_menu_ctx, - char *name, switch_ivr_menu_action_function_t * function) + const char *name, switch_ivr_menu_action_function_t * function) { return switch_ivr_menu_stack_xml_add(xml_menu_ctx, name, -1, function); } @@ -608,7 +632,7 @@ const char *digits = switch_xml_attr(xml_kvp, "digits"); const char *param = switch_xml_attr_soft(xml_kvp, "param"); - if (!switch_strlen_zero(action) && !switch_strlen_zero(digits)) { + if (is_valid_action(action) && !switch_strlen_zero(digits)) { switch_ivr_menu_xml_map_t *xml_map = xml_menu_ctx->map; int found = 0;

1 0

[commit] r7178 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: mikej Date: Fri Jan 11 13:10:39 2008 New Revision: 7178 Modified: freeswitch/trunk/src/switch_rtp.c Log: maintain using our ssrc. (FSCORE-83) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 13:10:39 2008 @@ -127,6 +127,7 @@ uint32_t autoadj_tally; uint16_t seq; + uint32_t ssrc; uint8_t sending_dtmf; switch_payload_t payload; switch_payload_t rpayload; @@ -537,6 +538,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } + rtp_session->ssrc = ssrc; rtp_session->seq = (uint16_t) rand(); rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; @@ -1300,6 +1302,7 @@ if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; } + send_msg->header.ssrc = htonl(rtp_session->ssrc); } else { uint8_t m = 0;

1 0

[commit] r7177 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: anthm Date: Fri Jan 11 11:51:21 2008 New Revision: 7177 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: fix for FSCORE-85 Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Fri Jan 11 11:51:21 2008 @@ -542,15 +542,15 @@ switch_ivr_action_t action; } iam[] = { { - "menu-exit", SWITCH_IVR_ACTION_DIE}, { - "menu-sub", SWITCH_IVR_ACTION_EXECMENU}, { - "menu-exec-api", SWITCH_IVR_ACTION_EXECAPP}, { - "menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND}, { - "menu-say-text", SWITCH_IVR_ACTION_SAYTEXT}, { - "menu-say-phrase", SWITCH_IVR_ACTION_SAYPHRASE}, { - "menu-back", SWITCH_IVR_ACTION_BACK}, { - "menu-top", SWITCH_IVR_ACTION_TOMAIN}, { - "menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER},}; + "menu-exit", SWITCH_IVR_ACTION_DIE}, { + "menu-sub", SWITCH_IVR_ACTION_EXECMENU}, { + "menu-exec-app", SWITCH_IVR_ACTION_EXECAPP}, { + "menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND}, { + "menu-say-text", SWITCH_IVR_ACTION_SAYTEXT}, { + "menu-say-phrase", SWITCH_IVR_ACTION_SAYPHRASE}, { + "menu-back", SWITCH_IVR_ACTION_BACK}, { + "menu-top", SWITCH_IVR_ACTION_TOMAIN}, { + "menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER},}; int iam_qty = (sizeof(iam) / sizeof(iam[0])); int i;

1 0

[commit] r7176 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: anthm Date: Fri Jan 11 11:50:05 2008 New Revision: 7176 Modified: freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_menu.c Log: fix for FSCORE-85 Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 11 11:50:05 2008 @@ -946,6 +946,9 @@ channel = switch_core_session_get_channel(session); switch_channel_clear_flag(channel, CF_BREAK); + + switch_assert(application_interface->application_function); + application_interface->application_function(session, arg); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE) == SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Fri Jan 11 11:50:05 2008 @@ -337,8 +337,6 @@ if (!switch_strlen_zero(menu->buf)) { for (ap = menu->actions; ap; ap = ap->next) { if (!strcmp(menu->buf, ap->bind)) { - char *membuf; - match++; errs = 0; if (ap->function) { @@ -376,24 +374,23 @@ reps = -1; status = switch_ivr_menu_execute(session, stack, aptr, obj); break; - case SWITCH_IVR_ACTION_EXECAPP:{ + case SWITCH_IVR_ACTION_EXECAPP: + { const switch_application_interface_t *application_interface; + char *app_name; + char *app_arg = NULL; + + status = SWITCH_STATUS_FALSE; - if ((membuf = strdup(aptr))) { - char *app_name = membuf; - char *app_arg = strchr(app_name, ' '); - - if (app_arg) { - *app_arg = '\0'; - app_arg++; + if (!switch_strlen_zero(aptr)) { + app_name = switch_core_session_strdup(session, aptr); + if ((app_arg = strchr(app_name, ' '))) { + *app_arg++ = '\0'; } - if (app_name && app_arg) { - if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { - if (application_interface->application_function) { - switch_core_session_exec(session, application_interface, app_arg); - } - } + if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { + switch_core_session_exec(session, application_interface, app_arg); + status = SWITCH_STATUS_SUCCESS; } } }

1 0

[commit] r7175 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: mikej Date: Fri Jan 11 11:01:07 2008 New Revision: 7175 Modified: freeswitch/trunk/src/switch_rtp.c Log: cleanup seq number handling, fix buglet breaking seq number base for 2833 (FSCORE-83) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 11:01:07 2008 @@ -127,7 +127,6 @@ uint32_t autoadj_tally; uint16_t seq; - uint16_t rseq; uint8_t sending_dtmf; switch_payload_t payload; switch_payload_t rpayload; @@ -1056,7 +1055,6 @@ rtp_session->recv_msg.header.pt = 97; } - rtp_session->rseq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); rtp_session->rpayload = (switch_payload_t) rtp_session->recv_msg.header.pt; /* RFC2833 ... TBD try harder to honor the duration etc. */ @@ -1322,7 +1320,6 @@ rtp_session->send_msg.header.ts = htonl(rtp_session->ts); - if ((rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10))) || rtp_session->ts == rtp_session->samples_per_interval) { m++; @@ -1333,8 +1330,7 @@ m++; } send_msg->header.m = m ? 1 : 0; - - + memcpy(send_msg->body, data, datalen); bytes = datalen + rtp_header_len; } @@ -1365,7 +1361,6 @@ time_t now = switch_timestamp(NULL); send = 0; - if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; @@ -1377,7 +1372,6 @@ datalen, rtp_session->vad_data.read_codec->implementation->actual_samples_per_second, decoded, &len, &rate, &codec_flags) == SWITCH_STATUS_SUCCESS) { - uint32_t energy = 0; uint32_t x, y = 0, z = len / sizeof(int16_t); @@ -1457,19 +1451,14 @@ } } - if (rtp_session->sending_dtmf) { - send = 0; - } - this_ts = ntohl(send_msg->header.ts); - if (!this_ts) { + if (rtp_session->sending_dtmf || !this_ts) { send = 0; } if (send) { - rtp_session->seq++; - rtp_session->send_msg.header.seq = htons(rtp_session->seq); + send_msg->header.seq = htons(++rtp_session->seq); if (switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { rtp_session->seq--; @@ -1480,11 +1469,9 @@ switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; } - rtp_session->last_write_ts = this_ts; } - if (rtp_session->ice_user) { if (ice_out(rtp_session) != SWITCH_STATUS_SUCCESS) { return -1; @@ -1583,7 +1570,6 @@ if (switch_test_flag(frame, SFF_RTP_HEADER)) { return switch_rtp_write_manual(rtp_session, frame->data, frame->datalen, frame->m, frame->payload, (uint32_t)(frame->timestamp), &frame->flags); - } if (fwd) { @@ -1605,7 +1591,6 @@ uint8_t m, switch_payload_t payload, uint32_t ts, switch_frame_flag_t *flags) { switch_size_t bytes; - uint16_t mseq; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1619,10 +1604,8 @@ return -1; } - rtp_session->seq++; - mseq = rtp_session->seq; rtp_session->write_msg = rtp_session->send_msg; - rtp_session->write_msg.header.seq = htons(mseq); + rtp_session->write_msg.header.seq = htons(++rtp_session->seq); rtp_session->write_msg.header.ts = htonl(ts); rtp_session->write_msg.header.pt = payload; rtp_session->write_msg.header.m = m ? 1 : 0; @@ -1630,7 +1613,6 @@ bytes = rtp_header_len + datalen; - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { int sbytes = (int) bytes; err_status_t stat; @@ -1639,7 +1621,6 @@ if (stat) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp protection failed with code %d\n", stat); } - bytes = sbytes; } @@ -1648,8 +1629,7 @@ return -1; } - //rtp_session->last_write_ts = ts; - + rtp_session->last_write_ts = ts; return (int) bytes; }

1 0

[commit] r7174 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: mikej Date: Fri Jan 11 01:38:19 2008 New Revision: 7174 Modified: freeswitch/trunk/src/switch_rtp.c Log: set for next digit timestamp. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 01:38:19 2008 @@ -830,6 +830,7 @@ } if (loops != 1) { + rtp_session->last_write_ts = rtp_session->dtmf_data.timestamp_dtmf + rtp_session->dtmf_data.out_digit_sofar; rtp_session->sending_dtmf = 0; } }

1 0

[commit] r7173 - freeswitch/trunk/src
by Freeswitch SVN 11 Jan '08

11 Jan '08

Author: mikej Date: Fri Jan 11 01:28:50 2008 New Revision: 7173 Modified: freeswitch/trunk/src/switch_rtp.c Log: start dtmf at next timestamp. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 01:28:50 2008 @@ -849,7 +849,7 @@ rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; - rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet,

1 0