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.9.2.7 and 1.9.2.24

version 1.9.2.7, 2012/05/15 22:47:10	version 1.9.2.24, 2012/05/17 15:18:48
Line 52 closeClient(sched_task_t *task)	Line 52 closeClient(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;

schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);	schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);

/* close client socket */	/* close client socket */
if (TASK_VAL(task))	if (TASK_VAL(task))
Line 82 txPacket(sched_task_t *task)	Line 82 txPacket(sched_task_t *task)
if (rpc->call_argc) {	if (rpc->call_argc) {
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->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 140 execCall(sched_task_t *task)	Line 141 execCall(sched_task_t *task)
rpc->call_rep.eno = RPC_ERROR(rpc_Errno);	rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
return NULL;	return NULL;
}	}
}	} else
	arr = NULL;

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");
Line 160 execCall(sched_task_t *task)	Line 162 execCall(sched_task_t *task)
/* without reply */	/* without reply */
io_clrVars(f->func_vars);	io_clrVars(f->func_vars);
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
} else	} else {
	/* reply */
rpc->call_argc = htons(io_arraySize(f->func_vars));	rpc->call_argc = htons(io_arraySize(f->func_vars));
	}
}	}
}	}

if (arr)	io_arrayDestroy(&arr);
io_arrayDestroy(&arr);
return NULL;	return NULL;
}	}

Line 175 rxPacket(sched_task_t *task)	Line 178 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 = AIT_GET_BUF(&c->cli_buf);
int len, rlen, noreply;	int len, rlen, noreply;
u_short crc, off = 0;	u_short crc, off = TASK_DATLEN(task);
	u_char *buf = AIT_GET_BUF(&c->cli_buf);
struct tagRPCCall *rpc;	struct tagRPCCall *rpc;

memset(buf, 0, AIT_LEN(&c->cli_buf));	memset(buf, 0, AIT_LEN(&c->cli_buf));
rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0);	rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0);
if (rlen < 1) {	if (rlen < 1) {
/* close connection */	/* close connection */
schedEvent(TASK_ROOT(task), closeClient, c, 0, NULL, 0);	schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0);
return NULL;	return NULL;
	} else {
	rlen += off; /* add reminded bytes from previous rxPacket, if exists! */
	off = 0; /* process buffer from start offset == 0 */
}	}

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

schedReadSelf(task);	/* reminder received previous bytes ;) */
	schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task),
	TASK_FD(task), TASK_DATA(task), rlen);
return NULL;	return NULL;
} else	} else
rpc = (struct tagRPCCall*) (buf + off);	rpc = (struct tagRPCCall*) (buf + off);
Line 201 rxPacket(sched_task_t *task)	Line 209 rxPacket(sched_task_t *task)
len = ntohs(rpc->call_len);	len = ntohs(rpc->call_len);
rlen -= len;	rlen -= len;

	/* check RPC packet lengths */
	if (rlen < 0 \|\| len < sizeof(struct tagRPCCall)) {
	rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length");
	/* skip entire packet */
	break;
	}

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

off += len;	off += len;
if (rlen < 1)	/* try next packet remaining into buffer */
break;	continue;
else
continue;
}	}

noreply = rpc->call_req.flags & RPC_NOREPLY;	noreply = rpc->call_req.flags & RPC_NOREPLY;
Line 235 rxPacket(sched_task_t *task)	Line 248 rxPacket(sched_task_t *task)
} while (rlen > 0);	} while (rlen > 0);

/* lets get next packet */	/* lets get next packet */
schedReadSelf(task);	schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0);
return NULL;	return NULL;
}	}

