[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.196, 1.197 chan_sip.c, 1.526, 1.527

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19554/channels

Modified Files:
	chan_iax2.c chan_sip.c 
Log Message:
Oops, we have to be able to pass multiple restrictions for when we go to voicemail...


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- chan_iax2.c	5 Oct 2004 06:46:11 -0000	1.196
+++ chan_iax2.c	7 Oct 2004 19:57:50 -0000	1.197
@@ -1992,7 +1992,7 @@
 	struct iax2_peer *peer=NULL;
 	time_t regseconds, nowtime;
 	int dynamic=0;
-	var = ast_load_realtime("iaxfriends", "name", peername);
+	var = ast_load_realtime("iaxfriends", "name", peername, NULL);
 	if (var) {
 		/* Make sure it's not a user only... */
 		peer = build_peer(peername, var);
@@ -2041,7 +2041,7 @@
 	struct ast_variable *var;
 	struct ast_variable *tmp;
 	struct iax2_user *user=NULL;
-	var = ast_load_realtime("iaxfriends", "name", username);
+	var = ast_load_realtime("iaxfriends", "name", username, NULL);
 	if (var) {
 		/* Make sure it's not a user only... */
 		user = build_user(username, var);

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -d -r1.526 -r1.527
--- chan_sip.c	7 Oct 2004 19:00:00 -0000	1.526
+++ chan_sip.c	7 Oct 2004 19:57:50 -0000	1.527
@@ -1055,9 +1055,9 @@
 	if (sin)
 		ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr);
 	if (peername) 
-		var = ast_load_realtime("sipfriends", "name", peername);
+		var = ast_load_realtime("sipfriends", "name", peername, NULL);
 	else
-		var = ast_load_realtime("sipfriends", "ipaddr", iabuf);
+		var = ast_load_realtime("sipfriends", "ipaddr", iabuf, NULL);
 	if (var) {
 		/* Make sure it's not a user only... */
 		peer = build_peer(peername, var);
@@ -1147,7 +1147,7 @@
 	struct ast_variable *var;
 	struct ast_variable *tmp;
 	struct sip_user *user=NULL;
-	var = ast_load_realtime("sipfriends", "name", username);
+	var = ast_load_realtime("sipfriends", "name", username, NULL);
 	if (var) {
 		/* Make sure it's not a user only... */
 		user = build_user(username, var);