- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9204 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: anthm Date: Tue Jul 29 13:54:42 2008 New Revision: 9204 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix jira issue FSCORE-164 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 Jul 29 13:54:42 2008 @@ -111,6 +111,7 @@ char gateway_name[512]; int destroy_nh; int destroy_me; + int is_call; }; #define set_param(ptr,val) if (ptr) {free(ptr) ; ptr = NULL;} if (val) {ptr = strdup(val);} 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 Jul 29 13:54:42 2008 @@ -205,6 +205,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); goto done; } + } else if (sofia_private && sofia_private->is_call) { + sofia_private->destroy_me = 22; } if ((profile->pflags & PFLAG_AUTH_ALL) && tech_pvt && tech_pvt->key && sip) { @@ -353,6 +355,7 @@ nua_handle_bind(nh, NULL); } sofia_private->destroy_me = 12; + free(sofia_private); sofia_private = NULL; } @@ -3559,6 +3562,7 @@ } memset(sofia_private, 0, sizeof(*sofia_private)); + sofia_private->is_call++; tech_pvt->sofia_private = sofia_private; if ((profile->pflags & PFLAG_PRESENCE)) { 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 Jul 29 13:54:42 2008 @@ -1206,7 +1206,10 @@ if (!(sofia_private = malloc(sizeof(*sofia_private)))) { abort(); } + memset(sofia_private, 0, sizeof(*sofia_private)); + sofia_private->is_call++; + tech_pvt->sofia_private = sofia_private; switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); nua_handle_bind(tech_pvt->nh, tech_pvt->sofia_private);

1 0

[commit] r9203 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: brian Date: Tue Jul 29 13:42:55 2008 New Revision: 9203 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix (MODAPP-115) and check-print error on vm-inject if it happens 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 Jul 29 13:42:55 2008 @@ -1389,25 +1389,6 @@ continue; } - if (total_saved_urgent_messages > 0) { - switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved", total_saved_urgent_messages); - TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); - informed++; - } - - if (total_saved_messages > 0 && total_saved_messages != total_saved_urgent_messages) { - switch_snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages); - TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); - informed++; - } - - if (!heard_auto_saved && total_saved_messages + total_saved_urgent_messages > 0) { - heard_auto_saved = 1; - play_msg_type = MSG_SAVED; - vm_check_state = VM_CHECK_PLAY_MESSAGES; - continue; - } - if (!informed) { switch_snprintf(msg_count, sizeof(msg_count), "0:new"); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); @@ -2433,8 +2414,11 @@ if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) { char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); - voicemail_inject(cmd); + if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc); + } } end:

1 0

[commit] r9202 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: brian Date: Tue Jul 29 13:32:30 2008 New Revision: 9202 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix voicemail_inject usage api call 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 Jul 29 13:32:30 2008 @@ -2076,14 +2076,19 @@ static switch_status_t voicemail_inject(const char *data) { vm_profile_t *profile; - char *dup, *user = NULL, *domain = NULL; - switch_status_t status = SWITCH_STATUS_FALSE; + char *dup = NULL, *user = NULL, *domain = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; int istag = 0, isall = 0; int argc = 0; char *argv[4]; char *box, *path, *cid_num, *cid_name; switch_memory_pool_t *pool = NULL; + if (switch_strlen_zero(data)) { + status = SWITCH_STATUS_FALSE; + goto end; + } + dup = strdup(data); switch_assert(dup); @@ -2163,16 +2168,13 @@ switch_core_destroy_memory_pool(&pool); switch_xml_free(xml_root); - } - end: switch_safe_free(dup); return status; - } static switch_status_t voicemail_leave_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id) @@ -3090,13 +3092,14 @@ } } - - +#define VM_INJECT_USAGE "[tag=]<box> <sound_file> [<cid_num>] [<cid_name>]" SWITCH_STANDARD_API(voicemail_inject_api_function) { - voicemail_inject(cmd); - - stream->write_function(stream, "%s", "+OK\n"); + if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "%s", "+OK\n"); + } else { + stream->write_function(stream, "Error: %s\n", VM_INJECT_USAGE); + } return SWITCH_STATUS_SUCCESS; } @@ -3226,7 +3229,7 @@ } SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "voicemail_inject", "voicemail", voicemail_inject_api_function, ""); + SWITCH_ADD_API(commands_api_interface, "voicemail_inject", "voicemail_inject", voicemail_inject_api_function, VM_INJECT_USAGE); SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX); /* indicate that the module should continue to be loaded */

1 0