Line 255 acceptClients(sched_task_t *task)	Line 268 acceptClients(sched_task_t *task)
c = malloc(sizeof(rpc_cli_t));	c = malloc(sizeof(rpc_cli_t));
if (!c) {	if (!c) {
LOGERR;	LOGERR;
srv->srv_kill = kill;	srv->srv_kill = 1;
return NULL;	return NULL;
} else {	} else {
memset(c, 0, sizeof(rpc_cli_t));	memset(c, 0, sizeof(rpc_cli_t));
Line 268 acceptClients(sched_task_t *task)	Line 281 acceptClients(sched_task_t *task)
AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);

/* accept client */	/* accept client */
c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);	c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen);
if (c->cli_sock == -1) {	if (c->cli_sock == -1) {
LOGERR;	LOGERR;
AIT_FREE_VAL(&c->cli_buf);	AIT_FREE_VAL(&c->cli_buf);
Line 283 end:	Line 296 end:
return NULL;	return NULL;
}	}

#if 0	/* ------------------------------------------------------ */

static void *	static void *
	closeBLOBClient(sched_task_t *task)
	{
	rpc_cli_t *c = TASK_ARG(task);
	rpc_srv_t *s = c->cli_parent;

	schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);

	/* close client socket */
	if (TASK_VAL(task))
	shutdown(c->cli_sock, SHUT_RDWR);
	close(c->cli_sock);

	/* free buffer */
	AIT_FREE_VAL(&c->cli_buf);

	io_arrayDel(s->srv_blob.clients, c->cli_id, 42);
	return NULL;
	}

	static void *
txBLOB(sched_task_t *task)	txBLOB(sched_task_t *task)
{	{
u_char *buf = TASK_DATA(task);	rpc_cli_t *c = TASK_ARG(task);
	u_char *buf = AIT_GET_BUF(&c->cli_buf);
struct tagBLOBHdr blob = (struct tagBLOBHdr ) buf;	struct tagBLOBHdr blob = (struct tagBLOBHdr ) buf;
int wlen = sizeof(struct tagBLOBHdr);	int wlen = sizeof(struct tagBLOBHdr);

Line 296 txBLOB(sched_task_t *task)	Line 331 txBLOB(sched_task_t *task)
blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 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, MSG_NOSIGNAL);
if (wlen == -1)	if (wlen == -1 \|\| wlen != sizeof(struct tagBLOBHdr)) {
LOGERR;	/* close blob connection */
else if (wlen != sizeof(struct tagBLOBHdr))	schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "	}
"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen);

return NULL;	return NULL;
}	}
Line 312 rxBLOB(sched_task_t *task)	Line 346 rxBLOB(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;
rpc_blob_t *b;	rpc_blob_t *b;
u_char *buf = TASK_DATA(task);	struct tagBLOBHdr blob;
struct tagBLOBHdr blob = (struct tagBLOBHdr ) buf;
int rlen;	int rlen;
u_short crc;	u_short crc;
struct timespec ts;

/* check for disable service at this moment? */	memset(&blob, 0, sizeof blob);
if (!s \|\| s->srv_blob.state == disable) {	rlen = recv(TASK_FD(task), &blob, sizeof blob, 0);
usleep(100000);	if (rlen < 1) {
#ifdef HAVE_PTHREAD_YIELD	/* close blob connection */
pthread_yield();	schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
#endif
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
}	}

memset(buf, 0, TASK_DATLEN(task));	/* check BLOB packet */
rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
if (rlen == -1) {
LOGERR;
c->cli_kill = kill;
return NULL;
} else if (!rlen) { /* receive EOF */
c->cli_kill = kill;
return NULL;
}

if (rlen < sizeof(struct tagBLOBHdr)) {	if (rlen < sizeof(struct tagBLOBHdr)) {
rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet");	rpc_SetErr(ERPCMISMATCH, "Short BLOB packet");
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));	schedReadSelf(task);
return NULL;	return NULL;
}	}

/* 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, rlen / 2)) {	if (crc != crcFletcher16((u_short*) &blob, 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),
TASK_DATA(task), TASK_DATLEN(task));	schedReadSelf(task);
return NULL;	return NULL;
}	}

/* check RPC packet session info */	/* check RPC packet session info */
if ((crc = rpc_chkPktSession(&blob->hdr_session, &s->srv_session))) {	if ((crc = rpc_chkPktSession(&blob.hdr_session, &s->srv_session))) {
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
blob->hdr_cmd = error;	blob.hdr_cmd = error;
goto end;	goto end;
} else {
/* change socket timeout from last packet */
ts.tv_sec = blob->hdr_session.sess_timeout;
ts.tv_nsec = 0;
schedPolling(TASK_ROOT(task), &ts, NULL);
}	}

