X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=f973f0178b923a0dab3f369fea14a04b076e85ab;hb=f1f22dbf6222c4899b45d9c83ccf1b6314464869;hp=e4de894c854e3e752271b1a3cb6833b400ec1a2c;hpb=dabf41528576be84318ce8da010173493c1e1231;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index e4de894..f973f01 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,54 +14,141 @@
    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"
+#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_NETINET_TCP_H
+#include <netinet/tcp.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 <unistd.h>
+#include <assert.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <string.h>
 #include <errno.h>
-#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 <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
 #include "slist.h"
 
+#ifdef WIN32
+//has to be included after stdlib!!
+#include "win32_errnowrapper.h"
+#endif
+
+static int rpc_reconnect_requeue(struct rpc_context *rpc);
+static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s);
+
 static void set_nonblocking(int fd)
 {
-	unsigned v;
+	int v = 0;
+#if defined(WIN32)
+	long nonblocking=1;
+	v = ioctl(fd, FIONBIO, &nonblocking);
+#else
 	v = fcntl(fd, F_GETFL, 0);
         fcntl(fd, F_SETFL, v | O_NONBLOCK);
+#endif //FIXME
+}
+
+static void set_nolinger(int fd)
+{
+	struct linger lng;
+	lng.l_onoff = 1;
+	lng.l_linger = 0;
+	setsockopt(fd, SOL_SOCKET, SO_LINGER, &lng, sizeof(lng));
+}
+
+#ifdef HAVE_NETINET_TCP_H
+int set_tcp_sockopt(int sockfd, int optname, int value)
+{
+	int level;
+
+	#if defined(__FreeBSD__) || defined(__sun) || (defined(__APPLE__) && defined(__MACH__))
+	struct protoent *buf;
+
+	if ((buf = getprotobyname("tcp")) != NULL)
+		level = buf->p_proto;
+	else
+		return -1;
+	#else
+		level = SOL_TCP;
+	#endif
+
+	return setsockopt(sockfd, level, optname, (char *)&value, sizeof(value));
 }
+#endif
 
 int rpc_get_fd(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return rpc->fd;
 }
 
+static int rpc_has_queue(struct rpc_queue *q)
+{
+	return q->head != NULL;
+}
+
 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 */
 		return POLLIN;
 	}
 
-	if (rpc->outqueue) {
+	if (rpc_has_queue(&rpc->outqueue)) {
 		events |= POLLOUT;
 	}
 	return events;
@@ -69,22 +156,22 @@ int rpc_which_events(struct rpc_context *rpc)
 
 static int rpc_write_to_socket(struct rpc_context *rpc)
 {
-	ssize_t count;
+	int32_t count;
+	struct rpc_pdu *pdu;
+
+	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;
 	}
 
-	while (rpc->outqueue != NULL) {
-		ssize_t total;
+	while ((pdu = rpc->outqueue.head) != NULL) {
+		int64_t total;
 
-		total = rpc->outqueue->outdata.size;
+		total = pdu->outdata.size;
 
-		count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
+		count = send(rpc->fd, pdu->outdata.data + pdu->written, total - pdu->written, 0);
 		if (count == -1) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK) {
 				return 0;
@@ -93,12 +180,16 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 			return -1;
 		}
 
-		rpc->outqueue->written += count;
-		if (rpc->outqueue->written == total) {
-			struct rpc_pdu *pdu = rpc->outqueue;
+		pdu->written += count;
+		if (pdu->written == total) {
+			unsigned int hash;
 
-	       	    	SLIST_REMOVE(&rpc->outqueue, pdu);
-			SLIST_ADD_END(&rpc->waitpdu, pdu);
+			rpc->outqueue.head = pdu->next;
+			if (pdu->next == NULL)
+				rpc->outqueue.tail = NULL;
+
+			hash = rpc_hash_xid(pdu->xid);
+			rpc_enqueue(&rpc->waitpdu[hash], pdu);
 		}
 	}
 	return 0;
@@ -109,12 +200,15 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	int available;
 	int size;
 	int pdu_size;
-	ssize_t count;
+	int32_t count;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
 	if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
 		rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
 		return -1;
 	}
+
 	if (available == 0) {
 		rpc_set_error(rpc, "Socket has been closed");
 		return -1;
@@ -133,6 +227,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		if (count < 0) {
 			rpc_set_error(rpc, "Failed recvfrom: %s", strerror(errno));
 			free(buf);
+			return -1;
 		}
 		if (rpc_process_pdu(rpc, buf, count) != 0) {
 			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Ignoring PDU");
@@ -155,7 +250,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	if (rpc->inpos < 4) {
 		size = 4 - rpc->inpos;
 
-		count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+		count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
 		if (count == -1) {
 			if (errno == EINTR) {
 				return 0;
@@ -174,7 +269,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	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);
@@ -191,7 +286,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		size = rpc->insize - rpc->inpos;
 	}
 
-	count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+	count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
 	if (count == -1) {
 		if (errno == EINTR) {
 			return 0;
@@ -203,14 +298,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) {
-			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
-			return -1;
-		}
-		free(rpc->inbuf);
+		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(buf);
 	}
 
 	return 0;
@@ -220,12 +318,18 @@ 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;
+#else
 		int err = 0;
+#endif
 		socklen_t err_size = sizeof(err);
 
 		if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
-				&err, &err_size) != 0 || err != 0) {
+				(char *)&err, &err_size) != 0 || err != 0) {
 			if (err == 0) {
 				err = errno;
 			}
@@ -236,12 +340,16 @@ int rpc_service(struct rpc_context *rpc, int revents)
 			rpc_set_error(rpc, "rpc_service: POLLERR, "
 						"Unknown socket error.");
 		}
-		rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		}
 		return -1;
 	}
 	if (revents & POLLHUP) {
 		rpc_set_error(rpc, "Socket failed with POLLHUP");
-		rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		}
 		return -1;
 	}
 
