version 1.9.2.29, 2012/05/18 15:24:33
|
version 1.11.2.4, 2012/11/05 17:06:51
|
Line 64 closeClient(sched_task_t *task)
|
Line 64 closeClient(sched_task_t *task)
|
|
|
io_arrayDel(s->srv_clients, c->cli_id, 0); |
io_arrayDel(s->srv_clients, c->cli_id, 0); |
if (c) |
if (c) |
free(c); | io_free(c); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 135 execCall(sched_task_t *task)
|
Line 135 execCall(sched_task_t *task)
|
if (argc) { |
if (argc) { |
arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), |
arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), |
AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), |
AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), |
argc, 1); | argc, 42); |
if (!arr) { |
if (!arr) { |
rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError()); |
rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError()); |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
Line 185 rxPacket(sched_task_t *task)
|
Line 185 rxPacket(sched_task_t *task)
|
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
|
|
memset(buf, 0, AIT_LEN(&c->cli_buf)); | if (!off) |
| memset(buf, 0, AIT_LEN(&c->cli_buf)); |
| else |
| memmove(buf, buf + off, AIT_LEN(&c->cli_buf) - off); |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
if (rlen < 1) { |
if (rlen < 1) { |
/* close connection */ |
/* close connection */ |
Line 267 acceptClients(sched_task_t *task)
|
Line 270 acceptClients(sched_task_t *task)
|
(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++); |
(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++); |
if (c) /* no more free slots! */ |
if (c) /* no more free slots! */ |
goto end; |
goto end; |
c = malloc(sizeof(rpc_cli_t)); | c = io_malloc(sizeof(rpc_cli_t)); |
if (!c) { |
if (!c) { |
LOGERR; |
LOGERR; |
srv->srv_kill = 1; |
srv->srv_kill = 1; |
Line 318 closeBLOBClient(sched_task_t *task)
|
Line 321 closeBLOBClient(sched_task_t *task)
|
|
|
io_arrayDel(s->srv_blob.clients, c->cli_id, 0); |
io_arrayDel(s->srv_blob.clients, c->cli_id, 0); |
if (c) |
if (c) |
free(c); | io_free(c); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 421 rxBLOB(sched_task_t *task)
|
Line 424 rxBLOB(sched_task_t *task)
|
} |
} |
break; |
break; |
case unset: |
case unset: |
if (rpc_srv_unregisterBLOB(s, blob.hdr_var) == -1) { | if (rpc_srv_unregisterBLOB(s, ntohl(blob.hdr_var)) == -1) { |
blob.hdr_cmd = error; |
blob.hdr_cmd = error; |
blob.hdr_ret = RPC_ERROR(-1); |
blob.hdr_ret = RPC_ERROR(-1); |
} |
} |
Line 446 acceptBLOBClients(sched_task_t *task)
|
Line 449 acceptBLOBClients(sched_task_t *task)
|
rpc_cli_t *c = NULL; |
rpc_cli_t *c = NULL; |
register int i; |
register int i; |
socklen_t salen = sizeof(io_sockaddr_t); |
socklen_t salen = sizeof(io_sockaddr_t); |
|
#ifdef TCP_NOPUSH |
|
int n = 1; |
|
#endif |
|
|
/* check free slots for connect */ |
/* check free slots for connect */ |
for (i = 0; i < io_arraySize(srv->srv_blob.clients) && |
for (i = 0; i < io_arraySize(srv->srv_blob.clients) && |
(c = io_array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); |
(c = io_array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); |
if (c) /* no more free slots! */ |
if (c) /* no more free slots! */ |
goto end; |
goto end; |
c = malloc(sizeof(rpc_cli_t)); | c = io_malloc(sizeof(rpc_cli_t)); |
if (!c) { |
if (!c) { |
LOGERR; |
LOGERR; |
srv->srv_kill = srv->srv_blob.kill = 1; |
srv->srv_kill = srv->srv_blob.kill = 1; |
Line 474 acceptBLOBClients(sched_task_t *task)
|
Line 480 acceptBLOBClients(sched_task_t *task)
|
AIT_FREE_VAL(&c->cli_buf); |
AIT_FREE_VAL(&c->cli_buf); |
io_arrayDel(srv->srv_blob.clients, i, 42); |
io_arrayDel(srv->srv_blob.clients, i, 42); |
goto end; |
goto end; |
} else | } else { |
| #ifdef TCP_NOPUSH |
| setsockopt(c->cli_sock, IPPROTO_TCP, TCP_NOPUSH, &n, sizeof n); |
| #endif |
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); |
|
} |
|
|
schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); |
schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); |
end: |
end: |
Line 663 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 673 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
rpc_srv_blobFree(srv, b); |
rpc_srv_blobFree(srv, b); |
free(b); | io_free(b); |
} |
} |
|
|
schedEnd(&srv->srv_blob.root); |
schedEnd(&srv->srv_blob.root); |
Line 689 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 699 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
{ |
{ |
int n = 1; |
int n = 1; |
rpc_srv_t *srv = NULL; |
rpc_srv_t *srv = NULL; |
io_sockaddr_t sa; | io_sockaddr_t sa = IO_SOCKADDR_INIT; |
|
|
if (!concurentClients || !regProgID) { |
if (!concurentClients || !regProgID) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
Line 702 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 712 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
if (netBuf < RPC_MIN_BUFSIZ) |
if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
else |
else |
netBuf = io_align(netBuf, 1); /* align netBuf length */ | netBuf = io_align(netBuf, 2); /* align netBuf length */ |
|
|
#ifdef HAVE_SRANDOMDEV |
#ifdef HAVE_SRANDOMDEV |
srandomdev(); |
srandomdev(); |
Line 712 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 722 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
srandom((time(&tim) ^ getpid())); |
srandom((time(&tim) ^ getpid())); |
#endif |
#endif |
|
|
srv = malloc(sizeof(rpc_srv_t)); | srv = io_malloc(sizeof(rpc_srv_t)); |
if (!srv) { |
if (!srv) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 734 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 744 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
srv->srv_root = schedBegin(); |
srv->srv_root = schedBegin(); |
if (!srv->srv_root) { |
if (!srv->srv_root) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
free(srv); | io_free(srv); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 743 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 753 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
if (!srv->srv_clients) { |
if (!srv->srv_clients) { |
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); |
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); |
schedEnd(&srv->srv_root); |
schedEnd(&srv->srv_root); |
free(srv); | io_free(srv); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 753 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 763 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
LOGERR; |
LOGERR; |
io_arrayDestroy(&srv->srv_clients); |
io_arrayDestroy(&srv->srv_clients); |
schedEnd(&srv->srv_root); |
schedEnd(&srv->srv_root); |
free(srv); | io_free(srv); |
return NULL; |
return NULL; |
} |
} |
if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { |
if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { |
Line 782 err: /* error condition */
|
Line 792 err: /* error condition */
|
close(srv->srv_server.cli_sock); |
close(srv->srv_server.cli_sock); |
io_arrayDestroy(&srv->srv_clients); |
io_arrayDestroy(&srv->srv_clients); |
schedEnd(&srv->srv_root); |
schedEnd(&srv->srv_root); |
free(srv); | io_free(srv); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 805 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 815 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
(*psrv)->srv_kill = 1; |
(*psrv)->srv_kill = 1; |
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
free(*psrv); | io_free(*psrv); |
*psrv = NULL; |
*psrv = NULL; |
} |
} |
|
|
Line 828 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 838 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
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 867 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 876 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
TAILQ_REMOVE(&srv->srv_funcs, f, func_node); |
TAILQ_REMOVE(&srv->srv_funcs, f, func_node); |
|
|
AIT_FREE_VAL(&f->func_name); |
AIT_FREE_VAL(&f->func_name); |
free(f); | io_free(f); |
} |
} |
|
|
schedEnd(&srv->srv_root); |
schedEnd(&srv->srv_root); |