/* Go to proceed packet ... */	/* Go to proceed packet ... */
switch (blob->hdr_cmd) {	switch (blob.hdr_cmd) {
case get:	case get:
if (!(b = rpc_srv_getBLOB(s, ntohl(blob->hdr_var)))) {	if (!(b = rpc_srv_getBLOB(s, ntohl(blob.hdr_var)))) {
rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob->hdr_var));	rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob.hdr_var));
blob->hdr_cmd = no;	blob.hdr_cmd = no;
blob->hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
break;	break;
} else	} else
blob->hdr_len = htonl(b->blob_len);	blob.hdr_len = htonl(b->blob_len);

if (rpc_srv_blobMap(s, b) != -1) {	if (rpc_srv_blobMap(s, b) != -1) {
/* deliver BLOB variable to client */	/* deliver BLOB variable to client */
blob->hdr_ret = htonl(rpc_srv_sendBLOB(c, b));	blob.hdr_ret = htonl(rpc_srv_sendBLOB(c, b));
rpc_srv_blobUnmap(b);	rpc_srv_blobUnmap(b);
} else {	} else {
blob->hdr_cmd = error;	blob.hdr_cmd = error;
blob->hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
}	}
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)))) {
/* 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);

/* receive BLOB from client */	/* receive BLOB from client */
blob->hdr_ret = htonl(rpc_srv_recvBLOB(c, b));	blob.hdr_ret = htonl(rpc_srv_recvBLOB(c, b));
rpc_srv_blobUnmap(b);	rpc_srv_blobUnmap(b);
} else {	} else {
blob->hdr_cmd = error;	blob.hdr_cmd = error;
blob->hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
}	}
break;	break;
case unset:	case unset:
if (rpc_srv_unregisterBLOB(s, blob->hdr_var) == -1) {	if (rpc_srv_unregisterBLOB(s, blob.hdr_var) == -1) {
blob->hdr_cmd = error;	blob.hdr_cmd = error;
blob->hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
}	}
break;	break;
default:	default:
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob->hdr_cmd);	rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd);
blob->hdr_cmd = error;	blob.hdr_cmd = error;
blob->hdr_ret = RPC_ERROR(-1);	blob.hdr_ret = RPC_ERROR(-1);
}	}

end:	end:
schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task),	memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob);
TASK_DATA(task), TASK_DATLEN(task));	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0);
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),	schedReadSelf(task);
TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
}	}

static void *	static void *
rpc_srv_dispatchVars(void *arg)	acceptBLOBClients(sched_task_t *task)
{	{
rpc_cli_t *c = arg;	rpc_srv_t *srv = TASK_ARG(task);
rpc_srv_t *s;	rpc_cli_t *c = NULL;
sched_root_task_t *root;	register int i;
u_char *buf;	socklen_t salen = sizeof(io_sockaddr_t);
struct timespec ts = { DEF_RPC_TIMEOUT, 0 };

if (!arg) {	/* check free slots for connect */
rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB");	for (i = 0; i < io_arraySize(srv->srv_blob.clients) &&
return NULL;	(c = io_array(srv->srv_blob.clients, i, rpc_cli_t*)); i++);
} else	if (c) /* no more free slots! */
s = c->cli_parent;	goto end;
	c = malloc(sizeof(rpc_cli_t));
/* allocate net buffer */	if (!c) {
buf = malloc(sizeof(struct tagBLOBHdr));
if (!buf) {
LOGERR;	LOGERR;
	srv->srv_kill = srv->srv_blob.kill = 1;
return NULL;	return NULL;
}

root = schedBegin();
if (!root) {
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
free(buf);
return NULL;
} else {	} else {
schedTermCondition(root, kill);	memset(c, 0, sizeof(rpc_cli_t));
schedPolling(root, &ts, NULL);	io_arraySet(srv->srv_blob.clients, i, c);
	c->cli_id = i;
	c->cli_parent = srv;
}	}

schedRead(root, rxBLOB, c, c->cli_sock, buf, sizeof(struct tagBLOBHdr));	/* alloc empty buffer */
	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);

