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.7 and 1.8

version 1.7, 2012/03/15 01:55:33	version 1.8, 2012/03/29 01:34:16
Line 83 txPacket(sched_task_t *task)	Line 83 txPacket(sched_task_t *task)
}	}
}	}

	rpc->call_len = htons(wlen);

/* calculate CRC */	/* calculate CRC */
rpc->call_crc ^= rpc->call_crc;	rpc->call_crc ^= rpc->call_crc;
rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2));	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));

/* send reply */	/* send reply */
ret = send(TASK_FD(task), buf, wlen, 0);	ret = send(TASK_FD(task), buf, wlen, 0);
Line 107 execCall(sched_task_t *task)	Line 109 execCall(sched_task_t *task)
rpc_srv_t *s = c->cli_parent;	rpc_srv_t *s = c->cli_parent;
rpc_func_t *f = NULL;	rpc_func_t *f = NULL;
array_t *arr = NULL;	array_t *arr = NULL;
u_char *buf = TASK_DATA(task);	u_char *buf = TASK_DATA(task) + TASK_VAL(task);
struct tagRPCCall rpc = (struct tagRPCCall) buf;	struct tagRPCCall rpc = (struct tagRPCCall) buf;
int argc = ntohs(rpc->call_argc);	int argc = ntohs(rpc->call_argc);

ioTRACE(RPC_TRACE_LEVEL);	ioTRACE(RPC_TRACE_LEVEL);

/* Go decapsulate variables ... */	/* Go decapsulate variables ... */
if (!(rpc->call_req.flags & RPC_NOREPLY) && argc) {	if (argc) {
arr = io_buffer2vars(buf + sizeof(struct tagRPCCall),	arr = io_buffer2vars(buf + sizeof(struct tagRPCCall),
TASK_DATLEN(task) - sizeof(struct tagRPCCall), argc, 1);	TASK_DATLEN(task) - TASK_VAL(task) - sizeof(struct tagRPCCall),
	argc, 1);
if (!arr) {	if (!arr) {
rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError());	rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError());
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
Line 135 execCall(sched_task_t *task)	Line 138 execCall(sched_task_t *task)
ioDEBUG(RPC_DEBUG_LEVEL, "RPC function %s from module %s",	ioDEBUG(RPC_DEBUG_LEVEL, "RPC function %s from module %s",
AIT_GET_STR(&f->func_name), AIT_GET_LIKE(&f->func_file, char*));	AIT_GET_STR(&f->func_name), AIT_GET_LIKE(&f->func_file, char*));

	/* if client doesn't want reply */
	argc = rpc->call_req.flags & RPC_NOREPLY;
rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr));	rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr));
if (rpc->call_rep.ret == htonl(-1)) {	if (rpc->call_rep.ret == htonl(-1)) {
rpc->call_rep.eno = RPC_ERROR(errno);	rpc->call_rep.eno = RPC_ERROR(errno);
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
} else {	} else {
rpc->call_rep.eno ^= rpc->call_rep.eno;	rpc->call_rep.eno ^= rpc->call_rep.eno;
rpc->call_argc = htons(rpc_srv_getVars(f, NULL));	if (argc) {
	/* without reply */
	io_clrVars(f->func_vars);
	rpc->call_argc ^= rpc->call_argc;
	} else
	rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
}	}
}	}

Line 156 rxPacket(sched_task_t *task)	Line 166 rxPacket(sched_task_t *task)
rpc_cli_t *c = TASK_ARG(task);	rpc_cli_t *c = TASK_ARG(task);
rpc_srv_t *s = c->cli_parent;	rpc_srv_t *s = c->cli_parent;
u_char *buf = TASK_DATA(task);	u_char *buf = TASK_DATA(task);
int rlen;	int rlen, noreply;
u_short crc;	u_short crc, off = 0;
struct tagRPCCall *rpc;	struct tagRPCCall *rpc;
struct timespec ts;	struct timespec ts;

Line 175 rxPacket(sched_task_t *task)	Line 185 rxPacket(sched_task_t *task)
} else	} else
ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen);	ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen);

if (rlen < sizeof(struct tagRPCCall)) {	do {
rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");	if (rlen < sizeof(struct tagRPCCall)) {
	rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));	TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
} else	} else
rpc = (struct tagRPCCall*) buf;	rpc = (struct tagRPCCall*) (buf + off);