@@ -250,46 +358,185 @@ int rpc_service(struct rpc_context *rpc, int revents)
 		socklen_t err_size = sizeof(err);
 
 		if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
-				&err, &err_size) != 0 || err != 0) {
+				(char *)&err, &err_size) != 0 || err != 0) {
 			if (err == 0) {
 				err = errno;
 			}
 			rpc_set_error(rpc, "rpc_service: socket error "
 				  	"%s(%d) while connecting.",
 					strerror(err), err);
-			rpc->connect_cb(rpc, RPC_STATUS_ERROR,
+			if (rpc->connect_cb != NULL) {
+				rpc->connect_cb(rpc, RPC_STATUS_ERROR,
 					NULL, rpc->connect_data);
+			}
 			return -1;
 		}
 
 		rpc->is_connected = 1;
-		rpc->connect_cb(rpc, RPC_STATUS_SUCCESS, NULL, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_SUCCESS, NULL, rpc->connect_data);
+		}
 		return 0;
 	}
 
-	if (revents & POLLOUT && rpc->outqueue != NULL) {
+	if (revents & POLLIN) {
+		if (rpc_read_from_socket(rpc) != 0) {
+		  	rpc_reconnect_requeue(rpc);
+			return 0;
+		}
+	}
+
+	if (revents & POLLOUT && rpc_has_queue(&rpc->outqueue)) {
 		if (rpc_write_to_socket(rpc) != 0) {
 			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 -1;
+	return 0;
+}
+
+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;
+}
+
+void rpc_set_tcp_syncnt(struct rpc_context *rpc, int v)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc->tcp_syncnt = v;
+}
+
+#ifndef TCP_SYNCNT
+#define TCP_SYNCNT        7
+#endif
+
+static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s)
+{
+	int socksize;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	switch (s->ss_family) {
+	case AF_INET:
+		socksize = sizeof(struct sockaddr_in);
+		rpc->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+#ifdef HAVE_NETINET_TCP_H
+		if (rpc->tcp_syncnt != RPC_PARAM_UNDEFINED) {
+			set_tcp_sockopt(rpc->fd, TCP_SYNCNT, rpc->tcp_syncnt);
+		}
+#endif
+		break;
+	case AF_INET6:
+		socksize = sizeof(struct sockaddr_in6);
+		rpc->fd = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+#ifdef HAVE_NETINET_TCP_H
+		if (rpc->tcp_syncnt != RPC_PARAM_UNDEFINED) {
+			set_tcp_sockopt(rpc->fd, TCP_SYNCNT, rpc->tcp_syncnt);
 		}
+#endif
+		break;
+	default:
+		rpc_set_error(rpc, "Can not handle AF_FAMILY:%d", s->ss_family);
+		return -1;
+	}
+
+	if (rpc->fd == -1) {
+		rpc_set_error(rpc, "Failed to open socket");
+		return -1;
+	}
+
+	/* Some systems allow you to set capabilities on an executable
+	 * to allow the file to be executed with privilege to bind to
+	 * privileged system ports, even if the user is not root.
+	 *
+	 * Opportunistically try to bind the socket to a low numbered
+	 * system port in the hope that the user is either root or the
+	 * executable has the CAP_NET_BIND_SERVICE.
+	 *
+	 * As soon as we fail the bind() with EACCES we know we will never
+	 * be able to bind to a system port so we terminate the loop.
+	 *
+	 * On linux, use
+	 *    sudo setcap 'cap_net_bind_service=+ep' /path/executable
+	 * to make the executable able to bind to a system port.
+	 *
+	 * On Windows, there is no concept of privileged ports. Thus
+	 * binding will usually succeed.
+	 */
+	{
+		struct sockaddr_storage ss;
+		static int portOfs = 0;
+		const int firstPort = 512;	/* >= 512 according to Sun docs */
+		const int portCount = IPPORT_RESERVED - firstPort;
+		int startOfs, port, rc;
+
+		if (portOfs == 0) {
+			portOfs = time(NULL) % 400;
+		}
+		startOfs = portOfs;
+		do {
+			rc = -1;
+			port = htons(firstPort + portOfs);
+			portOfs = (portOfs + 1) % portCount;
+
+			/* skip well-known ports */
+			if (!getservbyport(port, "tcp")) {
+				memset(&ss, 0, sizeof(ss));
+
+				switch (s->ss_family) {
+				case AF_INET:
+					((struct sockaddr_in *)&ss)->sin_port = port;
+					((struct sockaddr_in *)&ss)->sin_family      = AF_INET;
+#ifdef HAVE_SOCKADDR_LEN
+					((struct sockaddr_in *)&ss)->sin_len = sizeof(struct sockaddr_in);
+#endif
+					break;
+				case AF_INET6:
+					((struct sockaddr_in6 *)&ss)->sin6_port = port;
+					((struct sockaddr_in6 *)&ss)->sin6_family      = AF_INET6;
+#ifdef HAVE_SOCKADDR_LEN
+					((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr6_in);
+#endif
+					break;
+				}
+
+				rc = bind(rpc->fd, (struct sockaddr *)&ss, socksize);
+#if !defined(WIN32)
+				/* we got EACCES, so don't try again */
+				if (rc != 0 && errno == EACCES)
+					break;
+#endif
+			}
+		} while (rc != 0 && portOfs != startOfs);
+	}
+
+	set_nonblocking(rpc->fd);
+	set_nolinger(rpc->fd);
+
+	if (connect(rpc->fd, (struct sockaddr *)s, socksize) != 0 && errno != EINPROGRESS) {
+		rpc_set_error(rpc, "connect() to server failed. %s(%d)", strerror(errno), errno);
+		return -1;
 	}
 
 	return 0;
 }
 
-
 int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc_cb cb, void *private_data)
 {
-	struct sockaddr_storage s;
-	struct sockaddr_in *sin = (struct sockaddr_in *)&s;
-	int socksize;
+	struct addrinfo *ai = NULL;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
 	if (rpc->fd != -1) {
 		rpc_set_error(rpc, "Trying to connect while already connected");
@@ -301,43 +548,51 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 		return -1;
 	}
 
-	sin->sin_family = AF_INET;
-	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");
+	rpc->auto_reconnect = 0;
+
+	if (getaddrinfo(server, NULL, NULL, &ai) != 0) {
+		rpc_set_error(rpc, "Invalid address:%s. "
+			      "Can not resolv into IPv4/v6 structure.", server);
 		return -1;
-	}
+ 	}
 