schedRun(root, (void*) &c->cli_kill);	/* accept client */
schedEnd(&root);	c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen);
	if (c->cli_sock == -1) {
	LOGERR;
	AIT_FREE_VAL(&c->cli_buf);
	io_arrayDel(srv->srv_blob.clients, i, 42);
	goto end;
	} else
	fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) \| O_NONBLOCK);

shutdown(c->cli_sock, SHUT_RDWR);	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);
close(c->cli_sock);	end:
memset(c, 0, sizeof(rpc_cli_t));	schedReadSelf(task);
free(buf);
return NULL;	return NULL;
}	}

// -------------------------------------------------	/* ------------------------------------------------------ */

/*	/*
* rpc_srv_initBLOBServer() - Init & create BLOB Server	* rpc_srv_initBLOBServer() - Init & create BLOB Server
Line 480 int	Line 493 int
rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)	rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
{	{
int n = 1;	int n = 1;
io_sockaddr_t sa;

if (!srv) {	if (!srv \|\| srv->srv_kill) {
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");	rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");
return -1;	return -1;
}	}
if (srv->srv_blob.state) {
rpc_SetErr(EPERM, "Already started BLOB server!");
return 0;
}

memset(&srv->srv_blob, 0, sizeof srv->srv_blob);	memset(&srv->srv_blob, 0, sizeof srv->srv_blob);
if (access(diskDir, R_OK \| W_OK) == -1) {	if (access(diskDir, R_OK \| W_OK) == -1) {
Line 498 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 506 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
} else	} else
AIT_SET_STR(&srv->srv_blob.dir, diskDir);	AIT_SET_STR(&srv->srv_blob.dir, diskDir);

srv->srv_blob.server.cli_tid = pthread_self();	/* init blob list */
	TAILQ_INIT(&srv->srv_blob.blobs);

srv->srv_blob.server.cli_parent = srv;	srv->srv_blob.server.cli_parent = srv;

memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t));
switch (sa.sa.sa_family) {	switch (srv->srv_blob.server.cli_sa.sa.sa_family) {
case AF_INET:	case AF_INET:
sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);	srv->srv_blob.server.cli_sa.sin.sin_port =
	htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1);
break;	break;
case AF_INET6:	case AF_INET6:
sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1);	srv->srv_blob.server.cli_sa.sin6.sin6_port =
	htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1);
break;	break;
case AF_LOCAL:	case AF_LOCAL:
strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);	strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob",
	sizeof srv->srv_blob.server.cli_sa.sun.sun_path);
break;	break;
default:	default:
AIT_FREE_VAL(&srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}
memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);

/* create BLOB server socket */	/* create BLOB server socket */
srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
Line 552 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 564 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
return -1;	return -1;
}	}

/* allocate pool for concurent clients */	/* allocate pool for concurent blob clients */
srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));	srv->srv_blob.clients = io_arrayInit(io_arraySize(srv->srv_clients));
if (!srv->srv_blob.clients) {	if (!srv->srv_blob.clients) {
LOGERR;	rpc_SetErr(io_GetErrno(), "%s", io_GetError());
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
AIT_FREE_VAL(&srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
} else	}
memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));

rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);	/* init blob scheduler */
rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);	srv->srv_blob.root = schedBegin();
rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);	if (!srv->srv_blob.root) {
rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0);	rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
	io_arrayDestroy(&srv->srv_blob.clients);
	close(srv->srv_blob.server.cli_sock);
	AIT_FREE_VAL(&srv->srv_blob.dir);
	return -1;
	}

