April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12952 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 11:48:51 2009 New Revision: 12952 Log: ESL-13 Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Wed Apr 8 11:48:51 2009 @@ -140,10 +140,20 @@ static unsigned char console_eofkey(EditLine * el, int ch) { - printf("/exit\n\n"); - running = thread_running = 0; - - return CC_EOF; + LineInfo *line; + /* only exit if empty line */ + line = (LineInfo *)el_line(el); + if (line->buffer == line->lastchar) { + printf("/exit\n\n"); + running = thread_running = 0; + return CC_EOF; + } else { + if (line->cursor != line->lastchar) { + line->cursor++; + el_deletestr(el, 1); + } + return CC_REDISPLAY; + } } #endif

1 0

[commit] r12951 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 11:20:15 2009 New Revision: 12951 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Wed Apr 8 11:20:15 2009 @@ -2395,7 +2395,7 @@ char *codec_order[SWITCH_MAX_CODECS]; const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS] = { 0 }; - if (codec_string) { + if (!switch_strlen_zero(codec_string)) { char *tmp_codec_string; if ((tmp_codec_string = strdup(codec_string))) { num_codecs = switch_separate_string(tmp_codec_string, ',', codec_order, SWITCH_MAX_CODECS);

1 0

[commit] r12950 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: rupa Date: Wed Apr 8 10:54:46 2009 New Revision: 12950 Log: hook reloadxml event Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 8 10:54:46 2009 @@ -56,6 +56,8 @@ char *memcached_str; } globals; +static switch_event_node_t *NODE = NULL; + static switch_status_t config_callback_memcached(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -131,7 +133,7 @@ { memset(&globals, 0, sizeof(globals)); - if (switch_xml_config_parse_module_settings("memcache.conf", SWITCH_FALSE, instructions) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_config_parse_module_settings("memcache.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; } @@ -139,6 +141,12 @@ return SWITCH_STATUS_SUCCESS; } +static void event_handler(switch_event_t *event) +{ + do_config(SWITCH_TRUE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Memcache Reloaded\n"); +} + SWITCH_STANDARD_API(memcache_function) { switch_status_t status; @@ -338,6 +346,11 @@ do_config(SWITCH_FALSE); + if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event!\n"); + return SWITCH_STATUS_TERM; + } + SWITCH_ADD_API(api_interface, "memcache", "Memcache API", memcache_function, "syntax"); /* indicate that the module should continue to be loaded */

1 0

[commit] r12949 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: rupa Date: Wed Apr 8 10:27:42 2009 New Revision: 12949 Log: make -ERR for API call less verbose Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 8 10:27:42 2009 @@ -65,7 +65,7 @@ char *memcached_str = NULL; memcached_return rc; unsigned int servercount; - + if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { memcached_str = *((char**)data->ptr); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcached data: %s\n", memcached_str); @@ -173,6 +173,7 @@ /* clone memcached struct so we're thread safe */ memcached = memcached_clone(NULL, globals.memcached); if (!memcached) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error cloning memcached object"); stream->write_function(stream, "-ERR Error cloning memcached object\n"); } @@ -201,7 +202,7 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "+OK\n"); } else { - stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } } else if (!strcasecmp(subcmd, "get") && argc > 1) { key = argv[1]; @@ -210,7 +211,8 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "%.*s", (int)string_length, val); } else { - stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + switch_safe_free(val); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } switch_safe_free(val); } else if (!strcasecmp(subcmd, "getflags") && argc > 1) { @@ -220,7 +222,8 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "%x", flags); } else { - stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + switch_safe_free(val); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } switch_safe_free(val); } else if ((!strcasecmp(subcmd, "increment") || !strcasecmp(subcmd, "decrement")) && argc > 1) { @@ -238,7 +241,7 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "%ld", ivalue); } else { - stream->write_function(stream, "-ERR Error while running command %s %s: %s\n", subcmd, key, memcached_strerror(memcached, rc)); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } } else if (!strcasecmp(subcmd, "delete") && argc > 1) { key = argv[1]; @@ -250,7 +253,7 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "+OK\n", key); } else { - stream->write_function(stream, "-ERR Error while running command %s %s: %s\n", subcmd, key, memcached_strerror(memcached, rc)); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } } else if (!strcasecmp(subcmd, "flush")) { if(argc > 1) { @@ -261,7 +264,7 @@ if (rc == MEMCACHED_SUCCESS) { stream->write_function(stream, "+OK\n", key); } else { - stream->write_function(stream, "-ERR Error while running command %s : %s\n", subcmd, memcached_strerror(memcached, rc)); + switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error); } } else if (!strcasecmp(subcmd, "status")) { switch_bool_t verbose = SWITCH_FALSE; @@ -303,6 +306,13 @@ } } switch_goto_status(SWITCH_STATUS_SUCCESS, done); + +mcache_error: + if (rc != MEMCACHED_NOTFOUND) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + } + stream->write_function(stream, "-ERR %s\n", memcached_strerror(memcached, rc)); + goto done; usage: stream->write_function(stream, "-ERR\n%s\n", SYNTAX);

