--- libaitrpc/src/srv.c	2010/07/12 08:46:41	1.1.1.1.2.22
+++ libaitrpc/src/srv.c	2011/05/02 23:02:44	1.1.1.1.2.25
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.1.1.1.2.22 2010/07/12 08:46:41 misho Exp $
+* $Id: srv.c,v 1.1.1.1.2.25 2011/05/02 23:02:44 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -181,7 +181,7 @@ makeReply:
 			break;
 		}
 		if (ret != Limit) {
-			rpc_SetErr(EBADMSG, "Error:: in send RPC request, should be send %d bytes, "
+			rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, "
 					"really is %d\n", Limit, ret);
 			ret = -9;
 			break;
@@ -191,7 +191,7 @@ makeReply:
 	shutdown(c->cli_sock, SHUT_RDWR);
 	close(c->cli_sock);
 	memset(c, 0, sizeof(rpc_cli_t));
-	return (void*) ret;
+	return (void*) (long)ret;
 }
 
 
@@ -296,7 +296,7 @@ makeReply:
 			break;
 		}
 		if (ret != sizeof buf) {
-			rpc_SetErr(EBADMSG, "Error:: in send BLOB reply, should be send %d bytes, "
+			rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, "
 					"really is %d\n", sizeof buf, ret);
 			ret = -9;
 			break;
@@ -306,7 +306,7 @@ makeReply:
 	shutdown(c->cli_sock, SHUT_RDWR);
 	close(c->cli_sock);
 	memset(c, 0, sizeof(rpc_cli_t));
-	return (void*) ret;
+	return (void*) (long)ret;
 }
 
 // -------------------------------------------------
@@ -631,8 +631,10 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv)
 	rpc_srv_endBLOBServer(srv);
 
 	for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family)
+		if (c->cli_sa.sa_family) {
 			shutdown(c->cli_sock, SHUT_RDWR);
+			close(c->cli_sock);
+		}
 	close(srv->srv_server.cli_sock);
 
 	if (srv->srv_clients) {