summaryrefslogtreecommitdiff
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2009-03-04 17:03:32 +0000
committerMark Michelson <mmichelson@digium.com>2009-03-04 17:03:32 +0000
commit3a14487abf101cb3fb567bc17def47b0eb6c0bdf (patch)
tree3ac6f47c782605d521f7f0c2ba6b8b4e4389057b /channels/chan_sip.c
parent15090ba1dff9e35e77e7cb695db7fe0b3db9f8a3 (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) closes issue #14567 submitted by: alecdavis git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c2
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);