summaryrefslogtreecommitdiff
path: root/channels/misdn_config.c
diff options
context:
space:
mode:
authorChristian Richter <christian.richter@beronet.com>2007-06-05 11:48:25 +0000
committerChristian Richter <christian.richter@beronet.com>2007-06-05 11:48:25 +0000
commit8e4dbdd5e14d56814b0b2641cef4cee687136274 (patch)
treef2ee9d12a886081ec5d511e4f42b90e9ae6b744d /channels/misdn_config.c
parentfcc3aba33119934fa8ba8cad01f2a20c27e34d7d (diff)
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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/misdn_config.c')
-rw-r--r--channels/misdn_config.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index f9450c07b..69b35ccbf 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -314,6 +314,13 @@ static const struct misdn_cfg_spec port_spec[] = {
{ "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"