[svn-commits] russell: branch russell/iax2_media r122044 - in /team/russell/iax2_media: ./ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jun 12 08:17:52 CDT 2008
Author: russell
Date: Thu Jun 12 08:17:51 2008
New Revision: 122044
URL: http://svn.digium.com/view/asterisk?view=rev&rev=122044
Log:
resolve, reset
Modified:
team/russell/iax2_media/ (props changed)
team/russell/iax2_media/UPGRADE.txt
team/russell/iax2_media/channels/chan_agent.c
team/russell/iax2_media/channels/chan_zap.c
team/russell/iax2_media/contrib/scripts/realtime_pgsql.sql
team/russell/iax2_media/include/asterisk/cdr.h
team/russell/iax2_media/main/abstract_jb.c
team/russell/iax2_media/main/channel.c
Propchange: team/russell/iax2_media/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/iax2_media/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/iax2_media/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 12 08:17:51 2008
@@ -1,1 +1,1 @@
-/trunk:1-121844
+/trunk:1-121947
Modified: team/russell/iax2_media/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/UPGRADE.txt?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/UPGRADE.txt (original)
+++ team/russell/iax2_media/UPGRADE.txt Thu Jun 12 08:17:51 2008
@@ -150,6 +150,11 @@
username and password parameters in cdr_odbc.conf, therefore, are no
longer used. The dsn parameter now points to an entry in res_odbc.conf.
+* The uniqueid field in the core Asterisk structure has been changed from a
+ maximum 31 character field to a 149 character field, to account for all
+ possible values the systemname prefix could be. In the past, if the
+ systemname was too long, the uniqueid would have been truncated.
+
Formats:
* format_wav: The GAIN preprocessor definition and source code that used it
Modified: team/russell/iax2_media/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/channels/chan_agent.c?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/channels/chan_agent.c (original)
+++ team/russell/iax2_media/channels/chan_agent.c Thu Jun 12 08:17:51 2008
@@ -1018,7 +1018,7 @@
if (p->chan) {
if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) {
ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" );
- ast_assert(0);
+ ast_assert(ast_test_flag(p->chan, AST_FLAG_BLOCKING) == 0);
}
}
return tmp;
Modified: team/russell/iax2_media/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/channels/chan_zap.c?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/channels/chan_zap.c (original)
+++ team/russell/iax2_media/channels/chan_zap.c Thu Jun 12 08:17:51 2008
@@ -8169,7 +8169,7 @@
}
}
#ifdef HAVE_SS7
- if (conf->chan.sig == SIG_SS7) {
+ if (chan_sig == SIG_SS7) {
struct zt_ss7 *ss7;
int clear = 0;
if (ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &clear)) {
@@ -9456,11 +9456,18 @@
}
p = linkset->pvts[chanpos];
ast_mutex_lock(&p->lock);
+
p->inservice = 1;
p->remotelyblocked = 0;
dpc = p->dpc;
isup_set_call_dpc(e->rsc.call, dpc);
+ if (p->ss7call)
+ p->ss7call = NULL;
+ if (p->owner)
+ p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+
ast_mutex_unlock(&p->lock);
+
isup_rlc(ss7, e->rsc.call);
break;
case ISUP_EVENT_GRS:
Modified: team/russell/iax2_media/contrib/scripts/realtime_pgsql.sql
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/contrib/scripts/realtime_pgsql.sql?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/contrib/scripts/realtime_pgsql.sql (original)
+++ team/russell/iax2_media/contrib/scripts/realtime_pgsql.sql Thu Jun 12 08:17:51 2008
@@ -25,7 +25,7 @@
disposition character varying(45) DEFAULT '' NOT NULL,
amaflags bigint DEFAULT 0::bigint NOT NULL,
accountcode character varying(20) DEFAULT '' NOT NULL,
-uniqueid character varying(32) DEFAULT '' NOT NULL,
+uniqueid character varying(150) DEFAULT '' NOT NULL,
userfield character varying(255) DEFAULT '' NOT NULL
);
Modified: team/russell/iax2_media/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/include/asterisk/cdr.h?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/include/asterisk/cdr.h (original)
+++ team/russell/iax2_media/include/asterisk/cdr.h Thu Jun 12 08:17:51 2008
@@ -90,8 +90,9 @@
char accountcode[AST_MAX_ACCOUNT_CODE];
/*! flags */
unsigned int flags;
- /*! Unique Channel Identifier */
- char uniqueid[32];
+ /*! Unique Channel Identifier
+ * 150 = 127 (max systemname) + "-" + 10 (epoch timestamp) + "." + 10 (monotonically incrementing integer) + NULL */
+ char uniqueid[150];
/*! User field */
char userfield[AST_MAX_USER_FIELD];
Modified: team/russell/iax2_media/main/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/main/abstract_jb.c?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/main/abstract_jb.c (original)
+++ team/russell/iax2_media/main/abstract_jb.c Thu Jun 12 08:17:51 2008
@@ -430,7 +430,7 @@
return;
default:
ast_log(LOG_ERROR, "This should never happen!\n");
- ast_assert(0);
+ ast_assert("JB type unknown" == NULL);
break;
}
@@ -484,10 +484,9 @@
*tmp = '#';
bridged = ast_bridged_channel(chan);
- if (!bridged) {
- /* We should always have bridged chan if a jitterbuffer is in use */
- ast_assert(0);
- }
+ /* We should always have bridged chan if a jitterbuffer is in use */
+ ast_assert(bridged != NULL);
+
snprintf(name1, sizeof(name1), "%s", bridged->name);
tmp = strchr(name1, '/');
if (tmp)
Modified: team/russell/iax2_media/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_media/main/channel.c?view=diff&rev=122044&r1=122043&r2=122044
==============================================================================
--- team/russell/iax2_media/main/channel.c (original)
+++ team/russell/iax2_media/main/channel.c Thu Jun 12 08:17:51 2008
@@ -982,7 +982,7 @@
if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen > 128)) {
if (fin->frametype != AST_FRAME_VOICE) {
ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
- ast_assert(0);
+ ast_assert(fin->frametype == AST_FRAME_VOICE);
} else {
ast_debug(1, "Dropping voice to exceptionally long queue on %s\n", chan->name);
ast_frfree(f);
@@ -1632,7 +1632,7 @@
ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd "
"is blocked by thread %ld in procedure %s! Expect a failure\n",
(long)pthread_self(), chan->name, (long)chan->blocker, chan->blockproc);
- ast_assert(0);
+ ast_assert(ast_test_flag(chan, AST_FLAG_BLOCKING) == 0);
}
if (!ast_test_flag(chan, AST_FLAG_ZOMBIE)) {
ast_debug(1, "Hanging up channel '%s'\n", chan->name);
More information about the svn-commits
mailing list