srv->srv_blob.state = enable; /* enable BLOB */
return 0;	return 0;
}	}

Line 582 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 597 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
{	{
rpc_cli_t *c;	rpc_cli_t *c;
register int i;	register int i;
rpc_blob_t *f;	rpc_blob_t b, tmp;

if (!srv \|\| srv->srv_blob.state == disable)	if (!srv)
return;	return;
else
srv->srv_blob.state = kill;

rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);	if (srv->srv_blob.tid) {
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);	pthread_cancel(srv->srv_blob.tid);
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);	pthread_join(srv->srv_blob.tid, NULL);
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);	}

/* close all clients connections & server socket */	/* close all clients connections & server socket */
for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)	for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) {
if (c->cli_sa.sa.sa_family)	c = io_array(srv->srv_blob.clients, i, rpc_cli_t*);
	if (c) {
shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(srv->srv_blob.server.cli_sock);	close(c->cli_sock);

if (srv->srv_blob.clients) {	schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL);
free(srv->srv_blob.clients);	AIT_FREE_VAL(&c->cli_buf);
srv->srv_blob.clients = NULL;	}
	io_arrayDel(srv->srv_blob.clients, i, 42);
}	}
	io_arrayDestroy(&srv->srv_blob.clients);

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

/* detach blobs */	/* detach blobs */
while ((f = srv->srv_blob.blobs)) {	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
srv->srv_blob.blobs = f->blob_next;	TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
rpc_srv_blobFree(srv, f);
free(f);	rpc_srv_blobFree(srv, b);
	free(b);
}	}

	schedEnd(&srv->srv_blob.root);
AIT_FREE_VAL(&srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);

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

/*	/*
* rpc_srv_loopBLOB() - Execute Main BLOB server loop and wait for clients requests	* rpc_srv_loopBLOBServer() - Execute Main BLOB server loop and wait for clients requests
*	*
* @srv = RPC Server instance	* @srv = RPC Server instance
* return: -1 error or 0 ok, infinite loop ...	* return: -1 error or 0 ok, infinite loop ...
*/	*/
int	int
rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)	rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
{	{
socklen_t salen = sizeof(io_sockaddr_t);	if (!srv \|\| srv->srv_kill) {
register int i;
rpc_cli_t *c;
int ret;
pthread_attr_t attr;
struct pollfd pfd;

if (!srv \|\| srv->srv_blob.state == kill) {
rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");	rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");
return -1;	return -1;
}	}

if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {	fcntl(srv->srv_blob.server.cli_sock, F_SETFL,
	fcntl(srv->srv_blob.server.cli_sock, F_GETFL) \| O_NONBLOCK);

	if (listen(srv->srv_blob.server.cli_sock, io_arraySize(srv->srv_blob.clients)) == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
} else	}
fcntl(srv->srv_blob.server.cli_sock, F_SETFL,
fcntl(srv->srv_blob.server.cli_sock, F_GETFL) \| O_NONBLOCK);

pthread_attr_init(&attr);	if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv,
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);	srv->srv_blob.server.cli_sock, NULL, 0)) {
	rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
pfd.fd = srv->srv_blob.server.cli_sock;	return -1;
pfd.events = POLLIN \| POLLPRI;
/* main BLOB loop */
while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
if (!c->cli_sa.sa.sa_family)
break;
if (i >= srv->srv_numcli) {
#ifdef HAVE_PTHREAD_YIELD
pthread_yield();
#endif
usleep(1000000);
continue;
}

if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 \|\|
pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
LOGERR;
ret = 1;
break;
} else if (!ret)
continue;

c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
if (c->cli_sock == -1) {
LOGERR;
continue;
} else
c->cli_parent = srv;

/* spawn dispatch thread for BLOB client */
c->cli_kill = enable;
if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
LOGERR;
continue;
}
}	}

srv->srv_blob.state = kill;	/* main rpc loop */
	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);
pthread_attr_destroy(&attr);
return 0;	return 0;
}	}
#endif


