From: Malcolm Davenport <malcolmd@digium.com>
Date: Thu, 29 Apr 2004 20:09:05 +0000 (+0000)
Subject: Bug # 1503: Add Peter's fix to include "accountcode" support to MySQL based IAX-Friends
X-Git-Tag: 1.0.0-rc1~621
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f9df58afe2dbc29ca93417865dff89b9aa92685;p=thirdparty%2Fasterisk.git

Bug # 1503: Add Peter's fix to include "accountcode" support to MySQL based IAX-Friends


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9cfb628f54..230d0c2c69 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1901,7 +1901,7 @@ static struct iax2_user *mysql_user(char *user)
 		MYSQL_ROW rowval;
 		name = alloca(strlen(user) * 2 + 1);
 		mysql_real_escape_string(mysql, name, user, strlen(user));
-		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds FROM iaxfriends WHERE name=\"%s\"", name);
+		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds, accountcode FROM iaxfriends WHERE name=\"%s\"", name);
 		ast_mutex_lock(&mysqllock);
 		mysql_query(mysql, query);
 		if ((result = mysql_store_result(mysql))) {
@@ -1915,6 +1915,8 @@ static struct iax2_user *mysql_user(char *user)
 							strncpy(p->secret, rowval[x], sizeof(p->secret));
 						} else if (!strcasecmp(fields[x].name, "context")) {
 							strncpy(p->contexts->context, rowval[x], sizeof(p->contexts->context) - 1);
+						} else if (!strcasecmp(fields[x].name, "accountcode")) {
+							strncpy(p->accountcode, rowval[x], sizeof(p->accountcode));
 						}
 					}
 				}
diff --git a/contrib/scripts/iax-friends.sql b/contrib/scripts/iax-friends.sql
index d919ab16f9..717a27d07c 100755
--- a/contrib/scripts/iax-friends.sql
+++ b/contrib/scripts/iax-friends.sql
@@ -9,6 +9,7 @@ CREATE TABLE `iaxfriends` (
   `ipaddr` varchar(20) NOT NULL default '',
   `port` int(6) NOT NULL default '0',
   `regseconds` int(11) NOT NULL default '0',
+  `accountcode` varchar(20) NOT NULL default '', 
   PRIMARY KEY  (`name`)
 ) TYPE=MyISAM;