dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Allow for "magic" pickups to work when we wish to ignore the context 

When the subscription context for a call pickup subscription differs
from the context of the call pickup target, there's not an easy way
to divine what context should be used for the pickup. The way to work
around this is to use PICKUPMARK as the context for the pickup.

This has been documented in the sip.conf.sample file

(ABE-1708)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180155 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mmichelson 2009-03-04 17:03:32 +00:00
parent 1ee6240485
commit 3c05737b3d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@ -18574,7 +18574,7 @@ static int do_magic_pickup(struct ast_channel *channel, const char *extension, c
return -1;
}
ast_str_set(&str, 0, "%s@%s", extension, context);
ast_str_set(&str, 0, "%s@%s", extension, sip_cfg.notifycid == IGNORE_CONTEXT ? "PICKUPMARK" : context);
ast_debug(2, "About to call Pickup(%s)\n", str->str);

5
configs/sip.conf.sample
View File

@ -414,7 +414,10 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; extension is ringing because multiple calls are incoming,
; only one will be used as the source of caller ID. Specify
; 'ignore-context' to ignore the called context when looking
; for the caller's channel. The default value is 'no.'
; for the caller's channel. The default value is 'no.' Setting
; notifycid to 'ignore-context' also causes call-pickups attempted
; via SNOM's NOTIFY mechanism to set the context for the call pickup
; to PICKUPMARK.
;callcounter = yes ; Enable call counters on devices. This can be set per
; device too.