[svn-commits] russell: branch group/sip-object-matching r180156 - in /team/group/sip-object...

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar  4 11:10:50 2009
New Revision: 180156

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180156
Log:
sync with trunk

Modified:
    team/group/sip-object-matching/   (props changed)
    team/group/sip-object-matching/channels/chan_sip.c
    team/group/sip-object-matching/configs/sip.conf.sample

Propchange: team/group/sip-object-matching/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar  4 11:10:50 2009
@@ -1,1 +1,1 @@
-/trunk:1-180133
+/trunk:1-180155

Modified: team/group/sip-object-matching/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/channels/chan_sip.c?view=diff&rev=180156&r1=180155&r2=180156
==============================================================================
--- team/group/sip-object-matching/channels/chan_sip.c (original)
+++ team/group/sip-object-matching/channels/chan_sip.c Wed Mar  4 11:10:50 2009
@@ -18589,7 +18589,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: team/group/sip-object-matching/configs/sip.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/configs/sip.conf.sample?view=diff&rev=180156&r1=180155&r2=180156
==============================================================================
--- team/group/sip-object-matching/configs/sip.conf.sample (original)
+++ team/group/sip-object-matching/configs/sip.conf.sample Wed Mar  4 11:10:50 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.