diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-07 00:44:55 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-07 00:44:55 +0000 |
| commit | b7a4db0ced614b2a619a02227883528a7bb0a1a6 (patch) | |
| tree | 80d01b854334393ac9a340bc94f6fc74bd041827 /pbx/pbx_dundi.c | |
| parent | 367dfcb0ab6d7d47b39ed0a10ca84e51b73b6732 (diff) | |
Start moving in changes from my resolve-shadow-warnings branch. Going to do
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
Diffstat (limited to 'pbx/pbx_dundi.c')
| -rw-r--r-- | pbx/pbx_dundi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 25206f156..5d3a0be12 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -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")) { |