August 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9241 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 14:24:07 2008 New Revision: 9241 Modified: freeswitch/trunk/src/switch_time.c Log: move init sooner in timer module Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Aug 11 14:24:07 2008 @@ -309,9 +309,6 @@ switch_time_sync(); - memset(&globals, 0, sizeof(globals)); - switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); - globals.STARTED = globals.RUNNING = 1; switch_mutex_lock(runtime.throttle_mutex); runtime.sps = runtime.sps_total; @@ -430,6 +427,9 @@ switch_timer_interface_t *timer_interface; module_pool = pool; + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); timer_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_TIMER_INTERFACE);

1 0

[commit] r9240 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: mikej Date: Mon Aug 11 13:47:06 2008 New Revision: 9240 Modified: freeswitch/trunk/src/switch_console.c Log: fix a little leak reported by skopii Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Aug 11 13:47:06 2008 @@ -165,7 +165,7 @@ { char *errmsg = NULL; char *r = NULL; - char *sql; + char *sql = NULL; char *exp = NULL; switch_core_db_t *db = switch_core_db_handle(); int full = 0; @@ -179,6 +179,8 @@ free(errmsg); } + switch_safe_free(sql); + if (!r) { sql = switch_mprintf("select command from aliases where alias='%q %q'", cmd, arg); @@ -193,6 +195,7 @@ } } + switch_safe_free(sql); if (r) { if (arg && !full) {

1 0

[commit] r9239 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 12:50:45 2008 New Revision: 9239 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix pool hoarding of mem in js 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 Mon Aug 11 12:50:45 2008 @@ -83,8 +83,8 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_set_callerdata(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); -static switch_api_interface_t js_run_interface; -static switch_api_interface_t jsapi_interface; +static switch_api_interface_t *js_run_interface = NULL; +static switch_api_interface_t *jsapi_interface = NULL; static struct { size_t gStackChunkSize; @@ -3559,37 +3559,50 @@ js_parse_and_execute(session, data, NULL); } +struct js_task { + switch_memory_pool_t *pool; + char *code; +}; + static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t *thread, void *obj) { - char *input_code = obj; + struct js_task *task = (struct js_task *) obj; + switch_memory_pool_t *pool; - js_parse_and_execute(NULL, input_code, NULL); + js_parse_and_execute(NULL, task->code, NULL); - if (input_code) { - free(input_code); + if ((pool = task->pool)) { + switch_core_destroy_memory_pool(&pool); } return NULL; } -static switch_memory_pool_t *module_pool = NULL; - static void js_thread_launch(const char *text) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; + struct js_task *task; + switch_memory_pool_t *pool; - if (!module_pool) { - if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); - return; - } + if (switch_strlen_zero(text)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "missing required input!\n"); + return; } - switch_threadattr_create(&thd_attr, module_pool); + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return; + } + + task = switch_core_alloc(pool, sizeof(*task)); + task->pool = pool; + task->code = switch_core_strdup(pool, text); + + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, js_thread_run, strdup(text), module_pool); + switch_thread_create(&thread, thd_attr, js_thread_run, task, pool); } SWITCH_STANDARD_API(jsapi_function) @@ -3606,7 +3619,7 @@ } if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", jsapi_interface.syntax); + stream->write_function(stream, "USAGE: %s\n", jsapi_interface->syntax); return SWITCH_STATUS_SUCCESS; } @@ -3622,7 +3635,7 @@ SWITCH_STANDARD_API(launch_async) { if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", js_run_interface.syntax); + stream->write_function(stream, "USAGE: %s\n", js_run_interface->syntax); return SWITCH_STATUS_SUCCESS; } @@ -3654,7 +3667,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) { - switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; switch_status_t status; @@ -3670,8 +3682,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(api_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]"); - SWITCH_ADD_API(api_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]"); + SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]"); + SWITCH_ADD_API(jsapi_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]"); SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r9238 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 12:12:55 2008 New Revision: 9238 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: add some clarification Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Aug 11 12:12:55 2008 @@ -1186,7 +1186,8 @@ SWITCH_CAUSE_ALLOTTED_TIMEOUT = 602, SWITCH_CAUSE_USER_CHALLENGE = 603, SWITCH_CAUSE_MEDIA_TIMEOUT = 604, - SWITCH_CAUSE_PICKED_OFF = 605 + SWITCH_CAUSE_PICKED_OFF = 605, + SWITCH_CAUSE_USER_NOT_REGISTERED = 606 } switch_call_cause_t; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 11 12:12:55 2008 @@ -1616,8 +1616,8 @@ char *p; sofia_profile_t *profile = NULL; const char *exclude_contact = NULL; - char *reply = ""; - + char *reply = "error/facility_not_subscribed"; + if (!cmd) { stream->write_function(stream, "%s", ""); return SWITCH_STATUS_SUCCESS; @@ -1696,8 +1696,14 @@ if (!switch_strlen_zero(reply) && end_of(reply) == ',') { end_of(reply) = '\0'; } + + if (switch_strlen_zero(reply)) { + reply = "error/user_not_registered"; + } + stream->write_function(stream, "%s", reply); reply = NULL; + switch_safe_free(mystream.data); } } @@ -1960,7 +1966,7 @@ tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, host); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host); - cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; + cause = SWITCH_CAUSE_USER_NOT_REGISTERED; goto error; } } else if (!(host = strchr(dest, '@'))) { @@ -1972,7 +1978,7 @@ host = profile_name; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); - cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; + cause = SWITCH_CAUSE_USER_NOT_REGISTERED; goto error; } } else { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 12:12:55 2008 @@ -101,6 +101,7 @@ {"USER_CHALLENGE", SWITCH_CAUSE_USER_CHALLENGE}, {"MEDIA_TIMEOUT", SWITCH_CAUSE_MEDIA_TIMEOUT}, {"PICKED_OFF", SWITCH_CAUSE_PICKED_OFF}, + {"USER_NOT_REGISTERED", SWITCH_CAUSE_USER_NOT_REGISTERED}, {NULL, 0} }; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Aug 11 12:12:55 2008 @@ -536,10 +536,16 @@ char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; + *bleg = NULL; + + if (!strncasecmp(bridgeto, "error/", 6)) { + *cause = switch_channel_str2cause(bridgeto + 6); + return SWITCH_STATUS_SUCCESS; + } + switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; - *bleg = NULL; odata = strdup(bridgeto); if (!odata) {

1 0

[commit] r9237 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 12:11:50 2008 New Revision: 9237 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: extra blank-string protection 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 Mon Aug 11 12:11:50 2008 @@ -2384,7 +2384,9 @@ expanded = NULL; } if (!strncasecmp(file, "say:", 4)) { - status = conference_member_say(member, file + 4, leadin); + if (!switch_strlen_zero(file + 4)) { + status = conference_member_say(member, file + 4, leadin); + } goto done; } if (!switch_is_file_path(file)) { @@ -2393,7 +2395,7 @@ goto done; } file = dfile; - } else { + } else if (!switch_strlen_zero(file)) { status = conference_member_say(member, file, leadin); goto done; } @@ -2721,7 +2723,7 @@ return SWITCH_STATUS_GENERR; switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->muted_sound) { + if (!switch_strlen_zero(member->conference->muted_sound)) { conference_member_play_file(member, member->conference->muted_sound, 0); } else { char msg[512]; @@ -2753,7 +2755,7 @@ if (stream != NULL) { stream->write_function(stream, "OK unmute %u\n", member->id); } - if (member->conference->unmuted_sound) { + if (!switch_strlen_zero(member->conference->unmuted_sound)) { conference_member_play_file(member, member->conference->unmuted_sound, 0); } else { char msg[512];

1 0

[commit] r9236 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 11:37:50 2008 New Revision: 9236 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: fix out-of-bounds pointer in variable expansion detected by MSCV (thanks for nothing linux) FSCORE-171 Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 11:37:50 2008 @@ -1598,7 +1598,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, const char *in) { char *p, *c = NULL; - char *data, *indup; + char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; const char *q; char *cloned_sub_val = NULL, *sub_val = NULL; @@ -1632,11 +1632,12 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); + endof_indup = end_of_p(indup); if ((data = malloc(olen))) { memset(data, 0, olen); c = data; - for (p = indup; p && *p; p++) { + for (p = indup; p && p < endof_indup && *p; p++) { vtype = 0; if (*p == '\\') { @@ -1699,7 +1700,7 @@ e++; } - p = e; + p = e > endof_indup ? endof_indup : e; if ((vval = strchr(vname, '('))) { e = vval - 1; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Aug 11 11:37:50 2008 @@ -1190,7 +1190,7 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in) { char *p, *c = NULL; - char *data, *indup; + char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; const char *q, *sub_val = NULL; char *cloned_sub_val = NULL; @@ -1219,11 +1219,12 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); + endof_indup = end_of_p(indup); if ((data = malloc(olen))) { memset(data, 0, olen); c = data; - for (p = indup; p && *p; p++) { + for (p = indup; p && p < endof_indup && *p; p++) { vtype = 0; if (*p == '\\') { @@ -1286,7 +1287,7 @@ e++; } - p = e; + p = e > endof_indup ? endof_indup : e; if ((vval = strchr(vname, '('))) { e = vval - 1;

1 0

[commit] r9235 - freeswitch/trunk/libs/stfu
by Freeswitch SVN 10 Aug '08

10 Aug '08

Author: anthm Date: Sat Aug 9 22:17:21 2008 New Revision: 9235 Modified: freeswitch/trunk/libs/stfu/stfu.c Log: STFU n FIX Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Sat Aug 9 22:17:21 2008 @@ -125,7 +125,7 @@ } for(index = 0; index < STFU_MAX_TRACK; index++) { - if (track[index] > most) { + if (track[index] > track[most]) { most = index; } }

1 0

[commit] r9234 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Aug '08

10 Aug '08

Author: anthm Date: Sat Aug 9 21:41:46 2008 New Revision: 9234 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix MODENDP-124 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Aug 9 21:41:46 2008 @@ -162,6 +162,7 @@ static int hangup_cause_to_sip(switch_call_cause_t cause) { switch (cause) { + case SWITCH_CAUSE_UNALLOCATED_NUMBER: case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET: case SWITCH_CAUSE_NO_ROUTE_DESTINATION: return 404; @@ -170,7 +171,6 @@ case SWITCH_CAUSE_NO_USER_RESPONSE: return 408; case SWITCH_CAUSE_NO_ANSWER: - return 480; case SWITCH_CAUSE_SUBSCRIBER_ABSENT: return 480; case SWITCH_CAUSE_CALL_REJECTED:

1 0

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

07 Aug '08

Author: anthm Date: Thu Aug 7 11:44:29 2008 New Revision: 9233 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Aug 7 11:44:29 2008 @@ -1649,7 +1649,7 @@ profile->context = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - if (!profile->extsipip && switch_check_network_list_ip(profile->sipip, val)) { + if (!profile->extsipip && profile->sipip && switch_check_network_list_ip(profile->sipip, val)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not adding acl %s because it's the local network\n", val); } else { profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val);

1 0

[commit] r9232 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: anthm Date: Wed Aug 6 19:33:58 2008 New Revision: 9232 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add patch from MODAPP-123 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 Wed Aug 6 19:33:58 2008 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Bret McDanel <trixter AT 0xdecafbad.com> + * John Wehle (john(a)feith.com) * * mod_voicemail.c -- Voicemail Module * @@ -2785,8 +2786,8 @@ char read_date[80] = ""; char rss_date[80] = ""; switch_size_t retsize; - long l_created = 0; - long l_read = 0; + switch_time_t l_created = 0; + switch_time_t l_read = 0; long l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; @@ -2796,11 +2797,11 @@ char title_aft[128 * 3] = ""; if (argc > 0) { - l_created = atol(argv[0]) * 1000000; + l_created = switch_time_make (atol(argv[0]), 0); } if (argc > 1) { - l_read = atol(argv[1]) * 1000000; + l_read = switch_time_make (atol(argv[1]), 0); } if (argc > 9) { @@ -2877,8 +2878,8 @@ char *fname; switch_size_t flen; switch_file_t *fd; - long l_created = 0; - long l_read = 0; + switch_time_t l_created = 0; + switch_time_t l_read = 0; long l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; @@ -2886,11 +2887,11 @@ char heard[80]; if (argc > 0) { - l_created = atol(argv[0]) * 1000000; + l_created = switch_time_make (atol(argv[0]), 0); } if (argc > 1) { - l_read = atol(argv[1]) * 1000000; + l_read = switch_time_make (atol(argv[1]), 0); } if (argc > 9) {

1 0