mount.nfs: make nfs_lookup() global

[nfs-utils.git] / utils / mount / network.c

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 7b1152a4b3fa479e121a8709af7a42dd40081c48..7d9accd19f56ead4410906fb7394edc20a142b87 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -193,8 +193,18 @@ static const unsigned int *nfs_default_proto()
 }
 #endif /* MOUNT_CONFIG */
 
-static int nfs_lookup(const char *hostname, const sa_family_t family,
-                     struct sockaddr *sap, socklen_t *salen)
+/**
+ * nfs_lookup - resolve hostname to an IPv4 or IPv6 socket address
+ * @hostname: pointer to C string containing DNS hostname to resolve
+ * @family: address family hint
+ * @sap: pointer to buffer to fill with socket address
+ * @len: IN: size of buffer to fill; OUT: size of socket address
+ *
+ * Returns 1 and places a socket address at @sap if successful;
+ * otherwise zero.
+ */
+int nfs_lookup(const char *hostname, const sa_family_t family,
+               struct sockaddr *sap, socklen_t *salen)
 {
        struct addrinfo *gai_results;
        struct addrinfo gai_hint = {
@@ -1289,6 +1299,7 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
 int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
+       sa_family_t family;
        char *option;
 
        switch (po_rightmost(options, nfs_transport_opttbl)) {
@@ -1300,17 +1311,8 @@ nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
                return 1;
        case 2: /* proto */
                option = po_get(options, "proto");
-               if (option) {
-                       if (strcmp(option, "tcp") == 0) {
-                               *protocol = IPPROTO_TCP;
-                               return 1;
-                       }
-                       if (strcmp(option, "udp") == 0) {
-                               *protocol = IPPROTO_UDP;
-                               return 1;
-                       }
-                       return 0;
-               }
+               if (option != NULL)
+                       return nfs_get_proto(option, &family, protocol);
        }
 
        /*
@@ -1419,20 +1421,12 @@ nfs_mount_version(struct mount_options *options, unsigned long *version)
 static int
 nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
 {
+       sa_family_t family;
        char *option;
 
        option = po_get(options, "mountproto");
-       if (option) {
-               if (strcmp(option, "tcp") == 0) {
-                       *protocol = IPPROTO_TCP;
-                       return 1;
-               }
-               if (strcmp(option, "udp") == 0) {
-                       *protocol = IPPROTO_UDP;
-                       return 1;
-               }
-               return 0;
-       }
+       if (option != NULL)
+               return nfs_get_proto(option, &family, protocol);
 
        /*
         * MNT transport protocol wasn't specified.  If the NFS