[asterisk-commits] crichter: trunk r67240 - in /trunk: ./ channels/ channels/misdn/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Tue Jun  5 06:48:25 2007
New Revision: 67240

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67240
Log:
Merged revisions 67210 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r67210 | crichter | 2007-06-05 12:25:32 +0200 (Di, 05 Jun 2007) | 9 lines

Merged revisions 67209 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r67209 | crichter | 2007-06-05 12:05:45 +0200 (Di, 05 Jun 2007) | 1 line

added possibility to deactivate bridging per port
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c
    trunk/channels/misdn/chan_misdn_config.h
    trunk/channels/misdn_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=67240&r1=67239&r2=67240
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Tue Jun  5 06:48:25 2007
@@ -2808,6 +2808,16 @@
 	else
 		return -1;
 
+	int p1_b, p2_b;
+
+	misdn_cfg_get(ch1->bc->port, MISDN_CFG_BRIDGING, &p1_b, sizeof(int));
+	misdn_cfg_get(ch2->bc->port, MISDN_CFG_BRIDGING, &p2_b, sizeof(int));
+	
+	if ( ! p1_b || ! p2_b) {
+		ast_log(LOG_NOTICE, "Falling back to Asterisk bridging\n");
+		return AST_BRIDGE_FAILED;
+	}
+
 	int bridging;
 	misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int));
 	if (bridging) {
@@ -3268,6 +3278,7 @@
 		
 		int bridging;
 		misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int));
+		
 		if (bridging)
 			tmp->tech = &misdn_tech;
 		else

Modified: trunk/channels/misdn/chan_misdn_config.h
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/chan_misdn_config.h?view=diff&rev=67240&r1=67239&r2=67240
==============================================================================
--- trunk/channels/misdn/chan_misdn_config.h (original)
+++ trunk/channels/misdn/chan_misdn_config.h Tue Jun  5 06:48:25 2007
@@ -67,6 +67,7 @@
 	MISDN_CFG_NEED_MORE_INFOS,     /* bool */
 	MISDN_CFG_NOAUTORESPOND_ON_SETUP,     /* bool */
 	MISDN_CFG_NTTIMEOUT,     /* bool */
+	MISDN_CFG_BRIDGING,              /* int */
 	MISDN_CFG_JITTERBUFFER,              /* int */
 	MISDN_CFG_JITTERBUFFER_UPPER_THRESHOLD,              /* int */
 	MISDN_CFG_CALLGROUP,           /* ast_group_t */

Modified: trunk/channels/misdn_config.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn_config.c?view=diff&rev=67240&r1=67239&r2=67240
==============================================================================
--- trunk/channels/misdn_config.c (original)
+++ trunk/channels/misdn_config.c Tue Jun  5 06:48:25 2007
@@ -314,6 +314,13 @@
 	{ "nttimeout", MISDN_CFG_NTTIMEOUT, MISDN_CTYPE_BOOL, "no", NONE ,
 		"Set this to yes if you want calls disconnected in overlap mode\n"
 		"\twhen a timeout happens." },
+	{ "bridging", MISDN_CFG_BRIDGING, MISDN_CTYPE_BOOL, "yes", NONE,
+	 	"Set this to yes/no, default is yes.\n"
+		"This can be used to have bridging enabled in general and to\n"
+		"disable it for specific ports. It makes sense to disable\n"
+		"bridging on NT Port where you plan to use the HOLD/RETRIEVE\n"
+		"features with ISDN phones.\n"
+		},
 	{ "msns", MISDN_CFG_MSNS, MISDN_CTYPE_MSNLIST, "*", NONE,
 		"MSN's for TE ports, listen on those numbers on the above ports, and\n"
 		"\tindicate the incoming calls to Asterisk.\n"