summaryrefslogtreecommitdiffstats
path: root/fs/cifs/dns_resolve.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-06-11 10:27:30 -0400
committerSteve French <sfrench@us.ibm.com>2009-06-13 08:17:30 +0000
commit1e68b2b2756fc3488ecbade5ad5f13302b3aaafc (patch)
tree3ee4b36a1a00d449126050ce3bb1758ba88d7c2f /fs/cifs/dns_resolve.c
parent340481a36498bf3fe404bcecb2e2d6188e950bff (diff)
downloadop-kernel-dev-1e68b2b2756fc3488ecbade5ad5f13302b3aaafc.zip
op-kernel-dev-1e68b2b2756fc3488ecbade5ad5f13302b3aaafc.tar.gz
cifs: add new routine for converting AF_INET and AF_INET6 addrs
...to consolidate some logic used in more than one place. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/dns_resolve.c')
-rw-r--r--fs/cifs/dns_resolve.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
index df4a306..91b5500 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
@@ -37,24 +37,9 @@
static int
is_ip(const char *name)
{
- int rc;
- struct sockaddr_in sin_server;
- struct sockaddr_in6 sin_server6;
-
- rc = cifs_inet_pton(AF_INET, name,
- &sin_server.sin_addr.s_addr);
-
- if (rc <= 0) {
- /* not ipv4 address, try ipv6 */
- rc = cifs_inet_pton(AF_INET6, name,
- &sin_server6.sin6_addr.in6_u);
- if (rc > 0)
- return 1;
- } else {
- return 1;
- }
- /* we failed translating address */
- return 0;
+ struct sockaddr_storage ss;
+
+ return cifs_convert_address(name, &ss);
}
static int
OpenPOWER on IntegriCloud