update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8567 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/build/config/config.sub b/build/config/config.sub
index 387c18d1a135c2e33cb9f911c198efdf7b12b96c..6759825a5b7fcf64476b4398dc0e30b3090b925c 100755 (executable)
--- a/build/config/config.sub
+++ b/build/config/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@ case $basic_machine in
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
+       | fido | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore \
+       | maxq | mb | microblaze | mcore | mep \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -276,6 +276,7 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
+       | score \
        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
        | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
-       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
@@ -323,7 +324,7 @@ case $basic_machine in
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
@@ -367,11 +368,15 @@ case $basic_machine in
        | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa-* \
+       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa*-* \
        | ymp-* \
        | z8k-*)
                ;;
+       # Recognize the basic CPU types without company name, with glob match.
+       xtensa*)
+               basic_machine=$basic_machine-unknown
+               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
@@ -442,6 +447,14 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
+       blackfin)
+               basic_machine=bfin-unknown
+               os=-linux
+               ;;
+       blackfin-*)
+               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
@@ -474,8 +487,8 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16c)
-               basic_machine=cr16c-unknown
+       cr16)
+               basic_machine=cr16-unknown
                os=-elf
                ;;
        crds | unos)
@@ -667,6 +680,14 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
+       m68knommu)
+               basic_machine=m68k-unknown
+               os=-linux
+               ;;
+       m68knommu-*)
+               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;
@@ -682,6 +703,10 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-mingw32
                ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -808,6 +833,14 @@ case $basic_machine in
                basic_machine=i860-intel
                os=-osf
                ;;
+       parisc)
+               basic_machine=hppa-unknown
+               os=-linux
+               ;;
+       parisc-*)
+               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        pbd)
                basic_machine=sparc-tti
                ;;
@@ -909,6 +942,10 @@ case $basic_machine in
        sb1el)
                basic_machine=mipsisa64sb1el-unknown
                ;;
+       sde)
+               basic_machine=mipsisa32-sde
+               os=-elf
+               ;;
        sei)
                basic_machine=mips-sei
                os=-seiux
@@ -920,6 +957,9 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1009,6 +1049,10 @@ case $basic_machine in
                basic_machine=tic6x-unknown
                os=-coff
                ;;
+       tile*)
+               basic_machine=tile-unknown
+               os=-linux-gnu
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
@@ -1214,7 +1258,7 @@ case $os in
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers*)
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1366,6 +1410,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+               os=-elf
+               ;;
         spu-*)
                os=-elf
                ;;
@@ -1406,6 +1453,9 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
+        mep-*)
+               os=-elf
+               ;;
        mips*-cisco)
                os=-elf
                ;;

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index f8a644fc5a62cca97673e854d08f3772928ab0a3..8f338af626c9f102c4a1cc38e69abca9c2a0b22f 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -9,6 +9,14 @@
        <action application="deflect" data="${destination_number}"/>
       </condition>
     </extension>
+
+    <extension name="set_bind_leg">
+      <condition field="${leg_to_bind}" expression="^$">
+       <action application="set" data="leg_to_bind=a"/>
+      </condition>
+    </extension>
+
+
     <!-- Example of doing things based on time of day. -->
     <extension name="tod_example" continue="true">
       <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$">
@@ -140,6 +148,7 @@
       <condition field="destination_number" expression="^(10[01][0-9])$">
        <action application="set" data="dialed_ext=$1"/>
        <action application="export" data="dialed_ext=$1"/>
+       <action application="export" data="dialed_ext=$1"/>
       </condition>
       <condition field="destination_number" expression="^${caller_id_number}$">
        <action application="set" data="voicemail_authorized=${sip_authorized}"/>
@@ -147,9 +156,9 @@
        <action application="sleep" data="1000"/>
        <action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
        <!-- bind_meta_app can have these args <key> [a|b|ab] [a|b|o|s] <app> -->
