Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.348
diff -u -r1.348 chan_sip.c
--- channels/chan_sip.c	29 Apr 2004 05:01:32 -0000	1.348
+++ channels/chan_sip.c	29 Apr 2004 21:18:47 -0000
@@ -716,7 +716,7 @@
 		time(&nowtime);
 		mysql_real_escape_string(mysql, name, peer, strlen(peer));
 		mysql_real_escape_string(mysql, uname, username, strlen(username));
-		snprintf(query, sizeof(query), "UPDATE sipfriends SET ipaddr=\"%s\", port=\"%d\", regseconds=\"%ld\", username=\"%s\" WHERE name=\"%s\"", 
+		snprintf(query, sizeof(query), "UPDATE friends SET sip_ipaddr=\"%s\", sip_port=\"%d\", sip_regseconds=\"%ld\", username=\"%s\" WHERE name=\"%s\"", 
 			inet_ntoa(sin->sin_addr), ntohs(sin->sin_port), nowtime + expiry, uname, name);
 		ast_mutex_lock(&mysqllock);
 		if (mysql_real_query(mysql, query, strlen(query))) 
@@ -747,9 +747,9 @@
 			mysql_real_escape_string(mysql, name, peer, strlen(peer));
 		}
 		if (sin)
-			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));
+			snprintf(query, sizeof(query), "SELECT name, secret, context, username, sip_ipaddr AS ipaddr, sip_port AS port, sip_regseconds AS regseconds FROM friends WHERE sip_ipaddr=\"%s\" AND sip_port=\"%d\" AND enabled=\"true\" AND sip_enabled=\"true\"", inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
 		else
-			snprintf(query, sizeof(query), "SELECT name, secret, context, username, ipaddr, port, regseconds FROM sipfriends WHERE name=\"%s\"", name);
+			snprintf(query, sizeof(query), "SELECT name, secret, context, username, sip_ipaddr AS ipaddr, sip_port AS port, sip_regseconds AS regseconds FROM friends WHERE name=\"%s\" AND enabled=\"true\" AND sip_enabled=\"true\"", name);
 		ast_mutex_lock(&mysqllock);
 		mysql_query(mysql, query);
 		if ((result = mysql_store_result(mysql))) {