- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12906 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: andrew Date: Fri Apr 3 12:52:38 2009 New Revision: 12906 Log: Whoops! Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Apr 3 12:52:38 2009 @@ -1145,12 +1145,12 @@ session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); - switch_safe_free(pid); /* malloced in handle_ref_tuple */ switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); - ei_link(listener, ei_self(listener->ec), pid); + ei_link(listener, ei_self(listener->ec), pid); + switch_safe_free(pid); /* malloced in handle_ref_tuple */ } return session_element; }

1 0

[commit] r12905 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 11:43:46 2009 New Revision: 12905 Log: MODENDP-210 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.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 Fri Apr 3 11:43:46 2009 @@ -255,15 +255,14 @@ //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)); + if (switch_core_session_thread_launch(b_session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; } - - 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)); - } if (tech_pvt->other_session) {

1 0

[commit] r12904 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 10:09:30 2009 New Revision: 12904 Log: add rtp-autofix-timing (defauts to true even when not present) set to false to disable it FSCORE-281 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Apr 3 10:09:30 2009 @@ -191,6 +191,8 @@    +  +  <!-- clear clears them all or supply the name to add or the name prefixed with ~ to remove valid values:

1 0

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

03 Apr '09

Author: anthm Date: Fri Apr 3 10:07:10 2009 New Revision: 12903 Log: add rtp-autofix-timing (defauts to true even when not present) set to false to disable it Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Fri Apr 3 10:07:10 2009 @@ -716,7 +716,7 @@ return SWITCH_STATUS_GENERR; } - if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { + if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFIX_TIMING) && tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { if (!tech_pvt->read_impl.encoded_bytes_per_packet) { tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; goto skip; 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 Fri Apr 3 10:07:10 2009 @@ -183,6 +183,7 @@ PFLAG_DISABLE_NAPTR, PFLAG_AUTOFLUSH, PFLAG_NAT_OPTIONS_PING, + PFLAG_AUTOFIX_TIMING, /* No new flags below this line */ PFLAG_MAX } PFLAGS; 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 Fri Apr 3 10:07:10 2009 @@ -1680,6 +1680,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "rtp-autofix-timing")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFIX_TIMING); + } } else if (!strcasecmp(var, "nat-options-ping")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING); @@ -1947,6 +1953,7 @@ sofia_set_pflag(profile, PFLAG_STUN_ENABLED); sofia_set_pflag(profile, PFLAG_DISABLE_100REL); profile->auto_restart = 1; + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -2218,6 +2225,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "rtp-autofix-timing")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFIX_TIMING); + } } else if (!strcasecmp(var, "nat-options-ping")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING);

1 0

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

03 Apr '09

