March 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4441 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:46:33 2007 New Revision: 4441 Modified: freeswitch/trunk/src/switch_config.c Log: fix comments Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Sat Mar 3 20:46:33 2007 @@ -174,7 +174,7 @@ if ((*val = strchr(*var, '=')) == 0) { ret = -1; - //log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); + /* log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); */ continue; } else { p = *val - 1;

1 0

[commit] r4440 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:46:08 2007 New Revision: 4440 Modified: freeswitch/trunk/src/switch_channel.c Log: fix comments Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Mar 3 20:46:08 2007 @@ -667,9 +667,9 @@ state_names[last_state], state_names[state]); - //we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! + /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ if (channel->state < CS_HANGUP) { - // not cool lets crash this bad boy and figure out wtf is going on + /* not cool lets crash this bad boy and figure out wtf is going on */ assert(0); } }

1 0

[commit] r4439 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:45:17 2007 New Revision: 4439 Modified: freeswitch/trunk/src/switch_buffer.c Log: fixing c++ comments Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Sat Mar 3 20:45:17 2007 @@ -171,7 +171,7 @@ buffer->used -= reading; buffer->head += reading; - //if (buffer->id == 4) printf("%u o %d = %d\n", buffer->id, (uint32_t)reading, (uint32_t)buffer->used); + /* if (buffer->id == 4) printf("%u o %d = %d\n", buffer->id, (uint32_t)reading, (uint32_t)buffer->used); */ return reading; } @@ -231,7 +231,7 @@ buffer->used += datalen; buffer->actually_used += datalen; } - //if (buffer->id == 4) printf("%u i %d = %d\n", buffer->id, (uint32_t)datalen, (uint32_t)buffer->used); + /* if (buffer->id == 4) printf("%u i %d = %d\n", buffer->id, (uint32_t)datalen, (uint32_t)buffer->used); */ return buffer->used; }

1 0

[commit] r4438 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia
by Freeswitch SVN 03 Mar '07

03 Mar '07

Author: brian Date: Sat Mar 3 16:02:02 2007 New Revision: 4438 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: Please besure to do "make sure" this should fix the assert people were getting on ALL channel drivers. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat Mar 3 16:02:02 2007 @@ -181,7 +181,7 @@ static switch_status_t channel_on_loopback(switch_core_session_t *session); static switch_status_t channel_on_transmit(switch_core_session_t *session); static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, @@ -1515,7 +1515,7 @@ that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) { struct private_object *tech_pvt; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Sat Mar 3 16:02:02 2007 @@ -427,7 +427,7 @@ static switch_status_t channel_on_loopback(switch_core_session_t *session); static switch_status_t channel_on_transmit(switch_core_session_t *session); static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, @@ -803,7 +803,7 @@ that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) { private_t *tech_pvt; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sat Mar 3 16:02:02 2007 @@ -144,7 +144,7 @@ static switch_status_t channel_on_transmit(switch_core_session_t *session); static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, @@ -828,7 +828,7 @@ that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) { 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 Mar 3 16:02:02 2007 @@ -336,7 +336,7 @@ static switch_status_t sofia_on_transmit(switch_core_session_t *session); static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); @@ -2237,7 +2237,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; switch_core_session_t *nsession; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Mar 3 16:02:02 2007 @@ -3717,7 +3717,7 @@ return NULL; } - if (pool) { + if (pool && *pool) { usepool = *pool; *pool = NULL; } else if (switch_core_new_memory_pool(&usepool) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r4437 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 03 Mar '07

03 Mar '07

Author: brian Date: Sat Mar 3 15:30:10 2007 New Revision: 4437 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: woops 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 Sat Mar 3 15:30:10 2007 @@ -330,7 +330,7 @@ static switch_status_t wanpipe_on_loopback(switch_core_session_t *session); static switch_status_t wanpipe_on_transmit(switch_core_session_t *session); static switch_call_cause_t wanpipe_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t wanpipe_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); static switch_status_t wanpipe_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, @@ -867,7 +867,7 @@ static switch_call_cause_t wanpipe_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { char *bchan = NULL; char name[128] = "";

1 0

[commit] r4436 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 03 Mar '07

03 Mar '07

Author: anthm Date: Fri Mar 2 20:18:51 2007 New Revision: 4436 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add outcall support to nonexistant conferences (needs testing) 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 Fri Mar 2 20:18:51 2007 @@ -4072,7 +4072,18 @@ } if (switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { - switch_ivr_play_file(session, NULL, conference->kicked_sound, NULL); + char *toplay = NULL; + char *dfile = NULL; + + if (conference->sound_prefix) { + assert((dfile = switch_mprintf("%s/%s", conference->sound_prefix, conference->kicked_sound))); + toplay = dfile; + } else { + toplay = conference->kicked_sound; + } + + switch_ivr_play_file(session, NULL, toplay, NULL); + switch_safe_free(dfile); } switch_core_session_reset(session);

1 0

[commit] r4435 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 03 Mar '07

03 Mar '07

Author: anthm Date: Fri Mar 2 20:08:08 2007 New Revision: 4435 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add outcall support to nonexistant conferences (needs testing) 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 Fri Mar 2 20:08:08 2007 @@ -2956,7 +2956,7 @@ if (conference) { conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); } else { - conference_outcall(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + conference_outcall(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); } stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause));

