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 6f626529be9a2c3d6c7b982a648e9edf806d2e2d..c5068bae24ea754e4bbbf787a2fa44ca17d721e6 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,16 +14,6 @@
    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 WIN32
-#include "win32_compat.h"
-#else
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif/*WIN32*/
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -32,22 +22,48 @@
 #include "aros_compat.h"
 #endif
 
+#ifdef WIN32
+#include "win32_compat.h"
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #ifdef HAVE_POLL_H
 #include <poll.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
+
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
 #include <sys/types.h>
 #include "libnfs-zdr.h"
 #include "libnfs.h"
@@ -69,7 +85,7 @@ static void set_nonblocking(int fd)
        int v = 0;
 #if defined(WIN32)
        long nonblocking=1;
-       v = ioctlsocket(fd, FIONBIO,&nonblocking);
+       v = ioctl(fd, FIONBIO, &nonblocking);
 #else
        v = fcntl(fd, F_GETFL, 0);
         fcntl(fd, F_SETFL, v | O_NONBLOCK);
@@ -147,13 +163,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-       assert(rpc->magic == RPC_CONTEXT_MAGIC);
-
-#if defined(WIN32)
-       if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
-#else
        if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
-#endif
                rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
                return -1;
        }
@@ -246,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;
@@ -399,8 +412,12 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
                static int portOfs = 0;
                const int firstPort = 512;      /* >= 512 according to Sun docs */
                const int portCount = IPPORT_RESERVED - firstPort;
-               int startOfs = portOfs, port, rc;
+               int startOfs, port, rc;
 
+               if (portOfs == 0) {
+                       portOfs = time(NULL) % 400;
+               }
+               startOfs = portOfs;
                do {
                        rc = -1;
                        port = htons(firstPort + portOfs);
@@ -484,11 +501,7 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
        rpc_unset_autoreconnect(rpc);
 
        if (rpc->fd != -1) {
-#if defined(WIN32)
-               closesocket(rpc->fd);
-#else
                close(rpc->fd);
-#endif
        }
        rpc->fd  = -1;
 
@@ -520,11 +533,7 @@ static int rpc_reconnect_requeue(struct rpc_context *rpc)
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
        if (rpc->fd != -1) {
-#if defined(WIN32)
-               closesocket(rpc->fd);
-#else
                close(rpc->fd);
-#endif
        }
        rpc->fd  = -1;