[commit] r9201 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: anthm Date: Tue Jul 29 12:57:38 2008 New Revision: 9201 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix jira issue MODLANG-74 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 Tue Jul 29 12:57:38 2008 @@ -1095,10 +1095,10 @@ uintN argc = 0; jsval argv[4]; JSObject *Event = NULL; - jsval nval, *rval = &nval; + jsval ret, nval, *rval = &nval; JSContext *cx = cb_state->cx; JSObject *obj = cb_state->obj; - + METHOD_SANITY_CHECK(); jss->stack_depth++; @@ -1148,7 +1148,11 @@ return SWITCH_STATUS_FALSE; } - if (check_hangup_hook(jss, NULL) == JS_TRUE) { + JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); + check_hangup_hook(jss, &ret); + cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); + + if (ret == JS_TRUE) { JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); @@ -1422,13 +1426,10 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - - } + switch_ivr_record_file(jss->session, &fh, file_name, &args, limit); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; return ret; @@ -1480,14 +1481,9 @@ args.buf = bp; args.buflen = len; - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - - } - switch_ivr_collect_digits_callback(jss->session, &args, to); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; return ret; @@ -1560,12 +1556,10 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - } + switch_ivr_phrase_macro(jss->session, phrase_name, phrase_data, phrase_lang, &args); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; return ret; @@ -1704,13 +1698,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - } switch_ivr_play_file(jss->session, &fh, file_name, &args); - check_hangup_hook(jss, &ret); - JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; switch_snprintf(posbuf, sizeof(posbuf), "%u", fh.offset_pos); @@ -1770,12 +1760,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - } switch_ivr_sleep(jss->session, ms, &args); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; return ret; @@ -1961,12 +1948,9 @@ args.buflen = len; switch_core_speech_flush_tts(&jss->speech->sh); - if (check_hangup_hook(jss, NULL) != JS_TRUE) { - return JS_FALSE; - } switch_ivr_speak_text_handle(jss->session, &jss->speech->sh, &jss->speech->codec, NULL, text, &args); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); + check_hangup_hook(jss, &ret); *rval = cb_state.ret; return ret; @@ -2234,8 +2218,8 @@ saveDepth = JS_SuspendRequest(cx); switch_core_session_exec(jss->session, application_interface, app_arg); - check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, saveDepth); + check_hangup_hook(jss, &ret); retval = JS_TRUE; } }

1 0

[commit] r9200 - freeswitch/trunk/src
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: anthm Date: Tue Jul 29 11:42:05 2008 New Revision: 9200 Modified: freeswitch/trunk/src/switch_xml.c Log: fix jira issue (FSCORE-167) Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Jul 29 11:42:05 2008 @@ -1455,53 +1455,65 @@ switch_xml_t *user, switch_event_t *params) { - switch_status_t status; + switch_status_t status = SWITCH_STATUS_FALSE; + switch_event_t *my_params = NULL; + *root = NULL; *user = NULL; *domain = NULL; - if (params) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "key", key); + if (!params) { + switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_assert(my_params); + params = my_params; + } - if (user_name) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user", user_name); - } + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "key", key); - if (domain_name) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain_name); - } + if (user_name) { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user", user_name); + } - if (ip) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "ip", ip); - } + if (domain_name) { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain_name); } - + if (ip) { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "ip", ip); + } + if ((status = switch_xml_locate_domain(domain_name, params, root, domain)) != SWITCH_STATUS_SUCCESS) { - return status; + goto end; } if (ip) { if ((*user = switch_xml_find_child(*domain, "user", "ip", ip))) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto end; } } if (user_name) { - - if (params && switch_event_get_header(params, (char *) "mailbox")) { + if (params != my_params && switch_event_get_header(params, (char *) "mailbox")) { if ((*user = switch_xml_find_child(*domain, "user", "mailbox", user_name))) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto end; } } if ((*user = switch_xml_find_child(*domain, "user", key, user_name))) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto end; } - } - return SWITCH_STATUS_FALSE; + end: + + if (my_params) { + switch_event_destroy(&my_params); + } + + return status; } SWITCH_DECLARE(switch_xml_t) switch_xml_root(void)

1 0

[commit] r9199 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: anthm Date: Tue Jul 29 11:27:41 2008 New Revision: 9199 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: honor keyword silence in fifo MODAPP-118 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jul 29 11:27:41 2008 @@ -454,6 +454,10 @@ } } + if (moh && !strcasecmp(moh, "silence")) { + moh = NULL; + } + check_string(announce); check_string(moh); switch_assert(node);

1 0

