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.6 and 1.9.2.10

version 1.9.2.6, 2012/05/15 20:49:25	version 1.9.2.10, 2012/05/16 07:37:37
Line 75 txPacket(sched_task_t *task)	Line 75 txPacket(sched_task_t *task)
u_char buf[USHRT_MAX] = { 0 };	u_char buf[USHRT_MAX] = { 0 };
struct tagRPCCall rpc = (struct tagRPCCall) buf;	struct tagRPCCall rpc = (struct tagRPCCall) buf;
int ret, wlen = sizeof(struct tagRPCCall);	int ret, wlen = sizeof(struct tagRPCCall);
array_t *arr = NULL;

/* copy RPC header */	/* copy RPC header */
memcpy(buf, TASK_DATA(task), wlen);	memcpy(buf, TASK_DATA(task), wlen);
Line 87 txPacket(sched_task_t *task)	Line 86 txPacket(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 {
rpc->call_argc = htons(rpc_srv_getVars(f, &arr));	rpc->call_argc = htons(io_arraySize(f->func_vars));
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, arr);	ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, f->func_vars);
/* Free return values */	/* Free return values */
io_clrVars(f->func_vars);	io_clrVars(f->func_vars);
if (ret == -1) {	if (ret == -1) {
Line 141 execCall(sched_task_t *task)	Line 140 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 161 execCall(sched_task_t *task)	Line 161 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 {
rpc->call_argc = htons(rpc_srv_getVars(f, NULL));	/* reply */
	rpc->call_argc = htons(io_arraySize(f->func_vars));
	}
}	}
}	}

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

Line 466 rpc_srv_dispatchVars(void *arg)	Line 467 rpc_srv_dispatchVars(void *arg)
free(buf);	free(buf);
return NULL;	return NULL;
}	}
	#endif

// -------------------------------------------------

/*	/*
* rpc_srv_initBLOBServer() - Init & create BLOB Server	* rpc_srv_initBLOBServer() - Init & create BLOB Server
Line 499 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 500 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();
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 (sa.sa.sa_family) {
case AF_INET:	case AF_INET:
sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);	sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
Line 517 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 517 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
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 553 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s	Line 552 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);
rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0);

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

	#if 0
/*	/*
* rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources	* rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources
*	*

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

Removed from v.1.9.2.6
changed lines
	Added in v.1.9.2.10