kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 170501 via svnmerge from

Browse Source 
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:
Michiel van Baak
2009-01-23 17:49:55 +00:00
parent 55cddf916c
commit 17d6fa9568
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_h323.c
View File

@@ -1224,7 +1224,7 @@ static struct oh323_alias *realtime_alias(const char *alias)
struct ast_variable *var, *tmp; struct ast_variable *var, *tmp;
struct oh323_alias *a; struct oh323_alias *a;
var = ast_load_realtime("h323", "name", alias, NULL); var = ast_load_realtime("h323", "name", alias, SENTINEL);
if (!var) if (!var)
return NULL; return NULL;
@@ -1438,10 +1438,10 @@ static struct oh323_user *realtime_user(const call_details_t *cd)
const char *username; const char *username;
if (userbyalias) 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 { else {
username = (char *)NULL; username = (char *)NULL;
var = ast_load_realtime("h323", "host", cd->sourceIp, NULL); var = ast_load_realtime("h323", "host", cd->sourceIp, SENTINEL);
} }
if (!var) if (!var)
@@ -1554,9 +1554,9 @@ static struct oh323_peer *realtime_peer(const char *peername, struct sockaddr_in
/* First check on peer name */ /* First check on peer name */
if (peername) 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 */ 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 else
return NULL; return NULL;