--- libaitrpc/src/srv.c 2011/09/01 14:28:41 1.4.2.6 +++ libaitrpc/src/srv.c 2011/09/01 14:55:42 1.4.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.4.2.6 2011/09/01 14:28:41 misho Exp $ +* $Id: srv.c,v 1.4.2.7 2011/09/01 14:55:42 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -97,14 +97,14 @@ rpc_srv_dispatchCall(void *arg) break; } if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); ret = -4; break; } else rpc = (struct tagRPCCall*) buf; /* check RPC packet session info */ if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) { - rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); ret = -5; goto makeReply; } else @@ -123,7 +123,7 @@ rpc_srv_dispatchCall(void *arg) argc = 0; memcpy(&ses, &rpc->call_session, sizeof ses); if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { - rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); + rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n"); ret = -6; } else if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1) @@ -157,7 +157,7 @@ makeReply: rpc_srv_freeVals(f); argc = 0; ret = -7; - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n"); + rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n"); goto makeReply; } else { Limit += i; @@ -173,7 +173,7 @@ makeReply: break; } if (ret != Limit) { - rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, " "really is %d\n", Limit, ret); ret = -9; break; @@ -240,7 +240,7 @@ rpc_srv_dispatchVars(void *arg) break; } if (ret < sizeof(struct tagBLOBHdr)) { - rpc_SetErr(EMSGSIZE, "Error:: too short BLOB packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n"); ret = -4; break; } else @@ -284,7 +284,7 @@ rpc_srv_dispatchVars(void *arg) ret = -7; break; default: - rpc_SetErr(EINVAL, "Error:: unsupported BLOB command (%d)...\n", + rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", blob->hdr_cmd); ret = -7; } @@ -300,7 +300,7 @@ makeReply: break; } if (ret != sizeof buf) { - rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, " "really is %d\n", sizeof buf, ret); ret = -9; break;