libaitrpc/src/srv.c - diff

Return to srv.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/srv.c between versions 1.3.2.6 and 1.3.2.8

version 1.3.2.6, 2011/08/19 07:39:29	version 1.3.2.8, 2011/08/19 09:32:38
Line 76 rpc_srv_dispatchCall(void *arg)	Line 76 rpc_srv_dispatchCall(void *arg)
ret = -2;	ret = -2;
}	}
memset(buf, 0, BUFSIZ);	memset(buf, 0, BUFSIZ);
if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) {	if ((ret = read(c->cli_sock, buf, BUFSIZ)) == -1) {
LOGERR;	LOGERR;
ret = -3;	ret = -3;
break;	break;
Line 156 rpc_srv_dispatchCall(void *arg)	Line 156 rpc_srv_dispatchCall(void *arg)
if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)	if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
ret = -9;	ret = -9;
else	else
argc = rpc_srv_getValsCall(f, &vals);	argc = rpc_srv_getVars(f, &vals);
makeReply:	makeReply:
memset(buf, 0, BUFSIZ);	memset(buf, 0, BUFSIZ);
rrpc = (struct tagRPCRet*) buf;	rrpc = (struct tagRPCRet*) buf;
Line 174 makeReply:	Line 174 makeReply:
if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {	if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
for (i = 0; i < argc; i++)	for (i = 0; i < argc; i++)
RPC_FREE_VAL(&vals[i]);	RPC_FREE_VAL(&vals[i]);
rpc_srv_freeValsCall(f);	rpc_srv_freeVars(f);
vals = NULL;	vals = NULL;
argc = 0;	argc = 0;
ret = -7;	ret = -7;
Line 223 makeReply:	Line 223 makeReply:

RPC_FREE_VAL(&vals[i]);	RPC_FREE_VAL(&vals[i]);
}	}
rpc_srv_freeValsCall(f);	rpc_srv_freeVars(f);
vals = NULL;	vals = NULL;
argc = 0;	argc = 0;
}	}

if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) {	if ((ret = write(c->cli_sock, buf, Limit)) == -1) {
LOGERR;	LOGERR;
ret = -8;	ret = -8;
break;	break;
Line 280 rpc_srv_dispatchVars(void *arg)	Line 280 rpc_srv_dispatchVars(void *arg)
}	}

memset(buf, 0, sizeof buf);	memset(buf, 0, sizeof buf);
if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) {	if ((ret = read(c->cli_sock, buf, sizeof buf)) == -1) {
LOGERR;	LOGERR;
ret = -3;	ret = -3;
break;	break;
Line 343 makeReply:	Line 343 makeReply:
// Replay to client!	// Replay to client!
blob->hdr_cmd = ret < 0 ? error : ok;	blob->hdr_cmd = ret < 0 ? error : ok;
blob->hdr_ret = ret;	blob->hdr_ret = ret;
if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) {	if ((ret = write(c->cli_sock, buf, sizeof buf)) == -1) {
LOGERR;	LOGERR;
ret = -8;	ret = -8;
break;	break;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3.2.6
changed lines
	Added in v.1.3.2.8