Skip to content

F
freeswitch
提交 ef695ddf authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8567 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 716b5417
隐藏空白字符变更
内嵌 并排
正在显示 包含 98 行增加 和 33 行删除
build/config/config.sub
浏览文件 @ ef695ddf
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Inc. # Free Software Foundation, Inc.
timestamp='2006-07-02' timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME 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>." ...@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\ version="\
GNU config.sub ($timestamp) GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
Free Software Foundation, Inc. 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
...@@ -245,12 +245,12 @@ case $basic_machine in ...@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \ | bfin \
| c4x | clipper \ | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \ | d10v | d30v | dlx | dsp16xx \
| fr30 | frv \ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \ | i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \ | ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \ | m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore \ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \ | mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \ | mips16 \
| mips64 | mips64el \ | mips64 | mips64el \
...@@ -276,6 +276,7 @@ case $basic_machine in ...@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \ | pyramid \
| score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \ | sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
...@@ -284,7 +285,7 @@ case $basic_machine in ...@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \ | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \ | v850 | v850e \
| we32k \ | we32k \
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k) | z8k)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
;; ;;
...@@ -323,7 +324,7 @@ case $basic_machine in ...@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \ | d10v-* | d30v-* | dlx-* \
| elxsi-* \ | elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \ | h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \ | i*86-* | i860-* | i960-* | ia64-* \
...@@ -367,11 +368,15 @@ case $basic_machine in ...@@ -367,11 +368,15 @@ case $basic_machine in
| tron-* \ | tron-* \
| v850-* | v850e-* | vax-* \ | v850-* | v850e-* | vax-* \
| we32k-* \ | we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \ | xstormy16-* | xtensa*-* \
| ymp-* \ | ymp-* \
| z8k-*) | 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 # Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS. # for a CPU type and a company and sometimes even an OS.
386bsd) 386bsd)
...@@ -442,6 +447,14 @@ case $basic_machine in ...@@ -442,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent basic_machine=ns32k-sequent
os=-dynix os=-dynix
;; ;;
blackfin)
basic_machine=bfin-unknown
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
c90) c90)
basic_machine=c90-cray basic_machine=c90-cray
os=-unicos os=-unicos
...@@ -474,8 +487,8 @@ case $basic_machine in ...@@ -474,8 +487,8 @@ case $basic_machine in
basic_machine=craynv-cray basic_machine=craynv-cray
os=-unicosmp os=-unicosmp
;; ;;
cr16c) cr16)
basic_machine=cr16c-unknown basic_machine=cr16-unknown
os=-elf os=-elf
;; ;;
crds | unos) crds | unos)
...@@ -667,6 +680,14 @@ case $basic_machine in ...@@ -667,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi basic_machine=m68k-isi
os=-sysv os=-sysv
;; ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*) m88k-omron*)
basic_machine=m88k-omron basic_machine=m88k-omron
;; ;;
...@@ -682,6 +703,10 @@ case $basic_machine in ...@@ -682,6 +703,10 @@ case $basic_machine in
basic_machine=i386-pc basic_machine=i386-pc
os=-mingw32 os=-mingw32
;; ;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe) miniframe)
basic_machine=m68000-convergent basic_machine=m68000-convergent
;; ;;
...@@ -808,6 +833,14 @@ case $basic_machine in ...@@ -808,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel basic_machine=i860-intel
os=-osf os=-osf
;; ;;
parisc)
basic_machine=hppa-unknown
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd) pbd)
basic_machine=sparc-tti basic_machine=sparc-tti
;; ;;
...@@ -909,6 +942,10 @@ case $basic_machine in ...@@ -909,6 +942,10 @@ case $basic_machine in
sb1el) sb1el)
basic_machine=mipsisa64sb1el-unknown basic_machine=mipsisa64sb1el-unknown
;; ;;
sde)
basic_machine=mipsisa32-sde
os=-elf
;;
sei) sei)
basic_machine=mips-sei basic_machine=mips-sei
os=-seiux os=-seiux
...@@ -920,6 +957,9 @@ case $basic_machine in ...@@ -920,6 +957,9 @@ case $basic_machine in
basic_machine=sh-hitachi basic_machine=sh-hitachi
os=-hms os=-hms
;; ;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64) sh64)
basic_machine=sh64-unknown basic_machine=sh64-unknown
;; ;;
...@@ -1009,6 +1049,10 @@ case $basic_machine in ...@@ -1009,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown basic_machine=tic6x-unknown
os=-coff os=-coff
;; ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
;;
tx39) tx39)
basic_machine=mipstx39-unknown basic_machine=mipstx39-unknown
;; ;;
...@@ -1214,7 +1258,7 @@ case $os in ...@@ -1214,7 +1258,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -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. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)
...@@ -1366,6 +1410,9 @@ else ...@@ -1366,6 +1410,9 @@ else
# system, and we'll never get to this point. # system, and we'll never get to this point.
case $basic_machine in case $basic_machine in
score-*)
os=-elf
;;
spu-*) spu-*)
os=-elf os=-elf
;; ;;
...@@ -1406,6 +1453,9 @@ case $basic_machine in ...@@ -1406,6 +1453,9 @@ case $basic_machine in
m68*-cisco) m68*-cisco)
os=-aout os=-aout
;; ;;
mep-*)
os=-elf
;;
mips*-cisco) mips*-cisco)
os=-elf os=-elf
;; ;;
......
conf/dialplan/default.xml
浏览文件 @ ef695ddf
...@@ -9,6 +9,14 @@ ...@@ -9,6 +9,14 @@
<action application="deflect" data="${destination_number}"/> <action application="deflect" data="${destination_number}"/>
</condition> </condition>
</extension> </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. --> <!-- Example of doing things based on time of day. -->
<extension name="tod_example" continue="true"> <extension name="tod_example" continue="true">
<condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$"> <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$">
...@@ -140,6 +148,7 @@ ...@@ -140,6 +148,7 @@
<condition field="destination_number" expression="^(10[01][0-9])$"> <condition field="destination_number" expression="^(10[01][0-9])$">
<action application="set" data="dialed_ext=$1"/> <action application="set" data="dialed_ext=$1"/>
<action application="export" data="dialed_ext=$1"/> <action application="export" data="dialed_ext=$1"/>
<action application="export" data="dialed_ext=$1"/>
</condition> </condition>
<condition field="destination_number" expression="^${caller_id_number}$"> <condition field="destination_number" expression="^${caller_id_number}$">
<action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="set" data="voicemail_authorized=${sip_authorized}"/>
...@@ -147,9 +156,9 @@ ...@@ -147,9 +156,9 @@
<action application="sleep" data="1000"/> <action application="sleep" data="1000"/>
<action application="voicemail" data="check default $${domain} ${dialed_ext}"/> <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> --> <!-- 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="1 ${leg_to_bind} 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="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 b s execute_extension::cf XML features"/> <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="transfer_ringback=${us-ring}"/>
<anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="call_timeout=30"/>
<!-- <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> --> <!-- <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> -->
......
conf/dialplan/public.xml
浏览文件 @ ef695ddf
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<extension name="public_extensions"> <extension name="public_extensions">
<condition field="destination_number" expression="^(10[01][0-9])$"> <condition field="destination_number" expression="^(10[01][0-9])$">
<action application="set" data="leg_to_bind=b"/>
<action application="transfer" data="$1 XML default"/> <action application="transfer" data="$1 XML default"/>
</condition> </condition>
</extension> </extension>
......
debian/files
浏览文件 @ ef695ddf
freeswitch_1.0~rc5-1_i386.deb net extra freeswitch_1.0~rc6-1_i386.deb net extra
freeswitch-spidermonkey_1.0~rc5-1_i386.deb net extra freeswitch-dev_1.0~rc6-1_i386.deb net extra
freeswitch-dev_1.0~rc5-1_i386.deb net extra freeswitch-spidermonkey_1.0~rc6-1_i386.deb net extra
freeswitch-codec-passthru-g7231_1.0~rc5-1_i386.deb net extra freeswitch-perl_1.0~rc6-1_i386.deb net extra
freeswitch-codec-passthru-amr_1.0~rc5-1_i386.deb net extra freeswitch-lua_1.0~rc6-1_i386.deb net extra
freeswitch-codec-passthru-g729_1.0~rc5-1_i386.deb net extra freeswitch-codec-passthru-g7231_1.0~rc6-1_i386.deb net extra
freeswitch-lang-en_1.0~rc5-1_i386.deb net extra freeswitch-codec-passthru-amr_1.0~rc6-1_i386.deb net extra
freeswitch-lang-de_1.0~rc5-1_i386.deb net extra freeswitch-codec-passthru-g729_1.0~rc6-1_i386.deb net extra
freeswitch-lang-fr_1.0~rc5-1_i386.deb net extra freeswitch-lang-en_1.0~rc6-1_i386.deb net extra
freeswitch-lang-it_1.0~rc5-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
debian/rules
浏览文件 @ ef695ddf
...@@ -71,7 +71,7 @@ clean: ...@@ -71,7 +71,7 @@ clean:
dh_testroot dh_testroot
rm -f build-stamp rm -f build-stamp
-$(MAKE) clean megaclean -$(MAKE) update-clean
ifneq "$(wildcard /usr/share/misc/config.sub)" "" ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub build/config/config.sub cp -f /usr/share/misc/config.sub build/config/config.sub
endif endif
......
src/mod/endpoints/mod_sofia/sofia.c
浏览文件 @ ef695ddf
...@@ -2048,6 +2048,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, ...@@ -2048,6 +2048,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
goto done; goto done;
} }
} }
if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
&& (other_session = switch_core_session_locate(uuid))) { && (other_session = switch_core_session_locate(uuid))) {
other_channel = switch_core_session_get_channel(other_session); other_channel = switch_core_session_get_channel(other_session);
......
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @ ef695ddf
...@@ -522,8 +522,10 @@ switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, in ...@@ -522,8 +522,10 @@ switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, in
switch_port_t sdp_port; switch_port_t sdp_port;
char tmp[50]; 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) { if (!force) {
return SWITCH_STATUS_SUCCESS; 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) { 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 ...@@ -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); 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) { 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 | flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ |
......
src/switch_rtp.c
浏览文件 @ ef695ddf
...@@ -765,7 +765,7 @@ SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, ...@@ -765,7 +765,7 @@ SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host,
} }
if (!tx_port) { if (!tx_port) {
*err = "Missing local port"; *err = "Missing remote port";
goto end; goto end;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论