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.6.2.5 and 1.9.2.3

version 1.6.2.5, 2012/03/13 17:15:31	version 1.9.2.3, 2012/05/14 15:35:58
Line 47 SUCH DAMAGE.	Line 47 SUCH DAMAGE.


static void rxPacket(sched_task_t);	static void rxPacket(sched_task_t);
	static void rxBLOB(sched_task_t);

static void *	static void *
txPacket(sched_task_t *task)	txPacket(sched_task_t *task)
Line 80 txPacket(sched_task_t *task)	Line 81 txPacket(sched_task_t *task)
}	}
}	}

	rpc->call_len = htons(wlen);

	/* calculate CRC */
	rpc->call_crc ^= rpc->call_crc;
	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);
if (ret == -1)	if (ret == -1)
Line 88 txPacket(sched_task_t *task)	Line 95 txPacket(sched_task_t *task)
rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "	rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
"really sended %d bytes", wlen, ret);	"really sended %d bytes", wlen, ret);

/* lets get next packet */
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
}	}

Line 101 execCall(sched_task_t *task)	Line 105 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);

/* 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 124 execCall(sched_task_t *task)	Line 129 execCall(sched_task_t *task)
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);
} else {	} else {
	/* 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 145 rxPacket(sched_task_t *task)	Line 157 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 154 rxPacket(sched_task_t *task)	Line 166 rxPacket(sched_task_t *task)
rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
if (rlen == -1) {	if (rlen == -1) {
LOGERR;	LOGERR;
s->srv_kill = kill;	c->cli_kill = kill;

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
} else if (!rlen) { /* receive EOF */	} else if (!rlen) { /* receive EOF */
s->srv_kill = kill;	c->cli_kill = kill;

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
}	}
if (rlen < sizeof(struct tagRPCCall)) {
rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	do {
TASK_DATA(task), TASK_DATLEN(task));	if (rlen < sizeof(struct tagRPCCall)) {
return NULL;	rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
} else
rpc = (struct tagRPCCall*) buf;

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

schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	rlen -= ntohs(rpc->call_len);
TASK_DATA(task), TASK_DATLEN(task));
return NULL;
}

/* check RPC packet session info */	/* check integrity of packet */
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {	crc = ntohs(rpc->call_crc);
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	rpc->call_crc ^= rpc->call_crc;
rpc->call_argc ^= rpc->call_argc;	if (crc != crcFletcher16((u_short*) (buf + off), ntohs(rpc->call_len) / 2)) {
rpc->call_rep.ret = RPC_ERROR(-1);	rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
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 */	off += ntohs(rpc->call_len);
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0,	if (rlen < 1)
TASK_DATA(task), TASK_DATLEN(task));	break;
	else
	continue;
	}

end:	noreply = rpc->call_req.flags & RPC_NOREPLY;
/* send RPC reply */
if (!(rpc->call_req.flags & RPC_NOREPLY))	/* check RPC packet session info */
schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task),	if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
TASK_DATA(task), TASK_DATLEN(task));	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
else	rpc->call_argc ^= rpc->call_argc;
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),	rpc->call_rep.ret = RPC_ERROR(-1);
TASK_DATA(task), TASK_DATLEN(task));	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 */
	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task),
	TASK_DATA(task), TASK_DATLEN(task));
return NULL;	return NULL;
}	}

Line 249 rpc_srv_dispatchCall(void *arg)	Line 265 rpc_srv_dispatchCall(void *arg)

schedRead(root, rxPacket, c, c->cli_sock, buf, s->srv_netbuf);	schedRead(root, rxPacket, c, c->cli_sock, buf, s->srv_netbuf);

schedRun(root, (void*) &s->srv_kill);	schedRun(root, (void*) &c->cli_kill);
schedEnd(&root);	schedEnd(&root);

shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
Line 261 rpc_srv_dispatchCall(void *arg)	Line 277 rpc_srv_dispatchCall(void *arg)