/*	/*
Line 701 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)	Line 675 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
* @regProgID = ProgramID for authentication & recognition	* @regProgID = ProgramID for authentication & recognition
* @regProcID = ProcessID for authentication & recognition	* @regProcID = ProcessID for authentication & recognition
* @concurentClients = Concurent clients at same time to this server	* @concurentClients = Concurent clients at same time to this server
* @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)	* @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
* @csHost = Host name or address for bind server, if NULL any address	* @csHost = Host name or address for bind server, if NULL any address
* @Port = Port for bind server, if Port == 0 default port is selected	* @Port = Port for bind server, if Port == 0 default port is selected
* return: NULL == error or !=NULL bind and created RPC server instance	* return: NULL == error or !=NULL bind and created RPC server instance
Line 722 rpc_srv_initServer(u_int regProgID, u_char regProcID,	Line 696 rpc_srv_initServer(u_int regProgID, u_char regProcID,
return NULL;	return NULL;
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (!netBuf)	if (netBuf < RPC_MIN_BUFSIZ)
netBuf = BUFSIZ;	netBuf = BUFSIZ;
else	else
netBuf = io_align(netBuf, 1); /* align netBuf length */	netBuf = io_align(netBuf, 1); /* align netBuf length */

	#ifdef HAVE_SRANDOMDEV
	srandomdev();
	#else
	time_t tim;

	srandom((time(&tim) ^ getpid()));
	#endif

srv = malloc(sizeof(rpc_srv_t));	srv = malloc(sizeof(rpc_srv_t));
if (!srv) {	if (!srv) {
LOGERR;	LOGERR;
Line 790 rpc_srv_initServer(u_int regProgID, u_char regProcID,	Line 772 rpc_srv_initServer(u_int regProgID, u_char regProcID,
goto err;	goto err;
}	}

	rpc_register_srvPing(srv);

return srv;	return srv;
err: /* error condition */	err: /* error condition */
close(srv->srv_server.cli_sock);	close(srv->srv_server.cli_sock);
Line 812 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 796 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
register int i;	register int i;
rpc_func_t f, tmp;	rpc_func_t f, tmp;

if (!psrv \|\| !*psrv) {	if (!psrv \|\| !*psrv)
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!");
return;	return;
}

	if (!(*psrv)->srv_blob.kill)
	rpc_srv_endBLOBServer(*psrv);

/* close all clients connections & server socket */	/* close all clients connections & server socket */
for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) {	for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) {
c = io_array((psrv)->srv_clients, i, rpc_cli_t);	c = io_array((psrv)->srv_clients, i, rpc_cli_t);
Line 824 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 809 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(c->cli_sock);	close(c->cli_sock);

free(c);	schedCancelby((*psrv)->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
io_arrayDel((*psrv)->srv_clients, i, 0);	AIT_FREE_VAL(&c->cli_buf);
}	}
	io_arrayDel((*psrv)->srv_clients, i, 42);
}	}
io_arrayDestroy(&(*psrv)->srv_clients);	io_arrayDestroy(&(*psrv)->srv_clients);

Line 834 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 820 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)

/* detach exported calls */	/* detach exported calls */
TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {	TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {
	TAILQ_REMOVE(&(*psrv)->srv_funcs, f, func_node);

io_freeVars(&f->func_vars);	io_freeVars(&f->func_vars);
AIT_FREE_VAL(&f->func_name);	AIT_FREE_VAL(&f->func_name);
free(f);	free(f);
Line 897 rpc_srv_execCall(rpc_func_t * __restrict call, struct	Line 885 rpc_srv_execCall(rpc_func_t * __restrict call, struct
}	}

func = AIT_GET_LIKE(&call->func_name, rpc_callback_t);	func = AIT_GET_LIKE(&call->func_name, rpc_callback_t);
return func(call, ntohs(rpc->call_argc), args);	return func(call, rpc, args);
}	}

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

Removed from v.1.9.2.7
changed lines
	Added in v.1.9.2.24