diff options
| author | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-29 20:09:05 +0000 |
|---|---|---|
| committer | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-29 20:09:05 +0000 |
| commit | b69fa09a4704c9cbb504c8c4cfb1e670f7cfda6c (patch) | |
| tree | 3fb28ca9be5f95ef1e84134fa527cfc094574ef4 | |
| parent | 73e4e4ec57dc56d3e936e59970ed3e203ae3706a (diff) | |
Bug # 1503: Add Peter's fix to include "accountcode" support to MySQL based IAX-Friends
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2823 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_iax2.c | 4 | ||||
| -rwxr-xr-x | contrib/scripts/iax-friends.sql | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 9cfb628f5..230d0c2c6 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 d919ab16f..717a27d07 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; |