version 1.11, 2012/07/22 20:44:13
|
version 1.11.2.4, 2012/11/05 17:06:51
|
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 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) && |
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 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 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()); |