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

Start moving in changes from my resolve-shadow-warnings branch. Going to do

Browse Source 
this in pieces so the diffs are a little bit smaller and more reviewable.

pbx/ and formats/ first.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 00:44:55 +00:00
parent 367dfcb0ab
commit b7a4db0ced
5 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pbx/pbx_dundi.c
View File

@@ -1139,7 +1139,7 @@ static int cache_lookup_internal(time_t now, struct dundi_request *req, char *ke
return 0;
}
static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned long crc32, int *lowexpiration)
static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned long checksum, int *lowexpiration)
{
char key[256];
char eid_str[20];
@@ -1155,7 +1155,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned
dundi_eid_to_str_short(eid_str, sizeof(eid_str), peer_eid);
dundi_eid_to_str_short(eidroot_str, sizeof(eidroot_str), &req->root_eid);
ast_eid_to_str(eid_str_full, sizeof(eid_str_full), peer_eid);
snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, crc32);
snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, checksum);
res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, 0L);
res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
@@ -1170,7 +1170,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned
break;
x++;
/* Check for hints */
snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, crc32);
snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, checksum);
res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, 0L);
res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
@@ -4640,11 +4640,11 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
} else if(sin->sin_port != last_port)
ast_log(LOG_WARNING, "change to port ignored until next asterisk re-start\n");
} else if (!strcasecmp(v->name, "bindaddr")) {
struct hostent *hp;
struct ast_hostent he;
hp = ast_gethostbyname(v->value, &he);
if (hp) {
memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
struct hostent *hep;
struct ast_hostent hent;
hep = ast_gethostbyname(v->value, &hent);
if (hep) {
memcpy(&sin->sin_addr, hep->h_addr, sizeof(sin->sin_addr));
} else
ast_log(LOG_WARNING, "Invalid host/IP '%s'\n", v->value);
} else if (!strcasecmp(v->name, "authdebug")) {