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.16.2.3 and 1.17.6.2

version 1.16.2.3, 2013/07/15 14:54:40	version 1.17.6.2, 2013/08/22 12:22:25
Line 172 txPacket(sched_task_t *task)	Line 172 txPacket(sched_task_t *task)
f = rpc_srv_getCall(s, ntohs(rpc->call_tag));	f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
if (!f) {	if (!f) {
rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");	rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");

rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
rpc->call_rep.ret = RPC_ERROR(-1);	rpc->call_rep.ret = RPC_ERROR(-1);
rpc->call_rep.eno = RPC_ERROR(rpc_Errno);	rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
Line 191 txPacket(sched_task_t *task)	Line 192 txPacket(sched_task_t *task)
}	}
}	}

rpc->call_len = htons(wlen);	rpc->call_len = htonl(wlen);

#if 0	#if 0
/* calculate CRC */	/* calculate CRC */
Line 217 execCall(sched_task_t *task)	Line 218 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 = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task);	u_char *buf = AIT_GET_BUF(&c->cli_buf);
struct tagRPCCall rpc = (struct tagRPCCall) buf;	struct tagRPCCall rpc = (struct tagRPCCall) buf;
int argc = ntohs(rpc->call_argc);	int argc = ntohs(rpc->call_argc);

/* Go decapsulate variables ... */	/* Go decapsulate variables ... */
if (argc) {	if (argc) {
arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall),	arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall),
AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall),	AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42);
argc, 42);
if (!arr) {	if (!arr) {
rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError());	rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError());

rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
rpc->call_rep.ret = RPC_ERROR(-1);	rpc->call_rep.ret = RPC_ERROR(-1);
rpc->call_rep.eno = RPC_ERROR(rpc_Errno);	rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
Line 238 execCall(sched_task_t *task)	Line 239 execCall(sched_task_t *task)

if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");	rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");

rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
rpc->call_rep.ret = RPC_ERROR(-1);	rpc->call_rep.ret = RPC_ERROR(-1);
rpc->call_rep.eno = RPC_ERROR(rpc_Errno);	rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
Line 303 rxPacket(sched_task_t *task)	Line 305 rxPacket(sched_task_t *task)
} else	} else
rpc = (struct tagRPCCall*) (buf + off);	rpc = (struct tagRPCCall*) (buf + off);

len = ntohs(rpc->call_len);	len = ntohl(rpc->call_len);
rlen -= len;	rlen -= len;

/* check RPC packet lengths */	/* check RPC packet lengths */
Line 331 rxPacket(sched_task_t *task)	Line 333 rxPacket(sched_task_t *task)
/* check RPC packet session info */	/* check RPC packet session info */
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {	if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");

rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
rpc->call_rep.ret = RPC_ERROR(-1);	rpc->call_rep.ret = RPC_ERROR(-1);
rpc->call_rep.eno = RPC_ERROR(errno);	rpc->call_rep.eno = RPC_ERROR(errno);
} else {	} else {
/* execute RPC call */	/* execute RPC call */
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, NULL, 0);	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task),
	(int) noreply, rpc, len);
}	}

/* send RPC reply */	/* send RPC reply */
Line 422 txUDPPacket(sched_task_t *task)	Line 426 txUDPPacket(sched_task_t *task)
}	}
}	}

rpc->call_len = htons(wlen);	rpc->call_len = htonl(wlen);

/* calculate CRC */	/* calculate CRC */
rpc->call_crc ^= rpc->call_crc;	rpc->call_crc ^= rpc->call_crc;
Line 480 rxUDPPacket(sched_task_t *task)	Line 484 rxUDPPacket(sched_task_t *task)
} else	} else
rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off);	rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off);

len = ntohs(rpc->call_len);	len = ntohl(rpc->call_len);
rlen -= len;	rlen -= len;

/* check RPC packet lengths */	/* check RPC packet lengths */
Line 506 rxUDPPacket(sched_task_t *task)	Line 510 rxUDPPacket(sched_task_t *task)
/* check RPC packet session info */	/* check RPC packet session info */
if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {	if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");

rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
rpc->call_rep.ret = RPC_ERROR(-1);	rpc->call_rep.ret = RPC_ERROR(-1);
rpc->call_rep.eno = RPC_ERROR(errno);	rpc->call_rep.eno = RPC_ERROR(errno);
} else {	} else {
/* execute RPC call */	/* execute RPC call */
schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0);	schedEvent(TASK_ROOT(task), execCall, c,
	(int) noreply, rpc, len);
}	}