/* check integrity of packet */	rlen -= ntohs(rpc->call_len);
crc = ntohs(rpc->call_crc);
rpc->call_crc ^= rpc->call_crc;
if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) {
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	/* check integrity of packet */
TASK_DATA(task), TASK_DATLEN(task));	crc = ntohs(rpc->call_crc);
return NULL;	rpc->call_crc ^= rpc->call_crc;
}	if (crc != crcFletcher16((u_short*) (buf + off), ntohs(rpc->call_len) / 2)) {
	rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");

/* check RPC packet session info */	off += ntohs(rpc->call_len);
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {	if (rlen < 1)
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	break;
rpc->call_argc ^= rpc->call_argc;	else
rpc->call_rep.ret = RPC_ERROR(-1);	continue;
rpc->call_rep.eno = RPC_ERROR(errno);	}
goto end;
} else {
/* change socket timeout from last packet */
ts.tv_sec = rpc->call_session.sess_timeout;
ts.tv_nsec = 0;
schedPolling(TASK_ROOT(task), &ts, NULL);
}

/* execute RPC call */	noreply = rpc->call_req.flags & RPC_NOREPLY;
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0,
TASK_DATA(task), TASK_DATLEN(task));

end:	/* check RPC packet session info */
/* send RPC reply */	if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
if (!(rpc->call_req.flags & RPC_NOREPLY))	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task),	rpc->call_argc ^= rpc->call_argc;
TASK_DATA(task), TASK_DATLEN(task));	rpc->call_rep.ret = RPC_ERROR(-1);
	rpc->call_rep.eno = RPC_ERROR(errno);
	} else {
	/* change socket timeout from last packet */
	ts.tv_sec = rpc->call_session.sess_timeout;
	ts.tv_nsec = 0;
	schedPolling(TASK_ROOT(task), &ts, NULL);

	/* execute RPC call */
	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off,
	TASK_DATA(task), TASK_DATLEN(task));
	}

	/* send RPC reply */
	if (!noreply)
	schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task),
	buf + off, TASK_DATLEN(task) - off);

	off += ntohs(rpc->call_len);
	} while (rlen > 0);

/* lets get next packet */	/* lets get next packet */
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));	TASK_DATA(task), TASK_DATLEN(task));
Line 282 txBLOB(sched_task_t *task)	Line 301 txBLOB(sched_task_t *task)

/* calculate CRC */	/* calculate CRC */
blob->hdr_crc ^= blob->hdr_crc;	blob->hdr_crc ^= blob->hdr_crc;
blob->hdr_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2));	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));

/* send reply */	/* send reply */
wlen = send(TASK_FD(task), buf, wlen, 0);	wlen = send(TASK_FD(task), buf, wlen, 0);
Line 312 rxBLOB(sched_task_t *task)	Line 331 rxBLOB(sched_task_t *task)
ioTRACE(RPC_TRACE_LEVEL);	ioTRACE(RPC_TRACE_LEVEL);

/* check for disable service at this moment? */	/* check for disable service at this moment? */
if (s->srv_blob.state == disable) {	if (!s \|\| s->srv_blob.state == disable) {
usleep(100000);	usleep(100000);
#ifdef HAVE_PTHREAD_YIELD	#ifdef HAVE_PTHREAD_YIELD
pthread_yield();	pthread_yield();
Line 344 rxBLOB(sched_task_t *task)	Line 363 rxBLOB(sched_task_t *task)
/* check integrity of packet */	/* check integrity of packet */
crc = ntohs(blob->hdr_crc);	crc = ntohs(blob->hdr_crc);
blob->hdr_crc ^= blob->hdr_crc;	blob->hdr_crc ^= blob->hdr_crc;
if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) {	if (crc != crcFletcher16((u_short*) buf, rlen / 2)) {
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");	rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));	TASK_DATA(task), TASK_DATLEN(task));
Line 586 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 605 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)

ioTRACE(RPC_TRACE_LEVEL);	ioTRACE(RPC_TRACE_LEVEL);

if (!srv) {	if (!srv \|\| srv->srv_blob.state == disable)
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!");
return;	return;
} else	else
srv->srv_blob.state = kill;	srv->srv_blob.state = kill;

rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
Line 621 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 639 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)

while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);	while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);
pthread_mutex_destroy(&srv->srv_blob.mtx);	pthread_mutex_destroy(&srv->srv_blob.mtx);

	/* at final, save disable BLOB service state */
	srv->srv_blob.state = disable;
}	}

/*	/*
Line 838 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 859 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1);	rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1);
rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4);	rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4);
rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 1);	rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 1);

return srv;	return srv;
}	}

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

Removed from v.1.7
changed lines
	Added in v.1.8