-	switch (s.ss_family) {
+	switch (ai->ai_family) {
 	case AF_INET:
-		socksize = sizeof(struct sockaddr_in);
+		((struct sockaddr_in *)&rpc->s)->sin_family = ai->ai_family;
+		((struct sockaddr_in *)&rpc->s)->sin_port   = htons(port);
+		((struct sockaddr_in *)&rpc->s)->sin_addr   = ((struct sockaddr_in *)(ai->ai_addr))->sin_addr;
 #ifdef HAVE_SOCKADDR_LEN
-		sin->sin_len = socksize;
+		((struct sockaddr_in *)&rpc->s)->sin_len = sizeof(struct sockaddr_in);
+#endif
+		break;
+	case AF_INET6:
+		((struct sockaddr_in6 *)&rpc->s)->sin6_family = ai->ai_family;
+		((struct sockaddr_in6 *)&rpc->s)->sin6_port   = htons(port);
+		((struct sockaddr_in6 *)&rpc->s)->sin6_addr   = ((struct sockaddr_in6 *)(ai->ai_addr))->sin6_addr;
+#ifdef HAVE_SOCKADDR_LEN
+		((struct sockaddr_in6 *)&rpc->s)->sin6_len = sizeof(struct sockaddr_in6);
 #endif
-		rpc->fd = socket(AF_INET, SOCK_STREAM, 0);
 		break;
-	}
-
-	if (rpc->fd == -1) {
-		rpc_set_error(rpc, "Failed to open socket");
-		return -1;
 	}
 
 	rpc->connect_cb  = cb;
 	rpc->connect_data = private_data;
 
-	set_nonblocking(rpc->fd);
+	freeaddrinfo(ai);
 
-	if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) {
-		rpc_set_error(rpc, "connect() to server failed");
+	if (rpc_connect_sockaddr_async(rpc, &rpc->s) != 0) {
 		return -1;
-	}		
+	}
 
 	return 0;
