[asterisk-commits] branch oej/test-this-branch r17216 - in
/team/oej/test-this-branch: ./ channe...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Apr 4 01:23:57 MST 2006
Author: oej
Date: Tue Apr 4 03:23:50 2006
New Revision: 17216
URL: http://svn.digium.com/view/asterisk?rev=17216&view=rev
Log:
Reset, resolve, restart
Modified:
team/oej/test-this-branch/ (props changed)
team/oej/test-this-branch/.cleancount
team/oej/test-this-branch/channels/chan_sip.c
team/oej/test-this-branch/configs/features.conf.sample
team/oej/test-this-branch/configs/sip.conf.sample
team/oej/test-this-branch/doc/CODING-GUIDELINES
team/oej/test-this-branch/doc/manager.txt
team/oej/test-this-branch/include/asterisk/linkedlists.h
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 4 03:23:50 2006
@@ -1,1 +1,1 @@
-/trunk:1-17142
+/trunk:1-17215
Modified: team/oej/test-this-branch/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/.cleancount?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/.cleancount (original)
+++ team/oej/test-this-branch/.cleancount Tue Apr 4 03:23:50 2006
@@ -1,1 +1,1 @@
-12
+13
Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Tue Apr 4 03:23:50 2006
@@ -5669,12 +5669,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/test-this-branch/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/configs/features.conf.sample?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/configs/features.conf.sample (original)
+++ team/oej/test-this-branch/configs/features.conf.sample Tue Apr 4 03:23:50 2006
@@ -5,6 +5,8 @@
[general]
parkext => 700 ; What extension to dial to park (all parking lots)
parkpos => 701-720 ; What extensions to park calls on (default 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)
;parkingtime => 45 ; Number of seconds a call can be parked for
@@ -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/test-this-branch/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/configs/sip.conf.sample?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/configs/sip.conf.sample (original)
+++ team/oej/test-this-branch/configs/sip.conf.sample Tue Apr 4 03:23:50 2006
@@ -393,6 +393,8 @@
;host=box.provider.com
;usereqphone=yes ; This provider requires ";user=phone" on URI
;call-limit=5 ; permit only 5 simultaneous outgoing calls to this peer
+ ; Call-limits will not be enforced on real-time peers,
+ ; since they are not stored in-memory
;------------------------------------------------------------------------------
; Definitions of locally connected SIP phones
Modified: team/oej/test-this-branch/doc/CODING-GUIDELINES
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/doc/CODING-GUIDELINES?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/doc/CODING-GUIDELINES (original)
+++ team/oej/test-this-branch/doc/CODING-GUIDELINES Tue Apr 4 03:23:50 2006
@@ -522,6 +522,19 @@
if (name && (len = strlen(name) + strlen(prefix) + strlen(postfix) + 3) && (newname = alloca(len)))
snprintf(newname, len, "%s/%s/%s", prefix, name, postfix);
+* Creating new manager events?
+------------------------------
+If you create new AMI events, please read manager.txt. Do not re-use
+existing headers for new purposes, but please re-use existing headers
+for the same type of data.
+
+Manager events that signal a status are required to have one
+event name, with a status header that shows the status.
+The old style, with one event named "ThisEventOn" and another named
+"ThisEventOff", is no longer approved.
+
+Check manager.txt for more information on manager and existing
+headers. Please update this file if you add new headers.
-----------------------------------------------
Welcome to the Asterisk development community!
Modified: team/oej/test-this-branch/doc/manager.txt
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/doc/manager.txt?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/doc/manager.txt (original)
+++ team/oej/test-this-branch/doc/manager.txt Tue Apr 4 03:23:50 2006
@@ -296,3 +296,4 @@
** Please try to re-use existing headers to simplify manager message parsing in clients.
+Read the CODING-GUIDELINES if you develop new manager commands or events.
Modified: team/oej/test-this-branch/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/linkedlists.h?rev=17216&r1=17215&r2=17216&view=diff
==============================================================================
--- team/oej/test-this-branch/include/asterisk/linkedlists.h (original)
+++ team/oej/test-this-branch/include/asterisk/linkedlists.h Tue Apr 4 03:23:50 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)
More information about the asterisk-commits
mailing list