kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 226532 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r226532 | file | 2009-10-29 15:13:42 -0300 (Thu, 29 Oct 2009) | 13 lines
  
  Merged revisions 226531 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r226531 | file | 2009-10-29 15:11:26 -0300 (Thu, 29 Oct 2009) | 6 lines
    
    Add an option to enabling passing music on hold start and stop requests through instead of
    acting on them in chan_local.
    
    (closes issue #14709)
    Reported by: dimas
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@226534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-10-29 18:15:41 +00:00
parent 8ed14498d8
commit bf7f97a3ff
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_local.c
View File

@@ -119,6 +119,7 @@ struct local_pvt {
#define LOCAL_LAUNCHED_PBX (1 << 3) /*!< PBX was launched */ #define LOCAL_LAUNCHED_PBX (1 << 3) /*!< PBX was launched */
#define LOCAL_NO_OPTIMIZATION (1 << 4) /*!< Do not optimize using masquerading */ #define LOCAL_NO_OPTIMIZATION (1 << 4) /*!< Do not optimize using masquerading */
#define LOCAL_BRIDGE (1 << 5) /*!< Report back the "true" channel as being bridged to */ #define LOCAL_BRIDGE (1 << 5) /*!< Report back the "true" channel as being bridged to */
#define LOCAL_MOH_PASSTHRU (1 << 6) /*!< Pass through music on hold start/stop frames */
static AST_LIST_HEAD_STATIC(locals, local_pvt); static AST_LIST_HEAD_STATIC(locals, local_pvt);
@@ -406,9 +407,9 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
return -1; return -1;
/* If this is an MOH hold or unhold, do it on the Local channel versus real channel */ /* If this is an MOH hold or unhold, do it on the Local channel versus real channel */
if (condition == AST_CONTROL_HOLD) { if (!ast_test_flag(p, LOCAL_MOH_PASSTHRU) && condition == AST_CONTROL_HOLD) {
ast_moh_start(ast, data, NULL); ast_moh_start(ast, data, NULL);
} else if (condition == AST_CONTROL_UNHOLD) { } else if (!ast_test_flag(p, LOCAL_MOH_PASSTHRU) && condition == AST_CONTROL_UNHOLD) {
ast_moh_stop(ast); ast_moh_stop(ast);
} else { } else {
/* Queue up a frame representing the indication as a control frame */ /* Queue up a frame representing the indication as a control frame */
@@ -677,6 +678,9 @@ static struct local_pvt *local_alloc(const char *data, int format)
if (strchr(opts, 'b')) { if (strchr(opts, 'b')) {
ast_set_flag(tmp, LOCAL_BRIDGE); ast_set_flag(tmp, LOCAL_BRIDGE);
} }
if (strchr(opts, 'm')) {
ast_set_flag(tmp, LOCAL_MOH_PASSTHRU);
}
} }
/* Look for a context */ /* Look for a context */

4
doc/tex/localchannel.tex
View File

@@ -27,6 +27,10 @@ audio that it receives from the channel that called the local channel. This is
especially in the case of putting chan\_local in between an incoming SIP call especially in the case of putting chan\_local in between an incoming SIP call
and Asterisk applications, so that the incoming audio will be de-jittered. and Asterisk applications, so that the incoming audio will be de-jittered.
Using the "m" option will cause chan_local to forward music on hold start and stop
requests. Normally chan_local acts on them and it is started or stopped on the
Local channel itself.
\subsection{Purpose} \subsection{Purpose}
The Local channel construct can be used to establish dialing into any part of The Local channel construct can be used to establish dialing into any part of