- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4191 - freeswitch/trunk/src
by Freeswitch SVN 10 Feb '07

10 Feb '07

Author: brian Date: Sat Feb 10 12:26:40 2007 New Revision: 4191 Modified: freeswitch/trunk/src/switch_ivr.c Log: Update from Mike Murdock, Thanks Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Feb 10 12:26:40 2007 @@ -1893,7 +1893,7 @@ } } - switch_ivr_speak_text_handle(session, &sh, &codec, timer_name ? &timer : NULL, text, args); + status = switch_ivr_speak_text_handle(session, &sh, &codec, timer_name ? &timer : NULL, text, args); flags = 0; switch_core_speech_close(&sh, &flags); switch_core_codec_destroy(&codec); @@ -4741,7 +4741,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s)\n", func, odata, lang); if (!strcasecmp(func, "play-file")) { - switch_ivr_play_file(session, NULL, odata, args); + status = switch_ivr_play_file(session, NULL, odata, args); } else if (!strcasecmp(func, "break")) { done = 1; break; @@ -4778,6 +4778,7 @@ } if (status != SWITCH_STATUS_SUCCESS) { + done = 1; break; }

1 0

[commit] r4190 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 10 Feb '07

10 Feb '07

Author: anthm Date: Fri Feb 9 20:00:02 2007 New Revision: 4190 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Feb 9 20:00:02 2007 @@ -1054,7 +1054,7 @@ cb_state.session_state = jss; cb_state.cx = cx; cb_state.obj = obj; - dtmf_func = js_stream_input_callback; + dtmf_func = js_collect_input_callback; bp = &cb_state; len = sizeof(cb_state); }

1 0

[commit] r4189 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 10 Feb '07

10 Feb '07

