X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=8dc3ed2d6b0d5a9fc1a5d731f2cd96bd3ad0d48c;hb=c022471e52d3ea679139cdf026dcde179c8de23c;hp=1ba846a1c8151893a8b2237bd8c0f06afa2faa99;hpb=f3a75078066dd8022e1e52d9cce2256b4fc323d2;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index 1ba846a..8dc3ed2 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,32 +14,56 @@
    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"
-#else
-#include <unistd.h>
-#include <poll.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#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/*WIN32*/
+#endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#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>
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
 #include <sys/types.h>
 #include "libnfs-zdr.h"
 #include "libnfs.h"
@@ -61,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);
@@ -110,11 +134,7 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 
 		total = rpc->outqueue->outdata.size;
 
-#if defined(WIN32)
 		count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
-#else
-		count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
-#endif
 		if (count == -1) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK) {
 				return 0;
@@ -143,11 +163,9 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-#if defined(WIN32)
-	if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
-#else
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
-#endif
 		rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
 		return -1;
 	}
@@ -192,11 +210,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	if (rpc->inpos < 4) {
 		size = 4 - rpc->inpos;
 
-#if defined(WIN32)
 		count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
-		count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
 		if (count == -1) {
 			if (errno == EINTR) {
 				return 0;
@@ -232,11 +246,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		size = rpc->insize - rpc->inpos;
 	}
 
-#if defined(WIN32)
 	count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
-	count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
 	if (count == -1) {
 		if (errno == EINTR) {
 			return 0;
@@ -401,8 +411,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);
@@ -486,11 +500,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;
 
@@ -522,11 +532,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;