version 1.17.4.1, 2013/08/20 23:37:43
|
version 1.17.4.2, 2013/08/20 23:49:54
|
Line 126 _allocClient(rpc_srv_t * __restrict srv, sockaddr_t *
|
Line 126 _allocClient(rpc_srv_t * __restrict srv, sockaddr_t *
|
c->cli_parent = srv; |
c->cli_parent = srv; |
} |
} |
|
|
/* alloc empty buffer */ | /* init buffer(s) */ |
c->cli_buf = ait_allocVars(1); |
c->cli_buf = ait_allocVars(1); |
if (!c->cli_buf) { |
if (!c->cli_buf) { |
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
Line 373 acceptClients(sched_task_t *task)
|
Line 373 acceptClients(sched_task_t *task)
|
c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); |
c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); |
if (c->cli_sock == -1) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&c->cli_buf); | ait_freeVars(&c->cli_buf); |
array_Del(srv->srv_clients, c->cli_id, 42); |
array_Del(srv->srv_clients, c->cli_id, 42); |
goto end; |
goto end; |
} else |
} else |
Line 542 rpc_freeBLOBCli(rpc_cli_t * __restrict c)
|
Line 542 rpc_freeBLOBCli(rpc_cli_t * __restrict c)
|
|
|
schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); |
schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); |
|
|
/* free buffer */ | /* free buffer(s) */ |
AIT_FREE_VAL(&c->cli_buf); | ait_freeVars(&c->cli_buf); |
|
|
array_Del(s->srv_blob.clients, c->cli_id, 0); |
array_Del(s->srv_blob.clients, c->cli_id, 0); |
if (c) |
if (c) |
Line 711 acceptBLOBClients(sched_task_t *task)
|
Line 711 acceptBLOBClients(sched_task_t *task)
|
c->cli_parent = srv; |
c->cli_parent = srv; |
} |
} |
|
|
/* alloc empty buffer */ | /* init buffer(s) */ |
AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); | c->cli_buf = ait_allocVars(1); |
| if (!c->cli_buf) { |
| rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
| array_Del(srv->srv_blob.clients, i, 42); |
| goto end; |
| } else |
| AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); |
|
|
/* accept client */ |
/* accept client */ |
c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); |
c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); |
if (c->cli_sock == -1) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&c->cli_buf); | ait_freeVars(&c->cli_buf); |
array_Del(srv->srv_blob.clients, i, 42); |
array_Del(srv->srv_blob.clients, i, 42); |
goto end; |
goto end; |
} else { |
} else { |
Line 912 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 918 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
close(c->cli_sock); |
close(c->cli_sock); |
|
|
schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); |
schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); |
AIT_FREE_VAL(&c->cli_buf); | ait_freeVars(&c->cli_buf); |
} |
} |
array_Del(srv->srv_blob.clients, i, 42); |
array_Del(srv->srv_blob.clients, i, 42); |
} |
} |
Line 1118 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1124 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
|
|
schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL); |
schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL); |
ait_freeVars(&RPC_RETVARS(c)); |
ait_freeVars(&RPC_RETVARS(c)); |
AIT_FREE_VAL(&c->cli_buf); | ait_freeVars(&c->cli_buf); |
} |
} |
array_Del(srv->srv_clients, i, 42); |
array_Del(srv->srv_clients, i, 42); |
} |
} |