nfs_{pread,pwrite}_async: fix oom handling and comments

[deb_libnfs.git] / lib / pdu.c

diff --git a/lib/pdu.c b/lib/pdu.c
index 6efd3554b23517c0cf13c2ba0163f7dbc802f243..5def0bc5d9041363b2bc833b5f50677750e5c517 100644 (file)
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -14,20 +14,33 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 #ifdef WIN32
 #include "win32_compat.h"
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
 #endif
-#else
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif/*WIN32*/
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <assert.h>
 #include <errno.h>
 #include "slist.h"
@@ -36,10 +49,6 @@
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
 
-#ifdef AROS
-#include "aros_compat.h"
-#endif
-
 struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int version, int procedure, rpc_cb cb, void *private_data, zdrproc_t zdr_decode_fn, int zdr_decode_bufsize)
 {
        struct rpc_pdu *pdu;
@@ -74,8 +83,9 @@ struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int versi
        msg.body.cbody.cred    = rpc->auth->ah_cred;
        msg.body.cbody.verf    = rpc->auth->ah_verf;
 
-       if (zdr_callmsg(&pdu->zdr, &msg) == 0) {
-               rpc_set_error(rpc, "zdr_callmsg failed");
+       if (zdr_callmsg(rpc, &pdu->zdr, &msg) == 0) {
+               rpc_set_error(rpc, "zdr_callmsg failed with %s",
+                             rpc_get_error(rpc));
                zdr_destroy(&pdu->zdr);
                free(pdu);
                return NULL;
@@ -104,6 +114,10 @@ void rpc_free_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu)
        free(pdu);
 }
 
+void rpc_set_next_xid(struct rpc_context *rpc, uint32_t xid)
+{
+       rpc->xid = xid;
+}
 
 int rpc_queue_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu)
 {
@@ -167,8 +181,11 @@ static int rpc_process_reply(struct rpc_context *rpc, struct rpc_pdu *pdu, ZDR *
                }
                pdu->zdr_decode_buf = malloc(pdu->zdr_decode_bufsize);
                if (pdu->zdr_decode_buf == NULL) {
-                       rpc_set_error(rpc, "zdr_replymsg failed in portmap_getport_reply");
-                       pdu->cb(rpc, RPC_STATUS_ERROR, "Failed to allocate buffer for decoding of ZDR reply", pdu->private_data);
+                       rpc_set_error(rpc, "Failed to allocate memory for "
+                                     "zdr_encode_buf in rpc_process_reply");
+                       pdu->cb(rpc, RPC_STATUS_ERROR, "Failed to allocate "
+                               "buffer for decoding of ZDR reply",
+                               pdu->private_data);
                        return 0;
                }
                memset(pdu->zdr_decode_buf, 0, pdu->zdr_decode_bufsize);
@@ -176,9 +193,11 @@ static int rpc_process_reply(struct rpc_context *rpc, struct rpc_pdu *pdu, ZDR *
        msg.body.rbody.reply.areply.reply_data.results.where = pdu->zdr_decode_buf;
        msg.body.rbody.reply.areply.reply_data.results.proc  = pdu->zdr_decode_fn;
 
-       if (zdr_replymsg(zdr, &msg) == 0) {
-               rpc_set_error(rpc, "zdr_replymsg failed in portmap_getport_reply");
-               pdu->cb(rpc, RPC_STATUS_ERROR, "Message rejected by server", pdu->private_data);
+       if (zdr_replymsg(rpc, zdr, &msg) == 0) {
+               rpc_set_error(rpc, "zdr_replymsg failed in rpc_process_reply: "
+                             "%s", rpc_get_error(rpc));
+               pdu->cb(rpc, RPC_STATUS_ERROR, "Message rejected by server",
+                       pdu->private_data);
                if (pdu->zdr_decode_buf != NULL) {
                        free(pdu->zdr_decode_buf);
                        pdu->zdr_decode_buf = NULL;
@@ -221,7 +240,7 @@ int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size)
        struct rpc_pdu *pdu;
        ZDR zdr;
        int pos, recordmarker = 0;
-       unsigned int xid;
+       uint32_t xid;
        char *reasbuf = NULL;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);