static void *	static void *
rpc_srv_dispatchVars(void *arg)	txBLOB(sched_task_t *task)
{	{
rpc_cli_t *c = arg;	u_char *buf = TASK_DATA(task);
rpc_srv_t *s;	struct tagBLOBHdr blob = (struct tagBLOBHdr ) buf;
rpc_blob_t *b;	int wlen = sizeof(struct tagBLOBHdr);
int ret = 0;
fd_set fds;
u_char buf[sizeof(struct tagBLOBHdr)];
struct tagBLOBHdr *blob;

if (!arg) {	/* calculate CRC */
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n");	blob->hdr_crc ^= blob->hdr_crc;
return NULL;	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
} else
s = c->cli_parent;

do {	/* send reply */
/* check for disable service at this moment? */	wlen = send(TASK_FD(task), buf, wlen, 0);
if (s->srv_blob.state == disable && s->srv_kill != kill) {	if (wlen == -1)
usleep(100000);	LOGERR;
	else if (wlen != sizeof(struct tagBLOBHdr))
	rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
	"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen);

	return NULL;
	}

	static void *
	rxBLOB(sched_task_t *task)
	{
	rpc_cli_t *c = TASK_ARG(task);
	rpc_srv_t *s = c->cli_parent;
	rpc_blob_t *b;
	u_char *buf = TASK_DATA(task);
	struct tagBLOBHdr blob = (struct tagBLOBHdr ) buf;
	int rlen;
	u_short crc;
	struct timespec ts;

	/* check for disable service at this moment? */
	if (!s \|\| s->srv_blob.state == disable) {
	usleep(100000);
#ifdef HAVE_PTHREAD_YIELD	#ifdef HAVE_PTHREAD_YIELD
pthread_yield();	pthread_yield();
#endif	#endif
continue;	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
}	TASK_DATA(task), TASK_DATLEN(task));
	return NULL;
	}

FD_ZERO(&fds);	memset(buf, 0, TASK_DATLEN(task));
FD_SET(c->cli_sock, &fds);	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);	if (rlen == -1) {
if (ret == -1) {	LOGERR;
if (errno == EINTR && s->srv_kill != kill && s->srv_blob.state != kill)	c->cli_kill = kill;
continue;	return NULL;
	} else if (!rlen) { /* receive EOF */
	c->cli_kill = kill;
	return NULL;
	}

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

	/* check integrity of packet */
	crc = ntohs(blob->hdr_crc);
	blob->hdr_crc ^= blob->hdr_crc;
	if (crc != crcFletcher16((u_short*) buf, rlen / 2)) {
	rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
	TASK_DATA(task), TASK_DATLEN(task));
	return NULL;
	}

	/* check RPC packet session info */
	if ((crc = rpc_chkPktSession(&blob->hdr_session, &s->srv_session))) {
	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
	blob->hdr_cmd = error;
	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 ... */
	switch (blob->hdr_cmd) {
	case get:
	if (!(b = rpc_srv_getBLOB(s, ntohl(blob->hdr_var)))) {
	rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob->hdr_var));
	blob->hdr_cmd = no;
	blob->hdr_ret = RPC_ERROR(-1);
	break;
	} else
	blob->hdr_len = htonl(b->blob_len);

	if (rpc_srv_blobMap(s, b) != -1) {
	/* deliver BLOB variable to client */
	blob->hdr_ret = htonl(rpc_srv_sendBLOB(c, b));
	rpc_srv_blobUnmap(b);
	} else {
	blob->hdr_cmd = error;
	blob->hdr_ret = RPC_ERROR(-1);
	}
break;	break;
}	case set:
	if ((b = rpc_srv_registerBLOB(s, ntohl(blob->hdr_len)))) {
	/* set new BLOB variable for reply :) */
	blob->hdr_var = htonl(b->blob_var);

memset(buf, 0, sizeof buf);	/* receive BLOB from client */
ret = recv(c->cli_sock, buf, sizeof buf, 0);	blob->hdr_ret = htonl(rpc_srv_recvBLOB(c, b));
if (ret == -1) {	rpc_srv_blobUnmap(b);
LOGERR;	} else {
ret = -3;	blob->hdr_cmd = error;
	blob->hdr_ret = RPC_ERROR(-1);
	}
break;	break;
}	case unset:
/* receive EOF, disable or kill service */	if (rpc_srv_unregisterBLOB(s, blob->hdr_var) == -1) {
if (!ret \|\| s->srv_blob.state == kill \|\| s->srv_kill == kill) {	blob->hdr_cmd = error;
ret = 0;	blob->hdr_ret = RPC_ERROR(-1);
	}
break;	break;
}	default:
if (ret < sizeof(struct tagBLOBHdr)) {	rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob->hdr_cmd);
rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");	blob->hdr_cmd = error;
ret = -4;	blob->hdr_ret = RPC_ERROR(-1);
if (s->srv_kill != kill && s->srv_blob.state != kill)	}
continue;
else
break;
} else
blob = (struct tagBLOBHdr*) buf;
/* check BLOB packet session info */
if (memcmp(&blob->hdr_session, &s->srv_session, sizeof blob->hdr_session)) {
rpc_SetErr(EINVAL, "Error:: get invalid BLOB session ...\n");
ret = -5;
goto makeReply;
}
/* Go to proceed packet ... */
switch (blob->hdr_cmd) {
case get:
if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) {
rpc_SetErr(EINVAL, "Error:: var (%x) not found into BLOB server ...\n",
blob->hdr_var);
ret = -6;
break;
} else
blob->hdr_len = b->blob_len;

