kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop a seggy..it helps if you dont try to print out something we already know is NULL :)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2004-10-14 23:59:22 +00:00
parent def2962670
commit 839d68586b
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
channels/chan_h323.c
View File

@@ -851,17 +851,19 @@ struct oh323_peer *find_peer(char *peer, struct sockaddr_in *sin)
} }
} else { } else {
/* find by sin */ /* find by sin */
while (p) { if (sin) {
if ((!inaddrcmp(&p->addr, sin)) || while (p) {
(p->addr.sin_addr.s_addr == sin->sin_addr.s_addr)) { if ((!inaddrcmp(&p->addr, sin)) ||
ast_log(LOG_DEBUG, "Found peer %s/%s by addr\n", peer, ast_inet_ntoa(iabuf, sizeof(iabuf), p->addr.sin_addr)); (p->addr.sin_addr.s_addr == sin->sin_addr.s_addr)) {
break; ast_log(LOG_DEBUG, "Found peer %s/%s by addr\n", peer, ast_inet_ntoa(iabuf, sizeof(iabuf), p->addr.sin_addr));
break;
}
p = p->next;
} }
p = p->next; }
}
} }
if (!p) { if (!p) {
ast_log(LOG_DEBUG, "Could not find peer %s/%s by addr\n", peer, ast_inet_ntoa(iabuf, sizeof(iabuf), p->addr.sin_addr)); ast_log(LOG_DEBUG, "Could not find peer %s by name or address\n", peer);
} }
return p; return p;
} }
@@ -1804,25 +1806,8 @@ int reload(void)
delete_users(); delete_users();
delete_aliases(); delete_aliases();
prune_peers(); prune_peers();
#if 0
if (!ast_strlen_zero(gatekeeper)) {
h323_gk_urq();
}
#endif
reload_config(); reload_config();
#if 0
/* Possibly register with a GK */
if (gatekeeper_disable == 0) {
if (h323_set_gk(gatekeeper_discover, gatekeeper, secret)) {
ast_log(LOG_ERROR, "Gatekeeper registration failed.\n");
h323_end_process();
return -1;
}
}
#endif
restart_monitor(); restart_monitor();
return 0; return 0;
} }