[asterisk-commits] bebuild: tag 10.4.1 r367852 - in /tags/10.4.1: ./ channels/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue May 29 14:12:31 CDT 2012
Author: bebuild
Date: Tue May 29 14:12:26 2012
New Revision: 367852
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=367852
Log:
Commit 367844,367782
Removed:
tags/10.4.1/asterisk-10.4.0-summary.html
tags/10.4.1/asterisk-10.4.0-summary.txt
Modified:
tags/10.4.1/ (props changed)
tags/10.4.1/.version
tags/10.4.1/ChangeLog
tags/10.4.1/channels/chan_iax2.c
tags/10.4.1/channels/chan_skinny.c
Propchange: tags/10.4.1/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: tags/10.4.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 29 14:12:26 2012
@@ -1,1 +1,1 @@
-/branches/10:363103-363104,363107,363156,364707
+/branches/10:363103-363104,363107,363156,364707,367782,367844
Modified: tags/10.4.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.1/.version?view=diff&rev=367852&r1=367851&r2=367852
==============================================================================
--- tags/10.4.1/.version (original)
+++ tags/10.4.1/.version Tue May 29 14:12:26 2012
@@ -1,1 +1,1 @@
-10.4.0
+10.4.1
Modified: tags/10.4.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.1/ChangeLog?view=diff&rev=367852&r1=367851&r2=367852
==============================================================================
--- tags/10.4.1/ChangeLog (original)
+++ tags/10.4.1/ChangeLog Tue May 29 14:12:26 2012
@@ -1,3 +1,11 @@
+2012-05-29 Asterisk Development Team <asteriskteam at digium.com>
+
+ * Asterisk 10.4.1 Released.
+
+ * AST-2012-007
+
+ * AST-2012-008
+
2012-05-02 Asterisk Development Team <asteriskteam at digium.com>
* Asterisk 10.4.0 Released.
Modified: tags/10.4.1/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.1/channels/chan_iax2.c?view=diff&rev=367852&r1=367851&r2=367852
==============================================================================
--- tags/10.4.1/channels/chan_iax2.c (original)
+++ tags/10.4.1/channels/chan_iax2.c Tue May 29 14:12:26 2012
@@ -1922,24 +1922,25 @@
* we have received a destination call number. */
static int queue_signalling(struct chan_iax2_pvt *pvt, struct ast_frame *f)
{
- struct signaling_queue_entry *new;
+ struct signaling_queue_entry *qe;
if (f->frametype == AST_FRAME_IAX || !pvt->hold_signaling) {
return 1; /* do not queue this frame */
- } else if (!(new = ast_calloc(1, sizeof(struct signaling_queue_entry)))) {
+ } else if (!(qe = ast_calloc(1, sizeof(struct signaling_queue_entry)))) {
return -1; /* out of memory */
}
- memcpy(&new->f, f, sizeof(new->f)); /* copy ast_frame into our queue entry */
-
- if (new->f.datalen) { /* if there is data in this frame copy it over as well */
- if (!(new->f.data.ptr = ast_calloc(1, new->f.datalen))) {
- free_signaling_queue_entry(new);
+ /* copy ast_frame into our queue entry */
+ qe->f = *f;
+ if (qe->f.datalen) {
+ /* if there is data in this frame copy it over as well */
+ if (!(qe->f.data.ptr = ast_malloc(qe->f.datalen))) {
+ free_signaling_queue_entry(qe);
return -1;
}
- memcpy(new->f.data.ptr, f->data.ptr, sizeof(*new->f.data.ptr));
- }
- AST_LIST_INSERT_TAIL(&pvt->signaling_queue, new, next);
+ memcpy(qe->f.data.ptr, f->data.ptr, qe->f.datalen);
+ }
+ AST_LIST_INSERT_TAIL(&pvt->signaling_queue, qe, next);
return 0;
}
@@ -4243,6 +4244,15 @@
int needfree = 0;
struct ast_channel *owner = NULL;
struct ast_channel *bridge = NULL;
+
+ /*
+ * Clear fr->af.data if there is no data in the buffer. Things
+ * like AST_CONTROL_HOLD without a suggested music class must
+ * have a NULL pointer.
+ */
+ if (!fr->af.datalen) {
+ memset(&fr->af.data, 0, sizeof(fr->af.data));
+ }
/* Attempt to recover wrapped timestamps */
unwrap_timestamp(fr);
Modified: tags/10.4.1/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.1/channels/chan_skinny.c?view=diff&rev=367852&r1=367851&r2=367852
==============================================================================
--- tags/10.4.1/channels/chan_skinny.c (original)
+++ tags/10.4.1/channels/chan_skinny.c Tue May 29 14:12:26 2012
@@ -3104,6 +3104,10 @@
struct skinny_line *l = sub->line;
struct skinny_device *d = l->device;
+ if (!d) {
+ return;
+ }
+
if (!c->caller.id.number.valid
|| ast_strlen_zero(c->caller.id.number.str)
|| !c->connected.id.number.valid
@@ -4224,6 +4228,11 @@
int res = 0;
int loop_pause = 100;
+ if (!d) {
+ ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+ return NULL;
+ }
+
ast_verb(3, "Starting simple switch on '%s@%s'\n", l->name, d->name);
len = strlen(sub->exten);
@@ -4332,7 +4341,7 @@
struct ast_var_t *current;
int doautoanswer = 0;
- if (!d->registered) {
+ if (!d || !d->registered) {
ast_log(LOG_ERROR, "Device not registered, cannot call %s\n", dest);
return -1;
}
@@ -4731,7 +4740,13 @@
struct skinny_subchannel *sub = ast->tech_pvt;
struct skinny_line *l = sub->line;
struct skinny_device *d = l->device;
- struct skinnysession *s = d->session;
+ struct skinnysession *s;
+
+ if (!d) {
+ ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+ return -1;
+ }
+ s = d->session;
if (!s) {
ast_log(LOG_NOTICE, "Asked to indicate '%s' condition on channel %s, but session does not exist.\n", control2str(ind), ast->name);
@@ -5462,6 +5477,11 @@
l = sub->line;
d = l->device;
+ if (!d) {
+ ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+ return -1;
+ }
+
if (!sub->related) {
/* Another sub has not been created so this must be first XFER press */
if (!(sub->substate == SUBSTATE_HOLD)) {
@@ -5505,6 +5525,11 @@
struct skinny_line *l = sub->line;
struct skinny_device *d = l->device;
struct ast_channel *c = sub->owner;
+
+ if (!d) {
+ ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+ return 0;
+ }
if (d->hookstate == SKINNY_ONHOOK) {
d->hookstate = SKINNY_OFFHOOK;
More information about the asterisk-commits
mailing list