diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 17:03:32 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 17:03:32 +0000 |
| commit | 3c05737b3d09b4e26c7412ee5aef32d444805015 (patch) | |
| tree | 3ac6f47c782605d521f7f0c2ba6b8b4e4389057b /channels | |
| parent | 1ee62404852b4e1149ddb4cb39f1e466237f1093 (diff) | |
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
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 066cc3d30..6051fa9ec 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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); |