if (rpc_srv_blobMap(s, b) != -1) {	end:
ret = rpc_srv_sendBLOB(c, b);	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task),
rpc_srv_blobUnmap(b);	TASK_DATA(task), TASK_DATLEN(task));
} else	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task),
ret = -7;	TASK_DATA(task), TASK_DATLEN(task));
break;	return NULL;
case set:	}
if ((b = rpc_srv_registerBLOB(s, blob->hdr_len))) {
/* set new BLOB variable for reply :) */
blob->hdr_var = b->blob_var;

ret = rpc_srv_recvBLOB(c, b);	static void *
rpc_srv_blobUnmap(b);	rpc_srv_dispatchVars(void *arg)
} else	{
ret = -7;	rpc_cli_t *c = arg;
break;	rpc_srv_t *s;
case unset:	sched_root_task_t *root;
ret = rpc_srv_unregisterBLOB(s, blob->hdr_var);	u_char *buf;
if (ret == -1)	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
ret = -7;
break;
default:
rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n",
blob->hdr_cmd);
ret = -7;
}

makeReply:	if (!arg) {
/* Replay to client! */	rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB");
blob->hdr_cmd = ret < 0 ? error : ok;	return NULL;
blob->hdr_ret = ret;	} else
ret = send(c->cli_sock, buf, sizeof buf, 0);	s = c->cli_parent;
if (ret == -1) {
LOGERR;
ret = -8;
break;
}
if (ret != sizeof buf) {
rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
"really is %d\n", sizeof buf, ret);
ret = -9;
if (s->srv_kill != kill && s->srv_blob.state != kill)
continue;
else
break;
}
} while (ret > -1 \|\| s->srv_kill != kill);

	/* allocate net buffer */
	buf = malloc(sizeof(struct tagBLOBHdr));
	if (!buf) {
	LOGERR;
	return NULL;
	}

	root = schedBegin();
	if (!root) {
	rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
	free(buf);
	return NULL;
	} else {
	schedTermCondition(root, kill);
	schedPolling(root, &ts, NULL);
	}

	schedRead(root, rxBLOB, c, c->cli_sock, buf, sizeof(struct tagBLOBHdr));

	schedRun(root, (void*) &c->cli_kill);
	schedEnd(&root);

shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(c->cli_sock);	close(c->cli_sock);
memset(c, 0, sizeof(rpc_cli_t));	memset(c, 0, sizeof(rpc_cli_t));
return (void*) ((long)ret);	free(buf);
	return NULL;
}	}

// -------------------------------------------------	// -------------------------------------------------
Line 421 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 488 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
LOGERR;	LOGERR;
return -1;	return -1;
} else	} else
srv->srv_blob.dir = strdup(diskDir);	AIT_SET_STR(&srv->srv_blob.dir, diskDir);

srv->srv_blob.server.cli_tid = pthread_self();	srv->srv_blob.server.cli_tid = pthread_self();
srv->srv_blob.server.cli_parent = srv;	srv->srv_blob.server.cli_parent = srv;
Line 438 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 505 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);	strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
break;	break;
default:	default:
free(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);	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
Line 447 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 514 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
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);
if (srv->srv_blob.server.cli_sock == -1) {	if (srv->srv_blob.server.cli_sock == -1) {
LOGERR;	LOGERR;
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}
if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
LOGERR;	LOGERR;
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}
n = srv->srv_netbuf;	n = srv->srv_netbuf;
if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
LOGERR;	LOGERR;
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}
if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
LOGERR;	LOGERR;
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}
if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa,	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa,
srv->srv_blob.server.cli_sa.sa.sa_len) == -1) {	srv->srv_blob.server.cli_sa.sa.sa_len) == -1) {
LOGERR;	LOGERR;
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
}	}

Line 482 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 549 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
if (!srv->srv_blob.clients) {	if (!srv->srv_blob.clients) {
LOGERR;	LOGERR;
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);
free(srv->srv_blob.dir);	AIT_FREE_VAL(&srv->srv_blob.dir);
return -1;	return -1;
} else	} else
memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));	memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));

pthread_mutex_init(&srv->srv_blob.mtx, NULL);

rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
Line 511 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 576 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
register int i;	register int i;
rpc_blob_t *f;	rpc_blob_t *f;

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 522 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 586 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);