-       <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/>
-       <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-       <anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/>
+       <anti-action application="bind_meta_app" data="1 ${leg_to_bind} s execute_extension::dx XML features"/>
+       <anti-action application="bind_meta_app" data="2 ${leg_to_bind} s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
+       <anti-action application="bind_meta_app" data="3 ${leg_to_bind} s execute_extension::cf XML features"/>
        <anti-action application="set" data="transfer_ringback=${us-ring}"/>
        <anti-action application="set" data="call_timeout=30"/>
        <!-- <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> -->

diff --git a/conf/dialplan/public.xml b/conf/dialplan/public.xml
index d7e72740e627c00942379c3b0f06bedc87b21f79..58afd048c75ad8d6a81e8251ff07fdfecac9fd56 100644 (file)
--- a/conf/dialplan/public.xml
+++ b/conf/dialplan/public.xml
@@ -11,6 +11,7 @@
 
     <extension name="public_extensions">
       <condition field="destination_number" expression="^(10[01][0-9])$">
+       <action application="set" data="leg_to_bind=b"/>
        <action application="transfer" data="$1 XML default"/>
       </condition>
     </extension>

diff --git a/debian/files b/debian/files
index 7f6fdae392b13d78868dab22b63651303667e64d..244312fabddc660726ae5e150279d25cbe2ded15 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1,10 +1,12 @@
-freeswitch_1.0~rc5-1_i386.deb net extra
-freeswitch-spidermonkey_1.0~rc5-1_i386.deb net extra
-freeswitch-dev_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-g7231_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-amr_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-g729_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-en_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-de_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-fr_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-it_1.0~rc5-1_i386.deb net extra
+freeswitch_1.0~rc6-1_i386.deb net extra
+freeswitch-dev_1.0~rc6-1_i386.deb net extra
+freeswitch-spidermonkey_1.0~rc6-1_i386.deb net extra
+freeswitch-perl_1.0~rc6-1_i386.deb net extra
+freeswitch-lua_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-g7231_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-amr_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-g729_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-en_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-de_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-fr_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-it_1.0~rc6-1_i386.deb net extra

diff --git a/debian/rules b/debian/rules
index a75908c6b1fa4f8b0254f7b93cc26298186ac2e1..301bca9ab0ff87eca3afe7b6dd5cf39297463dc5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ clean:
        dh_testroot
        rm -f build-stamp 
 
-       -$(MAKE) clean megaclean
+       -$(MAKE) update-clean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub build/config/config.sub
 endif

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 6513613d701ae836c622bfb0299b40872873fe90..0fc7ea1be5fc03e5755019c120b46687bae676ca 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2048,6 +2048,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
                                                        goto done;
                                                }
                                        }
+
                                        if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
                                                && (other_session = switch_core_session_locate(uuid))) {
                                                other_channel = switch_core_session_get_channel(other_session);

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index e7177eab55f876941a937ddae6520c0c129c101a..a761c40295fa2b792dd57afa12d97c69709570e9 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -522,8 +522,10 @@ switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, in
        switch_port_t sdp_port;
        char tmp[50];
        
-       if ((!force && (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA))) || tech_pvt->adv_sdp_video_port) {
-               return SWITCH_STATUS_SUCCESS;
+       if (!force) {
+               if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->local_sdp_video_port) {
+                       return SWITCH_STATUS_SUCCESS;
+               }
        }
 
        if (tech_pvt->local_sdp_video_port) {
@@ -1753,9 +1755,9 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 
                sofia_glue_check_video_codecs(tech_pvt);
 
-               if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) {
+               if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding && tech_pvt->remote_sdp_video_port) {
                        if (!tech_pvt->local_sdp_video_port) {
-                               sofia_glue_tech_choose_video_port(tech_pvt, 0);
+                               sofia_glue_tech_choose_video_port(tech_pvt, 1);
                        }
 
                        flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | 

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 446d502e2cdf22676fce8f17b259caede4fdc340..4328e63ff2888225d4a6f5bc0ac06df572b01ecf 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -765,7 +765,7 @@ SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host,
        }
 
        if (!tx_port) {
-               *err = "Missing local port";
+               *err = "Missing remote port";
                goto end;
        }