mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	Merged revisions 170501 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r170501 | mvanbaak | 2009-01-23 18:46:02 +0100 (Fri, 23 Jan 2009) | 1 line let's use SENTINEL where needed ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -1224,7 +1224,7 @@ static struct oh323_alias *realtime_alias(const char *alias) | ||||
| 	struct ast_variable *var, *tmp; | ||||
| 	struct oh323_alias *a; | ||||
|  | ||||
| 	var = ast_load_realtime("h323", "name", alias, NULL); | ||||
| 	var = ast_load_realtime("h323", "name", alias, SENTINEL); | ||||
|  | ||||
| 	if (!var) | ||||
| 		return NULL; | ||||
| @@ -1438,10 +1438,10 @@ static struct oh323_user *realtime_user(const call_details_t *cd) | ||||
| 	const char *username; | ||||
|  | ||||
| 	if (userbyalias) | ||||
| 		var = ast_load_realtime("h323", "name", username = cd->call_source_aliases, NULL); | ||||
| 		var = ast_load_realtime("h323", "name", username = cd->call_source_aliases, SENTINEL); | ||||
| 	else { | ||||
| 		username = (char *)NULL; | ||||
| 		var = ast_load_realtime("h323", "host", cd->sourceIp, NULL); | ||||
| 		var = ast_load_realtime("h323", "host", cd->sourceIp, SENTINEL); | ||||
| 	} | ||||
|  | ||||
| 	if (!var) | ||||
| @@ -1554,9 +1554,9 @@ static struct oh323_peer *realtime_peer(const char *peername, struct sockaddr_in | ||||
|  | ||||
| 	/* First check on peer name */ | ||||
| 	if (peername) | ||||
| 		var = ast_load_realtime("h323", "name", peername, NULL); | ||||
| 		var = ast_load_realtime("h323", "name", peername, SENTINEL); | ||||
| 	else if (sin) /* Then check on IP address for dynamic peers */ | ||||
| 		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), NULL); | ||||
| 		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), SENTINEL); | ||||
| 	else | ||||
| 		return NULL; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user