--- libaitrpc/src/srv.c	2011/08/19 12:51:50	1.3.2.9
+++ libaitrpc/src/srv.c	2011/08/19 14:24:54	1.3.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.9 2011/08/19 12:51:50 misho Exp $
+* $Id: srv.c,v 1.3.2.10 2011/08/19 14:24:54 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -80,8 +80,8 @@ rpc_srv_dispatchCall(void *arg)
 			ret = -2;
 			break;
 		}
-		memset(buf, 0, BUFSIZ);
-		ret = recv(c->cli_sock, buf, BUFSIZ, 0);
+		memset(buf, 0, sizeof buf);
+		ret = recv(c->cli_sock, buf, sizeof buf, 0);
 		if (ret == -1) {
 			LOGERR;
 			ret = -3;
@@ -108,7 +108,7 @@ rpc_srv_dispatchCall(void *arg)
 		if (rpc->call_argc) {
 			v = (rpc_val_t*) (buf + Limit);
 			// check RPC packet length
-			if (rpc->call_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
+			if (rpc->call_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
 				rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
 				ret = -5;
 				goto makeReply;
@@ -119,7 +119,7 @@ rpc_srv_dispatchCall(void *arg)
 			for (i = 0; i < rpc->call_argc; i++) {
 				switch (v[i].val_type) {
 					case buffer:
-						if (v[i].val_len > BUFSIZ - Limit) {
+						if (v[i].val_len > sizeof buf - Limit) {
 							rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
 							ret = -5;
 							goto makeReply;
@@ -130,7 +130,7 @@ rpc_srv_dispatchCall(void *arg)
 					       	data += v[i].val_len;
 						break;
 					case string:
-						if (v[i].val_len > BUFSIZ - Limit) {
+						if (v[i].val_len > sizeof buf - Limit) {
 							rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
 							ret = -5;
 							goto makeReply;
@@ -169,7 +169,7 @@ rpc_srv_dispatchCall(void *arg)
 			else
 				argc = rpc_srv_getVars(f, &vals);
 makeReply:
-		memset(buf, 0, BUFSIZ);
+		memset(buf, 0, sizeof buf);
 		rrpc = (struct tagRPCRet*) buf;
 		Limit = sizeof(struct tagRPCRet);
 
@@ -182,7 +182,7 @@ makeReply:
 
 		if (argc && vals) {
 			v = (rpc_val_t*) (buf + Limit);
-			if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
+			if (argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
 				for (i = 0; i < argc; i++)
 					RPC_FREE_VAL(&vals[i]);
 				rpc_srv_freeVars(f);
@@ -198,7 +198,7 @@ makeReply:
 			for (ret = i = 0; i < argc; i++) {
 				switch (vals[i].val_type) {
 					case buffer:
-						if (ret || Limit + vals[i].val_len > BUFSIZ) {
+						if (ret || Limit + vals[i].val_len > sizeof buf) {
 							rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
 							rrpc->ret_retcode = ret = -7;
 							rrpc->ret_argc = 0;
@@ -210,7 +210,7 @@ makeReply:
 						Limit += vals[i].val_len;
 						break;
 					case string:
-						if (ret || Limit + vals[i].val_len > BUFSIZ) {
+						if (ret || Limit + vals[i].val_len > sizeof buf) {
 							rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
 							rrpc->ret_retcode = ret = -7;
 							rrpc->ret_argc = 0;