diff options
| -rw-r--r-- | channels/chan_sip.c | 2 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 5 |
2 files changed, 5 insertions, 2 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); diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index a33ec7f76..3ff56f878 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -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. |