Author: anthm Date: Fri Apr 3 09:47:52 2009 New Revision: 12902 Log: MODENDP-209 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Fri Apr 3 09:47:52 2009 @@ -539,7 +539,8 @@ break; } - if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || (status >= 300 && status != 401 && status != 407 && status != 603)) { + if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || + (!session && (status >= 300 && status != 401 && status != 407))) { nua_handle_bind(nh, NULL); nua_handle_destroy(nh); nh = NULL;

1 0

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

03 Apr '09

Author: anthm Date: Fri Apr 3 08:14:26 2009 New Revision: 12901 Log: don't unregister not registered gateways Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Apr 3 08:14:26 2009 @@ -67,9 +67,19 @@ static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr) { + if (gateway_ptr->state != REG_STATE_REGED) { + if (gateway_ptr->nh) { + nua_handle_destroy(gateway_ptr->nh); + gateway_ptr->nh = NULL; + } + return; + } + + /* if (!gateway_ptr->nh) { sofia_reg_new_handle(gateway_ptr, SWITCH_FALSE); } + */ if (gateway_ptr->nh) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UN-Registering %s\n", gateway_ptr->name); @@ -80,6 +90,8 @@ TAG_END()); } + + } static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway) { @@ -100,7 +112,9 @@ sofia_private_free(gateway_ptr->sofia_private); } - sofia_reg_kill_reg(gateway_ptr); + if (gateway_ptr->state == REG_STATE_REGED) { + sofia_reg_kill_reg(gateway_ptr); + } } }

1 0

[commit] r12900 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket: . Commands General
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: verifier Date: Fri Apr 3 06:54:01 2009 New Revision: 12900 Log: Removed the use of call leg variables in originate since session variables really can't be assigned in the form {global vars}[local vars]targetA targetB. Well, its fixed now. Removed: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs Fri Apr 3 06:54:01 2009 @@ -85,27 +85,20 @@ if (_autoAnswer) { - _variables.Add(new CallLegVariable("sip_invite_params", "intercom=true")); - _variables.Add(new CallLegVariable("sip_h_Call-Info", "<sip:$${domain}>;answer-after=0")); - _variables.Add(new CallLegVariable("sip_auto_answer", "true")); + /*_variables.Add(new CallVariable("sip_invite_params", "intercom=true"));*/ + _variables.Add(new CallVariable("sip_h_Call-Info", "answer-after=0")); + _variables.Add(new CallVariable("sip_auto_answer", "true")); } } string variables = string.Empty; - string legVariables = string.Empty; foreach (CallVariable var in _variables) - { - if (var is CallLegVariable) - legVariables += var + ","; - else variables += var + ","; - } + if (variables.Length > 0) variables = "{" + variables.Remove(variables.Length - 1, 1) + "}"; - if (legVariables.Length > 0) - legVariables = "[" + legVariables.Remove(legVariables.Length - 1, 1) + "]"; - return variables + legVariables + Caller + " " + Destination; + return variables + Caller + " " + Destination; } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx ============================================================================== Binary files. No diff available. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj Fri Apr 3 06:54:01 2009 @@ -91,7 +91,6 @@ <Compile Include="Events\EventHeartbeat.cs" /> <Compile Include="Events\EventReSchedule.cs" /> <Compile Include="General\Address.cs" /> - <Compile Include="General\CallLegVariable.cs" /> <Compile Include="General\SipAddress.cs" /> <Compile Include="General\SofiaSipAddress.cs" /> <Compile Include="PartyInfo.cs" />

1 0

[commit] r12899 - in freeswitch/trunk: . build
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mikej Date: Thu Apr 2 19:59:15 2009 New Revision: 12899 Log: libtool blah (FSBUILD-82) Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/build/modmake.rules.in Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Thu Apr 2 19:59:15 2009 @@ -87,7 +87,7 @@ # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14` +libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`} lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." @@ -103,8 +103,11 @@ if test -z "$1"; then a=0 ; else a=$1;fi if test -z "$2"; then b=0 ; else b=$2;fi if test -z "$3"; then c=0 ; else c=$3;fi +lt_major=$a -if test "$a" -lt "2"; then +if test "$a" -eq "2"; then + lt_status="good" +elif test "$a" -lt "2"; then if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then lt_status="bad" fi @@ -121,6 +124,43 @@ exit 1 fi +# check libtoolize availability +if [ -n "${LIBTOOL}" ]; then + libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize} +else + libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`} +fi +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi +if [ ! -x "$libtoolize" ]; then + echo "$libtoolize does not exist or ist not executable" + exit 1 +fi + +# compare libtool and libtoolize version +ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +ltl_version=`echo $ltl_pversion|sed -e 's/$[a-z]*$$/.\1/'` +IFS=.; set $ltl_version; IFS=' ' + +if [ "x${lt_version}" != "x${ltl_version}" ]; then + echo "$libtool and $libtoolize have different versions" + exit 1 +fi + + +# +# Info output +# +echo "Bootstrapping using:" +echo " autoconf : ${AUTOCONF:-`which autoconf`}" +echo " automake : ${AUTOMAKE:-`which automake`}" +echo " aclocal : ${ACLOCAL:-`which aclocal`}" +echo " libtool : ${libtool} (${lt_version})" +echo " libtoolize: ${libtoolize}" +echo + echo "Entering directory ${LIBDIR}/apr" cd ${LIBDIR}/apr @@ -144,13 +184,6 @@ # bootstrap: Build the support scripts needed to compile from a # checked-out version of the source code. - -libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` -if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -fi - # Create the libtool helper files # # Note: we copy (rather than link) them to simplify distribution. @@ -163,21 +196,30 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -$libtoolize --copy --automake +if ${libtoolize} -n --install 2>&1 >/dev/null ; then + $libtoolize --force --copy --install +else + $libtoolize --force --copy +fi if [ -f libtool.m4 ]; then ltfile=`pwd`/libtool.m4 else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} + if [ $lt_major -eq 2 ]; then + ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4} + else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} + fi # Expecting the code above to be very portable, but just in case... if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 fi fi - + if [ ! -f $ltfile ]; then echo "$ltfile not found" exit 1 @@ -196,19 +238,6 @@ # Clean up any leftovers rm -f aclocal.m4 libtool.m4 -# -# Generate the autoconf header and ./configure -# -echo "Creating include/arch/unix/apr_private.h.in ..." -${AUTOHEADER:-autoheader} - -echo "Creating configure ..." -### do some work to toss config.cache? -${AUTOCONF:-autoconf} - -# Remove autoconf 2.5x's cache directory -rm -rf autom4te*.cache - # fix for FreeBSD (at least): # libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19 # get aclocal's default directory and include the libtool.m4 directory via -I if @@ -220,6 +249,24 @@ ACLOCAL_OPTS="-I `dirname ${ltfile}`" fi +### run aclocal +echo "Re-creating aclocal.m4 ..." +${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} + +### do some work to toss config.cache? +echo "Creating configure ..." +${AUTOCONF:-autoconf} + +# +# Generate the autoconf header +# +echo "Creating include/arch/unix/apr_private.h.in ..." +${AUTOHEADER:-autoheader} + + +# Remove autoconf 2.5x's cache directory +rm -rf autom4te*.cache + echo "Entering directory ${LIBDIR}/apr-util" cd ${LIBDIR}/apr-util ./buildconf @@ -251,7 +298,11 @@ #only run if AC_PROG_LIBTOOL is in configure.in/configure.ac if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then echo "Running libtoolize..." - $libtoolize --force --copy ; + if ${libtoolize} -n --install 2>&1 >/dev/null ; then + $libtoolize --force --copy --install + else + $libtoolize --force --copy + fi fi echo "Creating configure" Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Thu Apr 2 19:59:15 2009 @@ -10,7 +10,7 @@ INSTALL=@INSTALL@ GETLIB=@GETLIB@ LIBTOOL=@LIBTOOL@ -LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) +LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f CCLD = $(CC) CXXLD = $(CXX) @@ -29,7 +29,8 @@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` -DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +DYNAMIC_LIB_EXTEN = la +#DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) @@ -39,11 +40,11 @@ COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp @@ -107,14 +108,14 @@ exit 1 ;\ fi -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo @echo Creating $@... @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).o $(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) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).o $(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) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean:

1 0

[commit] r12898 - freeswitch/trunk/scripts/contrib/mcollins
by FreeSWITCH SVN 02 Apr '09

02 Apr '09

Author: mcollins Date: Thu Apr 2 18:37:40 2009 New Revision: 12898 Log: Add chan var scripts (part of janitorial services) Added: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl (contents, props changed) freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh (contents, props changed) Added: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl Thu Apr 2 18:37:40 2009 @@ -0,0 +1,240 @@ +#!/usr/bin/perl +# +# create-chanvars-html-page.pl +# +# Part of the janitorial process. :) +# +# NOTE: This script is used in conjunction with the extract-vars-from-source-tree.sh script +# Do not run this script manually; use the shell script +# Specify the source and temp directories in that script +# +# Goes through a bunch of source files to snag all lines with +# switch_channel_(s|g)et_variable in *.c files +# _VARIABLE is *.h files +# +# Creates a table of vars aliased in *.h (hash, actually) +# Then cycles through each line and creates a data struct: +# key = chan var, val = hashes of source file names +# sub hashes are: +# key = src file name, val = Array of Arrays +# Each sub array has two elements: +# 0 = line number +# 1 = 'get' or 'set' +# +# example: +# +# remote_media_ip => { +# "mod_esf.c" => [[114, "set"]], +# "mod_sofia.c" => [[1050, "get"], [1078, "get"]], +# "sofia_glue.c" => [[2812, "set"]], +# } +# +# Also creates an index based on filename like so in a hash: +# key = source file name, val = hash of chanvar names +# sub hashes are: +# key = chan var name, val = Array of arrays +# Each sub array has two elements: +# 0 = line number +# 1 = 'get' or 'set' +# +# example: +# +# "mod_nibblebill.c" => { +# nibble_account => [[334, "get"], [632, "get"]], +# nibble_rate => [[333, "get"], [540, "get"]], +# nibble_total_billed => [[411, "set"]], +# } +# +# Finally we create a simple HTML file that lets the user easily click around to Fisheye source +# + +use strict; +use warnings; +use Data::Dump qw(dump); +use File::Basename; +use Getopt::Long; +use HTML::Tiny; + +$|++; + +# Get the cmd line options +my $srcdir = '/usr/src/freeswitch.trunk'; +my $tmpdir = '/tmp'; + +## Use these as defaults unless command line args are supplied +GetOptions( 'srcdir=s' => \$srcdir, + 'tmpdir=s' => \$tmpdir, +); + +my $srcdirlen = length $srcdir; # calculate this once since it doesn't change + +my $headerfile = $tmpdir . "/header-defs.txt"; +my $datafile = $tmpdir . "/get-set-vars.txt"; +my $htmlfile = "/Users/michaelcollins/Downloads/chanvars.html"; + +my $site = 'http://fisheye.freeswitch.org/browse/FreeSWITCH'; + +my $obvious_exceptions; # regex match for channel variable names we don't care about +$obvious_exceptions = '^(|argv|v?var|var_?name|v?buf|char.*|inner_var_array.*|arg.*|string|tmp_name|[^_]*_var|$char \*$ vvar)$'; + +my %switch_types; # key = switch type def, val = chan var name +my %channel_vars; # key = chan var name, val = HoA + # HoA: key = filename, val = [line number, set|get] +my %source_idx; # key = src file name, val = HoA + # HoA: key = var name, val = [line number, set|get] +my %source_files; # key = source filename, val = fisheye url where link is found + +open(FILEIN,"<",$headerfile) or die "$headerfile - $!\n"; +while(<FILEIN>) { + chomp; + my @RECIN = split /#define /,$_; + # debug + #print "$RECIN[1] \n"; + $RECIN[1] =~ s/"//g; # strip quote chars + my ($key, $val) = split /\s/,$RECIN[1]; + $switch_types{$key} = $val; +} +close(FILEIN); + +# debug +#print dump(\%switch_types); + +open(FILEIN,"<",$datafile) or die "$datafile - $!\n"; +while(<FILEIN>) { + chomp; + next if m/switch_channel_get_variables/; # get variables != what we want + next unless m/switch_channel_(s|g)et_variable\s?\(/; + next if m/#define|SWITCH_DECLARE/; + next unless m/\.c(pp)?:/; # only c and cpp files for now + ## Extract source file name + my @RECIN = split /(\.c(pp)?)/,$_; # split on file name.c or name.cpp + my ($filename,$dir,$ext) = fileparse($RECIN[0]); + $filename .= $RECIN[1]; # append .c or .cpp + # debug + #print "$filename\n"; + # trim off the srcdir from beginning of string + my $reldir = substr $dir, $srcdirlen; + #print "$filename $dir $ext ($reldir)\n"; + if ( ! exists( $source_files{$filename} ) ) { + $source_files{ $filename } = $site . $reldir . $filename; + } + + ## Extract line number for this occurrence in this source file + my $linenum = 0; + if ( $RECIN[3] =~ m/:(\d+):/ ) { + $linenum = $1; + } + + ## Determine get or set + my $setget = 'set'; + if ( $RECIN[3] =~ m/get_variable/ ) { + $setget = 'get'; + } + + ## Extract variable name + # Set is easier than get because splitting on comma does all the work + my @temp; + if ( $setget eq 'set' ) { + @temp = split /,\s*?/,$RECIN[3]; # second elem is channel variable name + $temp[1] =~ s/"//g; + } else { + # get is trickier - need to stop at first close paren + @temp = split /,\s+?/,$RECIN[3]; # second elem is channel variable name + $temp[1] =~ s/"//g; + $temp[1] =~ m/^([A-Za-z_]+)/; + $temp[1] = $1; + #debug + #print "$temp[1]\n"; + } + my $channel_variable_name = $temp[1]; + $channel_variable_name =~ s/"//g; # strip quote chars + $channel_variable_name =~ s/^\s*//; # strip leading whitespace + if ( exists( $switch_types{$channel_variable_name} ) ) { + ## This isn't actually a channel variable name but rather a def from switch_types.h + $channel_variable_name = $switch_types{$channel_variable_name}; + } + + ## Skip obvious exceptions... + next if $channel_variable_name =~ m/$obvious_exceptions/; + + ## populate the hash for this variable, filename and line num & get/set val + push @{ $channel_vars{$channel_variable_name}{$filename} }, [$linenum, $setget]; + push @{ $source_idx{$filename}{$channel_variable_name} }, [$linenum, $setget]; +} +close(FILEIN); + +#debug +#print dump(\%channel_vars); +#foreach (sort keys %channel_vars) { print "'$_'\n"; } +#print dump(\%source_idx) . "\n"; +#print dump(\%source_files) . "\n"; + +## Test the creation of simple html file +open(HTML,'>',$htmlfile) or die "$htmlfile - $!\n"; +my $h = HTML::Tiny->new; +my @links; # contains the links for the HTML::Tiny p and a tags + +## Header Row +#push @links, $h->tr( [ $h->th( 'Channel Variable', 'Source File', 'Links') ] ); + +## Data Rows +## NOTE: This does a case-insensitive sort +foreach my $chanvar ( sort {lc $a cmp lc $b} keys %channel_vars ) { + my %this_var = %{ $channel_vars{$chanvar} }; + + ## Cycle through each source file for this chan var + foreach ( sort keys %this_var ) { + ## These keys are source file names + my @row = ( + $chanvar, + $h->a( { + href => $source_files{$_}, target => '_blank', + }, + $_ + ) + ); + my $sourcename = $_; + foreach ( @{ $this_var{$_} } ) { + #$row[2] .= "@{ $_ }" . "<br/>"; + my $linkname = "@{ $_ }"; + my $linenum = @{ $_ }[0]; + my $url = $source_files{$sourcename} . '?r=9999999#l' . $linenum; + $row[2] .= $h->a( { href => $url, target => '_blank' }, + $linkname + ) . '<br/>'; + } + push @links, $h->tr( [ $h->td(@row) ] ); + } + +} + +## debug +#print dump(\@links) . "\n"; + +## Create a table +my $table = $h->table( + { + border => 1, cellspacing => 5, cellpadding => 1, + }, + [ + $h->tr( [ $h->th( 'Channel Variable', 'Source File', 'Links') ] ), + @links, + ] +); + +## Create the HTML +print HTML $h->html( + [ + $h->head( $h->title( 'FreeSWITCH Source Files' ) ), + $h->body( + [ + $h->h1( { class => 'main' }, 'FreeSWITCH Channel Variables' ), + $table, + ] + ) + ] +); + +close(HTML); + +print "Operation complete\n"; Added: freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh Thu Apr 2 18:37:40 2009 @@ -0,0 +1,23 @@ +#!/bin/sh +# +# extract-fs-vars-from-source-tree.sh +# +# Walks the FreeSWITCH source tree +# +# +# NOTES +# Be sure to specify your source and temp directories below +# Also, make this script and create-chanvars-html-page.pl executable +# +# MC 2009-04-02 + +# Change these vars if your source directory is different +SRCDIR=/usr/usr/freeswitch.trunk +TMPDIR=/tmp + +# Grep the variables, then grep the aliases in the header files +grep -rn "[sg]et_variable(" $SRCDIR/* | grep -v Binary | grep -v svn > $TMPDIR/get-set-vars.txt +grep -n "_VARIABLE" $SRCDIR/src/include/*h > $TMPDIR/header-defs.txt + +# launch perl script here +./extract-fs-chanvars.pl --srcdir=$SRCDIR --tmpdir=$TMPDIR \ No newline at end of file

1 0

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

02 Apr '09

Author: anthm Date: Thu Apr 2 16:53:47 2009 New Revision: 12897 Log: make nat options ping configurable and leave it off by default 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_reg.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 Thu Apr 2 16:53:47 2009 @@ -182,7 +182,7 @@ PFLAG_DISABLE_SRV, PFLAG_DISABLE_NAPTR, PFLAG_AUTOFLUSH, - + PFLAG_NAT_OPTIONS_PING, /* No new flags below this line */ PFLAG_MAX } PFLAGS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Apr 2 16:53:47 2009 @@ -1679,6 +1679,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "nat-options-ping")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING); + } else { + sofia_clear_pflag(profile, PFLAG_NAT_OPTIONS_PING); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); @@ -2211,6 +2217,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "nat-options-ping")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING); + } else { + sofia_clear_pflag(profile, PFLAG_NAT_OPTIONS_PING); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Apr 2 16:53:47 2009 @@ -596,7 +596,7 @@ sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); - if (now) { + if (now && sofia_test_pflag(profile, PFLAG_NAT_OPTIONS_PING)) { switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid," "expires,user_agent,server_user,server_host,profile_name" " from sip_registrations where (status like '%%AUTO-NAT%%' "

1 0