1 0

[commit] r12948 - freeswitch/trunk/src
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 02:02:16 2009 New Revision: 12948 Log: Complain about file open errors in XML preprocessing Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed Apr 8 02:02:16 2009 @@ -1249,6 +1249,8 @@ char *tcmd, *targ; if ((read_fd = open(file, O_RDONLY, 0)) < 0) { + const char *reason = strerror(errno); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldnt open %s (%s)\n", file, reason); return read_fd; }

1 0

[commit] r12947 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 01:09:34 2009 New Revision: 12947 Log: doxygen Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 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 Wed Apr 8 01:09:34 2009 @@ -672,6 +672,12 @@ const char *body, const char *type, const char *hint); void sofia_glue_tech_absorb_sdp(private_object_t *tech_pvt); +/* + * \brief Sets the "ep_codec_string" channel variable, parsing r_sdp and taing codec_string in consideration + * \param channel Current channel + * \param codec_string The profile's codec string or NULL if inexistant + * \param sdp The parsed SDP content + */ void sofia_glue_set_r_sdp_codec_string(switch_channel_t *channel,const char *codec_string, sdp_session_t *sdp); switch_status_t sofia_glue_tech_media(private_object_t *tech_pvt, const char *r_sdp); char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len);

1 0

[commit] r12946 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 01:05:56 2009 New Revision: 12946 Log: MODENDP-206 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 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 Wed Apr 8 01:05:56 2009 @@ -671,6 +671,8 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint); void sofia_glue_tech_absorb_sdp(private_object_t *tech_pvt); + +void sofia_glue_set_r_sdp_codec_string(switch_channel_t *channel,const char *codec_string, sdp_session_t *sdp); switch_status_t sofia_glue_tech_media(private_object_t *tech_pvt, const char *r_sdp); char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len); void event_handler(switch_event_t *event); 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 Wed Apr 8 01:05:56 2009 @@ -2886,9 +2886,19 @@ switch_channel_get_name(channel), nua_callstate_name(ss_state), status); if (r_sdp) { + sdp_parser_t *parser; + sdp_session_t *sdp; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp); tech_pvt->remote_sdp_str = switch_core_session_strdup(session, r_sdp); switch_channel_set_variable(channel, SWITCH_R_SDP_VARIABLE, r_sdp); + + if ( sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && (parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) { + if ((sdp = sdp_session(parser))) { + sofia_glue_set_r_sdp_codec_string(channel, (tech_pvt->profile?tech_pvt->profile->codec_string:NULL), sdp); + } + sdp_parser_free(parser); + } sofia_glue_pass_sdp(tech_pvt, (char *) r_sdp); } } 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 Wed Apr 8 01:05:56 2009 @@ -2380,6 +2380,142 @@ } +void sofia_glue_set_r_sdp_codec_string(switch_channel_t *channel,const char *codec_string, sdp_session_t *sdp) +{ + char buf[1024] = {0}; + sdp_media_t *m; + sdp_attribute_t *attr; + int ptime = 0, dptime = 0; + sdp_connection_t *connection; + sdp_rtpmap_t *map; + short int match = 0; + int i; + int already_did[128] = { 0 }; + int num_codecs = 0; + char *codec_order[SWITCH_MAX_CODECS]; + const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS] = { 0 }; + + if (codec_string) { + char *tmp_codec_string; + if ((tmp_codec_string = strdup(codec_string))) { + num_codecs = switch_separate_string(tmp_codec_string, ',', codec_order, SWITCH_MAX_CODECS); + num_codecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, codec_order, num_codecs); + switch_safe_free(tmp_codec_string); + } + } else { + num_codecs = switch_loadable_module_get_codecs(codecs, SWITCH_MAX_CODECS); + } + + if (!channel || !num_codecs) { + return; + } + + for (attr = sdp->sdp_attributes; attr; attr = attr->a_next) { + if (switch_strlen_zero(attr->a_name)) { + continue; + } + + if (!strcasecmp(attr->a_name, "ptime")) { + dptime = atoi(attr->a_value); + break; + } + } + + for (m = sdp->sdp_media; m; m = m->m_next) { + ptime = dptime; + if ( m->m_type == sdp_media_image && m->m_port) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",t38"); + } else if (m->m_type == sdp_media_audio && m->m_port) { + for (attr = m->m_attributes; attr; attr = attr->a_next) { + if (switch_strlen_zero(attr->a_name)) { + continue; + } + if (!strcasecmp(attr->a_name, "ptime") && attr->a_value) { + ptime = atoi(attr->a_value); + break; + } + } + connection = sdp->sdp_connection; + if (m->m_connections) { + connection = m->m_connections; + } + + if (!connection) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n"); + break; + } + + for (i = 0; i < num_codecs; i++) { + const switch_codec_implementation_t *imp = codecs[i]; + if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO || imp->ianacode > 127 || already_did[imp->ianacode]) { + continue; + } + for (map = m->m_rtpmaps; map; map = map->rm_next) { + if ( map->rm_pt > 127 || already_did[map->rm_pt]) { + continue; + } + + if (map->rm_pt < 96) { + match = (map->rm_pt == imp->ianacode) ? 1 : 0; + } else { + if(map->rm_encoding) { + match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1; + } else { + match = 0; + } + } + + if (match) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + already_did[imp->ianacode] = 1; + break; + } + } + } + } else if (m->m_type == sdp_media_video && m->m_port) { + connection = sdp->sdp_connection; + if (m->m_connections) { + connection = m->m_connections; + } + + if (!connection) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n"); + break; + } + for (i = 0; i < num_codecs; i++) { + const switch_codec_implementation_t *imp = codecs[i]; + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO || imp->ianacode > 127 || already_did[imp->ianacode]) { + continue; + } + for (map = m->m_rtpmaps; map; map = map->rm_next) { + if ( map->rm_pt > 127 || already_did[map->rm_pt]) { + continue; + } + + if (map->rm_pt < 96) { + match = (map->rm_pt == imp->ianacode) ? 1 : 0; + } else { + if(map->rm_encoding) { + match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1; + } else { + match = 0; + } + } + + if (match) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + already_did[imp->ianacode] = 1; + break; + } + } + } + } + } + if (buf[0] == ',') { + switch_channel_set_variable(channel, "ep_codec_string", buf + 1); + } +} + switch_status_t sofia_glue_tech_media(private_object_t *tech_pvt, const char *r_sdp) { sdp_parser_t *parser = NULL;

1 0

[commit] r12945 - freeswitch/trunk/conf
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: brian Date: Tue Apr 7 21:44:23 2009 New Revision: 12945 Log: Lets not make XML Parsers mad now Modified: freeswitch/trunk/conf/freeswitch.xml Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Apr 7 21:44:23 2009 @@ -1,3 +1,4 @@ +<?xml version="1.0"?>  -<?xml version="1.0"?> <document type="freeswitch/xml"> <!--#comment All comments starting with #command will be preprocessed and never sent to the xml parser

1 0

[commit] r12944 - in freeswitch/trunk/src: . mod/endpoints/mod_loopback
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: anthm Date: Tue Apr 7 18:44:08 2009 New Revision: 12944 Log: FSCORE-349 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue Apr 7 18:44:08 2009 @@ -57,6 +57,7 @@ struct private_object { unsigned int flags; switch_mutex_t *flag_mutex; + switch_mutex_t *mutex; switch_core_session_t *session; switch_channel_t *channel; switch_core_session_t *other_session; @@ -76,6 +77,7 @@ switch_timer_t timer; switch_caller_profile_t *caller_profile; int32_t bowout_frame_count; + char *other_uuid; }; typedef struct private_object private_t; @@ -185,6 +187,7 @@ if (!tech_pvt->flag_mutex) { switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); @@ -214,6 +217,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !switch_test_flag(tech_pvt, TFLAG_BLEG)) { if (!(b_session = switch_core_session_request(loopback_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) { @@ -221,6 +226,11 @@ goto end; } + if (switch_core_session_read_lock(b_session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure.\n"); + switch_core_session_destroy(&b_session); + goto end; + } switch_core_session_add_stream(b_session, NULL); b_channel = switch_core_session_get_channel(b_session); @@ -244,9 +254,11 @@ tech_pvt->other_tech_pvt = b_tech_pvt; tech_pvt->other_channel = b_channel; - b_tech_pvt->other_session = session; - b_tech_pvt->other_tech_pvt = tech_pvt; - b_tech_pvt->other_channel = channel; + //b_tech_pvt->other_session = session; + //b_tech_pvt->other_tech_pvt = tech_pvt; + //b_tech_pvt->other_channel = channel; + + b_tech_pvt->other_uuid = switch_core_session_strdup(b_session, switch_core_session_get_uuid(session)); switch_set_flag_locked(tech_pvt, TFLAG_LINKED); switch_set_flag_locked(b_tech_pvt, TFLAG_LINKED); @@ -256,7 +268,7 @@ switch_channel_set_flag(channel, CF_ACCEPT_CNG); //switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); switch_ivr_transfer_variable(session, tech_pvt->other_session, NULL); - + switch_channel_set_variable(channel, "other_loopback_leg_uuid", switch_channel_get_uuid(b_channel)); switch_channel_set_variable(b_channel, "other_loopback_leg_uuid", switch_channel_get_uuid(channel)); @@ -265,24 +277,13 @@ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; } + } else if ((tech_pvt->other_session = switch_core_session_locate(tech_pvt->other_uuid))) { + tech_pvt->other_tech_pvt = switch_core_session_get_private(tech_pvt->other_session); + tech_pvt->other_channel = switch_core_session_get_channel(tech_pvt->other_session); } - if (tech_pvt->other_session) { - if (switch_core_session_read_lock(tech_pvt->other_session) != SWITCH_STATUS_SUCCESS) { - tech_pvt->other_session = NULL; - tech_pvt->other_tech_pvt = NULL; - tech_pvt->other_channel = NULL; - switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); - if (b_tech_pvt) { - b_tech_pvt->other_session = NULL; - b_tech_pvt->other_tech_pvt = NULL; - b_tech_pvt->other_channel = NULL; - switch_clear_flag_locked(b_tech_pvt, TFLAG_LINKED); - } - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - goto end; - } - } else { + if (!tech_pvt->other_session) { + switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; } @@ -300,10 +301,12 @@ switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); switch_set_flag_locked(tech_pvt, TFLAG_CNG); + switch_mutex_lock(tech_pvt->mutex); if (tech_pvt->other_tech_pvt) { switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_CNG); } + switch_mutex_unlock(tech_pvt->mutex); } static switch_status_t channel_on_routing(switch_core_session_t *session) @@ -354,10 +357,12 @@ switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); + switch_mutex_lock(tech_pvt->mutex); if (tech_pvt->other_tech_pvt) { switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); tech_pvt->other_tech_pvt = NULL; } + switch_mutex_unlock(tech_pvt->mutex); if (tech_pvt->other_session) { switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); @@ -395,16 +400,20 @@ switch (sig) { case SWITCH_SIG_BREAK: switch_set_flag_locked(tech_pvt, TFLAG_CNG); + switch_mutex_lock(tech_pvt->mutex); if (tech_pvt->other_tech_pvt) { switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_CNG); } + switch_mutex_unlock(tech_pvt->mutex); break; case SWITCH_SIG_KILL: switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); + switch_mutex_lock(tech_pvt->mutex); if (tech_pvt->other_tech_pvt) { switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); } + switch_mutex_unlock(tech_pvt->mutex); break; default: break; @@ -492,6 +501,7 @@ switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; switch_status_t status = SWITCH_STATUS_FALSE; + switch_mutex_t *mutex = NULL; channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); @@ -505,6 +515,9 @@ *frame = NULL; + mutex = tech_pvt->mutex; + switch_mutex_lock(mutex); + while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt) { if (!switch_channel_ready(channel)) { goto end; @@ -550,6 +563,10 @@ end: + if (mutex) { + switch_mutex_unlock(mutex); + } + return status; } @@ -569,6 +586,7 @@ return SWITCH_STATUS_SUCCESS; } + switch_mutex_lock(tech_pvt->mutex); if (!switch_test_flag(tech_pvt, TFLAG_BOWOUT) && tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt, TFLAG_BRIDGE) && @@ -594,7 +612,7 @@ /* channel_masquerade eat your heart out....... */ switch_ivr_uuid_bridge(a_uuid, b_uuid); - + switch_mutex_unlock(tech_pvt->mutex); return SWITCH_STATUS_SUCCESS; } } @@ -615,6 +633,8 @@ status = SWITCH_STATUS_SUCCESS; } + switch_mutex_unlock(tech_pvt->mutex); + return status; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Apr 7 18:44:08 2009 @@ -610,7 +610,7 @@ } switch_mutex_lock(session->write_codec->mutex); - switch_mutex_lock(frame->codec->mutex); + if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { @@ -1002,7 +1002,9 @@ write_frame->timestamp = 0; } - if ((status = perform_write(session, write_frame, flags, stream_id)) != SWITCH_STATUS_SUCCESS) { + status = perform_write(session, write_frame, flags, stream_id); + + if (status != SWITCH_STATUS_SUCCESS) { break; } } @@ -1025,7 +1027,6 @@ error: switch_mutex_unlock(session->write_codec->mutex); - switch_mutex_unlock(frame->codec->mutex); switch_mutex_unlock(session->codec_write_mutex); return status;

1 0

[commit] r12943 - freeswitch/trunk
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: stkn Date: Tue Apr 7 17:07:57 2009 New Revision: 12943 Log: Hide the second test warning message during bootstrap too Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Tue Apr 7 17:07:57 2009 @@ -298,7 +298,7 @@ #only run if AC_PROG_LIBTOOL is in configure.in/configure.ac if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then echo "Running libtoolize..." - if ${libtoolize} -n --install 2>&1 >/dev/null ; then + if ${libtoolize} -n --install >/dev/null 2>&1 ; then $libtoolize --force --copy --install else $libtoolize --force --copy

1 0