- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8487 - freeswitch/trunk/src
by Freeswitch SVN 20 May '08

20 May '08

Author: anthm Date: Tue May 20 11:40:27 2008 New Revision: 8487 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue May 20 11:40:27 2008 @@ -99,7 +99,7 @@ uint32_t loop_count = 0; const char *app_name = NULL, *app_arg = NULL; const char *hook_var = NULL; - int nosuspend = 0; + int inner_bridge = 0; #ifdef SWITCH_VIDEO_IN_THREADS struct vid_helper vh = { 0 }; uint32_t vid_launch = 0; @@ -123,16 +123,24 @@ ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED); } - switch_channel_set_flag(chan_a, CF_BRIDGED); - - nosuspend = switch_channel_test_flag(chan_a, CF_INNER_BRIDGE); + inner_bridge = switch_channel_test_flag(chan_a, CF_INNER_BRIDGE); + + switch_channel_set_flag(chan_a, CF_BRIDGED); + + + switch_channel_wait_for_flag(chan_b, CF_BRIDGED, SWITCH_TRUE, 1000000); + for (;;) { switch_channel_state_t b_state; switch_status_t status; switch_event_t *event; loop_count++; + if (!switch_channel_test_flag(chan_b, CF_BRIDGED)) { + goto end_of_bridge_loop; + } + if (!switch_channel_ready(chan_a)) { goto end_of_bridge_loop; } @@ -160,7 +168,7 @@ switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); } - if (!nosuspend && (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND))) { + if (!inner_bridge && (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND))) { status = switch_core_session_read_frame(session_a, &read_frame, SWITCH_IO_FLAG_NONE, stream_id); if (!SWITCH_READ_ACCEPTABLE(status)) { @@ -290,7 +298,7 @@ } #endif - if (!nosuspend) { + if (!inner_bridge) { hook_var = switch_channel_get_variable(chan_a, SWITCH_API_BRIDGE_END_VARIABLE); } @@ -319,7 +327,7 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - if (!nosuspend && switch_channel_get_state(chan_a) < CS_HANGUP) { + if (!inner_bridge && switch_channel_get_state(chan_a) < CS_HANGUP) { if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { switch_caller_extension_t *extension = NULL; if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { @@ -345,7 +353,9 @@ switch_core_session_reset(session_a, SWITCH_TRUE); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); - switch_channel_clear_flag(chan_a, CF_BRIDGED); + if (!inner_bridge) { + switch_channel_clear_flag(chan_a, CF_BRIDGED); + } switch_core_session_rwunlock(session_b); return NULL; } @@ -648,7 +658,7 @@ switch_channel_state_t state; switch_event_t *event; int br = 0; - int nosuspend = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); + int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); switch_channel_set_flag(caller_channel, CF_ORIGINATOR); switch_channel_clear_flag(caller_channel, CF_TRANSFER); @@ -758,8 +768,7 @@ audio_bridge_thread(NULL, (void *) a_leg); switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); - //make sure this doesnt break anything - + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) { switch_channel_set_state(peer_channel, CS_RESET); } @@ -793,7 +802,7 @@ state = switch_channel_get_state(caller_channel); - if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !nosuspend) { + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !inner_bridge) { if ((state != CS_EXECUTE && state != CS_PARK && state != CS_ROUTING) || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) {

1 0

[commit] r8486 - freeswitch/trunk/src/mod/codecs/mod_ilbc
by Freeswitch SVN 20 May '08

20 May '08