1 0

[commit] r4434 - in freeswitch/trunk/src/mod/applications: mod_commands mod_conference
by Freeswitch SVN 03 Mar '07

03 Mar '07

Author: anthm Date: Fri Mar 2 20:01:37 2007 New Revision: 4434 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add outcall support to nonexistant conferences (needs testing) 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 Fri Mar 2 20:01:37 2007 @@ -35,7 +35,7 @@ #include <switch.h> #include <switch_version.h> -static const switch_state_handler_table_t noop_state_handler = {0}; + static const char modname[] = "mod_commands"; static switch_api_interface_t ctl_api_interface; static switch_api_interface_t uuid_bridge_api_interface; @@ -509,7 +509,7 @@ timeout = atoi(argv[6]); } - if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, NULL, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { if (machine) { stream->write_function(stream, "fail: %s\n", switch_channel_cause2str(cause)); } else { 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 Fri Mar 2 20:01:37 2007 @@ -286,6 +286,7 @@ static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t *conference, + char *conference_name, switch_core_session_t *session, char *bridgeto, uint32_t timeout, @@ -294,6 +295,7 @@ char *cid_num, switch_call_cause_t *cause); static switch_status_t conference_outcall_bg(conference_obj_t *conference, + char *conference_name, switch_core_session_t *session, char *bridgeto, uint32_t timeout, @@ -1248,7 +1250,7 @@ if (argc >= 4) { switch_call_cause_t cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); - conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); + conference_outcall(member->conference, NULL, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference outcall not executed\n"); } @@ -2948,13 +2950,18 @@ assert(stream != NULL); - if(!conference) { - stream->write_function(stream, "Conference %s not found\n", argv[0]); - } else if (argc > 2) { + if (argc > 2) { switch_call_cause_t cause; - conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + + if (conference) { + conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + } else { + conference_outcall(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + } + stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause)); } else { + stream->write_function(stream, "Bad Args\n"); ret_status = SWITCH_STATUS_GENERR; } @@ -2968,12 +2975,15 @@ assert(stream != NULL); - if(!conference) { - stream->write_function(stream, "Conference %s not found\n", argv[0]); - } else if (argc > 2) { - conference_outcall_bg(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); - stream->write_function(stream, "OK\n"); + if (argc > 2) { + if (conference) { + conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]); + } else { + conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]); + } + stream->write_function(stream, "OK\n"); } else { + stream->write_function(stream, "Bad Args\n"); ret_status = SWITCH_STATUS_GENERR; } @@ -3360,7 +3370,7 @@ conf_api_sub_list(NULL, stream, argc, argv); } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { stream->write_function(stream, "%s\n", conf_api_interface.syntax); - } else if (strcasecmp(argv[0], "dial") == 0) { + } else if (argv[1] && strcasecmp(argv[1], "dial") == 0) { if (conf_api_sub_dial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) { /* command returned error, so show syntax usage */ stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_DIAL].psyntax); @@ -3415,6 +3425,7 @@ /* generate an outbound call from the conference */ static switch_status_t conference_outcall(conference_obj_t *conference, + char *conference_name, switch_core_session_t *session, char *bridgeto, uint32_t timeout, @@ -3429,9 +3440,29 @@ switch_channel_t *caller_channel = NULL; char appdata[512]; + *cause = SWITCH_CAUSE_NORMAL_CLEARING; + if (conference == NULL) { + char *dialstr = switch_mprintf("{ignore_early_media=true}%s", bridgeto); + + status = switch_ivr_originate(NULL, &peer_session, cause, dialstr, 60, NULL, cid_name, cid_num, NULL); + switch_safe_free(dialstr); + + if (status != SWITCH_STATUS_SUCCESS) { + return status; + } + + peer_channel = switch_core_session_get_channel(peer_session); + assert(peer_channel != NULL); + + goto callup; + } + + + conference_name = conference->name; + if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); return SWITCH_STATUS_FALSE; @@ -3486,22 +3517,24 @@ switch_channel_answer(caller_channel); } + callup: + /* if the outbound call leg is ready */ if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { switch_caller_extension_t *extension = NULL; /* build an extension name object */ - if ((extension = switch_caller_extension_new(peer_session, conference->name, conference->name)) == 0) { + if ((extension = switch_caller_extension_new(peer_session, conference_name, conference_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); status = SWITCH_STATUS_MEMERR; goto done; } /* add them to the conference */ if (flags && strcasecmp(flags, "none")) { - snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); + snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference_name, flags); switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); } else { - switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference->name); + switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference_name); } switch_channel_set_caller_extension(peer_channel, extension); @@ -3514,7 +3547,9 @@ } done: - switch_thread_rwlock_unlock(conference->rwlock); + if (conference) { + switch_thread_rwlock_unlock(conference->rwlock); + } return status; } @@ -3526,6 +3561,7 @@ char *flags; char *cid_name; char *cid_num; + char *conference_name; }; static void *SWITCH_THREAD_FUNC conference_outcall_run(switch_thread_t *thread, void *obj) @@ -3536,7 +3572,7 @@ switch_call_cause_t cause; switch_event_t *event; - conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); + conference_outcall(call->conference, NULL, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", call->conference->name); @@ -3548,6 +3584,7 @@ switch_safe_free(call->flags); switch_safe_free(call->cid_name); switch_safe_free(call->cid_num); + switch_safe_free(call->conference_name); switch_safe_free(call); } @@ -3555,6 +3592,7 @@ } static switch_status_t conference_outcall_bg(conference_obj_t *conference, + char *conference_name, switch_core_session_t *session, char *bridgeto, uint32_t timeout, @@ -3585,6 +3623,11 @@ if (cid_num) { call->cid_num = strdup(cid_num); } + + if (conference_name) { + call->conference_name = strdup(conference_name); + } + switch_threadattr_create(&thd_attr, conference->pool); switch_threadattr_detach_set(thd_attr, 1); @@ -3882,7 +3925,7 @@ /* if we're using "bridge:" make an outbound call and bridge it in */ if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { switch_call_cause_t cause; - if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) { + if (conference_outcall(conference, NULL, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) { goto done; } } else {

