[svn-commits] dlee: branch dlee/ari-event-remodel r392088 - in /team/dlee/ari-event-remodel...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jun 17 14:20:25 CDT 2013
Author: dlee
Date: Mon Jun 17 14:20:23 2013
New Revision: 392088
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392088
Log:
Merged revisions 392004-392076 from http://svn.asterisk.org/svn/asterisk/trunk
Modified:
team/dlee/ari-event-remodel/ (props changed)
team/dlee/ari-event-remodel/CHANGES
team/dlee/ari-event-remodel/channels/chan_misdn.c
team/dlee/ari-event-remodel/channels/chan_vpb.cc
team/dlee/ari-event-remodel/funcs/func_cdr.c
team/dlee/ari-event-remodel/include/asterisk/app.h
team/dlee/ari-event-remodel/main/cdr.c
team/dlee/ari-event-remodel/main/channel.c
team/dlee/ari-event-remodel/main/manager_channels.c
Propchange: team/dlee/ari-event-remodel/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 17 14:20:23 2013
@@ -1,1 +1,1 @@
-/trunk:1-392002
+/trunk:1-392085
Modified: team/dlee/ari-event-remodel/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/CHANGES?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/CHANGES (original)
+++ team/dlee/ari-event-remodel/CHANGES Mon Jun 17 14:20:23 2013
@@ -80,6 +80,11 @@
Reports 'InUse' for no logged in agents or no free agents.
Reports 'Idle' when an agent is free.
+ * The configuration options eventwhencalled and eventmemberstatus have been
+ removed. As a result, the AMI events QueueMemberStatus, AgentCalled,
+ AgentConnect, AgentComplete, AgentDump, and AgentRingNoAnswer will always be
+ sent. The "Variable" fields will also no longer exist on the Agent* events.
+
ResetCDR
------------------
* The 'e' option has been deprecated. Use the CDR_PROP function to re-enable
@@ -92,6 +97,12 @@
------------------
* This application is deprecated in favor of the CHANNEL function.
+UserEvent
+------------------
+ * UserEvent will now handle duplicate keys by overwriting the previous value
+ assigned to the key. UserEvent invocations will also be distributed to any
+ interested res_stasis applications.
+
Core
------------------
@@ -99,6 +110,31 @@
that the REDIRECTING dialplan function can be used to set the redirecting
reason to any string. It also allows for custom strings to be read as the
redirecting reason from SIP Diversion headers.
+
+ * For DTMF blind and attended transfers, the channel variable TRANSFER_CONTEXT
+ must be on the channel initiating the transfer to have any effect.
+
+ * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND is no longer channel
+ driver specific. If the channel variable is set on the transferrer channel,
+ the sound will be played to the target of an attended transfer.
+
+ * The channel variable BRIDGEPEER becomes a comma separated list of peers in
+ a multi-party bridge. The BRIDGEPEER value can have a maximum of 10 peers
+ listed. Any more peers in the bridge will not be included in the list.
+ BRIDGEPEER is not valid in holding bridges like parking since those channels
+ do not talk to each other even though they are in a bridge.
+
+ * The channel variable BRIDGEPVTCALLID is only valid for two party bridges
+ and will contain a value if the BRIDGEPEER's channel driver supports it.
+
+ * The channel variable DYNAMIC_PEERNAME is redundant with BRIDGEPEER and is
+ removed. The more useful DYNAMIC_WHO_ACTIVATED gives the channel name that
+ activated the dynamic feature.
+
+ * The channel variables DYNAMIC_FEATURENAME and DYNAMIC_WHO_ACTIVATED are set
+ only on the channel executing the dynamic feature. Executing a dynamic
+ feature on the bridge peer in a multi-party bridge will execute it on all
+ peers of the activating channel.
AMI (Asterisk Manager Interface)
------------------
@@ -257,6 +293,11 @@
The preferred way to configure parking is now through res_parking.conf while
configuration through features.conf is not currently supported.
+ * res_parking uses the configuration framework. If an invalid configuration is
+ supplied, res_parking will fail to load or fail to reload. Previously parking
+ lots that were misconfigured would generally be accepted with certain
+ configuration problems leading to individual disabled parking lots.
+
* Parked calls are now placed in bridges. This is a largely architectural change,
but it could have some implications in allowing for new parked call retrieval
methods and the contents of parking lots will be visible though certain bridge
@@ -296,6 +337,11 @@
by default. Instead, it will follow the timeout rules of the parking lot. The
old behavior can be reproduced by using the 'c' option.
+ * Added a channel variable PARKER_FLAT which stores the name of the extension
+ that would be used to come back to if comebacktoorigin was set to use. This can
+ be useful when comebacktoorigin is off if you still want to use the extensions
+ in the park-dial context that are generated to redial the parker on timeout.
+
Realtime
------------------
* Dynamic realtime tables for SIP Users can now include a 'path' field. This
@@ -310,6 +356,11 @@
* All future modules which utilize Sorcery for object persistence must have a
column named "id" within their schema when using the Sorcery realtime module.
This column must be able to contain a string of up to 128 characters in length.
+
+Security Events Framework
+-------------------------
+ * Security Event timestamps now use ISO 8601 formatted date/time instead of the
+ "seconds-microseconds" format that it was using previously.
Channel Drivers
@@ -401,22 +452,6 @@
If no resources exist or all are unavailable the device state is considered
to be unavailable.
-Security Events Framework
--------------------------
- * Security Event timestamps now use ISO 8601 formatted date/time instead of the
- "seconds-microseconds" format that it was using previously.
-
-Sorcery
-------------------
- * All future modules which utilize Sorcery for object persistence must have a
- column named "id" within their schema when using the Sorcery realtime module.
- This column must be able to contain a string of up to 128 characters in length.
-
-app_userevent
-------------------
- * UserEvent will now handle duplicate keys by overwriting the previous value
- assigned to the key. UserEvent invocations will also be distributed to any
- interested res_stasis applications.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
Modified: team/dlee/ari-event-remodel/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/channels/chan_misdn.c?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/channels/chan_misdn.c (original)
+++ team/dlee/ari-event-remodel/channels/chan_misdn.c Mon Jun 17 14:20:23 2013
@@ -10134,7 +10134,6 @@
if (digits) {
strncat(bc->dialed.number, bc->info_dad, sizeof(bc->dialed.number) - strlen(bc->dialed.number) - 1);
ast_channel_exten_set(ch->ast, bc->dialed.number);
- ast_cdr_update(ch->ast);
}
ast_queue_frame(ch->ast, &fr);
Modified: team/dlee/ari-event-remodel/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/channels/chan_vpb.cc?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/channels/chan_vpb.cc (original)
+++ team/dlee/ari-event-remodel/channels/chan_vpb.cc Mon Jun 17 14:20:23 2013
@@ -2446,8 +2446,8 @@
return NULL;
}
ast_verb(4, "%s: New call for context [%s]\n", me->dev, context);
-
- tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, linkedid, 0, "%s", me->dev);
+
+ tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, linkedid, AST_AMA_NONE, "%s", me->dev);
if (tmp) {
if (use_ast_ind == 1){
ast_channel_tech_set(tmp, &vpb_tech_indicate);
Modified: team/dlee/ari-event-remodel/funcs/func_cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/funcs/func_cdr.c?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/funcs/func_cdr.c (original)
+++ team/dlee/ari-event-remodel/funcs/func_cdr.c Mon Jun 17 14:20:23 2013
@@ -248,11 +248,14 @@
|| !strcasecmp("answer", args.variable)) {
struct timeval fmt_time;
struct ast_tm tm;
- if (sscanf(tempbuf, "%ld.%ld", &fmt_time.tv_sec, &fmt_time.tv_usec) != 2) {
+ /* tv_usec is suseconds_t, which could be int or long */
+ long int tv_usec;
+ if (sscanf(tempbuf, "%ld.%ld", &fmt_time.tv_sec, &tv_usec) != 2) {
ast_log(AST_LOG_WARNING, "Unable to parse %s (%s) from the CDR for channel %s\n",
args.variable, tempbuf, ast_channel_name(chan));
return 0;
}
+ fmt_time.tv_usec = tv_usec;
ast_localtime(&fmt_time, &tm, NULL);
ast_strftime(tempbuf, sizeof(*tempbuf), "%Y-%m-%d %T", &tm);
} else if (!strcasecmp("disposition", args.variable)) {
Modified: team/dlee/ari-event-remodel/include/asterisk/app.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/include/asterisk/app.h?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/include/asterisk/app.h (original)
+++ team/dlee/ari-event-remodel/include/asterisk/app.h Mon Jun 17 14:20:23 2013
@@ -29,6 +29,7 @@
#include "asterisk/file.h"
#include "asterisk/linkedlists.h"
#include "asterisk/utils.h"
+#include "asterisk/stasis.h"
struct ast_flags64;
Modified: team/dlee/ari-event-remodel/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/main/cdr.c?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/main/cdr.c (original)
+++ team/dlee/ari-event-remodel/main/cdr.c Mon Jun 17 14:20:23 2013
@@ -1119,14 +1119,15 @@
}
}
- ast_debug(1, "Finalized CDR for %s - start %ld.%ld answer %ld.%ld end %ld.%ld dispo %s\n",
+ /* tv_usec is suseconds_t, which could be int or long */
+ ast_debug(1, "Finalized CDR for %s - start %ld.%06ld answer %ld.%06ld end %ld.%06ld dispo %s\n",
cdr->party_a.snapshot->name,
cdr->start.tv_sec,
- cdr->start.tv_usec,
+ (long)cdr->start.tv_usec,
cdr->answer.tv_sec,
- cdr->answer.tv_usec,
+ (long)cdr->answer.tv_usec,
cdr->end.tv_sec,
- cdr->end.tv_usec,
+ (long)cdr->end.tv_usec,
ast_cdr_disp2str(cdr->disposition));
}
@@ -1151,9 +1152,10 @@
if (cdr->party_a.snapshot->state == AST_STATE_UP && ast_tvzero(cdr->answer)) {
cdr->answer = ast_tvnow();
- CDR_DEBUG(mod_cfg, "%p - Set answered time to %ld.%ld\n", cdr,
+ /* tv_usec is suseconds_t, which could be int or long */
+ CDR_DEBUG(mod_cfg, "%p - Set answered time to %ld.%06ld\n", cdr,
cdr->answer.tv_sec,
- cdr->answer.tv_usec);
+ (long)cdr->answer.tv_usec);
}
}
Modified: team/dlee/ari-event-remodel/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/main/channel.c?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/main/channel.c (original)
+++ team/dlee/ari-event-remodel/main/channel.c Mon Jun 17 14:20:23 2013
@@ -1158,7 +1158,7 @@
struct ast_channel *__ast_channel_alloc(int needqueue, int state, const char *cid_num,
const char *cid_name, const char *acctcode,
const char *exten, const char *context,
- const char *linkedid, const enum ama_flags amaflag,
+ const char *linkedid, enum ama_flags amaflag,
const char *file, int line, const char *function,
const char *name_fmt, ...)
{
Modified: team/dlee/ari-event-remodel/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel/main/manager_channels.c?view=diff&rev=392088&r1=392087&r2=392088
==============================================================================
--- team/dlee/ari-event-remodel/main/manager_channels.c (original)
+++ team/dlee/ari-event-remodel/main/manager_channels.c Mon Jun 17 14:20:23 2013
@@ -638,6 +638,11 @@
return NULL;
}
+ /* Ignore any updates if we're hungup */
+ if (ast_test_flag(&new_snapshot->flags, AST_FLAG_ZOMBIE)) {
+ return NULL;
+ }
+
if (old_snapshot && ast_channel_snapshot_cep_equal(old_snapshot, new_snapshot)
&& !strcmp(old_snapshot->appl, new_snapshot->appl)) {
return NULL;
More information about the svn-commits
mailing list