version 1.17.4.4, 2013/08/21 11:41:15
|
version 1.17.6.2, 2013/08/22 12:22:25
|
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 98 rpc_freeCli(rpc_cli_t * __restrict c)
|
Line 74 rpc_freeCli(rpc_cli_t * __restrict c)
|
|
|
schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL); |
schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL); |
|
|
/* free buffer(s) */ | /* free buffer */ |
ait_freeVars(&c->cli_buf); | AIT_FREE_VAL(&c->cli_buf); |
|
|
array_Del(s->srv_clients, c->cli_id, 0); |
array_Del(s->srv_clients, c->cli_id, 0); |
if (c) |
if (c) |
Line 150 _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; |
} |
} |
|
|
/* init buffer(s) */ | /* alloc empty buffer */ |
c->cli_buf = ait_allocVars(1); | AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); |
if (!c->cli_buf) { | |
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); | |
array_Del(srv->srv_clients, n, 42); | |
return NULL; | |
} else | |
AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); | |
} |
} |
|
|
return c; |
return c; |
Line 191 txPacket(sched_task_t *task)
|
Line 161 txPacket(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; |
rpc_func_t *f = NULL; |
rpc_func_t *f = NULL; |
u_char *buf; | u_char buf[USHRT_MAX] = { 0 }; |
struct tagRPCCall *rpc; | struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
int ret, wlen = sizeof(struct tagRPCCall); |
int ret, wlen = sizeof(struct tagRPCCall); |
int len = sizeof(struct tagRPCCall) + ntohl(rpc->call_len); |
|
|
|
buf = e_malloc(len); | /* copy RPC header */ |
if (!buf) { | memcpy(buf, TASK_DATA(task), wlen); |
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); | |
return NULL; | |
} else { | |
/* copy RPC header */ | |
memcpy(buf, TASK_DATA(task), wlen); | |
rpc = (struct tagRPCCall*) buf; | |
} | |
|
|
if (rpc->call_argc) { |
if (rpc->call_argc) { |
f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); |
f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); |
Line 217 txPacket(sched_task_t *task)
|
Line 179 txPacket(sched_task_t *task)
|
} else { |
} else { |
rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); |
rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); |
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
ret = ait_vars2buffer(buf + wlen, len - wlen, RPC_RETVARS(c)); | ret = ait_vars2buffer(buf + wlen, sizeof buf - wlen, RPC_RETVARS(c)); |
/* Free return values */ |
/* Free return values */ |
ait_freeVars(&c->cli_vars); |
ait_freeVars(&c->cli_vars); |
if (ret == -1) { |
if (ret == -1) { |
rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); |
rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); |
|
|
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 233 txPacket(sched_task_t *task)
|
Line 194 txPacket(sched_task_t *task)
|
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
|
|
|
#if 0 |
|
/* calculate CRC */ |
|
rpc->call_crc ^= rpc->call_crc; |
|
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
#endif |
|
|
/* send reply */ |
/* send reply */ |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
if (ret == -1 || ret != wlen) { |
if (ret == -1 || ret != wlen) { |
Line 251 execCall(sched_task_t *task)
|
Line 218 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 = getBuffer(c); | u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc = getHeader(c); | struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
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, ntohl(rpc->call_len), argc, 42); | arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), |
| AIT_LEN(&c->cli_buf) - 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()); |
|
|
Line 305 rxPacket(sched_task_t *task)
|
Line 273 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; |
ait_val_t *bufz = array(c->cli_buf, 0, ait_val_t*); | u_short off = TASK_DATLEN(task); |
u_char *buf = (u_char*) AIT_GET_BUF(bufz); | #if 0 |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; | u_short crc; |
| #endif |
| u_char *buf = AIT_GET_BUF(&c->cli_buf); |
| struct tagRPCCall *rpc; |
|
|
memset(buf, 0, AIT_LEN(bufz)); | if (!off) |
/* 1st buffer is last */ | memset(buf, 0, AIT_LEN(&c->cli_buf)); |
RPC_CLR_NEXTBUF(c); | rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
| |
/* 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 { |
buf += sizeof(struct tagRPCCall); | rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ |
len = ntohl(rpc->call_len); | off = 0; /* process buffer from start offset == 0 */ |
} |
} |
|
|
if (len > (AIT_LEN(bufz) - sizeof(struct tagRPCCall))) { | do { |
/* add extra buffer */ | /* check RPC packet */ |
if (!(bufz = ait_getVars(&c->cli_buf, 1))) { | if (rlen < sizeof(struct tagRPCCall)) { |
/* close connection */ | rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | |
TASK_ARG(task), 0, NULL, 0); | /* reminder received previous bytes ;) */ |
| schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), |
| TASK_FD(task), TASK_DATA(task), rlen); |
return NULL; |
return NULL; |
} else { | } else |
AIT_SET_BUFSIZ(bufz, 0, len); | rpc = (struct tagRPCCall*) (buf + off); |
buf = AIT_GET_BUF(bufz); | |
| len = ntohl(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); |
|
} |
|
|
|
/* read payload */ | #if 0 |
rlen = recv(TASK_FD(task), buf, len, 0); | /* check integrity of packet */ |
if (rlen < len) { | crc = ntohs(rpc->call_crc); |
/* close connection */ | rpc->call_crc ^= rpc->call_crc; |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | if (crc != crcFletcher16((u_short*) rpc, len / 2)) { |
TASK_ARG(task), 0, NULL, 0); | rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
return NULL; | |
} | |
|
|
noreply = RPC_CHK_NOREPLY(rpc); | off += len; |
| /* try next packet remaining into buffer */ |
| continue; |
| } |
| #endif |
|
|
/* check RPC packet session info */ | noreply = RPC_CHK_NOREPLY(rpc); |
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { | |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); | |
|
|
rpc->call_argc ^= rpc->call_argc; | /* check RPC packet session info */ |
rpc->call_rep.ret = RPC_ERROR(-1); | if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { |
rpc->call_rep.eno = RPC_ERROR(errno); | rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
} else { | |
/* execute RPC call */ | |
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), noreply, rpc, len); | |
} | |
|
|
/* send RPC reply */ | rpc->call_argc ^= rpc->call_argc; |
if (!noreply) | rpc->call_rep.ret = RPC_ERROR(-1); |
schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], | rpc->call_rep.eno = RPC_ERROR(errno); |
TASK_ARG(task), TASK_FD(task), rpc, len); | } else { |
| /* execute RPC call */ |
| schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), |
| (int) noreply, rpc, len); |
| } |
|
|
|
/* send RPC reply */ |
|
if (!noreply) |
|
schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], |
|
TASK_ARG(task), TASK_FD(task), rpc, len); |
|
|
|
off += len; |
|
} while (rlen > 0); |
|
|
/* lets get next packet */ |
/* lets get next packet */ |
schedReadSelf(task); | schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 394 acceptClients(sched_task_t *task)
|
Line 371 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_freeVars(&c->cli_buf); | AIT_FREE_VAL(&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 449 txUDPPacket(sched_task_t *task)
|
Line 426 txUDPPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
rpc->call_len = htons(wlen); | rpc->call_len = htonl(wlen); |
|
|
/* calculate CRC */ |
/* calculate CRC */ |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
Line 507 rxUDPPacket(sched_task_t *task)
|
Line 484 rxUDPPacket(sched_task_t *task)
|
} else |
} else |
rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); |
rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); |
|
|
len = ntohs(rpc->call_len); | len = ntohl(rpc->call_len); |
rlen -= len; |
rlen -= len; |
|
|
/* check RPC packet lengths */ |
/* check RPC packet lengths */ |
Line 533 rxUDPPacket(sched_task_t *task)
|
Line 510 rxUDPPacket(sched_task_t *task)
|
/* check RPC packet session info */ |
/* check RPC packet session info */ |
if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { |
if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
|
|
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(errno); |
rpc->call_rep.eno = RPC_ERROR(errno); |
} else { |
} else { |
/* execute RPC call */ |
/* execute RPC call */ |
schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0); | schedEvent(TASK_ROOT(task), execCall, c, |
| (int) noreply, rpc, len); |
} |
} |
|
|
/* send RPC reply */ |
/* send RPC reply */ |
Line 563 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(s) */ | /* free buffer */ |
ait_freeVars(&c->cli_buf); | AIT_FREE_VAL(&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 732 acceptBLOBClients(sched_task_t *task)
|
Line 711 acceptBLOBClients(sched_task_t *task)
|
c->cli_parent = srv; |
c->cli_parent = srv; |
} |
} |
|
|
/* init buffer(s) */ | /* alloc empty buffer */ |
c->cli_buf = ait_allocVars(1); | AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); |
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_freeVars(&c->cli_buf); | AIT_FREE_VAL(&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 939 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 912 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_freeVars(&c->cli_buf); | AIT_FREE_VAL(&c->cli_buf); |
} |
} |
array_Del(srv->srv_blob.clients, i, 42); |
array_Del(srv->srv_blob.clients, i, 42); |
} |
} |
Line 1145 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1118 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_freeVars(&c->cli_buf); | AIT_FREE_VAL(&c->cli_buf); |
} |
} |
array_Del(srv->srv_clients, i, 42); |
array_Del(srv->srv_clients, i, 42); |
} |
} |