version 1.9.2.5, 2012/05/15 16:10:58
|
version 1.9.2.6, 2012/05/15 20:49:25
|
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_FD, (void*) c->cli_sock, NULL); | schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); |
|
|
/* close client socket */ |
/* close client socket */ |
if (TASK_VAL(task)) |
if (TASK_VAL(task)) |
Line 81 txPacket(sched_task_t *task)
|
Line 81 txPacket(sched_task_t *task)
|
memcpy(buf, TASK_DATA(task), wlen); |
memcpy(buf, TASK_DATA(task), wlen); |
|
|
if (rpc->call_argc) { |
if (rpc->call_argc) { |
f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)); | f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); |
if (!f) { |
if (!f) { |
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); |
Line 143 execCall(sched_task_t *task)
|
Line 143 execCall(sched_task_t *task)
|
} |
} |
} |
} |
|
|
if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)))) { | 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); |
Line 265 acceptClients(sched_task_t *task)
|
Line 265 acceptClients(sched_task_t *task)
|
c->cli_parent = srv; |
c->cli_parent = srv; |
} |
} |
|
|
|
/* alloc empty buffer */ |
|
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(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); |
if (c->cli_sock == -1) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
|
AIT_FREE_VAL(&c->cli_buf); |
io_arrayDel(srv->srv_clients, i, 42); |
io_arrayDel(srv->srv_clients, i, 42); |
goto end; |
goto end; |
} else |
} else |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
/* alloc empty buffer */ |
|
AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); |
|
|
|
schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0); |
schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0); |
end: |
end: |
schedReadSelf(task); |
schedReadSelf(task); |
Line 707 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 708 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
* return: NULL == error or !=NULL bind and created RPC server instance |
* return: NULL == error or !=NULL bind and created RPC server instance |
*/ |
*/ |
rpc_srv_t * |
rpc_srv_t * |
rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, | rpc_srv_initServer(u_int regProgID, u_char regProcID, int concurentClients, |
int netBuf, const char *csHost, u_short Port) |
int netBuf, const char *csHost, u_short Port) |
{ |
{ |
int n = 1; |
int n = 1; |
Line 736 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 737 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
|
|
srv->srv_netbuf = netBuf; |
srv->srv_netbuf = netBuf; |
srv->srv_session.sess_version = RPC_VERSION; |
srv->srv_session.sess_version = RPC_VERSION; |
srv->srv_session.sess_timeout = DEF_RPC_TIMEOUT; |
|
srv->srv_session.sess_program = regProgID; |
srv->srv_session.sess_program = regProgID; |
srv->srv_session.sess_process = regProcID; |
srv->srv_session.sess_process = regProcID; |
|
|
Line 824 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 824 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
if (c) { |
if (c) { |
shutdown(c->cli_sock, SHUT_RDWR); |
shutdown(c->cli_sock, SHUT_RDWR); |
close(c->cli_sock); |
close(c->cli_sock); |
|
|
free(c); |
free(c); |
io_arrayDel((*psrv)->srv_clients, i, 0); |
io_arrayDel((*psrv)->srv_clients, i, 0); |
} |
} |
Line 836 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 837 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) { |
TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) { |
io_freeVars(&f->func_vars); |
io_freeVars(&f->func_vars); |
AIT_FREE_VAL(&f->func_name); |
AIT_FREE_VAL(&f->func_name); |
AIT_FREE_VAL(&f->func_file); |
|
free(f); |
free(f); |
} |
} |
|
|
Line 854 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 854 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
int |
int |
rpc_srv_loopServer(rpc_srv_t * __restrict srv) |
rpc_srv_loopServer(rpc_srv_t * __restrict srv) |
{ |
{ |
/* |
|
int ret; |
|
*/ |
|
|
|
if (!srv) { |
if (!srv) { |
rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server"); |
rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server"); |
return -1; |
return -1; |
} |
} |
|
|
|
fcntl(srv->srv_server.cli_sock, F_SETFL, |
|
fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) { |
if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -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); | |
|
|
if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) { |
if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
Line 893 int
|
Line 890 int
|
rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, |
rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, |
array_t * __restrict args) |
array_t * __restrict args) |
{ |
{ |
void *dl; |
|
rpc_callback_t func; |
rpc_callback_t func; |
int ret; |
|
|
|
if (!call || !rpc || !call->func_parent) { | if (!call || !rpc || !call->func_parent || !AIT_ADDR(&call->func_name)) { |
rpc_SetErr(EINVAL, "Invalid parameter can`t exec function"); |
rpc_SetErr(EINVAL, "Invalid parameter can`t exec function"); |
return -1; |
return -1; |
} |
} |
|
|
dl = dlopen(AIT_ADDR(&call->func_file), RTLD_LAZY | RTLD_GLOBAL); | func = AIT_GET_LIKE(&call->func_name, rpc_callback_t); |
if (!dl) { | return func(call, ntohs(rpc->call_argc), args); |
rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror()); | |
return -1; | |
} | |
| |
func = dlsym(dl, (const char*) AIT_GET_STR(&call->func_name)); | |
if (func) | |
ret = func(call, ntohs(rpc->call_argc), args); | |
else { | |
rpc_SetErr(ENOEXEC, "Can`t find function %s!", dlerror()); | |
ret = -1; | |
} | |
| |
dlclose(dl); | |
return ret; | |
} |
} |