/* send RPC reply */	/* send RPC reply */
Line 629 rxBLOB(sched_task_t *task)	Line 635 rxBLOB(sched_task_t *task)
break;	break;
case set:	case set:
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len),	if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len),
ntohl(blob.hdr_ret), task))) {	ntohl(blob.hdr_ret)))) {
/* set new BLOB variable for reply :) */	/* set new BLOB variable for reply :) */
blob.hdr_var = htonl(b->blob_var);	blob.hdr_var = htonl(b->blob_var);

Line 646 rxBLOB(sched_task_t *task)	Line 652 rxBLOB(sched_task_t *task)
blob.hdr_cmd = error;	blob.hdr_cmd = error;
blob.hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
}	}

schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA,
(void*) (intptr_t) ntohl(blob.hdr_var), NULL);
break;	break;
default:	default:
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd);	rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd);
Line 664 end:	Line 667 end:
}	}

static void *	static void *
	flushBLOB(sched_task_t *task)
	{
	rpc_srv_t *srv = TASK_ARG(task);
	rpc_blob_t b, tmp;

	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
	TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);

	rpc_srv_blobFree(srv, b);
	e_free(b);
	}

	schedSignalSelf(task);
	return NULL;
	}

	static void *
acceptBLOBClients(sched_task_t *task)	acceptBLOBClients(sched_task_t *task)
{	{
rpc_srv_t *srv = TASK_ARG(task);	rpc_srv_t *srv = TASK_ARG(task);
Line 837 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 857 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
return;	return;

srv->srv_blob.kill = 1;	srv->srv_blob.kill = 1;

	schedEnd(&srv->srv_blob.root);
}	}

/*	/*
Line 863 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)	Line 885 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
return -1;	return -1;
}	}

	schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0);
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv,	if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv,
srv->srv_blob.server.cli_sock, NULL, 0)) {	srv->srv_blob.server.cli_sock, NULL, 0)) {
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());	rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
Line 873 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)	Line 896 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
/* main rpc loop */	/* main rpc loop */
schedRun(srv->srv_blob.root, &srv->srv_blob.kill);	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);

	/* detach blobs */
	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
	TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);

	rpc_srv_blobFree(srv, b);
	e_free(b);
	}

/* close all clients connections & server socket */	/* close all clients connections & server socket */
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) {	for (i = 0; i < array_Size(srv->srv_blob.clients); i++) {
c = array(srv->srv_blob.clients, i, rpc_cli_t*);	c = array(srv->srv_blob.clients, i, rpc_cli_t*);
Line 889 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)	Line 920 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)

close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);

/* detach blobs */
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);

rpc_srv_blobFree(srv, b);
e_free(b);
}

schedEnd(&srv->srv_blob.root);
AIT_FREE_VAL(&srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return 0;	return 0;
}	}
Line 1040 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 1062 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
return;	return;

/* if send kill to blob server */	/* if send kill to blob server */
if (!(*psrv)->srv_blob.kill)	rpc_srv_endBLOBServer(*psrv);
rpc_srv_endBLOBServer(*psrv);

(*psrv)->srv_kill = 1;	(*psrv)->srv_kill = 1;
sleep(RPC_SCHED_POLLING);	sleep(RPC_SCHED_POLLING);

	schedEnd(&(*psrv)->srv_root);

pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);	pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);
e_free(*psrv);	e_free(*psrv);
*psrv = NULL;	*psrv = NULL;
Line 1114 rpc_srv_loopServer(rpc_srv_t * __restrict srv)	Line 1137 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
srv->srv_funcs.avlh_root = NULL;	srv->srv_funcs.avlh_root = NULL;
RPC_FUNCS_UNLOCK(&srv->srv_funcs);	RPC_FUNCS_UNLOCK(&srv->srv_funcs);

schedEnd(&srv->srv_root);
return 0;	return 0;
}	}

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

Removed from v.1.16.2.3
changed lines
	Added in v.1.17.6.2