Author: mikej Date: Mon May 19 20:54:43 2008 New Revision: 8486 Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Log: bounds checks to avoid buffer overflow. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Mon May 19 20:54:43 2008 @@ -115,7 +115,7 @@ float buf[240]; for (x = 0; x < loops && new_len < *encoded_data_len; x++) { - for (y = 0; y < context->dbytes / sizeof(short); y++) { + for (y = 0; y < context->dbytes / sizeof(short) && y < 240; y++) { buf[y] = ddp[y]; } iLBC_encode(edp, buf, &context->encoder); @@ -157,7 +157,7 @@ for (x = 0; x < loops && new_len < *decoded_data_len; x++) { iLBC_decode(buf, edp, &context->decoder, 1); - for (y = 0; y < context->dbytes / sizeof(short); y++) { + for (y = 0; y < context->dbytes / sizeof(short) && y < 240; y++) { ddp[y] = (short) buf[y]; } ddp += context->dbytes / sizeof(short);

1 0

[commit] r8485 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:39:48 2008 New Revision: 8485 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: handle allocation error. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:39:48 2008 @@ -1852,6 +1852,8 @@ user = strdup(outbound_profile->destination_number); + if (!user) goto done; + if (!(domain = strchr(user, '@'))) { goto done; }

1 0

[commit] r8484 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:36:25 2008 New Revision: 8484 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: handle allocation error. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:36:25 2008 @@ -1687,7 +1687,10 @@ } path = switch_core_session_strdup(session, data); - if (path && (p = strchr(path, '+'))) { + + if (!path) return; + + if ((p = strchr(path, '+'))) { char *q = p - 1; while(q && *q == ' ') { *q = '\0';

1 0

[commit] r8483 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:34:30 2008 New Revision: 8483 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: tweak error handling. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:34:30 2008 @@ -1436,7 +1436,7 @@ timelimit = atoi(var); } - if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS || !peer_session) { goto end; } @@ -1475,13 +1475,10 @@ switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, bond); } - - end: - if (peer_session) { - switch_core_session_rwunlock(peer_session); - } + switch_core_session_rwunlock(peer_session); + end: switch_channel_set_variable(channel, SWITCH_HOLDING_UUID_VARIABLE, NULL); }

1 0

[commit] r8482 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:26:59 2008 New Revision: 8482 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:26:59 2008 @@ -901,12 +901,14 @@ for (x = 0; x < argc; x++) { char *p, *this = argv[x]; - p = this; - while(*p == ' ') *p++ = '\0'; - this = p; - if (this) { - char *var = this, *val = NULL; + char *var, *val; + p = this; + while(*p == ' ') *p++ = '\0'; + this = p; + + var = this; + val = NULL; if ((val = strchr(var, '='))) { p = val - 1; *val++ = '\0';

1 0

[commit] r8481 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:23:11 2008 New Revision: 8481 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_async.c Log: build tweak Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon May 19 18:23:11 2008 @@ -160,8 +160,8 @@ } switch_bind_flag_t; typedef enum { - SWITCH_DTMF_RECV, - SWITCH_DTMF_SEND + SWITCH_DTMF_RECV = 0, + SWITCH_DTMF_SEND = 1 } switch_dtmf_direction_t; typedef enum { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon May 19 18:23:11 2008 @@ -1309,7 +1309,7 @@ } dtmf_meta_settings_t; typedef struct { - dtmf_meta_settings_t sr[2]; + dtmf_meta_settings_t sr[3]; } dtmf_meta_data_t; #define SWITCH_META_VAR_KEY "__dtmf_meta" @@ -1354,9 +1354,9 @@ if (md->sr[direction].meta_on) { if (dtmf->digit >= '0' && dtmf->digit <= '9') { + int ok = 0; *digit = dtmf->digit; dval = atoi(digit); - int ok = 0; if (direction == SWITCH_DTMF_RECV && (md->sr[direction].map[dval].bind_flags & SBF_DIAL_ALEG)) { ok = 1;

1 0

[commit] r8480 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:17:10 2008 New Revision: 8480 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:17:10 2008 @@ -804,7 +804,15 @@ } else { exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE); var = switch_core_session_strdup(session, data); - val = strchr(var, '='); + if (var) { + val = strchr(var, '='); + if (!strncasecmp(var, "nolocal:", 8)) { + var_name = var + 8; + local = 0; + } else { + var_name = var; + } + } if (val) { *val++ = '\0'; @@ -813,14 +821,7 @@ } } - if (!strncasecmp(var, "nolocal:", 8)) { - var_name = var + 8; - local = 0; - } else { - var_name = var; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var_name, val ? val : "UNDEF"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var_name ? var_name : "", val ? val : "UNDEF"); switch_channel_set_variable(channel, var, val); if (var && val) {

1 0

[commit] r8479 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 18:11:37 2008 New Revision: 8479 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: don't pass NULL to atoi. Found by Klockwork (www.klocwork.com) 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 Mon May 19 18:11:37 2008 @@ -750,16 +750,16 @@ if (!strcasecmp(name, "caller_id_number")) { caller_profile->caller_id_number = val; } - if (!strcasecmp(name, "caller_ton")) { + if (val && !strcasecmp(name, "caller_ton")) { caller_profile->caller_ton = (uint8_t)atoi(val); } - if (!strcasecmp(name, "caller_numplan")) { + if (val && !strcasecmp(name, "caller_numplan")) { caller_profile->caller_numplan = (uint8_t)atoi(val); } - if (!strcasecmp(name, "destination_number_ton")) { + if (val && !strcasecmp(name, "destination_number_ton")) { caller_profile->destination_number_ton = (uint8_t)atoi(val); } - if (!strcasecmp(name, "destination_number_numplan")) { + if (val && !strcasecmp(name, "destination_number_numplan")) { caller_profile->destination_number_numplan = (uint8_t)atoi(val); } if (!strcasecmp(name, "ani")) {

1 0

[commit] r8478 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 17:44:11 2008 New Revision: 8478 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: handle allocation error and potential leak. Found by Klockwork (www.klocwork.com) 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 Mon May 19 17:44:11 2008 @@ -1513,7 +1513,7 @@ timeout = atoi(argv[6]); } - if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, NULL, cid_name, cid_num, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, NULL, cid_name, cid_num, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS || !caller_session) { if (machine) { stream->write_function(stream, "-ERR %s\n", switch_channel_cause2str(cause)); } else { @@ -1555,9 +1555,7 @@ stream->write_function(stream, "+OK Created Session: %s\n", switch_core_session_get_uuid(caller_session)); } - if (caller_session) { - switch_core_session_rwunlock(caller_session); - } + switch_core_session_rwunlock(caller_session); done: switch_safe_free(mycmd); @@ -1715,6 +1713,11 @@ char *reply, *freply = NULL; switch_event_t *event; char *arg; + switch_memory_pool_t *pool; + + if (!job) return NULL; + + pool = job->pool; SWITCH_STANDARD_STREAM(stream); @@ -1747,12 +1750,9 @@ switch_safe_free(stream.data); switch_safe_free(freply); - if (job) { - switch_memory_pool_t *pool = job->pool; - job = NULL; - switch_core_destroy_memory_pool(&pool); - pool = NULL; - } + job = NULL; + switch_core_destroy_memory_pool(&pool); + pool = NULL; return NULL; } @@ -2215,6 +2215,7 @@ switch_xml_free(xml); } else { stream->write_function(stream, "-ERR Unable to create xml!\n"); + switch_event_destroy(&event); switch_core_session_rwunlock(psession); goto done; } @@ -2227,7 +2228,7 @@ switch_event_destroy(&event); free(buf); } else { - abort(); + stream->write_function(stream, "-ERR Allocation error\n"); } switch_core_session_rwunlock(psession);

1 0