diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 17:44:39 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 17:44:39 +0000 |
| commit | e274b08136b2b5e668c6ad6ef09cd32301b80de3 (patch) | |
| tree | a3188c2d0b4fd9785868ffec3b73c1b77799ff4f | |
| parent | d46e4924e817ba2d9016744e4a1ad717f54f3d49 (diff) | |
Expand CDR uniqueid field to 150 chars, to account for maximum systemname.
(Closes issue #12831)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121855 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | UPGRADE.txt | 5 | ||||
| -rw-r--r-- | contrib/scripts/realtime_pgsql.sql | 2 | ||||
| -rw-r--r-- | include/asterisk/cdr.h | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index e3f304bb0..8cbed3fb7 100644 --- 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 c0de544ab..39e24460f 100644 --- 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 02d2eb35d..fbab3f53f 100644 --- 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]; |