X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=96bc695c60c105f518d0a56663f0f55cac19be5f;hb=fc01d2a96189edc0c08fb1d757f83c63077b0516;hp=4701685591793c67f2811aa0b3858c7aa87aef66;hpb=734ab63acda94fe05f147635b9b3d0474da801cf;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index 4701685..96bc695 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -15,6 +15,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,6 +28,9 @@
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include <arpa/inet.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
 #include <sys/ioctl.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
@@ -58,12 +64,11 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 	ssize_t count;
 
 	if (rpc == NULL) {
-		printf("trying to write to socket for NULL context\n");
 		return -1;
 	}
 	if (rpc->fd == -1) {
-		printf("trying to write but not connected\n");
-		return -2;
+		rpc_set_error(rpc, "trying to write but not connected");
+		return -1;
 	}
 
 	while (rpc->outqueue != NULL) {
@@ -74,11 +79,10 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 		count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
 		if (count == -1) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK) {
-				printf("socket would block, return from write to socket\n");
 				return 0;
 			}
-			printf("Error when writing to socket :%s(%d)\n", strerror(errno), errno);
-			return -3;
+			rpc_set_error(rpc, "Error when writing to socket :%s(%d)", strerror(errno), errno);
+			return -1;
 		}
 
 		rpc->outqueue->written += count;
@@ -96,7 +100,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 {
 	int available;
 	int size;
-	unsigned char *buf;
+	int pdu_size;
 	ssize_t count;
 
 	if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
@@ -105,59 +109,79 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	}
 	if (available == 0) {
 		rpc_set_error(rpc, "Socket has been closed");
-		return -2;
-	}
-	size = rpc->insize - rpc->inpos + available;
-	buf = malloc(size);
-	if (buf == NULL) {
-		rpc_set_error(rpc, "Out of memory: failed to allocate %d bytes for input buffer. Closing socket.", size);
-		return -3;
+		return -1;
 	}
-	if (rpc->insize > rpc->inpos) {
-		memcpy(buf, rpc->inbuf + rpc->inpos, rpc->insize - rpc->inpos);
-		rpc->insize -= rpc->inpos;
-		rpc->inpos   = 0;
+
+	/* read record marker, 4 bytes at the beginning of every pdu */
+	if (rpc->inbuf == NULL) {
+		rpc->insize = 4;
+		rpc->inbuf = malloc(rpc->insize);
+		if (rpc->inbuf == NULL) {
+			rpc_set_error(rpc, "Failed to allocate buffer for record marker, errno:%d. Closing socket.", errno);
+			return -1;
+		}
 	}
+	if (rpc->inpos < 4) {
+		size = 4 - rpc->inpos;
 
-	count = read(rpc->fd, buf + rpc->insize, available);
-	if (count == -1) {
-		if (errno == EINTR) {
-			free(buf);
-			buf = NULL;
-			return 0;
+		count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+		if (count == -1) {
+			if (errno == EINTR) {
+				return 0;
+			}
+			rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+			return -1;
 		}
-		rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
-		free(buf);
-		buf = NULL;
-		return -4;
+		available  -= count;
+		rpc->inpos += count;
 	}
 
-	if (rpc->inbuf != NULL) {
-		free(rpc->inbuf);
+	if (available == 0) {
+		return 0;
 	}
-	rpc->inbuf   = (char *)buf;
-	rpc->insize += count;
 
-	while (1) {
-		if (rpc->insize - rpc->inpos < 4) {
-			return 0;
+	pdu_size = rpc_get_pdu_size(rpc->inbuf);
+	if (rpc->insize < pdu_size) {
+		unsigned char *buf;
+		
+		buf = malloc(pdu_size);
+		if (buf == NULL) {
+			rpc_set_error(rpc, "Failed to allocate buffer of %d bytes for pdu, errno:%d. Closing socket.", pdu_size, errno);
+			return -1;
 		}
-		count = rpc_get_pdu_size(rpc->inbuf + rpc->inpos);
-		if (rpc->insize + rpc->inpos < count) {
+		memcpy(buf, rpc->inbuf, rpc->insize);
+		free(rpc->inbuf);
+		rpc->inbuf  = buf;
+		rpc->insize = rpc_get_pdu_size(rpc->inbuf);
+	}
+
+	size = available;
+	if (size > rpc->insize - rpc->inpos) {
+		size = rpc->insize - rpc->inpos;
+	}
+
+	count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+	if (count == -1) {
+		if (errno == EINTR) {
 			return 0;
 		}
-		if (rpc_process_pdu(rpc, rpc->inbuf + rpc->inpos, count) != 0) {
+		rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+		return -1;
+	}
+	available  -= count;
+	rpc->inpos += count;
+
+	if (rpc->inpos == rpc->insize) {
+		if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
 			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
-			return -5;
-		}
-		rpc->inpos += count;
-		if (rpc->inpos == rpc->insize) {
-			free(rpc->inbuf);
-			rpc->inbuf = NULL;
-			rpc->insize = 0;
-			rpc->inpos = 0;
+			return -1;
 		}
+		free(rpc->inbuf);
+		rpc->inbuf  = NULL;
+		rpc->insize = 0;
+		rpc->inpos  = 0;
 	}
+
 	return 0;
 }
 
@@ -185,10 +209,9 @@ int rpc_service(struct rpc_context *rpc, int revents)
 		return -1;
 	}
 	if (revents & POLLHUP) {
-		printf("rpc_service: POLLHUP, socket error\n");
 		rpc_set_error(rpc, "Socket failed with POLLHUP");
 		rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
-		return -2;
+		return -1;
 	}
 
 	if (rpc->is_connected == 0 && rpc->fd != -1 && revents&POLLOUT) {
@@ -215,15 +238,15 @@ int rpc_service(struct rpc_context *rpc, int revents)
 
 	if (revents & POLLOUT && rpc->outqueue != NULL) {
 		if (rpc_write_to_socket(rpc) != 0) {
-			printf("write to socket failed\n");
-			return -3;
+			rpc_set_error(rpc, "write to socket failed");
+			return -1;
 		}
 	}
 
 	if (revents & POLLIN) {
 		if (rpc_read_from_socket(rpc) != 0) {
 			rpc_disconnect(rpc, rpc_get_error(rpc));
-			return -4;
+			return -1;
 		}
 	}
 
@@ -239,7 +262,6 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 
 	if (rpc->fd != -1) {
 		rpc_set_error(rpc, "Trying to connect while already connected");
-		printf("%s\n", rpc->error_string);
 		return -1;
 	}
 
@@ -247,8 +269,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 	sin->sin_port   = htons(port);
 	if (inet_pton(AF_INET, server, &sin->sin_addr) != 1) {
 		rpc_set_error(rpc, "Not a valid server ip address");
-		printf("%s\n", rpc->error_string);
-		return -2;
+		return -1;
 	}
 
 	switch (s.ss_family) {
@@ -263,8 +284,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 
 	if (rpc->fd == -1) {
 		rpc_set_error(rpc, "Failed to open socket");
-		printf("%s\n", rpc->error_string);
-		return -3;
+		return -1;
 	}
 
 	rpc->connect_cb  = cb;
@@ -274,8 +294,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 
 	if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) {
 		rpc_set_error(rpc, "connect() to server failed");
-		printf("%s\n", rpc->error_string);
-		return -4;
+		return -1;
 	}		
 
 	return 0;