Reset the receive buffer processing the received PDU.

[deb_libnfs.git] / lib / socket.c

diff --git a/lib/socket.c b/lib/socket.c
index 733f1f4768e8a0b41c9a51a0903d73e1d08539c0..c5068bae24ea754e4bbbf787a2fa44ca17d721e6 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -24,9 +24,11 @@
 
 #ifdef WIN32
 #include "win32_compat.h"
-#else
+#endif
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#endif/*WIN32*/
+#endif
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
@@ -161,8 +163,6 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-       assert(rpc->magic == RPC_CONTEXT_MAGIC);
-
        if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
                rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
                return -1;
@@ -256,14 +256,17 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
        rpc->inpos += count;
 
        if (rpc->inpos == rpc->insize) {
-               if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
+               char *buf = rpc->inbuf;
+
+               rpc->inbuf  = NULL;
+               rpc->insize = 0;
+               rpc->inpos  = 0;
+
+               if (rpc_process_pdu(rpc, buf, pdu_size) != 0) {
                        rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
                        return -1;
                }
                free(rpc->inbuf);
-               rpc->inbuf  = NULL;
-               rpc->insize = 0;
-               rpc->inpos  = 0;
        }
 
        return 0;