mount.nfs: support netids in nfs_options2pmap()

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index e6511676b0a58cf895c18306464ece1c3792cf54..ecb5accac0621f1a4f0ccb1c3ce12b9e90315ca0 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = {
        0,
 };
 
+static const unsigned int *nfs_default_proto(void);
+#ifdef MOUNT_CONFIG
+static const unsigned int *nfs_default_proto()
+{
+       extern unsigned long config_default_proto;
+       /*
+        * If the default proto has been set and 
+        * its not TCP, start with UDP
+        */
+       if (config_default_proto && config_default_proto != IPPROTO_TCP)
+               return probe_udp_first;
+
+       return probe_tcp_first; 
+}
+#else
+static const unsigned int *nfs_default_proto() 
+{
+       return probe_tcp_first; 
+}
+#endif /* MOUNT_CONFIG */
+
 static int nfs_lookup(const char *hostname, const sa_family_t family,
                      struct sockaddr *sap, socklen_t *salen)
 {
@@ -590,7 +611,6 @@ out_ok:
        nfs_clear_rpc_createerr();
        return 1;
 }
-
 /*
  * Probe a server's NFS service to determine which versions and
  * transport protocols are supported.
@@ -611,14 +631,9 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,
                return 1;
 
        if (nfs_mount_data_version >= 4) {
-               const unsigned int *probe_proto = probe_tcp_first;
+               const unsigned int *probe_proto;
 
-               /*
-                * If the default proto has been set and 
-                * its not TCP, start with UDP
-                */
-               if (config_default_proto && config_default_proto != IPPROTO_TCP)
-                       probe_proto =  probe_udp_first;
+               probe_proto = nfs_default_proto();
 
                return nfs_probe_port(sap, salen, pmap,
                                        probe_nfs3_first, probe_proto);
@@ -1274,6 +1289,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)) {
@@ -1285,17 +1301,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);
        }
 
        /*
@@ -1404,20 +1411,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