[commit] r9198 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: brian Date: Tue Jul 29 11:19:58 2008 New Revision: 9198 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: remove_bugs to zap all the media bugs on a session 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 Jul 29 11:19:58 2008 @@ -373,6 +373,11 @@ switch_channel_ring_ready(switch_core_session_get_channel(session)); } +SWITCH_STANDARD_APP(remove_bugs_function) +{ + switch_core_media_bug_remove_all(session); +} + SWITCH_STANDARD_APP(break_function) { switch_channel_set_flag(switch_core_session_get_channel(session), CF_BREAK); @@ -2223,6 +2228,7 @@ "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "unset", "Unset a channel variable", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "ring_ready", "Indicate Ring_Ready", "Indicate Ring_Ready on a channel.", ring_ready_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "remove_bugs", "Remove media bugs", "Remove all media bugs from a channel.", remove_bugs_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "break", "Break", "Set the break flag.", break_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "detect_speech", "Detect speech", "Detect speech on a channel.", detect_speech_function, DETECT_SPEECH_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "ivr", "Run an ivr menu", "Run an ivr menu.", ivr_application_function, "<menu_name>", SAF_NONE);

1 0

[commit] r9197 - freeswitch/trunk/src/mod/formats/mod_tone_stream
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: anthm Date: Tue Jul 29 11:18:28 2008 New Revision: 9197 Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Log: let silence_stream://0 indicate perpetual silence Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Tue Jul 29 11:18:28 2008 @@ -38,6 +38,7 @@ struct silence_handle { int32_t samples; int silence; + int forever; }; static switch_status_t silence_stream_file_open(switch_file_handle_t *handle, const char *path) @@ -45,31 +46,30 @@ struct silence_handle *sh; int ms; + char *p; sh = switch_core_alloc(handle->memory_pool, sizeof(*sh)); ms = atoi(path); if (ms > 0) { - char *p; - sh->samples = (handle->samplerate / 1000) * ms; + } else { + sh->samples = 0; + sh->forever = 1; + } - if ((p = strchr(path, ','))) { - p++; - ms = atoi(p); - if (ms > 0) { - sh->silence = ms; - } + if ((p = strchr(path, ','))) { + p++; + ms = atoi(p); + if (ms > 0) { + sh->silence = ms; } - - handle->private_info = sh; - return SWITCH_STATUS_SUCCESS; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid format!\n"); - - return SWITCH_STATUS_GENERR; + handle->private_info = sh; + + return SWITCH_STATUS_SUCCESS; } static switch_status_t silence_stream_file_close(switch_file_handle_t *handle) @@ -81,15 +81,17 @@ { struct silence_handle *sh = handle->private_info; - if (sh->samples <= 0) { - return SWITCH_STATUS_FALSE; - } + if (!sh->forever) { + if (sh->samples <= 0) { + return SWITCH_STATUS_FALSE; + } - if (*len > (size_t)sh->samples) { - *len = sh->samples; - } + if (*len > (size_t)sh->samples) { + *len = sh->samples; + } - sh->samples -= *len; + sh->samples -= *len; + } if (sh->silence) { switch_generate_sln_silence((int16_t *) data, *len, sh->silence);

1 0

[commit] r9196 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: mikej Date: Tue Jul 29 11:07:47 2008 New Revision: 9196 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: only treat the right event types as a message (MODAPP-116) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Jul 29 11:07:47 2008 @@ -1820,21 +1820,23 @@ if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { - char *from = switch_event_get_header(event, "from"); - char *to = switch_event_get_header(event, "to"); - char *proto = switch_event_get_header(event, "proto"); - char *subject = switch_event_get_header(event, "subject"); - char *hint = switch_event_get_header(event, "hint"); - char *body = switch_event_get_body(event); - char *p, *freeme = NULL; - - if (to && from && body) { - if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) { - freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain); - to = freeme; + if (event->event_id == SWITCH_EVENT_MESSAGE) { + char *from = switch_event_get_header(event, "from"); + char *to = switch_event_get_header(event, "to"); + char *proto = switch_event_get_header(event, "proto"); + char *subject = switch_event_get_header(event, "subject"); + char *hint = switch_event_get_header(event, "hint"); + char *body = switch_event_get_body(event); + char *p, *freeme = NULL; + + if (to && from && body) { + if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) { + freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain); + to = freeme; + } + chat_send(proto, from, to, subject, body, hint); + switch_safe_free(freeme); } - chat_send(proto, from, to, subject, body, hint); - switch_safe_free(freeme); } switch_event_destroy(&event); }

1 0

[commit] r9195 - in freeswitch/trunk/src/mod: formats/mod_shout languages/mod_spidermonkey xml_int/mod_xml_curl
by Freeswitch SVN 29 Jul '08

29 Jul '08

Author: brian Date: Tue Jul 29 10:40:23 2008 New Revision: 9195 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: make curl follow redirects for a max of 10 levels Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Jul 29 10:40:23 2008 @@ -451,6 +451,8 @@ curl_handle = curl_easy_init(); curl_easy_setopt(curl_handle, CURLOPT_URL, context->stream_url); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) context); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "FreeSWITCH(mod_shout)/1.0"); 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 Tue Jul 29 10:40:23 2008 @@ -2439,6 +2439,8 @@ config_data.name = name; } curl_easy_setopt(curl_handle, CURLOPT_URL, url); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, hash_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); @@ -2481,6 +2483,8 @@ config_data.name = filename; if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { curl_easy_setopt(curl_handle, CURLOPT_URL, url); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); @@ -2532,6 +2536,8 @@ } curl_easy_setopt(curl_handle, CURLOPT_URL, url); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, fetch_url_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Tue Jul 29 10:40:23 2008 @@ -165,6 +165,8 @@ } curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); curl_easy_setopt(curl_handle, CURLOPT_URL, binding->url); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback);

1 0