Author: anthm Date: Fri Feb 9 19:28:50 2007 New Revision: 4189 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: wanpipe update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Feb 9 19:28:50 2007 @@ -442,17 +442,9 @@ pri_destroycall(tech_pvt->spri->pri, tech_pvt->call); switch_mutex_lock(globals.channel_mutex); - if (chanmap->map[tech_pvt->callno]) { - chanmap->map[tech_pvt->callno][0] = '\0'; - } + *chanmap->map[tech_pvt->callno] = '\0'; + switch_mutex_unlock(globals.channel_mutex); - /* - pri_hangup(tech_pvt->spri->pri, - tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call, - tech_pvt->cause); - pri_destroycall(tech_pvt->spri->pri, - tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call); - */ } teletone_destroy_session(&tech_pvt->tone_session); @@ -883,7 +875,7 @@ struct sangoma_pri *spri; int span = 0, autospan = 0, autochan = 0; char *num, *p; - int channo = 0; + int callno = 0; struct channel_map *chanmap = NULL; caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -915,7 +907,7 @@ } else if (*num == 'A') { autochan = -1; } else if (num && *num > 47 && *num < 58) { - channo = atoi(num); + callno = atoi(num); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); switch_core_session_destroy(new_session); @@ -952,8 +944,8 @@ } } else { switch_mutex_lock(globals.channel_mutex); - channo = 0; - while (!channo) { + callno = 0; + while (!callno) { if (autospan > 0 && span == MAX_SPANS - 1) { break; } @@ -966,21 +958,21 @@ chanmap = spri->private_info; if (autochan > 0) { - for(channo = 1; channo < SANGOMA_MAX_CHAN_PER_SPAN; channo++) { - if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo][0]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, channo); + for(callno = 1; callno < SANGOMA_MAX_CHAN_PER_SPAN; callno++) { + if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); goto done; } } - channo = 0; + callno = 0; } else if (autochan < 0) { - for(channo = SANGOMA_MAX_CHAN_PER_SPAN; channo > 0; channo--) { - if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo][0]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, channo); + for(callno = SANGOMA_MAX_CHAN_PER_SPAN; callno > 0; callno--) { + if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); goto done; } } - channo = 0; + callno = 0; } } @@ -993,20 +985,22 @@ done: switch_mutex_unlock(globals.channel_mutex); - if (!spri || channo == 0 || channo == (SANGOMA_MAX_CHAN_PER_SPAN)) { + if (!spri || callno == 0 || callno == (SANGOMA_MAX_CHAN_PER_SPAN)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Free Channels!\n"); switch_core_session_destroy(new_session); return SWITCH_CAUSE_SWITCH_CONGESTION; } - + + tech_pvt->callno = callno; + if (spri && (tech_pvt->call = pri_new_call(spri->pri))) { struct pri_sr *sr; - snprintf(name, sizeof(name), "WanPipe/s%dc%d/%s", spri->span, channo, caller_profile->destination_number); + snprintf(name, sizeof(name), "WanPipe/s%dc%d/%s", spri->span, callno, caller_profile->destination_number); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, caller_profile); sr = pri_sr_new(); - pri_sr_set_channel(sr, channo, 0, 0); + pri_sr_set_channel(sr, callno, 0, 0); pri_sr_set_bearer(sr, 0, SPANS[span]->l1); pri_sr_set_called(sr, caller_profile->destination_number, SPANS[span]->dp, 1); pri_sr_set_caller(sr, @@ -1026,16 +1020,16 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - if (!wp_open(tech_pvt, spri->span, channo)) { + if (!wp_open(tech_pvt, spri->span, callno)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); switch_core_session_destroy(new_session); pri_sr_free(sr); return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } pri_sr_free(sr); - switch_copy_string(chanmap->map[channo], + switch_copy_string(chanmap->map[callno], switch_core_session_get_uuid(*new_session), - sizeof(chanmap->map[channo])); + sizeof(chanmap->map[callno])); tech_pvt->spri = spri; } } @@ -1146,7 +1140,7 @@ switch_channel_hangup(channel, tech_pvt->cause); switch_mutex_lock(globals.channel_mutex); - chanmap->map[pevent->hangup.channel][0] = '\0'; + *chanmap->map[pevent->hangup.channel] = '\0'; switch_mutex_unlock(globals.channel_mutex); switch_core_session_rwunlock(session);

1 0

[commit] r4188 - freeswitch/trunk/src
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: mikej Date: Fri Feb 9 17:56:42 2007 New Revision: 4188 Modified: freeswitch/trunk/src/switch_utils.c Log: add some error checking to switch_url_encode function Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Feb 9 17:56:42 2007 @@ -599,7 +599,16 @@ const char urlunsafe[] = "\r\n \"#%&+:;<=>?@[\\]^`{|}"; const char hex[] = "0123456789ABCDEF"; + if (!buf) { + return 0; + } + memset(buf, 0, len); + + if (!url) { + return 0; + } + for( p = url ; *p ; p++) { if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) { if ((x + 3) > len) {

1 0

[commit] r4187 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/languages/mod_spidermonkey
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: mikej Date: Fri Feb 9 17:55:48 2007 New Revision: 4187 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr.c Log: fix paramater checking on switch_ivr_phrase_macro and it's consumers. 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 Fri Feb 9 17:55:48 2007 @@ -128,9 +128,8 @@ if ((mdata = strchr(macro, ','))) { *mdata++ = '\0'; } - if (!(lang = switch_channel_get_variable(channel, "language"))) { - lang = "en"; - } + + lang = switch_channel_get_variable(channel, "language"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, mdata, lang); switch_ivr_phrase_macro(session, macro, mdata, lang, NULL); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Feb 9 17:55:48 2007 @@ -1029,8 +1029,11 @@ if (switch_strlen_zero(phrase_name)) { return JS_FALSE; } + } else { + return JS_FALSE; } + if (argc > 1) { phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 9 17:55:48 2007 @@ -4617,6 +4617,19 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); + if (!macro_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No phrase macro specified.\n"); + return status; + } + + if (!lang) { + lang = "en"; + } + + if (!data) { + data = ""; + } + switch_url_encode(data, enc_hint, sizeof(enc_hint)); snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s", macro_name, lang, enc_hint);

1 0

[commit] r4186 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: mikej Date: Fri Feb 9 16:56:44 2007 New Revision: 4186 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Add session.sayPhrase from Mike Murdock. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Feb 9 16:56:44 2007 @@ -997,6 +997,80 @@ return JS_TRUE; } +/* session.sayphrase(phrase_name, phrase_data, language, dtmf_callback, dtmf_callback_args)*/ + +static JSBool session_sayphrase(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + char *phrase_name = NULL; + char *phrase_data = NULL; + char *phrase_lang = NULL; + //char *input_callback = NULL; + void *bp = NULL; + int len = 0; + switch_input_callback_function_t dtmf_func = NULL; + struct input_callback_state cb_state = {0}; + JSFunction *function; + switch_input_args_t args = {0}; + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + + if (argc > 0) { + phrase_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + if (switch_strlen_zero(phrase_name)) { + return JS_FALSE; + } + } + + if (argc > 1) { + phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + } + + if (argc > 2) { + phrase_lang = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + } + + if (argc > 3) { + if ((function = JS_ValueToFunction(cx, argv[3]))) { + memset(&cb_state, 0, sizeof(cb_state)); + cb_state.function = function; + + if (argc > 4) { + cb_state.arg = argv[4]; + } + + cb_state.session_state = jss; + cb_state.cx = cx; + cb_state.obj = obj; + dtmf_func = js_stream_input_callback; + bp = &cb_state; + len = sizeof(cb_state); + } + } + + cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); + cb_state.saveDepth = JS_SuspendRequest(cx); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; + + switch_ivr_phrase_macro(jss->session, phrase_name, phrase_data, phrase_lang, &args); + + JS_ResumeRequest(cx, cb_state.saveDepth); + *rval = cb_state.ret; + + return JS_TRUE; +} + static JSBool session_streamfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -1623,7 +1697,8 @@ }; static JSFunctionSpec session_methods[] = { - {"streamFile", session_streamfile, 1}, + {"sayPhrase", session_sayphrase, 1}, + {"streamFile", session_streamfile, 1}, {"collectInput", session_collect_input, 1}, {"recordFile", session_recordfile, 1}, {"flushEvents", session_flush_events, 1},

1 0

[commit] r4185 - in freeswitch/trunk/src: . mod/say/mod_say_en
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: anthm Date: Fri Feb 9 16:48:24 2007 New Revision: 4185 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_ivr.c Log: phrase update Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Feb 9 16:48:24 2007 @@ -46,8 +46,11 @@ #define say_file(...) {\ char tmp[80];\ + switch_status_t status;\ snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - switch_ivr_play_file(session, NULL, tmp, args); \ + if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return status;\ + }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ }}\ @@ -540,10 +543,10 @@ } if (say_cb) { - say_cb(session, tosay, type, method, args); + return say_cb(session, tosay, type, method, args); } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_FALSE; } static const switch_say_interface_t en_say_interface= { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 9 16:48:24 2007 @@ -4697,7 +4697,8 @@ } if (match) { - for (action = switch_xml_child(match, "action"); action; action = action->next) { + status = SWITCH_STATUS_SUCCESS; + for (action = switch_xml_child(match, "action"); action && status == SWITCH_STATUS_SUCCESS; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); @@ -4739,7 +4740,7 @@ char *say_type = (char *) switch_xml_attr_soft(action, "type"); char *say_method = (char *) switch_xml_attr_soft(action, "method"); - si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args); + status = si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", lang); } @@ -4747,12 +4748,12 @@ switch_codec_t *read_codec; if ((read_codec = switch_core_session_get_read_codec(session))) { - switch_ivr_speak_text(session, - tts_engine, - tts_voice, - read_codec->implementation->samples_per_second, - odata, - args); + status = switch_ivr_speak_text(session, + tts_engine, + tts_voice, + read_codec->implementation->samples_per_second, + odata, + args); } } } @@ -4763,6 +4764,10 @@ switch_safe_free(substituted); } + if (status != SWITCH_STATUS_SUCCESS) { + break; + } + input = input->next; }

1 0

[commit] r4184 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: mikej Date: Fri Feb 9 16:47:30 2007 New Revision: 4184 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Log: I don't think this has any real effect, but it was easier for me to read while I was debugging.. will probably revert it later. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Fri Feb 9 16:47:30 2007 @@ -930,8 +930,10 @@ SU_DEBUG_9(("sres_query(%p, %p, %s, \"%s\") called\n", (void *)res, (void *)context, sres_record_type(type, b), domain)); - if (res == NULL || domain == NULL) - return su_seterrno(EFAULT), (void *)NULL; + if (res == NULL || domain == NULL) { + su_seterrno(EFAULT); + return NULL; + } dlen = strlen(domain); if (dlen > SRES_MAXDNAME || @@ -943,8 +945,10 @@ /* Reread resolv.conf if needed */ sres_resolver_update(res, 0); - if (res->res_n_servers == 0) - return (void)su_seterrno(ENETDOWN), (sres_query_t *)NULL; + if (res->res_n_servers == 0) { + su_seterrno(ENETDOWN); + return NULL; + } query = sres_query_alloc(res, callback, context, type, domain);

1 0

[commit] r4183 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: anthm Date: Fri Feb 9 16:32:12 2007 New Revision: 4183 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: add option to wanpipe Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Feb 9 16:32:12 2007 @@ -245,6 +245,8 @@ static int str2switch(char *swtype) { + if (!strcasecmp(swtype, "ni1")) + return PRI_SWITCH_NI1; if (!strcasecmp(swtype, "ni2")) return PRI_SWITCH_NI2; if (!strcasecmp(swtype, "dms100"))

1 0

[commit] r4182 - freeswitch/trunk/src
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: anthm Date: Fri Feb 9 15:36:01 2007 New Revision: 4182 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix causes some more Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 9 15:36:01 2007 @@ -3553,7 +3553,7 @@ if (switch_channel_get_state(caller_channel) < CS_HANGUP && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { - switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING); + switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); } return status;

1 0