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.1.1.1.2.25 and 1.3.2.9

version 1.1.1.1.2.25, 2011/05/02 23:02:44	version 1.3.2.9, 2011/08/19 12:51:50
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"


Line 15 rpc_srv_dispatchCall(void *arg)	Line 52 rpc_srv_dispatchCall(void *arg)
rpc_cli_t *c = arg;	rpc_cli_t *c = arg;
rpc_srv_t *s;	rpc_srv_t *s;
rpc_val_t vals = NULL, v = NULL;	rpc_val_t vals = NULL, v = NULL;
rpc_func_t *f;	rpc_func_t *f = NULL;
struct tagRPCCall *rpc;	struct tagRPCCall *rpc;
struct tagRPCRet rrpc;	struct tagRPCRet *rrpc;
	rpc_sess_t ses = { 0 };
fd_set fds;	fd_set fds;
u_char buf[BUFSIZ], *data;	u_char buf[BUFSIZ], *data;
int ret, argc = 0, Limit = 0;	int ret, argc = 0, Limit = 0;
Line 30 rpc_srv_dispatchCall(void *arg)	Line 68 rpc_srv_dispatchCall(void *arg)
s = c->cli_parent;	s = c->cli_parent;

do {	do {
	v = NULL;
FD_ZERO(&fds);	FD_ZERO(&fds);
FD_SET(c->cli_sock, &fds);	FD_SET(c->cli_sock, &fds);
ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);	ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
if (ret == -1) {	if (ret == -1) {
	if (errno == EINTR && s->srv_kill != kill)
	continue;

	LOGERR;
ret = -2;	ret = -2;
	break;
}	}
memset(&rrpc, 0, sizeof rrpc);
memset(buf, 0, BUFSIZ);	memset(buf, 0, BUFSIZ);
if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) {	ret = recv(c->cli_sock, buf, BUFSIZ, 0);
	if (ret == -1) {
LOGERR;	LOGERR;
ret = -3;	ret = -3;
break;	break;
Line 86 rpc_srv_dispatchCall(void *arg)	Line 130 rpc_srv_dispatchCall(void *arg)
data += v[i].val_len;	data += v[i].val_len;
break;	break;
case string:	case string:
if (v[i].val_len + 1 > BUFSIZ - Limit) {	if (v[i].val_len > BUFSIZ - Limit) {
rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");	rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
ret = -5;	ret = -5;
goto makeReply;	goto makeReply;
Line 94 rpc_srv_dispatchCall(void *arg)	Line 138 rpc_srv_dispatchCall(void *arg)
Limit += v[i].val_len;	Limit += v[i].val_len;

v[i].val.string = (int8_t*) data;	v[i].val.string = (int8_t*) data;
data += v[i].val_len + 1;	data += v[i].val_len;
break;	break;
case blob:	case blob:
if (s->srv_blob.state == disable) {	if (s->srv_blob.state == disable) {
Line 102 rpc_srv_dispatchCall(void *arg)	Line 146 rpc_srv_dispatchCall(void *arg)
ret = -5;	ret = -5;
goto makeReply;	goto makeReply;
}	}
	if (s->srv_blob.state == kill) {
	rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n");
	ret = -5;
	goto makeReply;
	}
default:	default:
break;	break;
}	}
Line 110 rpc_srv_dispatchCall(void *arg)	Line 159 rpc_srv_dispatchCall(void *arg)

argc = 0;	argc = 0;
vals = NULL;	vals = NULL;
	memcpy(&ses, &rpc->call_session, sizeof ses);
if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {	if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {
rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");	rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");
ret = -6;	ret = -6;
Line 117 rpc_srv_dispatchCall(void *arg)	Line 167 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:
memcpy(&rrpc.ret_session, &rpc->call_session, sizeof rrpc.ret_session);
rrpc.ret_tag = rpc->call_tag;
rrpc.ret_hash = rpc->call_hash;
rrpc.ret_errno = rpc_Errno;
rrpc.ret_retcode = ret;
rrpc.ret_argc = argc;

memset(buf, 0, BUFSIZ);	memset(buf, 0, BUFSIZ);
memcpy(buf, &rrpc, (Limit = sizeof rrpc));	rrpc = (struct tagRPCRet*) buf;
	Limit = sizeof(struct tagRPCRet);

	memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t));
	rrpc->ret_tag = rpc->call_tag;
	rrpc->ret_hash = rpc->call_hash;
	rrpc->ret_errno = rpc_Errno;
	rrpc->ret_retcode = ret;
	rrpc->ret_argc = argc;

if (argc && vals) {	if (argc && vals) {
v = (rpc_val_t*) (buf + sizeof rrpc);	v = (rpc_val_t*) (buf + Limit);
	if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
	for (i = 0; i < argc; i++)
	RPC_FREE_VAL(&vals[i]);
	rpc_srv_freeVars(f);
	vals = NULL;
	argc = 0;
	ret = -7;
	rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
	goto makeReply;
	} else
	Limit += argc * sizeof(rpc_val_t);
memcpy(v, vals, argc * sizeof(rpc_val_t));	memcpy(v, vals, argc * sizeof(rpc_val_t));
Limit += argc * sizeof(rpc_val_t);
data = (u_char) v + argc sizeof(rpc_val_t);	data = (u_char) v + argc sizeof(rpc_val_t);
for (ret = i = 0; i < argc; i++) {	for (ret = i = 0; i < argc; i++) {
switch (vals[i].val_type) {	switch (vals[i].val_type) {
case buffer:	case buffer:
if (ret \|\| Limit + vals[i].val_len > BUFSIZ) {	if (ret \|\| Limit + vals[i].val_len > BUFSIZ) {
rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");	rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
rrpc.ret_retcode = ret = -7;	rrpc->ret_retcode = ret = -7;
rrpc.ret_argc = 0;	rrpc->ret_argc = 0;
break;	break;
}	}

Line 149 makeReply:	Line 210 makeReply:
Limit += vals[i].val_len;	Limit += vals[i].val_len;
break;	break;
case string:	case string:
if (ret \|\| Limit + vals[i].val_len + 1 > BUFSIZ) {	if (ret \|\| Limit + vals[i].val_len > BUFSIZ) {
rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");	rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
rrpc.ret_retcode = ret = -7;	rrpc->ret_retcode = ret = -7;
rrpc.ret_argc = 0;	rrpc->ret_argc = 0;
break;	break;
}	}

memcpy(data, vals[i].val.string, vals[i].val_len + 1);	memcpy(data, vals[i].val.string, vals[i].val_len);
data += vals[i].val_len + 1;	data += vals[i].val_len;
Limit += vals[i].val_len + 1;	Limit += vals[i].val_len;
break;	break;
case blob:	case blob:
if (s->srv_blob.state == disable) {	if (s->srv_blob.state == disable) {
rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");	rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");
rrpc.ret_retcode = ret = -5;	rrpc->ret_retcode = ret = -5;
rrpc.ret_argc = 0;	rrpc->ret_argc = 0;
break;	break;
}	}
	if (s->srv_blob.state == kill) {
	rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n");
	rrpc->ret_retcode = ret = -5;
	rrpc->ret_argc = 0;
	break;
	}
default:	default:
break;	break;
}	}

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

if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) {	ret = send(c->cli_sock, buf, Limit, 0);
	if (ret == -1) {
LOGERR;	LOGERR;
ret = -8;	ret = -8;
break;	break;
Line 186 makeReply:	Line 257 makeReply:
ret = -9;	ret = -9;
break;	break;
}	}
} while (ret > -1);	} while (ret > -1 \|\| s->srv_kill != kill);

shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(c->cli_sock);	close(c->cli_sock);
Line 201 rpc_srv_dispatchVars(void *arg)	Line 272 rpc_srv_dispatchVars(void *arg)
rpc_cli_t *c = arg;	rpc_cli_t *c = arg;
rpc_srv_t *s;	rpc_srv_t *s;
rpc_blob_t *b;	rpc_blob_t *b;
int ret;	int ret = 0;
fd_set fds;	fd_set fds;
u_char buf[sizeof(struct tagBLOBHdr)];	u_char buf[sizeof(struct tagBLOBHdr)];
struct tagBLOBHdr *blob;	struct tagBLOBHdr *blob;
Line 214 rpc_srv_dispatchVars(void *arg)	Line 285 rpc_srv_dispatchVars(void *arg)

do {	do {
// check for disable service at this moment?	// check for disable service at this moment?
if (s->srv_blob.state == disable) {	if (s->srv_blob.state == disable && s->srv_kill != kill) {
ret = 0;	usleep(100000);
break;	pthread_yield();
	continue;
}	}

FD_ZERO(&fds);	FD_ZERO(&fds);
FD_SET(c->cli_sock, &fds);	FD_SET(c->cli_sock, &fds);
ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);	ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
if (ret == -1) {	if (ret == -1) {
	if (errno == EINTR && s->srv_kill != kill && s->srv_blob.state != kill)
	continue;

	LOGERR;
ret = -2;	ret = -2;
	break;
}	}

memset(buf, 0, sizeof buf);	memset(buf, 0, sizeof buf);
if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) {	ret = recv(c->cli_sock, buf, sizeof buf, 0);
	if (ret == -1) {
LOGERR;	LOGERR;
ret = -3;	ret = -3;
break;	break;
}	}
if (!ret \|\| s->srv_blob.state == disable) { // receive EOF or disable service	/* receive EOF, disable or kill service */
	if (!ret \|\| s->srv_blob.state == kill \|\| s->srv_kill == kill) {
ret = 0;	ret = 0;
break;	break;
}	}
Line 290 makeReply:	Line 369 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) {	ret = send(c->cli_sock, buf, sizeof buf, 0);
	if (ret == -1) {
LOGERR;	LOGERR;
ret = -8;	ret = -8;
break;	break;
Line 301 makeReply:	Line 381 makeReply:
ret = -9;	ret = -9;
break;	break;
}	}
} while (ret > -1);	} while (ret > -1 \|\| s->srv_kill != kill);

shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
close(c->cli_sock);	close(c->cli_sock);
Line 313 makeReply:	Line 393 makeReply:

/*	/*
* rpc_srv_initBLOBServer() Init & create BLOB Server	* rpc_srv_initBLOBServer() Init & create BLOB Server
	* @srv = RPC server instance
* @Port = Port for bind server, if Port == 0 default port is selected	* @Port = Port for bind server, if Port == 0 default port is selected
* @diskDir = Disk place for BLOB file objects	* @diskDir = Disk place for BLOB file objects
* return: -1 == error or 0 bind and created BLOB server instance	* return: -1 == error or 0 bind and created BLOB server instance
Line 321 int	Line 402 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;
struct sockaddr_in sin;	struct sockaddr sa;
struct sockaddr_in6 sin6;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
	struct sockaddr_un sun = (struct sockaddr_un) &sa;

if (!srv) {	if (!srv) {
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
Line 344 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 427 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s

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;
if (srv->srv_server.cli_sa.sa_family == AF_INET) {
memcpy(&sin, &srv->srv_server.cli_sa, sizeof sin);	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
sin.sin_port = htons(Port);	switch (srv->srv_server.cli_sa.sa_family) {
memcpy(&srv->srv_blob.server.cli_sa, &sin, sizeof(struct sockaddr));	case AF_INET:
} else {	sin->sin_port = htons(Port);
memcpy(&sin6, &srv->srv_server.cli_sa, sizeof sin6);	memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
sin6.sin6_port = htons(Port);	break;
memcpy(&srv->srv_blob.server.cli_sa, &sin6, sizeof(struct sockaddr));	case AF_INET6:
	sin6->sin6_port = htons(Port);
	memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr));
	break;
	case AF_LOCAL:
	strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
	memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr));
	break;
	default:
	return -1;
}	}

	/* create BLOB server socket */
srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0);	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0);
if (srv->srv_blob.server.cli_sock == -1) {	if (srv->srv_blob.server.cli_sock == -1) {
LOGERR;	LOGERR;
Line 371 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 464 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
return -1;	return -1;
}	}

	/* allocate pool for concurent clients */
srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
if (!srv->srv_blob.clients) {	if (!srv->srv_blob.clients) {
LOGERR;	LOGERR;
Line 408 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 502 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");	rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
return;	return;
} else	} else
srv->srv_blob.state = disable;	srv->srv_blob.state = kill;

rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);
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);

	/* 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_family)	if (c->cli_sa.sa_family)
shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
Line 425 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 520 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
srv->srv_blob.clients = NULL;	srv->srv_blob.clients = NULL;
}	}

	/* detach blobs */
pthread_mutex_lock(&srv->srv_blob.mtx);	pthread_mutex_lock(&srv->srv_blob.mtx);
while ((f = srv->srv_blob.blobs)) {	while ((f = srv->srv_blob.blobs)) {
srv->srv_blob.blobs = f->blob_next;	srv->srv_blob.blobs = f->blob_next;
Line 452 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)	Line 548 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
int ret;	int ret;
struct timeval tv = { DEF_RPC_TIMEOUT, 0 };	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };

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

while (!blob_Kill && !rpc_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++)
if (!c->cli_sa.sa_family)	if (!c->cli_sa.sa_family)
break;	break;
Line 492 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)	Line 588 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) {	if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) {
LOGERR;	LOGERR;
continue;	continue;
}	} else
	pthread_detach(c->cli_tid);
}	}

srv->srv_blob.state = disable;	srv->srv_blob.state = disable;
Line 506 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)	Line 603 rpc_srv_execBLOBServer(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
* @family = Family socket type, AF_INET or AF_INET6	* @family = Family type, AF_INET, AF_INET6 or AF_LOCAL
* @csHost = Host name or IP 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 518 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 615 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;	struct hostent *host = NULL;
struct sockaddr_in sin;	struct sockaddr sa;
struct sockaddr_in6 sin6;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
	struct sockaddr_un sun = (struct sockaddr_un) &sa;

if (!concurentClients \|\| !regProgID \|\| (family != AF_INET && family != AF_INET6)) {	if (!concurentClients \|\| !regProgID \|\|
	(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n");	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n");
return NULL;	return NULL;
}	}
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (csHost) {	if (csHost && family != AF_LOCAL) {
host = gethostbyname2(csHost, family);	host = gethostbyname2(csHost, family);
if (!host) {	if (!host) {
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));	rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
return NULL;	return NULL;
}	}
}	}
	memset(&sa, 0, sizeof sa);
	sa.sa_family = family;
