[svn-commits] mmichelson: trunk r180155 - in /trunk: channels/ configs/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Mar  4 11:03:32 2009
New Revision: 180155

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180155
Log:
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)


Modified:
    trunk/channels/chan_sip.c
    trunk/configs/sip.conf.sample

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=180155&r1=180154&r2=180155
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Mar  4 11:03:32 2009
@@ -18574,7 +18574,7 @@
 		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);
 

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=180155&r1=180154&r2=180155
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Wed Mar  4 11:03:32 2009
@@ -414,7 +414,10 @@
                                 ; 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.