[svn-commits] wdoekes: branch 1.8 r342869 - in /branches/1.8: ./ configs/ contrib/realtime/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Nov 1 14:37:51 CDT 2011
Author: wdoekes
Date: Tue Nov 1 14:37:47 2011
New Revision: 342869
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=342869
Log:
Cleanup references to sipusers and sipfriends dynamic realtime families
Somewhere between 1.4 and 1.8 the sipusers family has become completely
unused. Before that, the sipfriends family had been obsoleted in favor
of separate sipusers and sippeers families. Apparently, they have been
merged back again into a single family which is now called "sippeers".
Reviewed by: irroot, oej, pabelanger
Review: https://reviewboard.asterisk.org/r/1523
Added:
branches/1.8/contrib/realtime/mysql/sippeers.sql
- copied, changed from r342868, branches/1.8/contrib/realtime/mysql/sipfriends.sql
Removed:
branches/1.8/contrib/realtime/mysql/sipfriends.sql
Modified:
branches/1.8/UPGRADE.txt
branches/1.8/configs/dbsep.conf.sample
branches/1.8/configs/extconfig.conf.sample
branches/1.8/configs/res_config_mysql.conf.sample
branches/1.8/configs/res_ldap.conf.sample
branches/1.8/main/config.c
branches/1.8/res/res_realtime.c
Modified: branches/1.8/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/UPGRADE.txt?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/UPGRADE.txt (original)
+++ branches/1.8/UPGRADE.txt Tue Nov 1 14:37:47 2011
@@ -159,6 +159,9 @@
changes to the files will not be detected. You can revert to polling the
directory by specifying --without-inotify to configure before compiling.
+* The 'sipusers' realtime table has been removed completely. Use the 'sippeers'
+ table with type 'user' for user type objects.
+
From 1.6.1 to 1.6.2:
* SIP no longer sends the 183 progress message for early media by
Modified: branches/1.8/configs/dbsep.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/dbsep.conf.sample?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/configs/dbsep.conf.sample (original)
+++ branches/1.8/configs/dbsep.conf.sample Tue Nov 1 14:37:47 2011
@@ -17,8 +17,7 @@
# and res_config_curl.so in modules.conf and configure extconfig.conf:
#
# voicemail => curl,http://server/path/to/dbsep.cgi/voicemail
-# sippeers => curl,http://server/path/to/dbsep.cgi/sipfriends
-# sipusers => curl,http://server/path/to/dbsep.cgi/sipfriends
+# sippeers => curl,http://server/path/to/dbsep.cgi/sippeers
#
# The Data Source Name, as specified by the Perl DBI module.
Modified: branches/1.8/configs/extconfig.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/extconfig.conf.sample?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/configs/extconfig.conf.sample (original)
+++ branches/1.8/configs/extconfig.conf.sample Tue Nov 1 14:37:47 2011
@@ -63,7 +63,6 @@
;
;iaxusers => odbc,asterisk
;iaxpeers => odbc,asterisk
-;sipusers => odbc,asterisk
;sippeers => odbc,asterisk
;sipregs => odbc,asterisk
;voicemail => odbc,asterisk
Modified: branches/1.8/configs/res_config_mysql.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/res_config_mysql.conf.sample?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/configs/res_config_mysql.conf.sample (original)
+++ branches/1.8/configs/res_config_mysql.conf.sample Tue Nov 1 14:37:47 2011
@@ -17,7 +17,7 @@
; and writes should be performed to the same database.
;
; For example, in extconfig.conf, you could specify a line like:
-; sippeers => mysql,readhost.asterisk/writehost.asterisk,sipfriends
+; sippeers => mysql,readhost.asterisk/writehost.asterisk,sippeers
; and then define the contexts [readhost.asterisk] and [writehost.asterisk]
; below.
;
Modified: branches/1.8/configs/res_ldap.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/res_ldap.conf.sample?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/configs/res_ldap.conf.sample (original)
+++ branches/1.8/configs/res_ldap.conf.sample Tue Nov 1 14:37:47 2011
@@ -7,7 +7,6 @@
; In order to use this module, you start
; in extconfig.conf with a configuration like this:
;
-; sipusers = ldap,"dc=myDomain,dc=myDomainExt",sip
; sippeers = ldap,"dc=myDomain,dc=myDomainExt",sip
; extensions = ldap,"dc=myDomain,dc=myDomainExt",extensions
; sip.conf = ldap,"dc=myDomain,dc=myDomainExt",config
Copied: branches/1.8/contrib/realtime/mysql/sippeers.sql (from r342868, branches/1.8/contrib/realtime/mysql/sipfriends.sql)
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/contrib/realtime/mysql/sippeers.sql?view=diff&rev=342869&p1=branches/1.8/contrib/realtime/mysql/sipfriends.sql&r1=342868&p2=branches/1.8/contrib/realtime/mysql/sippeers.sql&r2=342869
==============================================================================
--- branches/1.8/contrib/realtime/mysql/sipfriends.sql (original)
+++ branches/1.8/contrib/realtime/mysql/sippeers.sql Tue Nov 1 14:37:47 2011
@@ -1,8 +1,8 @@
#
-# Table structure for table `sipfriends`
+# Table structure for table `sippeers`
#
-CREATE TABLE IF NOT EXISTS `sipfriends` (
+CREATE TABLE IF NOT EXISTS `sippeers` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(10) NOT NULL,
`ipaddr` varchar(15) DEFAULT NULL,
Modified: branches/1.8/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/config.c?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/main/config.c (original)
+++ branches/1.8/main/config.c Tue Nov 1 14:37:47 2011
@@ -2146,8 +2146,7 @@
if (!driver || !database)
continue;
if (!strcasecmp(v->name, "sipfriends")) {
- ast_log(LOG_WARNING, "The 'sipfriends' table is obsolete, update your config to use sipusers and sippeers, though they can point to the same table.\n");
- append_mapping("sipusers", driver, database, table ? table : "sipfriends", pri);
+ ast_log(LOG_WARNING, "The 'sipfriends' table is obsolete, update your config to use sippeers instead.\n");
append_mapping("sippeers", driver, database, table ? table : "sipfriends", pri);
} else if (!strcasecmp(v->name, "iaxfriends")) {
ast_log(LOG_WARNING, "The 'iaxfriends' table is obsolete, update your config to use iaxusers and iaxpeers, though they can point to the same table.\n");
Modified: branches/1.8/res/res_realtime.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_realtime.c?view=diff&rev=342869&r1=342868&r2=342869
==============================================================================
--- branches/1.8/res/res_realtime.c (original)
+++ branches/1.8/res/res_realtime.c Tue Nov 1 14:37:47 2011
@@ -93,8 +93,8 @@
"Usage: realtime update <family> <colmatch> <valuematch> <colupdate> <newvalue>\n"
" Update a single variable using the RealTime driver.\n"
" You must supply a family name, a column to update on, a new value, column to match, and value to match.\n"
- " Ex: realtime update sipfriends name bobsphone port 4343\n"
- " will execute SQL as UPDATE sipfriends SET port = 4343 WHERE name = bobsphone\n";
+ " Ex: realtime update sippeers name bobsphone port 4343\n"
+ " will execute SQL as UPDATE sippeers SET port = 4343 WHERE name = bobsphone\n";
return NULL;
case CLI_GENERATE:
return NULL;
@@ -127,9 +127,9 @@
" Update a single variable, requiring one or more fields to match using the\n"
" RealTime driver. You must supply a family name, a column to update, a new\n"
" value, and at least one column and value to match.\n"
- " Ex: realtime update sipfriends name bobsphone ipaddr 127.0.0.1 NULL port 4343\n"
+ " Ex: realtime update sippeers name bobsphone ipaddr 127.0.0.1 NULL port 4343\n"
" will execute SQL as\n"
- " UPDATE sipfriends SET port='4343' WHERE name='bobsphone' and ipaddr='127.0.0.1'\n";
+ " UPDATE sippeers SET port='4343' WHERE name='bobsphone' and ipaddr='127.0.0.1'\n";
return NULL;
case CLI_GENERATE:
return NULL;
More information about the svn-commits
mailing list