[svn-commits] oej: branch oej/pinetree-1.4 r209439 - in /team/oej/pinetree-1.4: ./ agi/ app...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jul 28 09:39:12 CDT 2009
Author: oej
Date: Tue Jul 28 09:39:03 2009
New Revision: 209439
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209439
Log:
Reset automerge. Very strange conflicts in files that is not touched by this branch.
Modified:
team/oej/pinetree-1.4/ (props changed)
team/oej/pinetree-1.4/Makefile
team/oej/pinetree-1.4/Makefile.moddir_rules
team/oej/pinetree-1.4/Makefile.rules
team/oej/pinetree-1.4/UPGRADE.txt
team/oej/pinetree-1.4/agi/Makefile
team/oej/pinetree-1.4/apps/app_dial.c
team/oej/pinetree-1.4/apps/app_mixmonitor.c
team/oej/pinetree-1.4/apps/app_queue.c
team/oej/pinetree-1.4/apps/app_voicemail.c
team/oej/pinetree-1.4/channels/Makefile
team/oej/pinetree-1.4/channels/chan_dahdi.c
team/oej/pinetree-1.4/channels/chan_iax2.c
team/oej/pinetree-1.4/channels/chan_misdn.c
team/oej/pinetree-1.4/channels/chan_sip.c
team/oej/pinetree-1.4/channels/chan_skinny.c
team/oej/pinetree-1.4/channels/misdn/isdn_lib.c
team/oej/pinetree-1.4/channels/misdn/isdn_lib.h
team/oej/pinetree-1.4/channels/misdn/isdn_lib_intern.h
team/oej/pinetree-1.4/codecs/Makefile
team/oej/pinetree-1.4/codecs/codec_dahdi.c
team/oej/pinetree-1.4/codecs/gsm/Makefile
team/oej/pinetree-1.4/codecs/lpc10/Makefile
team/oej/pinetree-1.4/config.guess
team/oej/pinetree-1.4/config.sub
team/oej/pinetree-1.4/configs/chan_dahdi.conf.sample
team/oej/pinetree-1.4/configs/iax.conf.sample
team/oej/pinetree-1.4/configs/udptl.conf.sample
team/oej/pinetree-1.4/funcs/func_odbc.c
team/oej/pinetree-1.4/funcs/func_realtime.c
team/oej/pinetree-1.4/funcs/func_strings.c
team/oej/pinetree-1.4/include/asterisk/compat.h
team/oej/pinetree-1.4/include/asterisk/devicestate.h
team/oej/pinetree-1.4/include/asterisk/frame.h
team/oej/pinetree-1.4/include/asterisk/pbx.h
team/oej/pinetree-1.4/include/asterisk/time.h
team/oej/pinetree-1.4/main/Makefile
team/oej/pinetree-1.4/main/asterisk.exports
team/oej/pinetree-1.4/main/astmm.c
team/oej/pinetree-1.4/main/callerid.c
team/oej/pinetree-1.4/main/channel.c
team/oej/pinetree-1.4/main/cli.c
team/oej/pinetree-1.4/main/db1-ast/Makefile
team/oej/pinetree-1.4/main/devicestate.c
team/oej/pinetree-1.4/main/file.c
team/oej/pinetree-1.4/main/manager.c
team/oej/pinetree-1.4/main/pbx.c
team/oej/pinetree-1.4/main/rtp.c
team/oej/pinetree-1.4/main/say.c
team/oej/pinetree-1.4/main/translate.c
team/oej/pinetree-1.4/main/udptl.c
team/oej/pinetree-1.4/pbx/Makefile
team/oej/pinetree-1.4/res/Makefile
team/oej/pinetree-1.4/res/res_crypto.c
team/oej/pinetree-1.4/res/res_features.c
team/oej/pinetree-1.4/sounds/sounds.xml
team/oej/pinetree-1.4/utils/Makefile
Propchange: team/oej/pinetree-1.4/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/pinetree-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/pinetree-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 28 09:39:03 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-193188
+/branches/1.4:1-209400
Modified: team/oej/pinetree-1.4/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/Makefile?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/Makefile (original)
+++ team/oej/pinetree-1.4/Makefile Tue Jul 28 09:39:03 2009
@@ -13,18 +13,24 @@
# All Makefiles use the following variables:
#
-# ASTCFLAGS - compiler options
-# ASTLDFLAGS - linker flags (not libraries)
+# ASTCFLAGS - compiler options provided by the user (if any)
+# _ASTCFLAGS - compiler options provided by the build system
+# ASTLDFLAGS - linker flags (not libraries) provided by the user (if any)
+# _ASTLDFLAGS - linker flags (not libraries) provided by the build system
# AST_LIBS - libraries to build binaries XXX
# LIBS - additional libraries, at top-level for all links,
# on a single object just for that object
# SOLINK - linker flags used only for creating shared objects (.so files),
# used for all .so links
#
-# Default values fo ASTCFLAGS and ASTLDFLAGS can be specified in the
+# Values for ASTCFLAGS and ASTLDFLAGS can be specified in the
# environment when running make, as follows:
#
-# $ ASTCFLAGS="-Werror" make
+# $ ASTCFLAGS="-Werror" make ...
+#
+# or as a variable value on the make command line itself:
+#
+# $ make ASTCFLAGS="-Werror" ...
export ASTTOPDIR
export ASTERISKVERSION
@@ -150,7 +156,7 @@
HTTP_CGIDIR=/var/www/cgi-bin
# Uncomment this to use the older DSP routines
-#ASTCFLAGS+=-DOLD_DSP_ROUTINES
+#_ASTCFLAGS+=-DOLD_DSP_ROUTINES
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
@@ -197,53 +203,53 @@
endif
endif
-ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+_ASTCFLAGS+=-pipe
+endif
+
+_ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror
- ASTCFLAGS+=-Wunused
- ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
- ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
-# ASTCFLAGS+=-Wundef
- ASTCFLAGS+=-Wformat -Wformat-security
- ASTCFLAGS+=-Wmissing-format-attribute
-# ASTCFLAGS+=-Wformat=2
+ _ASTCFLAGS+=-Werror
+ _ASTCFLAGS+=-Wunused
+ _ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+ _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+# _ASTCFLAGS+=-Wundef
+ _ASTCFLAGS+=-Wformat -Wformat-security
+ _ASTCFLAGS+=-Wmissing-format-attribute
+# _ASTCFLAGS+=-Wformat=2
endif
ifneq ($(findstring BSD,$(OSARCH)),)
- ASTCFLAGS+=-I/usr/local/include
- ASTLDFLAGS+=-L/usr/local/lib
+ _ASTCFLAGS+=-I/usr/local/include
+ _ASTLDFLAGS+=-L/usr/local/lib
endif
ifneq ($(PROC),ultrasparc)
- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
endif
ifeq ($(PROC),ppc)
- ASTCFLAGS+=-fsigned-char
+ _ASTCFLAGS+=-fsigned-char
endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
endif
ifeq ($(OSARCH),NetBSD)
- ASTCFLAGS+=-pthread -I/usr/pkg/include
+ _ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
ifeq ($(OSARCH),OpenBSD)
- ASTCFLAGS+=-pthread
+ _ASTCFLAGS+=-pthread
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+ _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif
ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
@@ -256,7 +262,7 @@
ASTERISKVERSIONNUM=999999
endif
-ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
+_ASTCFLAGS+=$(BUSYDETECT)$(OPTIONS)
MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
OTHER_SUBDIRS:=utils agi
@@ -271,7 +277,7 @@
MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
- ASTCFLAGS+=-D__Darwin__
+ _ASTCFLAGS+=-D__Darwin__
AUDIO_LIBS=-framework CoreAudio
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
@@ -348,10 +354,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -404,7 +410,7 @@
rm -f build_tools/menuselect-deps
datafiles: _all
- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
Modified: team/oej/pinetree-1.4/Makefile.moddir_rules
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/Makefile.moddir_rules?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/Makefile.moddir_rules (original)
+++ team/oej/pinetree-1.4/Makefile.moddir_rules Tue Jul 28 09:39:03 2009
@@ -12,7 +12,7 @@
#
ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
- ASTCFLAGS+=${GC_CFLAGS}
+ _ASTCFLAGS+=${GC_CFLAGS}
endif
ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
@@ -23,12 +23,12 @@
comma:=,
-$(addsuffix .o,$(C_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
-$(addsuffix .oo,$(CC_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+$(addsuffix .o,$(C_MODS)): _ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+$(addsuffix .oo,$(CC_MODS)): _ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
-$(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+$(LOADABLE_MODS:%=%.so): _ASTCFLAGS+=-fPIC
$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
-$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
+$(LOADABLE_MODS:%=%.so): _ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
Modified: team/oej/pinetree-1.4/Makefile.rules
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/Makefile.rules?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/Makefile.rules (original)
+++ team/oej/pinetree-1.4/Makefile.rules Tue Jul 28 09:39:03 2009
@@ -38,26 +38,20 @@
OPTIMIZE?=-O6
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
- # More GSM codec optimization
- # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
- # which support MMX instructions. This should be newer pentiums,
- # ppro's, etc, as well as the AMD K6 and K7.
- #K6OPT=-DK6OPT
-
- ASTCFLAGS+=$(OPTIMIZE)
+ _ASTCFLAGS+=$(OPTIMIZE)
endif
# shortcuts for common combinations of flags; these must be recursively expanded so that
# per-target settings will be applied
-CC_CFLAGS=$(PTHREAD_CFLAGS) $(ASTCFLAGS)
-CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS))
+CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS) $(ASTCFLAGS)
+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(_ASTCFLAGS) $(ASTCFLAGS))
ifeq ($(GNU_LD),1)
SO_SUPPRESS_SYMBOLS=-Wl,--version-script,$(if $(wildcard $(subst .so,.exports,$@)),$(subst .so,.exports,$@),$(ASTTOPDIR)/default.exports)
endif
-CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS)
-CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS)
+CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS) $(ASTLDFLAGS)
+CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS) $(ASTLDFLAGS)
CC_LIBS=$(PTHREAD_LIBS) $(LIBS)
CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
@@ -73,43 +67,43 @@
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS)
endif
$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
%.o: %.i
$(ECHO_PREFIX) echo " [CCi] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS)
endif
$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
ifneq ($(COMPILE_DOUBLE),yes)
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(MAKE_DEPS) $(CC_CFLAGS)
endif
%.i: %.c
$(ECHO_PREFIX) echo " [CPP] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -E $< $(CC_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -E $< $(MAKE_DEPS) $(CC_CFLAGS)
%.oo: %.ii
$(ECHO_PREFIX) echo " [CXXi] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(OPTIMIZE) $(CXX_CFLAGS)
endif
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
ifneq ($(COMPILE_DOUBLE),yes)
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(MAKE_DEPS) $(CXX_CFLAGS)
endif
%.ii: %.cc
$(ECHO_PREFIX) echo " [CPP] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CXX) -o $@ -E $< $(MAKE_DEPS) $(CXX_CFLAGS)
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
@@ -129,6 +123,6 @@
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(CXX_LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $^ $(CXX_LIBS) $(ASTLDFLAGS)
dist-clean:: clean
Modified: team/oej/pinetree-1.4/UPGRADE.txt
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/UPGRADE.txt?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/UPGRADE.txt (original)
+++ team/oej/pinetree-1.4/UPGRADE.txt Tue Jul 28 09:39:03 2009
@@ -106,6 +106,16 @@
if your dialplan relies on the ability to 'run off the end' of an extension
and wait for a new extension without using WaitExten() to accomplish that,
you will need set autofallthrough to 'no' in your extensions.conf file.
+
+Language Support:
+
+* Support for Taiwanese was incorrectly supported with the "tw" language code.
+ In reality, the "tw" language code is reserved for the Twi language, native
+ to Ghana. If you were previously using the "tw" language code, you should
+ switch to using either "zh" (for Mandarin Chinese) or "zh_TW" for Taiwan
+ specific localizations. Additionally, "mx" should be changed to "es_MX",
+ Georgian was incorrectly specified as "ge" but should be "ka", and Czech is
+ "cs", not "cz".
Command Line Interface:
Modified: team/oej/pinetree-1.4/agi/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/agi/Makefile?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/agi/Makefile (original)
+++ team/oej/pinetree-1.4/agi/Makefile Tue Jul 28 09:39:03 2009
@@ -21,7 +21,7 @@
include $(ASTTOPDIR)/Makefile.rules
-ASTCFLAGS+=-DSTANDALONE
+_ASTCFLAGS+=-DSTANDALONE
all: $(AGIS)
Modified: team/oej/pinetree-1.4/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/apps/app_dial.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/apps/app_dial.c (original)
+++ team/oej/pinetree-1.4/apps/app_dial.c Tue Jul 28 09:39:03 2009
@@ -1674,7 +1674,6 @@
}
if (ast_autoservice_stop(chan) < 0) {
- ast_log(LOG_ERROR, "Could not stop autoservice on calling channel\n");
res = -1;
}
Modified: team/oej/pinetree-1.4/apps/app_mixmonitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/apps/app_mixmonitor.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/apps/app_mixmonitor.c (original)
+++ team/oej/pinetree-1.4/apps/app_mixmonitor.c Tue Jul 28 09:39:03 2009
@@ -273,6 +273,8 @@
ast_writestream(*fs, cur);
}
}
+ } else {
+ ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
}
ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
Modified: team/oej/pinetree-1.4/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/apps/app_queue.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/apps/app_queue.c (original)
+++ team/oej/pinetree-1.4/apps/app_queue.c Tue Jul 28 09:39:03 2009
@@ -1648,7 +1648,8 @@
res = play_file(qe->chan, qe->parent->sound_thanks);
playout:
- if ((res > 0 && !valid_exit(qe, res)) || res < 0)
+
+ if ((res > 0 && !valid_exit(qe, res)))
res = 0;
/* Set our last_pos indicators */
@@ -2123,7 +2124,7 @@
/* play the announcement */
res = play_file(qe->chan, qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]);
- if ((res > 0 && !valid_exit(qe, res)) || res < 0)
+ if (res > 0 && !valid_exit(qe, res))
res = 0;
/* Resume Music on Hold if the caller is going to stay in the queue */
@@ -4364,7 +4365,7 @@
struct ao2_iterator mem_iter;
int new;
const char *general_val = NULL;
- char parse[80];
+ char *parse;
char *interface, *state_interface;
char *membername = NULL;
int penalty;
@@ -4449,7 +4450,9 @@
}
/* Add a new member */
- ast_copy_string(parse, var->value, sizeof(parse));
+ if (!(parse = ast_strdup(var->value))) {
+ continue;
+ }
AST_NONSTANDARD_APP_ARGS(args, parse, ',');
@@ -4495,6 +4498,7 @@
else {
q->membercount++;
}
+ ast_free(parse);
} else {
queue_set_param(q, var->name, var->value, var->lineno, 1);
}
Modified: team/oej/pinetree-1.4/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/apps/app_voicemail.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/apps/app_voicemail.c (original)
+++ team/oej/pinetree-1.4/apps/app_voicemail.c Tue Jul 28 09:39:03 2009
@@ -8510,7 +8510,7 @@
if ((s = ast_variable_retrieve(cfg, "general", "minmessage"))) {
if (sscanf(s, "%d", &x) == 1) {
vmminmessage = x;
- if (maxsilence <= vmminmessage)
+ if (maxsilence / 1000 >= vmminmessage)
ast_log(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
} else {
ast_log(LOG_WARNING, "Invalid min message time length\n");
Modified: team/oej/pinetree-1.4/channels/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/channels/Makefile?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/channels/Makefile (original)
+++ team/oej/pinetree-1.4/channels/Makefile Tue Jul 28 09:39:03 2009
@@ -107,19 +107,19 @@
ifeq ($(OSARCH),linux-gnu)
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(ASTLDFLAGS)
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat $(ASTLDFLAGS)
endif
-chan_misdn.o: ASTCFLAGS+=-Imisdn
+chan_misdn.o: _ASTCFLAGS+=-Imisdn
-misdn_config.o: ASTCFLAGS+=-Imisdn
+misdn_config.o: _ASTCFLAGS+=-Imisdn
-misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
+misdn/isdn_lib.o: _ASTCFLAGS+=-Wno-strict-aliasing
-misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o: ASTCFLAGS+=$(MENUSELECT_OPTS_chan_misdn:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_chan_misdn),$(value $(dep)_INCLUDE))
+misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o: _ASTCFLAGS+=$(MENUSELECT_OPTS_chan_misdn:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_chan_misdn),$(value $(dep)_INCLUDE))
$(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
Modified: team/oej/pinetree-1.4/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/channels/chan_dahdi.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/channels/chan_dahdi.c (original)
+++ team/oej/pinetree-1.4/channels/chan_dahdi.c Tue Jul 28 09:39:03 2009
@@ -195,6 +195,12 @@
#define DCHAN_UP (1 << 2)
#define DCHAN_AVAILABLE (DCHAN_PROVISIONED | DCHAN_NOTINALARM | DCHAN_UP)
+
+/* Overlap dialing option types */
+#define DAHDI_OVERLAPDIAL_NONE 0
+#define DAHDI_OVERLAPDIAL_OUTGOING 1
+#define DAHDI_OVERLAPDIAL_INCOMING 2
+#define DAHDI_OVERLAPDIAL_BOTH (DAHDI_OVERLAPDIAL_INCOMING|DAHDI_OVERLAPDIAL_OUTGOING)
static char defaultcic[64] = "";
static char defaultozz[64] = "";
@@ -2366,7 +2372,7 @@
return -1;
}
} else
- ast_log(LOG_DEBUG, "Deferring dialing...\n");
+ ast_log(LOG_DEBUG, "Deferring dialing... (res %d)\n", res);
p->dialing = 1;
if (ast_strlen_zero(c))
p->dialednone = 1;
@@ -2463,15 +2469,12 @@
pri_set_crv(p->pri->pri, p->call, p->channel, 0);
}
p->digital = IS_DIGITAL(ast->transfercapability);
- /* Add support for exclusive override */
- if (p->priexclusive)
+
+ /* Should the picked channel be used exclusively? */
+ if (p->priexclusive || p->pri->nodetype == PRI_NETWORK) {
exclusive = 1;
- else {
- /* otherwise, traditional behavior */
- if (p->pri->nodetype == PRI_NETWORK)
- exclusive = 0;
- else
- exclusive = 1;
+ } else {
+ exclusive = 0;
}
pri_sr_set_channel(sr, p->bearer ? PVT_TO_CHANNEL(p->bearer) : PVT_TO_CHANNEL(p), exclusive, 1);
@@ -4137,7 +4140,7 @@
ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff);
#ifdef HAVE_PRI
- if (!p->proceeding && p->sig == SIG_PRI && p->pri && p->pri->overlapdial) {
+ if (!p->proceeding && p->sig == SIG_PRI && p->pri && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) {
/* absorb event */
} else {
#endif
@@ -4800,7 +4803,6 @@
break;
case SIG_EM:
case SIG_EM_E1:
- case SIG_EMWINK:
case SIG_FEATD:
case SIG_SF:
case SIG_SFWINK:
@@ -4834,7 +4836,8 @@
case SIG_FEATB:
case SIG_SF_FEATDMF:
case SIG_SF_FEATB:
- /* FGD MF *Must* wait for wink */
+ case SIG_EMWINK:
+ /* FGD MF and EMWINK *Must* wait for wink */
if (!ast_strlen_zero(p->dop.dialstr)) {
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_DIAL, &p->dop);
if (res < 0) {
@@ -5324,7 +5327,9 @@
}
} else if (f->frametype == AST_FRAME_DTMF) {
#ifdef HAVE_PRI
- if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
+ if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial &&
+ ((!p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) ||
+ (p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)))) {
/* Don't accept in-band DTMF when in overlap dial mode */
f->frametype = AST_FRAME_NULL;
f->subclass = 0;
@@ -7648,6 +7653,7 @@
for (x = 0; x < 3; x++)
tmp->subs[x].dfd = -1;
tmp->channel = channel;
+ tmp->priindication_oob = conf->chan.priindication_oob;
}
if (tmp) {
@@ -7948,7 +7954,6 @@
tmp->dahditrcallerid = conf->chan.dahditrcallerid;
tmp->restrictcid = conf->chan.restrictcid;
tmp->use_callingpres = conf->chan.use_callingpres;
- tmp->priindication_oob = conf->chan.priindication_oob;
tmp->priexclusive = conf->chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
@@ -8386,7 +8391,7 @@
if (roundrobin)
round_robin[x] = p;
#if 0
- ast_verbose("name = %s, %d, %d, %d\n",p->owner ? p->owner->name : "<none>", p->channel, channelmatch, groupmatch);
+ ast_verbose("name = %s, %d, %d, %llu\n",p->owner ? p->owner->name : "<none>", p->channel, channelmatch, groupmatch);
#endif
if (p && available(p, channelmatch, groupmatch, &busy, &channelmatched, &groupmatched)) {
@@ -9181,7 +9186,7 @@
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
/* queue DTMF frame if the PBX for this call was already started (we're forwarding KEYPAD_DIGITs further on */
- if (pri->overlapdial && pri->pvts[chanpos]->call==e->digit.call && pri->pvts[chanpos]->owner) {
+ if ((pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) && pri->pvts[chanpos]->call==e->digit.call && pri->pvts[chanpos]->owner) {
/* how to do that */
int digitlen = strlen(e->digit.digits);
char digit;
@@ -9209,7 +9214,7 @@
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
/* queue DTMF frame if the PBX for this call was already started (we're forwarding INFORMATION further on */
- if (pri->overlapdial && pri->pvts[chanpos]->call==e->ring.call && pri->pvts[chanpos]->owner) {
+ if ((pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) && pri->pvts[chanpos]->call==e->ring.call && pri->pvts[chanpos]->owner) {
/* how to do that */
int digitlen = strlen(e->ring.callednum);
char digit;
@@ -9332,7 +9337,7 @@
pri->pvts[chanpos]->exten[1] = '\0';
}
/* Make sure extension exists (or in overlap dial mode, can exist) */
- if ((pri->overlapdial && ast_canmatch_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) ||
+ if (((pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) && ast_canmatch_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) ||
ast_exists_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
/* Setup law */
int law;
@@ -9352,7 +9357,7 @@
res = set_actual_gain(pri->pvts[chanpos]->subs[SUB_REAL].dfd, 0, pri->pvts[chanpos]->rxgain, pri->pvts[chanpos]->txgain, law);
if (res < 0)
ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
- if (e->ring.complete || !pri->overlapdial) {
+ if (e->ring.complete || !(pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) {
/* Just announce proceeding */
pri->pvts[chanpos]->proceeding = 1;
pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
@@ -9366,7 +9371,7 @@
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
/* Start PBX */
- if (!e->ring.complete && pri->overlapdial && ast_matchmore_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
+ if (!e->ring.complete && (pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) && ast_matchmore_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
/* Release the PRI lock while we create the channel */
ast_mutex_unlock(&pri->lock);
if (crv) {
@@ -9673,6 +9678,7 @@
} else if (pri->pvts[chanpos]->confirmanswer) {
ast_log(LOG_DEBUG, "Waiting on answer confirmation on channel %d!\n", pri->pvts[chanpos]->channel);
} else {
+ pri->pvts[chanpos]->dialing = 0;
pri->pvts[chanpos]->subs[SUB_REAL].needanswer =1;
/* Enable echo cancellation if it's not on already */
dahdi_enable_ec(pri->pvts[chanpos]);
@@ -10020,8 +10026,8 @@
pri->dchans[i] = pri_new(pri->fds[i], pri->nodetype, pri->switchtype);
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
- pri->overlapdial = 1;
- pri_set_overlapdial(pri->dchans[i],pri->overlapdial);
+ pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
+ pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
#ifdef HAVE_PRI_INBANDDISCONNECT
pri_set_inbanddisconnect(pri->dchans[i], pri->inbanddisconnect);
#endif
@@ -10284,7 +10290,7 @@
#else
pri_dump_info(pris[span-1].pri);
#endif
- ast_cli(fd, "\n");
+ ast_cli(fd, "Overlap Recv: %s\n\n", (pris[span-1].overlapdial & DAHDI_OVERLAPDIAL_INCOMING)?"Yes":"No");
}
}
return RESULT_SUCCESS;
@@ -11816,33 +11822,54 @@
} else if (!strcasecmp(v->name, "idledial")) {
ast_copy_string(confp->pri.idledial, v->value, sizeof(confp->pri.idledial));
} else if (!strcasecmp(v->name, "overlapdial")) {
- confp->pri.overlapdial = ast_true(v->value);
+ if (ast_true(v->value)) {
+ confp->pri.overlapdial = DAHDI_OVERLAPDIAL_BOTH;
+ } else if (!strcasecmp(v->value, "incoming")) {
+ confp->pri.overlapdial = DAHDI_OVERLAPDIAL_INCOMING;
+ } else if (!strcasecmp(v->value, "outgoing")) {
+ confp->pri.overlapdial = DAHDI_OVERLAPDIAL_OUTGOING;
+ } else if (!strcasecmp(v->value, "both") || ast_true(v->value)) {
+ confp->pri.overlapdial = DAHDI_OVERLAPDIAL_BOTH;
+ } else {
+ confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
+ }
#ifdef HAVE_PRI_INBANDDISCONNECT
} else if (!strcasecmp(v->name, "inbanddisconnect")) {
confp->pri.inbanddisconnect = ast_true(v->value);
#endif
} else if (!strcasecmp(v->name, "pritimer")) {
#ifdef PRI_GETSET_TIMERS
- char *timerc, *c;
- int timer, timeridx;
- c = v->value;
+ char tmp[20];
+ char *timerc;
+ char *c;
+ int timer;
+ int timeridx;
+
+ ast_copy_string(tmp, v->value, sizeof(tmp));
+ c = tmp;
timerc = strsep(&c, ",");
- if (timerc) {
+ if (!ast_strlen_zero(timerc) && !ast_strlen_zero(c)) {
+ timeridx = pri_timer2idx(timerc);
timer = atoi(c);
- if (!timer)
- ast_log(LOG_WARNING, "'%s' is not a valid value for an ISDN timer\n", timerc);
- else {
- if ((timeridx = pri_timer2idx(timerc)) >= 0)
- pritimers[timeridx] = timer;
- else
- ast_log(LOG_WARNING, "'%s' is not a valid ISDN timer\n", timerc);
+ if (timeridx < 0 || PRI_MAX_TIMERS <= timeridx) {
+ ast_log(LOG_WARNING,
+ "'%s' is not a valid ISDN timer at line %d.\n", timerc,
+ v->lineno);
+ } else if (!timer) {
+ ast_log(LOG_WARNING,
+ "'%s' is not a valid value for ISDN timer '%s' at line %d.\n",
+ c, timerc, v->lineno);
+ } else {
+ pritimers[timeridx] = timer;
}
- } else
- ast_log(LOG_WARNING, "'%s' is not a valid ISDN timer configuration string\n", v->value);
-
+ } else {
+ ast_log(LOG_WARNING,
+ "'%s' is not a valid ISDN timer configuration string at line %d.\n",
+ v->value, v->lineno);
+ }
+#endif /* PRI_GETSET_TIMERS */
} else if (!strcasecmp(v->name, "facilityenable")) {
confp->pri.facilityenable = ast_true(v->value);
-#endif /* PRI_GETSET_TIMERS */
#endif /* HAVE_PRI */
} else if (!strcasecmp(v->name, "cadence")) {
/* setup to scan our argument */
@@ -11985,7 +12012,7 @@
}
/*< \todo why check for the pseudo in the per-channel section.
* Any actual use for manual setup of the pseudo channel? */
- if (!found_pseudo && reload == 0) {
+ if (!found_pseudo && reload != 1) {
/* use the default configuration for a channel, so
that any settings from real configured channels
don't "leak" into the pseudo channel config
Modified: team/oej/pinetree-1.4/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/channels/chan_iax2.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/channels/chan_iax2.c (original)
+++ team/oej/pinetree-1.4/channels/chan_iax2.c Tue Jul 28 09:39:03 2009
@@ -1358,10 +1358,20 @@
goto retry;
}
}
- if (!owner && iaxs[callno]) {
- AST_SCHED_DEL_SPINLOCK(sched, iaxs[callno]->lagid, &iaxsl[callno]);
- AST_SCHED_DEL_SPINLOCK(sched, iaxs[callno]->pingid, &iaxsl[callno]);
- iaxs[callno] = NULL;
+
+ /* SPINLOCK gives up the pvt lock so the scheduler and iax2_pvt don't deadlock. Since we
+ * give up the pvt lock, the pvt could be destroyed from underneath us. To guarantee
+ * the pvt stays around, a ref count is added to it. */
+ if (!owner && pvt) {
+ ao2_ref(pvt, +1);
+ AST_SCHED_DEL_SPINLOCK(sched, pvt->lagid, &iaxsl[pvt->callno]);
+ AST_SCHED_DEL_SPINLOCK(sched, pvt->pingid, &iaxsl[pvt->callno]);
+ ao2_ref(pvt, -1);
+ if (iaxs[callno]) {
+ iaxs[callno] = NULL;
+ } else {
+ pvt = NULL;
+ }
}
if (pvt) {
@@ -2758,7 +2768,7 @@
/* create an interpolation frame */
af.frametype = AST_FRAME_VOICE;
af.subclass = pvt->voiceformat;
- af.samples = frame.ms * 8;
+ af.samples = frame.ms * (ast_format_rate(pvt->voiceformat) / 1000);
af.src = "IAX2 JB interpolation";
af.delivery = ast_tvadd(pvt->rxcore, ast_samp2tv(next, 1000));
af.offset = AST_FRIENDLY_OFFSET;
@@ -2831,7 +2841,7 @@
if(fr->af.frametype == AST_FRAME_VOICE) {
type = JB_TYPE_VOICE;
- len = ast_codec_get_samples(&fr->af) / 8;
+ len = ast_codec_get_samples(&fr->af) / (ast_format_rate(fr->af.subclass) / 1000);
} else if(fr->af.frametype == AST_FRAME_CNG) {
type = JB_TYPE_SILENCE;
}
@@ -3322,13 +3332,15 @@
char *options;
};
-static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno)
+static int send_apathetic_reply(unsigned short callno, unsigned short dcallno,
+ struct sockaddr_in *sin, int command, int ts, unsigned char seqno,
+ int sockfd)
{
struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno),
.ts = htonl(ts), .iseqno = seqno, .oseqno = 0, .type = AST_FRAME_IAX,
.csub = compress_subclass(command) };
- return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin));
+ return sendto(sockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin));
}
/*!
@@ -3710,7 +3722,7 @@
return AST_BRIDGE_FAILED;
}
/* Put them in native bridge mode */
- if (!flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
+ if (!(flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) {
iaxs[callno0]->bridgecallno = callno1;
iaxs[callno1]->bridgecallno = callno0;
}
@@ -4062,6 +4074,7 @@
int voice = 0;
int genuine = 0;
int adjust;
+ int rate = ast_format_rate(f->subclass) / 1000;
struct timeval *delivery = NULL;
@@ -4129,7 +4142,7 @@
p->offset = ast_tvadd(p->offset, ast_samp2tv(adjust, 10000));
if (!p->nextpred) {
- p->nextpred = ms; /*f->samples / 8;*/
+ p->nextpred = ms; /*f->samples / rate;*/
if (p->nextpred <= p->lastsent)
p->nextpred = p->lastsent + 3;
}
@@ -4148,11 +4161,11 @@
ast_log(LOG_DEBUG, "predicted timestamp skew (%u) > max (%u), using real ts instead.\n",
abs(ms - p->nextpred), MAX_TIMESTAMP_SKEW);
- if (f->samples >= 8) /* check to make sure we dont core dump */
+ if (f->samples >= rate) /* check to make sure we dont core dump */
{
- int diff = ms % (f->samples / 8);
+ int diff = ms % (f->samples / rate);
if (diff)
- ms += f->samples/8 - diff;
+ ms += f->samples/rate - diff;
}
p->nextpred = ms;
@@ -4184,7 +4197,7 @@
}
p->lastsent = ms;
if (voice)
- p->nextpred = p->nextpred + f->samples / 8;
+ p->nextpred = p->nextpred + f->samples / rate;
return ms;
}
@@ -7466,7 +7479,7 @@
/* Deal with POKE/PONG without allocating a callno */
if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) {
/* Reply back with a PONG, but don't care about the result. */
- send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohl(fh->ts), fh->iseqno + 1);
+ send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohl(fh->ts), fh->iseqno + 1, fd);
return 1;
} else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) {
/* Ignore */
Modified: team/oej/pinetree-1.4/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/channels/chan_misdn.c?view=diff&rev=209439&r1=209438&r2=209439
==============================================================================
--- team/oej/pinetree-1.4/channels/chan_misdn.c (original)
+++ team/oej/pinetree-1.4/channels/chan_misdn.c Tue Jul 28 09:39:03 2009
@@ -131,30 +131,32 @@
MISDN_ALERTING, /*!< when Alerting */
MISDN_BUSY, /*!< when BUSY */
MISDN_CONNECTED, /*!< when connected */
- MISDN_PRECONNECTED, /*!< when connected */
MISDN_DISCONNECTED, /*!< when connected */
- MISDN_RELEASED, /*!< when connected */
- MISDN_BRIDGED, /*!< when bridged */
MISDN_CLEANING, /*!< when hangup from * but we were connected before */
- MISDN_HUNGUP_FROM_MISDN, /*!< when DISCONNECT/RELEASE/REL_COMP came from misdn */
- MISDN_HUNGUP_FROM_AST, /*!< when DISCONNECT/RELEASE/REL_COMP came out of misdn_hangup */
- MISDN_HOLDED, /*!< if this chan is holded */
- MISDN_HOLD_DISCONNECT, /*!< if this chan is holded */
-
};
#define ORG_AST 1
#define ORG_MISDN 2
+enum misdn_hold_state {
+ MISDN_HOLD_IDLE, /*!< HOLD not active */
+ MISDN_HOLD_ACTIVE, /*!< Call is held */
+ MISDN_HOLD_TRANSFER, /*!< Held call is being transferred */
+ MISDN_HOLD_DISCONNECT, /*!< Held call is being disconnected */
+};
struct hold_info {
/*!
- * \brief Logical port the channel call record is HOLDED on
- * because the B channel is no longer associated.
+ * \brief Call HOLD state.
+ */
+ enum misdn_hold_state state;
+ /*!
+ * \brief Logical port the channel call record is HELD on
+ * because the B channel is no longer associated.
*/
int port;
/*!
- * \brief Original B channel number the HOLDED call was using.
+ * \brief Original B channel number the HELD call was using.
* \note Used only for debug display messages.
*/
int channel;
[... 5652 lines stripped ...]
More information about the svn-commits
mailing list