Expand CDR uniqueid field to 150 chars, to account for maximum systemname.

(Closes issue #12831)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121855 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index e3f304bb07a8b202b56924dadb020233723b5ae3..8cbed3fb73b63a6621220ddbde823491e31d254e 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -150,6 +150,11 @@ CDR:
   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

diff --git a/contrib/scripts/realtime_pgsql.sql b/contrib/scripts/realtime_pgsql.sql
index c0de544ab55105abae45f7e0dcb1b0787bec823e..39e24460fcfc092c5197405e034e23da8235f365 100644 (file)
--- a/contrib/scripts/realtime_pgsql.sql
+++ b/contrib/scripts/realtime_pgsql.sql
@@ -25,7 +25,7 @@ billsec bigint DEFAULT 0::bigint NOT NULL,
 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
 );
 

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index 02d2eb35d9b7570423d2627941a52ed0821fd692..fbab3f53fe734db1a06bd55b3a6a842f54693089 100644 (file)
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -90,8 +90,9 @@ struct ast_cdr {
        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];