1 0

[commit] r4433 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: anthm Date: Fri Mar 2 18:50:13 2007 New Revision: 4433 Modified: freeswitch/trunk/src/switch_core.c Log: pesky * bug Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 2 18:50:13 2007 @@ -3717,7 +3717,7 @@ return NULL; } - if (*pool) { + if (pool) { usepool = *pool; *pool = NULL; } else if (switch_core_new_memory_pool(&usepool) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r4432 - in freeswitch/trunk/src: . include mod/endpoints/mod_woomera
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: brian Date: Fri Mar 2 18:38:01 2007 New Revision: 4432 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: fix potential naughty bug you will need 'make sure' Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Mar 2 18:38:01 2007 @@ -428,7 +428,7 @@ \param pool the pool to use for the allocation (a new one will be used if NULL) \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t **pool); /*! \brief Destroy a session and return the memory pool to the core @@ -449,7 +449,7 @@ \param pool the pool to use \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char *endpoint_name, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char *endpoint_name, switch_memory_pool_t **pool); /*! \brief Launch the session thread (state machine) on a given session @@ -649,7 +649,7 @@ char *endpoint_name, switch_caller_profile_t *caller_profile, switch_core_session_t **new_session, - switch_memory_pool_t *pool); + switch_memory_pool_t **pool); /*! \brief Answer the channel of a given session Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Fri Mar 2 18:38:01 2007 @@ -172,7 +172,7 @@ /*! \brief A table of i/o routines that an endpoint interface can implement */ struct switch_io_routines { /*! creates an outgoing session from given session, caller profile */ - switch_call_cause_t (*outgoing_channel)(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t *); + switch_call_cause_t (*outgoing_channel)(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t **); /*! answers the given session's channel */ switch_status_t (*answer_channel)(switch_core_session_t *); /*! read a frame from a session */ Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Mar 2 18:38:01 2007 @@ -170,7 +170,7 @@ static switch_status_t woomera_on_loopback(switch_core_session_t *session); static switch_status_t woomera_on_transmit(switch_core_session_t *session); static switch_call_cause_t woomera_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool); + switch_core_session_t **new_session, switch_memory_pool_t **pool); static switch_status_t woomera_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); static switch_status_t woomera_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, @@ -482,7 +482,7 @@ that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ static switch_call_cause_t woomera_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, switch_memory_pool_t *pool) + switch_core_session_t **new_session, switch_memory_pool_t **pool) { if ((*new_session = switch_core_session_request(&woomera_endpoint_interface, pool)) != 0) { struct private_object *tech_pvt; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 2 18:38:01 2007 @@ -1596,7 +1596,7 @@ char *endpoint_name, switch_caller_profile_t *caller_profile, switch_core_session_t **new_session, - switch_memory_pool_t *pool) + switch_memory_pool_t **pool) { switch_io_event_hook_outgoing_channel_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; @@ -3693,8 +3693,8 @@ return ptr; } -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, - switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t **pool) + { switch_memory_pool_t *usepool; switch_core_session_t *session; @@ -3717,8 +3717,9 @@ return NULL; } - if (pool) { - usepool = pool; + if (*pool) { + usepool = *pool; + *pool = NULL; } else if (switch_core_new_memory_pool(&usepool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); return NULL; @@ -3778,7 +3779,7 @@ return runtime.session_count; } -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char *endpoint_name, switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char *endpoint_name, switch_memory_pool_t **pool) { const switch_endpoint_interface_t *endpoint_interface; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Mar 2 18:38:01 2007 @@ -2750,7 +2750,7 @@ } } - if ((reason = switch_core_session_outgoing_channel(session, chan_type, caller_profiles[i], &peer_sessions[i], pool)) != SWITCH_CAUSE_SUCCESS) { + if ((reason = switch_core_session_outgoing_channel(session, chan_type, caller_profiles[i], &peer_sessions[i], &pool)) != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! cause: %s\n", switch_channel_cause2str(reason)); if (pool) { switch_core_destroy_memory_pool(&pool);

1 0