if (srv->srv_blob.dir)
free(srv->srv_blob.dir);

/* 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, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
if (c->cli_sa.sa.sa_family)	if (c->cli_sa.sa.sa_family)
shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(srv->srv_blob.server.cli_sock);	close(srv->srv_blob.server.cli_sock);

pthread_mutex_lock(&srv->srv_blob.mtx);
if (srv->srv_blob.clients) {	if (srv->srv_blob.clients) {
free(srv->srv_blob.clients);	free(srv->srv_blob.clients);
srv->srv_blob.clients = NULL;	srv->srv_blob.clients = NULL;
Line 543 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 603 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
rpc_srv_blobFree(srv, f);	rpc_srv_blobFree(srv, f);
free(f);	free(f);
}	}
pthread_mutex_unlock(&srv->srv_blob.mtx);

while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);	AIT_FREE_VAL(&srv->srv_blob.dir);
pthread_mutex_destroy(&srv->srv_blob.mtx);
	/* at final, save disable BLOB service state */
	srv->srv_blob.state = disable;
}	}

/*	/*
Line 561 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)	Line 622 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
socklen_t salen = sizeof(io_sockaddr_t);	socklen_t salen = sizeof(io_sockaddr_t);
register int i;	register int i;
rpc_cli_t *c;	rpc_cli_t *c;
fd_set fds;
int ret;	int ret;
struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
pthread_attr_t attr;	pthread_attr_t attr;
	struct pollfd pfd;

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

tv.tv_sec = srv->srv_session.sess_timeout;

if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -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);	pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

	pfd.fd = srv->srv_blob.server.cli_sock;
	pfd.events = POLLIN \| POLLPRI;
/* main BLOB loop */	/* main BLOB loop */
while (srv->srv_blob.state != kill && srv->srv_kill != kill) {	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++)	for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
Line 589 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)	Line 651 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
if (i >= srv->srv_numcli) {	if (i >= srv->srv_numcli) {
#ifdef HAVE_PTHREAD_YIELD	#ifdef HAVE_PTHREAD_YIELD
pthread_yield();	pthread_yield();
#else
usleep(1000000);
#endif	#endif
	usleep(1000000);
continue;	continue;
}	}

FD_ZERO(&fds);	if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 \|\|
FD_SET(srv->srv_blob.server.cli_sock, &fds);	pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
ret = select(srv->srv_blob.server.cli_sock + 1, &fds, NULL, NULL, &tv);
if (ret == -1) {
LOGERR;	LOGERR;
ret = 1;	ret = 1;
break;	break;
}	} else if (!ret)
if (!ret)
continue;	continue;

c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);	c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
Line 614 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)	Line 672 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
c->cli_parent = srv;	c->cli_parent = srv;

/* spawn dispatch thread for BLOB client */	/* spawn dispatch thread for BLOB client */
	c->cli_kill = enable;
if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {	if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
LOGERR;	LOGERR;
continue;	continue;
Line 645 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 704 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
{	{
rpc_srv_t *srv = NULL;	rpc_srv_t *srv = NULL;
int n = 1;	int n = 1;
struct hostent *host = NULL;
io_sockaddr_t sa;	io_sockaddr_t sa;

if (!concurentClients \|\| !regProgID \|\|	if (!concurentClients \|\| !regProgID) {
(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {	rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n");
return NULL;	return NULL;
}	}
	if (!io_gethostbyname(csHost, Port, &sa))
	return NULL;
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (!netBuf)	if (!netBuf)
netBuf = BUFSIZ;	netBuf = BUFSIZ;
if (csHost && family != AF_LOCAL) {	else
host = gethostbyname2(csHost, family);	netBuf = io_align(netBuf, 1); /* align netBuf length */
if (!host) {
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
return NULL;
}
}
memset(&sa, 0, sizeof sa);
sa.sa.sa_family = family;
switch (family) {
case AF_INET:
sa.sin.sin_len = sizeof(struct sockaddr_in);
sa.sin.sin_port = htons(Port);
if (csHost)
memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length);
break;
case AF_INET6:
sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
sa.sin6.sin6_port = htons(Port);
if (csHost)
memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
break;
case AF_LOCAL:
sa.sun.sun_len = sizeof(struct sockaddr_un);
if (csHost)
strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path);
unlink(sa.sun.sun_path);
break;
default:
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
return NULL;
}

srv = malloc(sizeof(rpc_srv_t));	srv = malloc(sizeof(rpc_srv_t));
if (!srv) {	if (!srv) {
Line 709 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 738 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);	memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);

/* create server socket */	/* create server socket */
srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);	srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
if (srv->srv_server.cli_sock == -1) {	if (srv->srv_server.cli_sock == -1) {
LOGERR;	LOGERR;
free(srv);	free(srv);
Line 752 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 781 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
} else	} else
memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));	memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));

