Use the default protocol and version values, when they

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index ad6c14644e7f31fa64196cf2af86a25cd87caf45..e6511676b0a58cf895c18306464ece1c3792cf54 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -50,6 +50,7 @@
 #include "nfsrpc.h"
 #include "parse_opt.h"
 #include "network.h"
+#include "conffile.h"
 
 #define PMAP_TIMEOUT   (10)
 #define CONNECT_TIMEOUT        (20)
@@ -90,6 +91,7 @@ static const char *nfs_transport_opttbl[] = {
 static const char *nfs_version_opttbl[] = {
        "v2",
        "v3",
+       "v4",
        "vers",
        "nfsvers",
        NULL,
@@ -255,7 +257,6 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
 /**
  * nfs_string_to_sockaddr - convert string address to sockaddr
  * @address:   pointer to presentation format address to convert
- * @addrlen:   length of presentation address
  * @sap:       pointer to socket address buffer to fill in
  * @salen:     IN: length of address buffer
  *             OUT: length of converted socket address
@@ -269,8 +270,8 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
  * See RFC 4038 section 5.1 or RFC 3513 section 2.2 for more details
  * on presenting IPv6 addresses as text strings.
  */
-int nfs_string_to_sockaddr(const char *address, const size_t addrlen,
-                          struct sockaddr *sap, socklen_t *salen)
+int nfs_string_to_sockaddr(const char *address, struct sockaddr *sap,
+                          socklen_t *salen)
 {
        struct addrinfo *gai_results;
        struct addrinfo gai_hint = {
@@ -609,10 +610,19 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,
        if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port)
                return 1;
 
-       if (nfs_mount_data_version >= 4)
+       if (nfs_mount_data_version >= 4) {
+               const unsigned int *probe_proto = probe_tcp_first;
+
+               /*
+                * 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;
+
                return nfs_probe_port(sap, salen, pmap,
-                                       probe_nfs3_first, probe_tcp_first);
-       else
+                                       probe_nfs3_first, probe_proto);
+       } else
                return nfs_probe_port(sap, salen, pmap,
                                        probe_nfs2_only, probe_udp_only);
 }
@@ -783,8 +793,8 @@ int start_statd(void)
                                execl(START_STATD, START_STATD, NULL);
                                exit(1);
                        case -1: /* error */
-                               nfs_error(_("fork failed: %s"),
-                                                       strerror(errno));
+                               nfs_error(_("%s: fork failed: %s"),
+                                               progname, strerror(errno));
                                break;
                        default: /* parent */
                                waitpid(pid, NULL,0);
@@ -849,10 +859,14 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
                        (xdrproc_t)xdr_dirpath, (caddr_t)argp,
                        (xdrproc_t)xdr_void, NULL,
                        timeout);
-       if (verbose && res != RPC_SUCCESS)
-               nfs_error(_("%s: UMNT call failed: %s"),
-                       progname, clnt_sperrno(res));
+       if (res != RPC_SUCCESS) {
+               rpc_createerr.cf_stat = res;
+               CLNT_GETERR(client, &rpc_createerr.cf_error);
+               if (verbose)
+                       nfs_error(_("%s: UMNT call failed: %s"),
+                               progname, clnt_sperrno(res));
 
+       }
        auth_destroy(client->cl_auth);
        CLNT_DESTROY(client);
 
@@ -1103,7 +1117,7 @@ static int nfs_ca_sockname(const struct sockaddr *sap, const socklen_t salen,
  *
  * Returns 1 and fills in @buf if successful; otherwise, zero.
  */
-static int nfs_ca_gai(const struct sockaddr *sap, const socklen_t salen,
+static int nfs_ca_gai(const struct sockaddr *sap,
                      struct sockaddr *buf, socklen_t *buflen)
 {
        struct addrinfo *gai_results;
@@ -1144,7 +1158,7 @@ int nfs_callback_address(const struct sockaddr *sap, const socklen_t salen,
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)buf;
 
        if (nfs_ca_sockname(sap, salen, buf, buflen) == 0)
-               if (nfs_ca_gai(sap, salen, buf, buflen) == 0)
+               if (nfs_ca_gai(sap, buf, buflen) == 0)
                        goto out_failed;
 
        /*
@@ -1159,7 +1173,8 @@ int nfs_callback_address(const struct sockaddr *sap, const socklen_t salen,
 out_failed:
        *buflen = 0;
        if (verbose)
-               nfs_error(_("%s: failed to construct callback address"));
+               nfs_error(_("%s: failed to construct callback address"),
+                               progname);
        return 0;
 }
 
@@ -1199,7 +1214,7 @@ nfs_nfs_program(struct mount_options *options, unsigned long *program)
  * Returns TRUE if @version contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_version(struct mount_options *options, unsigned long *version)
 {
        long tmp;
@@ -1211,10 +1226,13 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
        case 1: /* v3 */
                *version = 3;
                return 1;
-       case 2: /* vers */
+       case 2: /* v4 */
+               *version = 4;
+               return 1;
+       case 3: /* vers */
                switch (po_get_numeric(options, "vers", &tmp)) {
                case PO_FOUND:
-                       if (tmp >= 2 && tmp <= 3) {
+                       if (tmp >= 2 && tmp <= 4) {
                                *version = tmp;
                                return 1;
                        }
@@ -1225,10 +1243,10 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
                case PO_BAD_VALUE:
                        return 0;
                }
-       case 3: /* nfsvers */
+       case 4: /* nfsvers */
                switch (po_get_numeric(options, "nfsvers", &tmp)) {
                case PO_FOUND:
-                       if (tmp >= 2 && tmp <= 3) {
+                       if (tmp >= 2 && tmp <= 4) {
                                *version = tmp;
                                return 1;
                        }
@@ -1253,7 +1271,7 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
  * Returns TRUE if @protocol contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
        char *option;