lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cifs: add new routine for converting AF_INET and AF_INET6 addrs

Browse Source 
...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>
This commit is contained in:
Jeff Layton
2009-06-11 10:27:30 -04:00
committed by Steve French
parent 340481a364
commit 1e68b2b275
4 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/cifs/dns_resolve.c
View File

@@ -37,24 +37,9 @@
static int
is_ip(const char *name)
{
int rc;
struct sockaddr_in sin_server;
struct sockaddr_in6 sin_server6;
struct sockaddr_storage ss;
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;
return cifs_convert_address(name, &ss);
}
static int