[svn-commits] tilghman: branch 1.6.0 r121856 - in /branches/1.6.0: ./ contrib/scripts/ incl...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jun 11 12:45:37 2008
New Revision: 121856

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121856
Log:
Merged revisions 121855 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r121855 | tilghman | 2008-06-11 12:44:39 -0500 (Wed, 11 Jun 2008) | 3 lines

Expand CDR uniqueid field to 150 chars, to account for maximum systemname.
(Closes issue #12831)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/UPGRADE.txt
    branches/1.6.0/contrib/scripts/realtime_pgsql.sql
    branches/1.6.0/include/asterisk/cdr.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/UPGRADE.txt?view=diff&rev=121856&r1=121855&r2=121856
==============================================================================
--- branches/1.6.0/UPGRADE.txt (original)
+++ branches/1.6.0/UPGRADE.txt Wed Jun 11 12:45:37 2008
@@ -137,6 +137,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: branches/1.6.0/contrib/scripts/realtime_pgsql.sql
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/realtime_pgsql.sql?view=diff&rev=121856&r1=121855&r2=121856
==============================================================================
--- branches/1.6.0/contrib/scripts/realtime_pgsql.sql (original)
+++ branches/1.6.0/contrib/scripts/realtime_pgsql.sql Wed Jun 11 12:45:37 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: branches/1.6.0/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/cdr.h?view=diff&rev=121856&r1=121855&r2=121856
==============================================================================
--- branches/1.6.0/include/asterisk/cdr.h (original)
+++ branches/1.6.0/include/asterisk/cdr.h Wed Jun 11 12:45:37 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];