version 1.6.2.5, 2012/03/13 17:15:31
|
version 1.6.2.7, 2012/03/14 13:29:11
|
Line 59 txPacket(sched_task_t *task)
|
Line 59 txPacket(sched_task_t *task)
|
int ret, wlen = sizeof(struct tagRPCCall); |
int ret, wlen = sizeof(struct tagRPCCall); |
array_t *arr = NULL; |
array_t *arr = NULL; |
|
|
|
FTRACE(); |
|
|
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), ntohl(rpc->call_hash)); |
if (!f) { |
if (!f) { |
Line 80 txPacket(sched_task_t *task)
|
Line 82 txPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* calculate CRC */ |
|
rpc->call_crc ^= rpc->call_crc; |
|
rpc->call_crc = htons(crcFletcher16((u_short*) buf, ((wlen + 1) & ~1) / 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 87 txPacket(sched_task_t *task)
|
Line 93 txPacket(sched_task_t *task)
|
else if (ret != wlen) |
else if (ret != wlen) |
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); |
|
else |
|
LOGGER("Sended %d bytes", ret); |
|
|
/* lets get next packet */ |
/* lets get next packet */ |
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), |
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), |
Line 105 execCall(sched_task_t *task)
|
Line 113 execCall(sched_task_t *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); |
|
|
|
FTRACE(); |
|
|
/* Go decapsulate variables ... */ |
/* Go decapsulate variables ... */ |
if (!(rpc->call_req.flags & RPC_NOREPLY) && argc) { |
if (!(rpc->call_req.flags & RPC_NOREPLY) && argc) { |
arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), |
arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), |
Line 124 execCall(sched_task_t *task)
|
Line 134 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 { |
|
LOGGER("RPC function %s from module %s", AIT_GET_STR(&f->func_name), |
|
AIT_GET_STR(&f->func_file)); |
|
|
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); |
Line 150 rxPacket(sched_task_t *task)
|
Line 163 rxPacket(sched_task_t *task)
|
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
struct timespec ts; |
struct timespec ts; |
|
|
|
FTRACE(); |
|
|
memset(buf, 0, TASK_DATLEN(task)); |
memset(buf, 0, TASK_DATLEN(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) { |
Line 165 rxPacket(sched_task_t *task)
|
Line 180 rxPacket(sched_task_t *task)
|
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), |
schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), |
TASK_DATA(task), TASK_DATLEN(task)); |
TASK_DATA(task), TASK_DATLEN(task)); |
return NULL; |
return NULL; |
} | } else |
| LOGGER("Readed %d bytes", rlen); |
| |
if (rlen < sizeof(struct tagRPCCall)) { |
if (rlen < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); |
|
|
Line 224 rpc_srv_dispatchCall(void *arg)
|
Line 241 rpc_srv_dispatchCall(void *arg)
|
sched_root_task_t *root; |
sched_root_task_t *root; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
|
FTRACE(); |
|
|
if (!arg) { |
if (!arg) { |
rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client"); |
rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client"); |
return NULL; |
return NULL; |
Line 271 rpc_srv_dispatchVars(void *arg)
|
Line 290 rpc_srv_dispatchVars(void *arg)
|
u_char buf[sizeof(struct tagBLOBHdr)]; |
u_char buf[sizeof(struct tagBLOBHdr)]; |
struct tagBLOBHdr *blob; |
struct tagBLOBHdr *blob; |
|
|
|
FTRACE(); |
|
|
if (!arg) { |
if (!arg) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n"); |
return NULL; |
return NULL; |
Line 407 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 428 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
int n = 1; |
int n = 1; |
io_sockaddr_t sa; |
io_sockaddr_t sa; |
|
|
|
FTRACE(); |
|
|
if (!srv) { |
if (!srv) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
return -1; |
return -1; |
Line 421 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 444 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 461 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 470 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 505 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)); |
Line 511 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 534 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
register int i; |
register int i; |
rpc_blob_t *f; |
rpc_blob_t *f; |
|
|
|
FTRACE(); |
|
|
if (!srv) { |
if (!srv) { |
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); |
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); |
return; |
return; |
Line 522 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 547 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) | AIT_FREE_VAL(&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++) |
Line 566 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 590 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
pthread_attr_t attr; |
pthread_attr_t attr; |
|
|
|
FTRACE(); |
|
|
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, "Error:: Invalid parameter can`t start BLOB server ...\n"); |
return -1; |
return -1; |
Line 648 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 674 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
struct hostent *host = NULL; |
struct hostent *host = NULL; |
io_sockaddr_t sa; |
io_sockaddr_t sa; |
|
|
|
FTRACE(); |
|
|
if (!concurentClients || !regProgID || |
if (!concurentClients || !regProgID || |
(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
(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"); |
Line 774 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 802 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
register int i; |
register int i; |
rpc_func_t *f; |
rpc_func_t *f; |
|
|
|
FTRACE(); |
|
|
if (!psrv || !*psrv) { |
if (!psrv || !*psrv) { |
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; |
Line 830 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 860 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
pthread_attr_t attr; |
pthread_attr_t attr; |
|
|
|
FTRACE(); |
|
|
if (!srv) { |
if (!srv) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n"); |
return -1; |
return -1; |
Line 908 rpc_srv_execCall(rpc_func_t * __restrict call, struct
|
Line 940 rpc_srv_execCall(rpc_func_t * __restrict call, struct
|
void *dl; |
void *dl; |
rpc_callback_t func; |
rpc_callback_t func; |
int ret; |
int ret; |
|
|
|
FTRACE(); |
|
|
if (!call || !rpc || !call->func_parent) { |
if (!call || !rpc || !call->func_parent) { |
rpc_SetErr(EINVAL, "Invalid parameter can`t exec function"); |
rpc_SetErr(EINVAL, "Invalid parameter can`t exec function"); |