switch (family) {	switch (family) {
case AF_INET:	case AF_INET:
memset(&sin, 0, sizeof sin);	sin->sin_len = sizeof(struct sockaddr_in);
sin.sin_len = sizeof sin;	sin->sin_port = htons(Port);
sin.sin_family = family;
sin.sin_port = htons(Port);
if (csHost)	if (csHost)
memcpy(&sin.sin_addr, host->h_addr, host->h_length);	memcpy(&sin->sin_addr, host->h_addr, host->h_length);
break;	break;
case AF_INET6:	case AF_INET6:
memset(&sin6, 0, sizeof sin6);	sin6->sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_len = sizeof sin6;	sin6->sin6_port = htons(Port);
sin6.sin6_family = family;
sin6.sin6_port = htons(Port);
if (csHost)	if (csHost)
memcpy(&sin6.sin6_addr, host->h_addr, host->h_length);	memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
break;	break;
	case AF_LOCAL:
	sun->sun_len = sizeof(struct sockaddr_un);
	if (csHost)
	strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
	break;
default:	default:
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
return NULL;	return NULL;
Line 570 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 673 rpc_srv_initServer(u_int regProgID, u_int regProcID, i

srv->srv_server.cli_tid = pthread_self();	srv->srv_server.cli_tid = pthread_self();
srv->srv_server.cli_parent = srv;	srv->srv_server.cli_parent = srv;
if (family == AF_INET)	switch (family) {
memcpy(&srv->srv_server.cli_sa, &sin, sizeof srv->srv_server.cli_sa);	case AF_INET:
else	memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa);
memcpy(&srv->srv_server.cli_sa, &sin6, sizeof srv->srv_server.cli_sa);	break;
	case AF_INET6:
	memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa);
	break;
	case AF_LOCAL:
	memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa);
	unlink(sun->sun_path);
	break;
	}

	/* create server socket */
srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
if (srv->srv_server.cli_sock == -1) {	if (srv->srv_server.cli_sock == -1) {
LOGERR;	LOGERR;
Line 593 rpc_srv_initServer(u_int regProgID, u_int regProcID, i	Line 706 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
return NULL;	return NULL;
}	}

	/* allocate pool for concurent clients */
srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));	srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
if (!srv->srv_clients) {	if (!srv->srv_clients) {
LOGERR;	LOGERR;
Line 630 rpc_srv_endServer(rpc_srv_t * __restrict srv)	Line 744 rpc_srv_endServer(rpc_srv_t * __restrict srv)

rpc_srv_endBLOBServer(srv);	rpc_srv_endBLOBServer(srv);

	/* close all clients connections & server socket */
for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++)	for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++)
if (c->cli_sa.sa_family) {	if (c->cli_sa.sa_family) {
shutdown(c->cli_sock, SHUT_RDWR);	shutdown(c->cli_sock, SHUT_RDWR);
Line 643 rpc_srv_endServer(rpc_srv_t * __restrict srv)	Line 758 rpc_srv_endServer(rpc_srv_t * __restrict srv)
srv->srv_numcli = 0;	srv->srv_numcli = 0;
}	}

	/* detach exported calls */
pthread_mutex_lock(&srv->srv_mtx);	pthread_mutex_lock(&srv->srv_mtx);
while ((f = srv->srv_funcs)) {	while ((f = srv->srv_funcs)) {
srv->srv_funcs = f->func_next;	srv->srv_funcs = f->func_next;
Line 682 rpc_srv_execServer(rpc_srv_t * __restrict srv)	Line 798 rpc_srv_execServer(rpc_srv_t * __restrict srv)
return -1;	return -1;
}	}

while (!rpc_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++)
if (!c->cli_sa.sa_family)	if (!c->cli_sa.sa_family)
break;	break;
Line 712 rpc_srv_execServer(rpc_srv_t * __restrict srv)	Line 828 rpc_srv_execServer(rpc_srv_t * __restrict srv)
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {	if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {
LOGERR;	LOGERR;
continue;	continue;
}	} else
	pthread_detach(c->cli_tid);
}	}

return 0;	return 0;

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

Removed from v.1.1.1.1.2.25
changed lines
	Added in v.1.3.2.9