Clean up SQL queries (bug #1479)

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

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 962c6ea31ff1aeb02bcf9ec320a57655144ed412..af0f81ccb7525d251975910c7468b1a155ac6014 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -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))) {

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c0f538c84a2aa9110c173a759b77a89706a211ca..624d9ef620bb16f5f0d6d326c67b1831a0874e77 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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))) {

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e17f77fc914efbabab71b5671180aac2883e0763..b57a13c710bc2cbc71720f13271b8db3ce2828d0 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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))) {