diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-11-23 23:03:32 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-11-23 23:03:32 +0000 |
| commit | 7d9ba4875baa4b50522627c38e271e5574deb0ac (patch) | |
| tree | 2158e70a49eae0974541a790dba3690c4dd1a8d8 /main/acl.c | |
| parent | 2ee874178ef8a1a109ee31fe23e10707387f255b (diff) | |
Fix calls to ast_get_ip() not initializing the address family.
........
Merged revisions 346239 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 346240 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@346241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/acl.c')
| -rw-r--r-- | main/acl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/acl.c b/main/acl.c index 69713bbd8..6361b71d8 100644 --- a/main/acl.c +++ b/main/acl.c @@ -586,7 +586,7 @@ static int resolve_first(struct ast_sockaddr *addr, const char *name, int flag, return 0; } -int ast_get_ip_or_srv(struct ast_sockaddr *addr, const char *value, const char *service) +int ast_get_ip_or_srv(struct ast_sockaddr *addr, const char *hostname, const char *service) { char srv[256]; char host[256]; @@ -594,13 +594,13 @@ int ast_get_ip_or_srv(struct ast_sockaddr *addr, const char *value, const char * int tportno; if (service) { - snprintf(srv, sizeof(srv), "%s.%s", service, value); + snprintf(srv, sizeof(srv), "%s.%s", service, hostname); if ((srv_ret = ast_get_srv(NULL, host, sizeof(host), &tportno, srv)) > 0) { - value = host; + hostname = host; } } - if (resolve_first(addr, value, PARSE_PORT_FORBID, addr->ss.ss_family) != 0) { + if (resolve_first(addr, hostname, PARSE_PORT_FORBID, addr->ss.ss_family) != 0) { return -1; } @@ -689,9 +689,9 @@ const char *ast_tos2str(unsigned int tos) return "unknown"; } -int ast_get_ip(struct ast_sockaddr *addr, const char *value) +int ast_get_ip(struct ast_sockaddr *addr, const char *hostname) { - return ast_get_ip_or_srv(addr, value, NULL); + return ast_get_ip_or_srv(addr, hostname, NULL); } int ast_ouraddrfor(const struct ast_sockaddr *them, struct ast_sockaddr *us) |