[asterisk-commits] branch murf/bug_7474 r37254 - in
/team/murf/bug_7474: ./ apps/ cdr/ channels/...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Jul 6 15:14:18 MST 2006
Author: murf
Date: Thu Jul 6 17:14:18 2006
New Revision: 37254
URL: http://svn.digium.com/view/asterisk?rev=37254&view=rev
Log:
Merged revisions 37222-37223,37225-37226 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r37222 | kpfleming | 2006-07-06 15:04:28 -0600 (Thu, 06 Jul 2006) | 2 lines
move rules file to prepare for generic rules file
................
r37223 | mogorman | 2006-07-06 15:36:17 -0600 (Thu, 06 Jul 2006) | 4 lines
patch resolves issue with when to decide if its right time
to native bridge, feature redirect was not being checked.
patch from bug #7296
................
r37225 | mogorman | 2006-07-06 15:42:09 -0600 (Thu, 06 Jul 2006) | 11 lines
Blocked revisions 37224 via svnmerge
........
r37224 | mogorman | 2006-07-06 16:41:23 -0500 (Thu, 06 Jul 2006) | 4 lines
patch resolves issue with when to decide if its right time
to native bridge, feature redirect was not being checked.
patch from bug #7296
........
................
r37226 | mattf | 2006-07-06 15:51:51 -0600 (Thu, 06 Jul 2006) | 2 lines
Asterisk portion of the T309 patch. (#7271)
................
Added:
team/murf/bug_7474/Makefile.moddir_rules (props changed)
- copied unchanged from r37226, trunk/Makefile.moddir_rules
Removed:
team/murf/bug_7474/Makefile.rules
Modified:
team/murf/bug_7474/ (props changed)
team/murf/bug_7474/Makefile
team/murf/bug_7474/apps/Makefile
team/murf/bug_7474/cdr/Makefile
team/murf/bug_7474/channel.c
team/murf/bug_7474/channels/Makefile
team/murf/bug_7474/channels/chan_zap.c
team/murf/bug_7474/codecs/Makefile
team/murf/bug_7474/configs/zapata.conf.sample
team/murf/bug_7474/formats/Makefile
team/murf/bug_7474/funcs/Makefile
team/murf/bug_7474/pbx/Makefile
team/murf/bug_7474/res/Makefile
Propchange: team/murf/bug_7474/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/murf/bug_7474/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 6 17:14:18 2006
@@ -1,1 +1,1 @@
-/trunk:1-37208
+/trunk:1-37253
Modified: team/murf/bug_7474/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/Makefile (original)
+++ team/murf/bug_7474/Makefile Thu Jul 6 17:14:18 2006
@@ -25,14 +25,14 @@
#SUB_PROC=xscale # or maverick
ifeq ($(CROSS_COMPILE),)
- OSARCH=$(shell uname -s)
- PROC?=$(shell uname -m)
+ OSARCH:=$(shell uname -s)
+ PROC?:=$(shell uname -m)
else
OSARCH=$(CROSS_ARCH)
PROC=$(CROSS_PROC)
endif
-PWD=$(shell pwd)
+ASTTOPDIR:=$(shell pwd)
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
@@ -886,7 +886,7 @@
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
- @CFLAGS="-include $(PWD)/include/asterisk/autoconfig.h -I$(PWD)/include" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect
+ @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect
mxml/libmxml.a:
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
Propchange: team/murf/bug_7474/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/bug_7474/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/murf/bug_7474/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/murf/bug_7474/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/apps/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/apps/Makefile (original)
+++ team/murf/bug_7474/apps/Makefile Thu Jul 6 17:14:18 2006
@@ -20,7 +20,7 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o
Modified: team/murf/bug_7474/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/cdr/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/cdr/Makefile (original)
+++ team/murf/bug_7474/cdr/Makefile Thu Jul 6 17:14:18 2006
@@ -18,4 +18,4 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
Modified: team/murf/bug_7474/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/channel.c?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/channel.c (original)
+++ team/murf/bug_7474/channel.c Thu Jul 6 17:14:18 2006
@@ -3593,7 +3593,8 @@
(config->timelimit == 0) &&
(c0->tech->bridge == c1->tech->bridge) &&
!nativefailed && !c0->monitor && !c1->monitor &&
- !c0->spies && !c1->spies) {
+ !c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) &&
+ !ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) {
/* Looks like they share a bridge method and nothing else is in the way */
ast_set_flag(c0, AST_FLAG_NBRIDGE);
ast_set_flag(c1, AST_FLAG_NBRIDGE);
Modified: team/murf/bug_7474/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/channels/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/channels/Makefile (original)
+++ team/murf/bug_7474/channels/Makefile Thu Jul 6 17:14:18 2006
@@ -60,17 +60,17 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
clean::
rm -f busy.h ringtone.h gentone gentone-ulaw
-ifneq ($(wildcard h323/Makefile.ast),)
- include h323/Makefile.ast
+ifneq ($(wildcard $(ASTTOPDIR)/Makefile.ast),)
+ include $(ASTTOPDIR)/Makefile.ast
endif
-ifneq ($(wildcard misdn/Makefile.ast),)
- include misdn/Makefile.ast
+ifneq ($(wildcard m$(ASTTOPDIR)/Makefile.ast),)
+ include m$(ASTTOPDIR)/Makefile.ast
endif
gentone gentone-ulaw: %: %.c
@@ -95,7 +95,7 @@
$(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
ifeq ($(OSARCH),Linux)
-chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
+chan_h323.so: chan_h323.o h323/libchanh323.a $(ASTTOPDIR)/Makefile.ast
$(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
else
chan_h323.so: chan_h323.o h323/libchanh323.a
Modified: team/murf/bug_7474/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/channels/chan_zap.c?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/channels/chan_zap.c (original)
+++ team/murf/bug_7474/channels/chan_zap.c Thu Jul 6 17:14:18 2006
@@ -3637,20 +3637,23 @@
break;
case ZT_EVENT_ALARM:
#ifdef HAVE_PRI
- if (p->call) {
- if (p->pri && p->pri->pri) {
- if (!pri_grab(p, p->pri)) {
- pri_hangup(p->pri->pri, p->call, -1);
- pri_destroycall(p->pri->pri, p->call);
- p->call = NULL;
- pri_rel(p->pri);
+ if (!p->pri || !p->pri->pri || (pri_get_timer(p->pri->pri, PRI_TIMER_T309) < 0)) {
+ /* T309 is not enabled : hangup calls when alarm occurs */
+ if (p->call) {
+ if (p->pri && p->pri->pri) {
+ if (!pri_grab(p, p->pri)) {
+ pri_hangup(p->pri->pri, p->call, -1);
+ pri_destroycall(p->pri->pri, p->call);
+ p->call = NULL;
+ pri_rel(p->pri);
+ } else
+ ast_log(LOG_WARNING, "Failed to grab PRI!\n");
} else
- ast_log(LOG_WARNING, "Failed to grab PRI!\n");
- } else
- ast_log(LOG_WARNING, "The PRI Call have not been destroyed\n");
- }
- if (p->owner)
- p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+ ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n");
+ }
+ if (p->owner)
+ p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+ }
if (p->bearer)
p->bearer->inalarm = 1;
else
@@ -3662,7 +3665,13 @@
"Alarm: %s\r\n"
"Channel: %d\r\n",
alarm2str(res), p->channel);
- /* fall through intentionally */
+#ifdef HAVE_LIBPRI
+ if (!p->pri || !p->pri->pri || pri_get_timer(p->pri->pri, PRI_TIMER_T309) < 0) {
+ /* fall through intentionally */
+ } else {
+ break;
+ }
+#endif
case ZT_EVENT_ONHOOK:
if (p->radio) {
p->subs[index].f.frametype = AST_FRAME_CONTROL;
@@ -8366,18 +8375,21 @@
for (i = 0; i < pri->numchans; i++) {
struct zt_pvt *p = pri->pvts[i];
if (p) {
- if (p->call) {
- if (p->pri && p->pri->pri) {
- pri_hangup(p->pri->pri, p->call, -1);
- pri_destroycall(p->pri->pri, p->call);
- p->call = NULL;
- } else
- ast_log(LOG_WARNING, "The PRI Call have not been destroyed\n");
+ if (!p->pri || !p->pri->pri || pri_get_timer(p->pri->pri, PRI_TIMER_T309) < 0) {
+ /* T309 is not enabled : hangup calls when alarm occurs */
+ if (p->call) {
+ if (p->pri && p->pri->pri) {
+ pri_hangup(p->pri->pri, p->call, -1);
+ pri_destroycall(p->pri->pri, p->call);
+ p->call = NULL;
+ } else
+ ast_log(LOG_WARNING, "The PRI Call have not been destroyed\n");
+ }
+ if (p->realcall) {
+ pri_hangup_all(p->realcall, pri);
+ } else if (p->owner)
+ p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
}
- if (p->realcall) {
- pri_hangup_all(p->realcall, pri);
- } else if (p->owner)
- p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
p->inalarm = 1;
}
}
@@ -10218,12 +10230,11 @@
cfg = ast_config_load(config);
- /* We *must* have a config file otherwise stop immediately */
+ /* Error if we have no config file */
if (!cfg) {
ast_log(LOG_ERROR, "Unable to load config %s\n", config);
return 0;
}
-
/* It's a little silly to lock it, but we mind as well just to be sure */
ast_mutex_lock(&iflock);
Modified: team/murf/bug_7474/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/codecs/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/codecs/Makefile (original)
+++ team/murf/bug_7474/codecs/Makefile Thu Jul 6 17:14:18 2006
@@ -30,7 +30,7 @@
codec_gsm.so: gsm/lib/libgsm.a
endif
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
clean::
$(MAKE) -C gsm clean
Modified: team/murf/bug_7474/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/configs/zapata.conf.sample?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/configs/zapata.conf.sample (original)
+++ team/murf/bug_7474/configs/zapata.conf.sample Thu Jul 6 17:14:18 2006
@@ -131,6 +131,16 @@
; ISDN Timers
; All of the ISDN timers and counters that are used are configurable. Specify
; the timer name, and its value (in ms for timers).
+; K: Layer 2 max number of outstanding unacknowledged I frames (default 7)
+; N200: Layer 2 max number of retransmissions of a frame (default 3)
+; T200: Layer 2 max time before retransmission of a frame (default 1000 ms)
+; T203: Layer 2 max time without frames being exchanged (default 10000 ms)
+; T305: Wait for DISCONNECT acknowledge (default 30000 ms)
+; T308: Wait for RELEASE acknowledge (default 4000 ms)
+; T309: Maintain active calls on Layer 2 disconnection (default -1, Asterisk clears calls)
+; EuroISDN: 6000 to 12000 ms, according to (N200 + 1) × T200 + 2s
+; May vary in other ISDN standards (Q.931 1993 : 90000 ms)
+; T313: Wait for CONNECT acknowledge, CPE side only (default 3000 ms)
;
; pritimer => t200,1000
; pritimer => t313,4000
Modified: team/murf/bug_7474/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/formats/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/formats/Makefile (original)
+++ team/murf/bug_7474/formats/Makefile Thu Jul 6 17:14:18 2006
@@ -18,4 +18,4 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
Modified: team/murf/bug_7474/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/funcs/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/funcs/Makefile (original)
+++ team/murf/bug_7474/funcs/Makefile Thu Jul 6 17:14:18 2006
@@ -29,4 +29,4 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
Modified: team/murf/bug_7474/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/pbx/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/pbx/Makefile (original)
+++ team/murf/bug_7474/pbx/Makefile Thu Jul 6 17:14:18 2006
@@ -20,7 +20,7 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
clean::
rm -f ael/*.o
Modified: team/murf/bug_7474/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7474/res/Makefile?rev=37254&r1=37253&r2=37254&view=diff
==============================================================================
--- team/murf/bug_7474/res/Makefile (original)
+++ team/murf/bug_7474/res/Makefile Thu Jul 6 17:14:18 2006
@@ -22,7 +22,7 @@
all: _all
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
res_snmp.so: res_snmp.o snmp/agent.o
More information about the asterisk-commits
mailing list