getport: Restore historical TCP connect timeout error code

[nfs-utils.git] / support / nfs / getport.c

diff --git a/support/nfs/getport.c b/support/nfs/getport.c
index 71f02f3e655e9a59fb031e539f79e7f84a55a5a6..e39f809973d84c2e9dc676c1f69ba4eb740b17fb 100644 (file)
--- a/support/nfs/getport.c
+++ b/support/nfs/getport.c
@@ -65,6 +65,23 @@ static const rpcvers_t default_rpcb_version = RPCBVERS_4;
 static const rpcvers_t default_rpcb_version = PMAPVERS;
 #endif /* !HAVE_LIBTIRPC */
 
+/*
+ * Historical: Map TCP connect timeouts to timeout
+ * error code used by UDP.
+ */
+static void
+nfs_gp_map_tcp_errorcodes(const unsigned short protocol)
+{
+       if (protocol != IPPROTO_TCP)
+               return;
+
+       switch (rpc_createerr.cf_error.re_errno) {
+       case ETIMEDOUT:
+               rpc_createerr.cf_stat = RPC_TIMEDOUT;
+               break;
+       }
+}
+
 /*
  * There's no easy way to tell how the local system's networking
  * and rpcbind is configured (ie. whether we want to use IPv6 or
@@ -188,10 +205,13 @@ static CLIENT *nfs_gp_get_rpcbclient(struct sockaddr *sap,
                NULL,
        };
        rpcprog_t rpcb_prog = nfs_getrpcbyname(RPCBPROG, rpcb_pgmtbl);
+       CLIENT *clnt;
 
        nfs_gp_set_port(sap, nfs_gp_get_rpcb_port(transport));
-       return nfs_get_rpcclient(sap, salen, transport, rpcb_prog,
-                                       version, timeout);
+       clnt = nfs_get_rpcclient(sap, salen, transport, rpcb_prog,
+                                                       version, timeout);
+       nfs_gp_map_tcp_errorcodes(transport);
+       return clnt;
 }
 
 /*
@@ -627,11 +647,14 @@ int nfs_rpc_ping(const struct sockaddr *sap, const socklen_t salen,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_get_rpcclient(saddr, salen, protocol,
                                                program, version, &tout);
        if (client != NULL) {
                result = nfs_gp_ping(client, tout);
+               nfs_gp_map_tcp_errorcodes(protocol);
                CLNT_DESTROY(client);
        }
 
@@ -690,6 +713,8 @@ unsigned short nfs_getport(const struct sockaddr *sap,
        unsigned short port = 0;
        CLIENT *client;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_gp_get_rpcbclient(saddr, salen, protocol,
                                                default_rpcb_version, &timeout);
@@ -729,6 +754,8 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,
        CLIENT *client;
        int result = 0;
        
+       nfs_clear_rpc_createerr();
+
        client = nfs_gp_get_rpcbclient(sap, salen, protocol,
                                                default_rpcb_version, &timeout);
        if (client != NULL) {
@@ -745,10 +772,13 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,
                memcpy(saddr, sap, (size_t)salen);
                nfs_gp_set_port(saddr, htons(port));
 
+               nfs_clear_rpc_createerr();
+
                client = nfs_get_rpcclient(saddr, salen, protocol,
                                                program, version, &timeout);
                if (client != NULL) {
                        result = nfs_gp_ping(client, timeout);
+                       nfs_gp_map_tcp_errorcodes(protocol);
                        CLNT_DESTROY(client);
                }
        }
@@ -803,6 +833,8 @@ unsigned short nfs_getlocalport(const rpcprot_t program,
        CLIENT *client;
        struct timeval timeout = { -1, 0 };
 
+       nfs_clear_rpc_createerr();
+
        client = nfs_gp_get_rpcbclient(sap, salen, 0, RPCBVERS_4, &timeout);
        if (client != NULL) {
                struct rpcb parms;
@@ -817,6 +849,8 @@ unsigned short nfs_getlocalport(const rpcprot_t program,
 #endif /* NFS_GP_LOCAL */
 
        if (port == 0) {
+               nfs_clear_rpc_createerr();
+
                if (nfs_gp_loopback_address(lb_addr, &lb_len)) {
                        port = nfs_getport(lb_addr, lb_len,
                                                program, version, protocol);
@@ -878,6 +912,8 @@ unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_gp_get_rpcbclient(saddr, salen, transport,
                                                        RPCBVERS_4, &tout);
@@ -904,6 +940,8 @@ unsigned short nfs_rpcb_getaddr(__attribute__((unused)) const struct sockaddr *s
                                __attribute__((unused)) const unsigned short protocol,
                                __attribute__((unused)) const struct timeval *timeout)
 {
+       nfs_clear_rpc_createerr();
+
        rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
        return 0;
 }
@@ -959,6 +997,8 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sin, sizeof(address));
        client = nfs_gp_get_rpcbclient(saddr, (socklen_t)sizeof(*sin),
                                        transport, PMAPVERS, &tout);