X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsocket.c;h=8dc3ed2d6b0d5a9fc1a5d731f2cd96bd3ad0d48c;hb=be184101ca7251c15184e6af3880680018011e32;hp=413ebbe4c8e4009cca6f0ccbc506a5a02b657014;hpb=4a2b08768a0d9ec9f5604da76f8e41263f20b821;p=deb_libnfs.git
diff --git a/lib/socket.c b/lib/socket.c
index 413ebbe..8dc3ed2 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,35 +14,58 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
#ifdef WIN32
#include "win32_compat.h"
-#else
-#include
-#include
+#endif
+
+#ifdef HAVE_ARPA_INET_H
#include
+#endif
+
+#ifdef HAVE_POLL_H
+#include
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
#include
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
#include
+#endif
+
+#ifdef HAVE_NETDB_H
#include
-#endif/*WIN32*/
+#endif
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_SYS_FILIO_H
+#include
+#endif
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include
#endif
+
#include
#include
#include
#include
#include
#include
-#include
-#include
-#ifdef HAVE_SYS_FILIO_H
-#include
-#endif
-#ifdef HAVE_SYS_SOCKIO_H
-#include
-#endif
#include
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
@@ -62,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);
@@ -97,7 +120,7 @@ int rpc_which_events(struct rpc_context *rpc)
static int rpc_write_to_socket(struct rpc_context *rpc)
{
- int64_t count;
+ int32_t count;
assert(rpc->magic == RPC_CONTEXT_MAGIC);
@@ -111,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;
@@ -140,15 +159,13 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
int available;
int size;
int pdu_size;
- int64_t count;
+ int32_t count;
+
+ 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;
}
@@ -193,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;
@@ -233,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;
@@ -402,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);
@@ -487,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;
@@ -523,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;