[asterisk-commits] branch oej/multiparking r17198 - in /team/oej/multiparking: ./ channels/ conf...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Apr  4 02:16:56 2006
New Revision: 17198

URL: http://svn.digium.com/view/asterisk?rev=17198&view=rev
Log:
Reset automerge, resolve conflict

Modified:
    team/oej/multiparking/   (props changed)
    team/oej/multiparking/.cleancount
    team/oej/multiparking/channels/chan_sip.c
    team/oej/multiparking/configs/features.conf.sample
    team/oej/multiparking/include/asterisk/linkedlists.h

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  4 02:16:56 2006
@@ -1,1 +1,1 @@
-/trunk:1-17141
+/trunk:1-17197

Modified: team/oej/multiparking/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/.cleancount?rev=17198&r1=17197&r2=17198&view=diff
==============================================================================
--- team/oej/multiparking/.cleancount (original)
+++ team/oej/multiparking/.cleancount Tue Apr  4 02:16:56 2006
@@ -1,1 +1,1 @@
-12
+13

Modified: team/oej/multiparking/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/channels/chan_sip.c?rev=17198&r1=17197&r2=17198&view=diff
==============================================================================
--- team/oej/multiparking/channels/chan_sip.c (original)
+++ team/oej/multiparking/channels/chan_sip.c Tue Apr  4 02:16:56 2006
@@ -5075,12 +5075,16 @@
 	
 	ast_string_field_set(p, uri, invite_buf);
 
-	/* If there is a VXML URL append it to the SIP URL */
-	if (p->options && p->options->vxml_url) {
+	if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 
+		/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
+		snprintf(to, sizeof(to), "<sip:%s>;tag=%s", p->uri, p->theirtag);
+	} else if (p->options && p->options->vxml_url) {
+		/* If there is a VXML URL append it to the SIP URL */
 		snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);
 	} else {
 		snprintf(to, sizeof(to), "<%s>", p->uri);
 	}
+	
 	memset(req, 0, sizeof(struct sip_request));
 	init_req(req, sipmethod, p->uri);
 	snprintf(tmp, sizeof(tmp), "%d %s", ++p->ocseq, sip_methods[sipmethod].text);

Modified: team/oej/multiparking/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/configs/features.conf.sample?rev=17198&r1=17197&r2=17198&view=diff
==============================================================================
--- team/oej/multiparking/configs/features.conf.sample (original)
+++ team/oej/multiparking/configs/features.conf.sample Tue Apr  4 02:16:56 2006
@@ -4,9 +4,11 @@
 
 [general]
 parkext => 700			; What extension to dial to park	(all parking lots)
-parkpos => 701-720		; What extensions to park calls on (default parking lot)
+parkpos => 701-720		; What extensions to park calls on. (defafult parking lot)
+				; These needs to be numeric, as Asterisk starts from the start position
+				; and increments with one for the next parked call.
 context => parkedcalls		; Which context parked calls are in (default parking lot)
-;findslot => next		; Continue to the 'next' parking space. Defaults to 'first' available (default parking lot)
+context => parkedcalls		; Which context parked calls are in
 ;parkingtime => 45		; Number of seconds a call can be parked for 
 				; (default is 45 seconds)
 ;courtesytone = beep		; Sound file to play to the parked caller 
@@ -15,12 +17,14 @@
 ;parkedplay = caller		; Who to play the courtesy tone to when picking up a parked call
 				; one of: parked, caller, both  (default is caller)
 ;adsipark = yes			; if you want ADSI parking announcements
-;findslot => next		; Continue to the 'next' parking space. Defaults to 'first' available
+;findslot => next		; Continue to the 'next' free parking space. 
+				; Defaults to 'first' available
+
 ;transferdigittimeout => 3	; Number of seconds to wait between digits when transfering a call
 				; (default is 3 seconds)
 ;xfersound = beep		; to indicate an attended transfer is complete
 ;xferfailsound = beeperr	; to indicate a failed transfer
-;pickupexten = *8		; Configure the pickup extension  (default is *8)
+;pickupexten = *8		; Configure the pickup extension. (default is *8)
 ;featuredigittimeout = 500	; Max time (ms) between digits for 
 				; feature activation  (default is 500 ms)
 

Modified: team/oej/multiparking/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/include/asterisk/linkedlists.h?rev=17198&r1=17197&r2=17198&view=diff
==============================================================================
--- team/oej/multiparking/include/asterisk/linkedlists.h (original)
+++ team/oej/multiparking/include/asterisk/linkedlists.h Tue Apr  4 02:16:56 2006
@@ -478,11 +478,13 @@
 			(head)->last = NULL;			\
 	} else {								\
 		typeof(elm) curelm = (head)->first;			\
-		while (curelm->field.next != (elm))			\
+		while (curelm && (curelm->field.next != (elm)))			\
 			curelm = curelm->field.next;			\
-		curelm->field.next = (elm)->field.next;			\
-		if ((head)->last == (elm))				\
-			(head)->last = curelm;				\
+		if (curelm) { \
+			curelm->field.next = (elm)->field.next;			\
+			if ((head)->last == (elm))				\
+				(head)->last = curelm;				\
+		} \
 	}								\
 } while (0)