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
This commit is contained in:
parent
66498eee0b
commit
6f9df58afe
|
@ -1901,7 +1901,7 @@ static struct iax2_user *mysql_user(char *user)
|
||||||
MYSQL_ROW rowval;
|
MYSQL_ROW rowval;
|
||||||
name = alloca(strlen(user) * 2 + 1);
|
name = alloca(strlen(user) * 2 + 1);
|
||||||
mysql_real_escape_string(mysql, name, user, strlen(user));
|
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);
|
ast_mutex_lock(&mysqllock);
|
||||||
mysql_query(mysql, query);
|
mysql_query(mysql, query);
|
||||||
if ((result = mysql_store_result(mysql))) {
|
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));
|
strncpy(p->secret, rowval[x], sizeof(p->secret));
|
||||||
} else if (!strcasecmp(fields[x].name, "context")) {
|
} else if (!strcasecmp(fields[x].name, "context")) {
|
||||||
strncpy(p->contexts->context, rowval[x], sizeof(p->contexts->context) - 1);
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ CREATE TABLE `iaxfriends` (
|
||||||
`ipaddr` varchar(20) NOT NULL default '',
|
`ipaddr` varchar(20) NOT NULL default '',
|
||||||
`port` int(6) NOT NULL default '0',
|
`port` int(6) NOT NULL default '0',
|
||||||
`regseconds` int(11) NOT NULL default '0',
|
`regseconds` int(11) NOT NULL default '0',
|
||||||
|
`accountcode` varchar(20) NOT NULL default '',
|
||||||
PRIMARY KEY (`name`)
|
PRIMARY KEY (`name`)
|
||||||
) TYPE=MyISAM;
|
) TYPE=MyISAM;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue