X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=1dbbdeae5eb5c21758f5e1c7789765f706706d71;hb=d7c6e9aaa9df593e951e2f19106dcc71102e74f1;hp=1bb34f0ef9e57212d7919d4fee3d0d524c3488f6;hpb=f96b24fadad7dddbd4162bf8fdb2e9c9206bb2a7;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index 1bb34f0..1dbbdea 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -18,7 +18,6 @@
 #include "win32_compat.h"
 #else
 #include <unistd.h>
-#include <poll.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -28,13 +27,21 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#ifdef AROS
+#include "aros_compat.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>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
@@ -42,6 +49,7 @@
 #include <sys/sockio.h>
 #endif
 #include <sys/types.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -70,12 +78,18 @@ static void set_nonblocking(int fd)
 
 int rpc_get_fd(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return rpc->fd;
 }
 
 int rpc_which_events(struct rpc_context *rpc)
 {
-	int events = rpc->is_connected ? POLLIN : POLLOUT;
+	int events;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	events = rpc->is_connected ? POLLIN : POLLOUT;
 
 	if (rpc->is_udp != 0) {
 		/* for udp sockets we only wait for pollin */
@@ -90,11 +104,10 @@ 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);
 
-	if (rpc == NULL) {
-		return -1;
-	}
 	if (rpc->fd == -1) {
 		rpc_set_error(rpc, "trying to write but not connected");
 		return -1;
@@ -134,7 +147,11 @@ 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) {
@@ -258,6 +275,8 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
 int rpc_service(struct rpc_context *rpc, int revents)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (revents & POLLERR) {
 #ifdef WIN32
 		char err = 0;
@@ -336,11 +355,15 @@ int rpc_service(struct rpc_context *rpc, int revents)
 
 void rpc_set_autoreconnect(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	rpc->auto_reconnect = 1;
 }
 
 void rpc_unset_autoreconnect(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	rpc->auto_reconnect = 0;
 }
 
@@ -348,6 +371,8 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 {
 	int socksize;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	switch (s->ss_family) {
 	case AF_INET:
 		socksize = sizeof(struct sockaddr_in);
@@ -424,6 +449,8 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 {
 	struct sockaddr_in *sin = (struct sockaddr_in *)&rpc->s;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->fd != -1) {
 		rpc_set_error(rpc, "Trying to connect while already connected");
 		return -1;
@@ -464,6 +491,8 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 
 int rpc_disconnect(struct rpc_context *rpc, char *error)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	rpc_unset_autoreconnect(rpc);
 
 	if (rpc->fd != -1) {
@@ -484,6 +513,8 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
 
 static void reconnect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (status != RPC_STATUS_SUCCESS) {
 		rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
 		return;
@@ -498,6 +529,8 @@ static int rpc_reconnect_requeue(struct rpc_context *rpc)
 {
 	struct rpc_pdu *pdu;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->fd != -1) {
 #if defined(WIN32)
 		closesocket(rpc->fd);
@@ -537,6 +570,8 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
 	struct addrinfo *ai = NULL;
 	char service[6];
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->is_udp == 0) {
 		rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
 		return -1;
@@ -580,6 +615,8 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
 	struct addrinfo *ai = NULL;
 	char service[6];
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->is_udp == 0) {
 		rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
 		return -1;
@@ -599,6 +636,7 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
 	rpc->udp_dest = malloc(ai->ai_addrlen);
 	if (rpc->udp_dest == NULL) {
 		rpc_set_error(rpc, "Out of memory. Failed to allocate sockaddr structure");
+		freeaddrinfo(ai);
 		return -1;
 	}
 	memcpy(rpc->udp_dest, ai->ai_addr, ai->ai_addrlen);
@@ -612,6 +650,8 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
 
 struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return (struct sockaddr *)&rpc->udp_src;
 }
 
@@ -620,6 +660,8 @@ int rpc_queue_length(struct rpc_context *rpc)
 	int i=0;
 	struct rpc_pdu *pdu;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
 		i++;
 	}