version 1.17.4.1, 2013/08/20 23:37:43
|
version 1.17.4.3, 2013/08/21 09:42:12
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
}; |
}; |
|
|
|
|
|
static inline u_char * |
|
getBuffer(rpc_cli_t * __restrict c) |
|
{ |
|
u_char *b = NULL; |
|
|
|
assert(c); |
|
|
|
if (RPC_ISNEXTBUF(c)) |
|
b = AIT_GET_BUF(array(c->cli_buf, 1, ait_val_t*)); |
|
else |
|
b = AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)) + |
|
sizeof(struct tagRPCCall); |
|
|
|
return b; |
|
} |
|
|
|
static inline struct tagRPCCall * |
|
getHeader(rpc_cli_t * __restrict c) |
|
{ |
|
assert(c); |
|
|
|
return (struct tagRPCCall*) AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)); |
|
} |
|
|
void |
void |
rpc_freeCli(rpc_cli_t * __restrict c) |
rpc_freeCli(rpc_cli_t * __restrict c) |
{ |
{ |
Line 126 _allocClient(rpc_srv_t * __restrict srv, sockaddr_t *
|
Line 150 _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 223 execCall(sched_task_t *task)
|
Line 247 execCall(sched_task_t *task)
|
rpc_srv_t *s = c->cli_parent; |
rpc_srv_t *s = c->cli_parent; |
rpc_func_t *f = NULL; |
rpc_func_t *f = NULL; |
array_t *arr = NULL; |
array_t *arr = NULL; |
u_char *buf = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task); | u_char *buf = getBuffer(c); |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; | struct tagRPCCall *rpc = getHeader(c); |
int argc = ntohs(rpc->call_argc); |
int argc = ntohs(rpc->call_argc); |
|
|
/* Go decapsulate variables ... */ |
/* Go decapsulate variables ... */ |
if (argc) { |
if (argc) { |
arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), | arr = ait_buffer2vars(buf, ntohl(rpc->call_len), argc, 42); |
AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), | |
argc, 42); | |
if (!arr) { |
if (!arr) { |
rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); |
rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); |
|
|
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
Line 244 execCall(sched_task_t *task)
|
Line 267 execCall(sched_task_t *task)
|
|
|
if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) { |
if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) { |
rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); |
rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); |
|
|
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
Line 277 rxPacket(sched_task_t *task)
|
Line 301 rxPacket(sched_task_t *task)
|
rpc_cli_t *c = TASK_ARG(task); |
rpc_cli_t *c = TASK_ARG(task); |
rpc_srv_t *s = c->cli_parent; |
rpc_srv_t *s = c->cli_parent; |
int len, rlen, noreply; |
int len, rlen, noreply; |
u_short off = TASK_DATLEN(task); | ait_val_t *bufz = array(c->cli_buf, 0, ait_val_t*); |
#if 0 | u_char *buf = (u_char*) AIT_GET_BUF(bufz); |
u_short crc; | struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
#endif | |
u_char *buf = AIT_GET_BUF(&c->cli_buf); | |
struct tagRPCCall *rpc; | |
|
|
if (!off) | memset(buf, 0, AIT_LEN(bufz)); |
memset(buf, 0, AIT_LEN(&c->cli_buf)); | /* 1st buffer is last */ |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); | RPC_CLR_NEXTBUF(c); |
| |
| /* read rpc header */ |
| rlen = recv(TASK_FD(task), rpc, MIN(sizeof(struct tagRPCCall), AIT_LEN(bufz)), 0); |
if (rlen < 1) { |
if (rlen < 1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
TASK_ARG(task), 0, NULL, 0); |
TASK_ARG(task), 0, NULL, 0); |
return NULL; |
return NULL; |
|
} else if (rlen < sizeof(struct tagRPCCall) || |
|
ntohl(rpc->call_len) < sizeof(struct tagRPCCall)) { |
|
/* close connection */ |
|
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
|
TASK_ARG(task), 0, NULL, 0); |
|
return NULL; |
} else { |
} else { |
rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ | buf += sizeof(struct tagRPCCall); |
off = 0; /* process buffer from start offset == 0 */ | len = ntohl(rpc->call_len); |
} |
} |
|
|
do { | if (len > (AIT_LEN(bufz) - sizeof(struct tagRPCCall))) { |
/* check RPC packet */ | /* add extra buffer */ |
if (rlen < sizeof(struct tagRPCCall)) { | if (!(bufz = ait_getVars(&c->cli_buf, 1))) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); | /* close connection */ |
| schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
/* reminder received previous bytes ;) */ | TASK_ARG(task), 0, NULL, 0); |
schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), | |
TASK_FD(task), TASK_DATA(task), rlen); | |
return NULL; |
return NULL; |
} else | } else { |
rpc = (struct tagRPCCall*) (buf + off); | AIT_SET_BUFSIZ(bufz, 0, len); |
| buf = AIT_GET_BUF(bufz); |
len = ntohs(rpc->call_len); | |
rlen -= len; | |
| |
/* check RPC packet lengths */ | |
if (rlen < 0 || len < sizeof(struct tagRPCCall)) { | |
rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length"); | |
/* skip entire packet */ | |
break; | |
} |
} |
|
/* buffer isnt last */ |
|
RPC_SET_NEXTBUF(c); |
|
} |
|
|
#if 0 | /* read payload */ |
/* check integrity of packet */ | rlen = recv(TASK_FD(task), buf, len, 0); |
crc = ntohs(rpc->call_crc); | if (rlen < len) { |
rpc->call_crc ^= rpc->call_crc; | /* close connection */ |
if (crc != crcFletcher16((u_short*) rpc, len / 2)) { | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); | TASK_ARG(task), 0, NULL, 0); |
| return NULL; |
| } |
|
|
off += len; | noreply = RPC_CHK_NOREPLY(rpc); |
/* try next packet remaining into buffer */ | |
continue; | |
} | |
#endif | |
|
|
noreply = RPC_CHK_NOREPLY(rpc); | /* check RPC packet session info */ |
| if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { |
| rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
|
|
/* check RPC packet session info */ | rpc->call_argc ^= rpc->call_argc; |
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { | rpc->call_rep.ret = RPC_ERROR(-1); |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); | rpc->call_rep.eno = RPC_ERROR(errno); |
rpc->call_argc ^= rpc->call_argc; | } else { |
rpc->call_rep.ret = RPC_ERROR(-1); | /* execute RPC call */ |
rpc->call_rep.eno = RPC_ERROR(errno); | schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), noreply, rpc, len); |
} else { | } |
/* execute RPC call */ | |
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, NULL, 0); | |
} | |
|
|
/* send RPC reply */ | /* send RPC reply */ |
if (!noreply) | if (!noreply) |
schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], | schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], |
TASK_ARG(task), TASK_FD(task), rpc, len); | TASK_ARG(task), TASK_FD(task), rpc, len); |
|
|
off += len; |
|
} while (rlen > 0); |
|
|
|
/* lets get next packet */ |
/* lets get next packet */ |
schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); | schedReadSelf(task); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 373 acceptClients(sched_task_t *task)
|
Line 390 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 559 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 728 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 935 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 1141 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); |
} |
} |