version 1.7.2.3, 2012/03/29 00:40:59
|
version 1.8.2.3, 2012/05/11 08:49:43
|
Line 87 txPacket(sched_task_t *task)
|
Line 87 txPacket(sched_task_t *task)
|
|
|
/* calculate CRC */ |
/* calculate CRC */ |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2)); | 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); |
Line 200 rxPacket(sched_task_t *task)
|
Line 200 rxPacket(sched_task_t *task)
|
/* check integrity of packet */ |
/* check integrity of packet */ |
crc = ntohs(rpc->call_crc); |
crc = ntohs(rpc->call_crc); |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
if (crc != crcFletcher16((u_short*) (buf + off), | if (crc != crcFletcher16((u_short*) (buf + off), ntohs(rpc->call_len) / 2)) { |
io_align(ntohs(rpc->call_len), 1) / 2)) { | |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
|
|
off += ntohs(rpc->call_len); |
off += ntohs(rpc->call_len); |
Line 302 txBLOB(sched_task_t *task)
|
Line 301 txBLOB(sched_task_t *task)
|
|
|
/* calculate CRC */ |
/* calculate CRC */ |
blob->hdr_crc ^= blob->hdr_crc; |
blob->hdr_crc ^= blob->hdr_crc; |
blob->hdr_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2)); | blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
|
/* send reply */ |
/* send reply */ |
wlen = send(TASK_FD(task), buf, wlen, 0); |
wlen = send(TASK_FD(task), buf, wlen, 0); |
Line 364 rxBLOB(sched_task_t *task)
|
Line 363 rxBLOB(sched_task_t *task)
|
/* check integrity of packet */ |
/* check integrity of packet */ |
crc = ntohs(blob->hdr_crc); |
crc = ntohs(blob->hdr_crc); |
blob->hdr_crc ^= blob->hdr_crc; |
blob->hdr_crc ^= blob->hdr_crc; |
if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) { | if (crc != crcFletcher16((u_short*) buf, rlen / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), |
TASK_DATA(task), TASK_DATLEN(task)); |
TASK_DATA(task), TASK_DATLEN(task)); |
Line 580 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 579 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
} 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 622 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 619 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
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 634 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 630 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); |
|
|
|
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
|
|
while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY); |
|
pthread_mutex_destroy(&srv->srv_blob.mtx); |
|
|
|
/* at final, save disable BLOB service state */ |
/* at final, save disable BLOB service state */ |
srv->srv_blob.state = disable; |
srv->srv_blob.state = disable; |
} |
} |
Line 657 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 649 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; |
|
|
ioTRACE(RPC_TRACE_LEVEL); |
ioTRACE(RPC_TRACE_LEVEL); |
|
|
Line 669 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 660 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
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_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 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 693 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 685 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
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 854 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 843 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); |
Line 901 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 888 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 909 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 895 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 930 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 912 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; |
|
|
ioTRACE(RPC_TRACE_LEVEL); |
ioTRACE(RPC_TRACE_LEVEL); |
|
|
Line 942 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 923 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
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, SOMAXCONN) == -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 969 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 951 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
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 1023 rpc_srv_execCall(rpc_func_t * __restrict call, struct
|
Line 1002 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; |