pthread_mutex_init(&srv->srv_mtx, NULL);

rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);	rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);
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;
}	}

Line 775 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 803 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
rpc_func_t *f;	rpc_func_t *f;

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

Line 796 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 824 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
}	}

/* detach exported calls */	/* detach exported calls */
pthread_mutex_lock(&(*psrv)->srv_mtx);
while ((f = (*psrv)->srv_funcs)) {	while ((f = (*psrv)->srv_funcs)) {
(*psrv)->srv_funcs = f->func_next;	(*psrv)->srv_funcs = f->func_next;
io_freeVars(&f->func_vars);	io_freeVars(&f->func_vars);
Line 804 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 831 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
AIT_FREE_VAL(&f->func_file);	AIT_FREE_VAL(&f->func_file);
free(f);	free(f);
}	}
pthread_mutex_unlock(&(*psrv)->srv_mtx);

while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY);
pthread_mutex_destroy(&(*psrv)->srv_mtx);

free(*psrv);	free(*psrv);
*psrv = NULL;	*psrv = NULL;
}	}
Line 825 rpc_srv_loopServer(rpc_srv_t * __restrict srv)	Line 848 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
socklen_t salen = sizeof(io_sockaddr_t);	socklen_t salen = sizeof(io_sockaddr_t);
register int i;	register int i;
rpc_cli_t *c;	rpc_cli_t *c;
fd_set fds;
int ret;	int ret;
struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
pthread_attr_t attr;	pthread_attr_t attr;
	struct pollfd pfd;

if (!srv) {	if (!srv) {
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n");	rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server");
return -1;	return -1;
}	}

tv.tv_sec = srv->srv_session.sess_timeout;

/* activate BLOB server worker if srv->srv_blob.state == enable */	/* activate BLOB server worker if srv->srv_blob.state == enable */
rpc_srv_execBLOBServer(srv);	rpc_srv_execBLOBServer(srv);

if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {	if (listen(srv->srv_server.cli_sock, srv->srv_numcli) == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
}	} else
	fcntl(srv->srv_server.cli_sock, F_SETFL, fcntl(srv->srv_server.cli_sock, F_GETFL) \| O_NONBLOCK);

pthread_attr_init(&attr);	pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

	pfd.fd = srv->srv_server.cli_sock;
	pfd.events = POLLIN \| POLLPRI;
/* main rpc loop */	/* main rpc loop */
while (srv->srv_kill != kill) {	while (srv->srv_kill != kill) {
for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)	for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
Line 856 rpc_srv_loopServer(rpc_srv_t * __restrict srv)	Line 879 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
if (i >= srv->srv_numcli) {	if (i >= srv->srv_numcli) {
#ifdef HAVE_PTHREAD_YIELD	#ifdef HAVE_PTHREAD_YIELD
pthread_yield();	pthread_yield();
#else
usleep(1000000);
#endif	#endif
	usleep(1000000);
continue;	continue;
}	}

FD_ZERO(&fds);	if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 \|\|
FD_SET(srv->srv_server.cli_sock, &fds);	pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
ret = select(srv->srv_server.cli_sock + 1, &fds, NULL, NULL, &tv);
if (ret == -1) {
LOGERR;	LOGERR;
ret = 1;	ret = 1;
break;	break;
}	} else if (!ret)
if (!ret)
continue;	continue;

c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);	c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
Line 881 rpc_srv_loopServer(rpc_srv_t * __restrict srv)	Line 900 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
c->cli_parent = srv;	c->cli_parent = srv;

/* spawn rpc client dispatcher */	/* spawn rpc client dispatcher */
	c->cli_kill = enable;
if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchCall, c)) {	if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchCall, c)) {
LOGERR;	LOGERR;
continue;	continue;
Line 914 rpc_srv_execCall(rpc_func_t * __restrict call, struct	Line 934 rpc_srv_execCall(rpc_func_t * __restrict call, struct
return -1;	return -1;
}	}

dl = dlopen(AIT_VOID(&call->func_file), RTLD_NOW);	dl = dlopen(AIT_ADDR(&call->func_file), RTLD_NOW);
if (!dl) {	if (!dl) {
rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());	rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());
return -1;	return -1;

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

Removed from v.1.6.2.5
changed lines
	Added in v.1.9.2.3