version 1.10.2.1, 2012/05/28 08:02:00
|
version 1.11.2.2, 2012/08/29 14:54:57
|
Line 421 rxBLOB(sched_task_t *task)
|
Line 421 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 446 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 477 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 689 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 696 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"); |