-}	    
+}
 
 int rpc_disconnect(struct rpc_context *rpc, char *error)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc_unset_autoreconnect(rpc);
+
 	if (rpc->fd != -1) {
 		close(rpc->fd);
 	}
@@ -350,21 +605,77 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
 	return 0;
 }
 
+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;
+	}
+
+	rpc->is_connected = 1;
+	rpc->connect_cb   = NULL;
+}
+
+/* disconnect but do not error all PDUs, just move pdus in-flight back to the outqueue and reconnect */
+static int rpc_reconnect_requeue(struct rpc_context *rpc)
+{
+	struct rpc_pdu *pdu;
+	unsigned int i;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	if (rpc->fd != -1) {
+		close(rpc->fd);
+	}
+	rpc->fd  = -1;
+
+	rpc->is_connected = 0;
+
+	/* socket is closed so we will not get any replies to any commands
+	 * in flight. Move them all over from the waitpdu queue back to the out queue
+	 */
+	for (i = 0; i < HASHES; i++) {
+		struct rpc_queue *q = &rpc->waitpdu[i];
+
+		for (pdu=q->head; pdu; pdu=pdu->next) {
+			rpc_return_to_queue(&rpc->outqueue, pdu);
+			/* we have to re-send the whole pdu again */
+			pdu->written = 0;
+		}
+		rpc_reset_queue(q);
+	}
+
+	if (rpc->auto_reconnect != 0) {
+		rpc->connect_cb  = reconnect_cb;
+
+		if (rpc_connect_sockaddr_async(rpc, &rpc->s) != 0) {
+			rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 
 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;
 	}
 
-	snprintf(service, 6, "%d", port);
+	sprintf(service, "%d", port);
 	if (getaddrinfo(addr, service, NULL, &ai) != 0) {
 		rpc_set_error(rpc, "Invalid address:%s. "
-			"Can not resolv into IPv4/v6 structure.");
+			      "Can not resolv into IPv4/v6 structure.", addr);
 		return -1;
  	}
 
@@ -372,13 +683,13 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
 	case AF_INET:
 		rpc->fd = socket(ai->ai_family, SOCK_DGRAM, 0);
 		if (rpc->fd == -1) {
-			rpc_set_error(rpc, "Failed to create UDP socket: %s", strerror(errno)); 
+			rpc_set_error(rpc, "Failed to create UDP socket: %s", strerror(errno));
 			freeaddrinfo(ai);
 			return -1;
 		}
 
 		if (bind(rpc->fd, (struct sockaddr *)ai->ai_addr, sizeof(struct sockaddr_in)) != 0) {
-			rpc_set_error(rpc, "Failed to bind to UDP socket: %s",strerror(errno)); 
+			rpc_set_error(rpc, "Failed to bind to UDP socket: %s",strerror(errno));
 			freeaddrinfo(ai);
 			return -1;
 		}
@@ -399,15 +710,17 @@ 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;
 	}
 
-	snprintf(service, 6, "%d", port);
+	sprintf(service, "%d", port);
 	if (getaddrinfo(addr, service, NULL, &ai) != 0) {
 		rpc_set_error(rpc, "Invalid address:%s. "
-			"Can not resolv into IPv4/v6 structure.");
+			      "Can not resolv into IPv4/v6 structure.", addr);
 		return -1;
  	}
 
@@ -418,18 +731,49 @@ 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);
 	freeaddrinfo(ai);
 
 	rpc->is_broadcast = is_broadcast;
-	setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, &is_broadcast, sizeof(is_broadcast));
+	setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, (char *)&is_broadcast, sizeof(is_broadcast));
 
 	return 0;
 }
 
 struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return (struct sockaddr *)&rpc->udp_src;
 }
+
+int rpc_queue_length(struct rpc_context *rpc)
+{
+	int i=0;
+	struct rpc_pdu *pdu;
+	unsigned int n;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	for(pdu = rpc->outqueue.head; pdu; pdu = pdu->next) {
+		i++;
+	}
+
+	for (n = 0; n < HASHES; n++) {
+		struct rpc_queue *q = &rpc->waitpdu[n];
+
+		for(pdu = q->head; pdu; pdu = pdu->next)
+			i++;
+	}
+	return i;
+}
+
+void rpc_set_fd(struct rpc_context *rpc, int fd)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc->fd = fd;
+}