kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 05:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-16 18:06:16 +00:00
parent aad583ff1d
commit 2b3941fcbf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_zap.c
View File

@@ -5856,7 +5856,7 @@ static void *ss_thread(void *data)
number = 0; number = 0;
/* If set to use V23 Signalling, launch our FSK gubbins and listen for it */ /* If set to use V23 Signalling, launch our FSK gubbins and listen for it */
} else if (p->cid_signalling == CID_SIG_V23) { } else if (p->cid_signalling == CID_SIG_V23) {
cs = callerid_new(cid_signalling); cs = callerid_new(p->cid_signalling);
if (cs) { if (cs) {
samples = 0; samples = 0;
#if 1 #if 1
@@ -6027,7 +6027,7 @@ static void *ss_thread(void *data)
} }
} else if (p->use_callerid && p->cid_start == CID_START_RING) { } else if (p->use_callerid && p->cid_start == CID_START_RING) {
/* FSK Bell202 callerID */ /* FSK Bell202 callerID */
cs = callerid_new(cid_signalling); cs = callerid_new(p->cid_signalling);
if (cs) { if (cs) {
#if 1 #if 1
bump_gains(p); bump_gains(p);

1
configs/sip.conf.sample
View File

@@ -86,6 +86,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;progressinband=never ; If we should generate in-band ringing always ;progressinband=never ; If we should generate in-band ringing always
; use 'never' to never use in-band signalling, even in cases ; use 'never' to never use in-band signalling, even in cases
; where some buggy devices might not render it ; where some buggy devices might not render it
; Valid values: yes, no, never Default: never
;useragent=Asterisk PBX ; Allows you to change the user agent string ;useragent=Asterisk PBX ; Allows you to change the user agent string
;promiscredir = no ; If yes, allows 302 or REDIR to non-local SIP address ;promiscredir = no ; If yes, allows 302 or REDIR to non-local SIP address
; Note that promiscredir when redirects are made to the ; Note that promiscredir when redirects are made to the