mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Clean up SQL queries (bug #1479)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -1558,7 +1558,7 @@ static struct iax_peer *mysql_peer(char *peer) | ||||
| 		MYSQL_ROW rowval; | ||||
| 		name = alloca(strlen(peer) * 2 + 1); | ||||
| 		mysql_real_escape_string(mysql, name, peer, strlen(peer)); | ||||
| 		snprintf(query, sizeof(query), "SELECT * FROM iax1friends WHERE name=\"%s\"", name); | ||||
| 		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds FROM iax1friends WHERE name=\"%s\"", name); | ||||
| 		ast_mutex_lock(&mysqllock); | ||||
| 		mysql_query(mysql, query); | ||||
| 		if ((result = mysql_store_result(mysql))) { | ||||
| @@ -1626,7 +1626,7 @@ static struct iax_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 * FROM iax1friends WHERE name=\"%s\"", name); | ||||
| 		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds FROM iax1friends WHERE name=\"%s\"", name); | ||||
| 		ast_mutex_lock(&mysqllock); | ||||
| 		mysql_query(mysql, query); | ||||
| 		if ((result = mysql_store_result(mysql))) { | ||||
|   | ||||
| @@ -1816,7 +1816,7 @@ static struct iax2_peer *mysql_peer(char *peer) | ||||
| 		MYSQL_ROW rowval; | ||||
| 		name = alloca(strlen(peer) * 2 + 1); | ||||
| 		mysql_real_escape_string(mysql, name, peer, strlen(peer)); | ||||
| 		snprintf(query, sizeof(query), "SELECT * FROM iaxfriends WHERE name=\"%s\"", name); | ||||
| 		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds FROM iaxfriends WHERE name=\"%s\"", name); | ||||
| 		ast_mutex_lock(&mysqllock); | ||||
| 		mysql_query(mysql, query); | ||||
| 		if ((result = mysql_store_result(mysql))) { | ||||
| @@ -1885,7 +1885,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 * FROM iaxfriends WHERE name=\"%s\"", name); | ||||
| 		snprintf(query, sizeof(query), "SELECT name, secret, context, ipaddr, port, regseconds FROM iaxfriends WHERE name=\"%s\"", name); | ||||
| 		ast_mutex_lock(&mysqllock); | ||||
| 		mysql_query(mysql, query); | ||||
| 		if ((result = mysql_store_result(mysql))) { | ||||
|   | ||||
| @@ -747,9 +747,9 @@ static struct sip_peer *mysql_peer(char *peer, struct sockaddr_in *sin) | ||||
| 			mysql_real_escape_string(mysql, name, peer, strlen(peer)); | ||||
| 		} | ||||
| 		if (sin) | ||||
| 			snprintf(query, sizeof(query), "SELECT * FROM sipfriends WHERE ipaddr=\"%s\" AND port=\"%d\"", inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); | ||||
| 			snprintf(query, sizeof(query), "SELECT name, secret, context, username, ipaddr, port, regseconds FROM sipfriends WHERE ipaddr=\"%s\" AND port=\"%d\"", inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); | ||||
| 		else | ||||
| 			snprintf(query, sizeof(query), "SELECT * FROM sipfriends WHERE name=\"%s\"", name); | ||||
| 			snprintf(query, sizeof(query), "SELECT name, secret, context, username, ipaddr, port, regseconds FROM sipfriends WHERE name=\"%s\"", name); | ||||
| 		ast_mutex_lock(&mysqllock); | ||||
| 		mysql_query(mysql, query); | ||||
| 		if ((result = mysql_store_result(mysql))) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user