- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r12942 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 16:34:31 2009 New Revision: 12942 Log: temporary hack to avoid segfaults on 503 w/ retry-after and 423 responses to CANCEL (and maybe others) (SFSIP-134) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Tue Apr 7 16:34:31 2009 @@ -1140,7 +1140,7 @@ if (status == 423) { unsigned my_expires = 0; - if (cr->cr_sip->sip_expires) + if (cr->cr_sip && cr->cr_sip->sip_expires) my_expires = cr->cr_sip->sip_expires->ex_delta; if (sip->sip_min_expires && @@ -1195,7 +1195,8 @@ } } - if (0 && 500 <= status && status < 600 && + if (500 <= status && status < 600 && + cr->cr_sip && sip->sip_retry_after && sip->sip_retry_after->af_delta < 32) { su_timer_t *timer;

1 0

[commit] r12941 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 15:53:42 2009 New Revision: 12941 Log: temporary hack to ignore retry-after so we can avoid segfault (SFSIP-134) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Tue Apr 7 15:53:42 2009 @@ -1195,7 +1195,7 @@ } } - if (500 <= status && status < 600 && + if (0 && 500 <= status && status < 600 && sip->sip_retry_after && sip->sip_retry_after->af_delta < 32) { su_timer_t *timer; @@ -1219,6 +1219,7 @@ nua_client_report(cr, 100, phrase, NULL, orq, NULL); nta_outgoing_destroy(orq); cr->cr_status = 0, cr->cr_phrase = NULL; + return 1; }

1 0

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

07 Apr '09

Author: mikej Date: Tue Apr 7 15:04:22 2009 New Revision: 12940 Log: hide warning from test in bootstrap Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Tue Apr 7 15:04:22 2009 @@ -196,7 +196,7 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -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

[commit] r12939 - in freeswitch/trunk: build src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 14:48:50 2009 New Revision: 12939 Log: fix error loading mod_spidermonkey due to missing PR_* symbols Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Apr 7 14:48:50 2009 @@ -112,9 +112,9 @@ @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Tue Apr 7 14:48:50 2009 @@ -3,7 +3,8 @@ JSLA=$(JS_DIR)/libjs.la LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1 -LOCAL_LIBADD+=$(JSLA) $(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LDFLAGS_POST=$(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LIBADD+=$(JSLA) include $(switch_srcdir)/build/modmake.rules

1 0

[commit] r12938 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 14:30:07 2009 New Revision: 12938 Log: tweak the configs to bind siptrace on and off to F10 and F11 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Tue Apr 7 14:30:07 2009 @@ -10,8 +10,8 @@ <key name="7" value="console loglevel 0"/> <key name="8" value="console loglevel 7"/> <key name="9" value="sofia status profile internal"/> - <key name="10" value="fsctl pause"/> - <key name="11" value="fsctl resume"/> + <key name="10" value="sofia profile internal siptrace on"/> + <key name="11" value="sofia profile internal siptrace off"/> <key name="12" value="version"/> </cli-keybindings>

1 0

[commit] r12937 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: gmaruzz Date: Tue Apr 7 11:31:36 2009 New Revision: 12937 Log: skypiax: modified configs/startskype.sh to specify which unix user will start the Skype client instance. Thx to mbrancaleoni(a)voismart.it Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh Tue Apr 7 11:31:36 2009 @@ -11,14 +11,14 @@ /usr/bin/Xvfb :101 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 -# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the "username password" you send to it on stdin. Here xxx would be the password and skypiax1 the username -echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype --pipelogin & +# as user "unixusername", start a Skype client instance that will connect to the X server above, and will login to the Skype network using the 'username password' you send to it on stdin. Here xxx would be the Skype password and skypiax1 the Skype username. Please note that the ".Skypiax" directory containing the Skype clients configurations MUST be in the home directory of the "unixusername" user. +su unixusername -c "/bin/echo 'skypiax1 xxx'| DISPLAY=:101 /usr/bin/skype --pipelogin &" sleep 7 /usr/bin/Xvfb :102 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 -echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype --pipelogin & +su unixusername -c "/bin/echo 'skypiax2 xxx'| DISPLAY=:102 /usr/bin/skype --pipelogin &" sleep 7 @@ -28,109 +28,109 @@ ###/usr/bin/Xvfb :103 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax3 xxx'| DISPLAY=:103 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :104 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax4 xxx'| DISPLAY=:104 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :105 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax5 xxx'| DISPLAY=:105 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :106 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax6 xxx'| DISPLAY=:106 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :107 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax7 xxx'| DISPLAY=:107 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :108 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax8 xxx'| DISPLAY=:108 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :109 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax9 xxx'| DISPLAY=:109 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :110 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax10 xxx'| DISPLAY=:110 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :111 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax11 xxx'| DISPLAY=:111 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :112 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax12 xxx'| DISPLAY=:112 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :113 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax13 xxx'| DISPLAY=:113 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :114 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax14 xxx'| DISPLAY=:114 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :115 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax15 xxx'| DISPLAY=:115 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :116 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax16 xxx'| DISPLAY=:116 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :117 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax17 xxx'| DISPLAY=:117 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :118 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax18 xxx'| DISPLAY=:118 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :119 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax19 xxx'| DISPLAY=:119 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :120 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax20 xxx'| DISPLAY=:120 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###

1 0