version 1.17.4.8, 2013/08/21 15:28:16
|
version 1.17.6.1, 2013/08/22 11:55:45
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
}; |
}; |
|
|
|
|
ait_val_t * |
|
rpc_getBufVar(rpc_cli_t * __restrict c) |
|
{ |
|
return array(c->cli_buf, RPC_ISNEXTBUF(c), ait_val_t*); |
|
} |
|
|
|
u_char * |
|
rpc_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; |
|
} |
|
|
|
struct tagRPCCall * |
|
rpc_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 104 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 156 _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(2); | 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 197 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*) TASK_DATA(task); | 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()); | |
/* close connection */ | |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | |
TASK_ARG(task), 0, NULL, 0); | |
return NULL; | |
} else { | |
/* copy RPC header */ | |
memcpy(buf, rpc, 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)); |
if (!f) { |
if (!f) { |
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); |
} 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 242 txPacket(sched_task_t *task)
|
Line 193 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 250 txPacket(sched_task_t *task)
|
Line 207 txPacket(sched_task_t *task)
|
TASK_ARG(task), 0, NULL, 0); |
TASK_ARG(task), 0, NULL, 0); |
} |
} |
|
|
e_free(buf); |
|
return NULL; |
return NULL; |
} |
} |
|
|
Line 261 execCall(sched_task_t *task)
|
Line 217 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 = rpc_getBuffer(c); | u_char *buf = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task); |
struct tagRPCCall *rpc = 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) - 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 281 execCall(sched_task_t *task)
|
Line 238 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 315 rxPacket(sched_task_t *task)
|
Line 271 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); |
| if (rlen < 1) { |
/* read rpc header */ | |
rlen = recv(TASK_FD(task), rpc, MIN(sizeof(struct tagRPCCall), AIT_LEN(bufz)), 0); | |
if (rlen < sizeof(struct tagRPCCall) || | |
ntohl(rpc->call_len) < sizeof(struct tagRPCCall)) { | |
/* 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 { |
} 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_FREE_VAL(bufz); | rpc = (struct tagRPCCall*) (buf + off); |
AIT_SET_BUFSIZ(bufz, 0, len); | |
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 { | rpc->call_argc ^= rpc->call_argc; |
/* execute RPC call */ | rpc->call_rep.ret = RPC_ERROR(-1); |
schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), noreply, rpc, len); | rpc->call_rep.eno = RPC_ERROR(errno); |
} | } 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 */ |
schedReadSelf(task); | schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 400 acceptClients(sched_task_t *task)
|
Line 367 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 420 txUDPPacket(sched_task_t *task)
|
Line 387 txUDPPacket(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*) TASK_DATA(task); | 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); |
|
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
TASK_ARG(task), ts, TASK_ARG(task), 0); |
TASK_ARG(task), ts, TASK_ARG(task), 0); |
|
|
buf = e_malloc(len); | /* copy RPC header */ |
if (!buf) { | memcpy(buf, TASK_DATA(task), wlen); |
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); | |
/* close connection */ | |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | |
TASK_ARG(task), 0, NULL, 0); | |
return NULL; | |
} else { | |
/* copy RPC header */ | |
memcpy(buf, rpc, 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)); |
if (!f) { |
if (!f) { |
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); |
} 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 483 txUDPPacket(sched_task_t *task)
|
Line 437 txUDPPacket(sched_task_t *task)
|
TASK_ARG(task), 0, NULL, 0); |
TASK_ARG(task), 0, NULL, 0); |
} |
} |
|
|
e_free(buf); |
|
return NULL; |
return NULL; |
} |
} |
|
|
Line 493 rxUDPPacket(sched_task_t *task)
|
Line 446 rxUDPPacket(sched_task_t *task)
|
rpc_srv_t *srv = TASK_ARG(task); |
rpc_srv_t *srv = TASK_ARG(task); |
rpc_cli_t *c = NULL; |
rpc_cli_t *c = NULL; |
int len, rlen, noreply; |
int len, rlen, noreply; |
ait_val_t *bufz; | u_short crc, off = 0; |
u_char *buf = NULL; | u_char buf[USHRT_MAX + 1]; |
struct tagRPCCall rpcbuf, *rpc; | struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
sockaddr_t sa[2]; | sockaddr_t sa; |
socklen_t salen; |
socklen_t salen; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
memset(&rpcbuf, 0, sizeof rpcbuf); |
|
|
|
/* receive connect packet */ |
/* receive connect packet */ |
salen = sa[0].ss.ss_len = sizeof(sockaddr_t); | salen = sa.ss.ss_len = sizeof(sockaddr_t); |
rlen = recvfrom(TASK_FD(task), &rpcbuf, sizeof rpcbuf, 0, &sa[0].sa, &salen); | rlen = recvfrom(TASK_FD(task), buf, sizeof buf, 0, &sa.sa, &salen); |
if (rlen < sizeof(struct tagRPCCall) || ntohl(rpcbuf.call_len) < sizeof(struct tagRPCCall)) | if (rlen < 1) |
goto end; |
goto end; |
else |
|
len = ntohl(rpcbuf.call_len); |
|
|
|
buf = e_malloc(len); | c = _allocClient(srv, &sa); |
if (!buf) | |
goto end; | |
else | |
memset(buf, 0, len); | |
| |
/* read payload */ | |
salen = sa[1].ss.ss_len = sizeof(sockaddr_t); | |
rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa[1].sa, &salen); | |
if (rlen < len || memcmp(&sa[0], &sa[1], sizeof sa[0])) | |
goto end; | |
| |
c = _allocClient(srv, sa); | |
if (!c) |
if (!c) |
goto end; |
goto end; |
else { |
else { |
/* add extra buffer */ |
|
if (!(bufz = ait_getVars(&c->cli_buf, 1))) |
|
goto end; |
|
else { |
|
AIT_FREE_VAL(bufz); |
|
AIT_SET_BUFSIZ(bufz, 0, len); |
|
/* buffer isnt last */ |
|
RPC_SET_NEXTBUF(c); |
|
} |
|
|
|
rpc = rpc_getHeader(c); |
|
memcpy(rpc, &rpcbuf, sizeof(struct tagRPCCall)); |
|
memcpy(rpc_getBuffer(c), buf, len); |
|
|
|
c->cli_sock = TASK_FD(task); |
c->cli_sock = TASK_FD(task); |
memcpy(&c->cli_sa, sa, sizeof c->cli_sa); | memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); |
| memcpy(AIT_GET_BUF(&c->cli_buf), buf, AIT_LEN(&c->cli_buf)); |
/* armed timer for close stateless connection */ |
/* armed timer for close stateless connection */ |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); |
schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
c, ts, c, 0); |
c, ts, c, 0); |
} |
} |
|
|
/* check integrity of packet */ | do { |
if (ntohs(rpc->call_crc) != crcFletcher16((u_short*) buf, len / 2)) { | /* check RPC packet */ |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); | if (rlen < sizeof(struct tagRPCCall)) { |
goto end; | rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
} | break; |
| } else |
| rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); |
|
|
noreply = RPC_CHK_NOREPLY(rpc); | len = ntohl(rpc->call_len); |
| rlen -= len; |
|
|
/* check RPC packet session info */ | /* check RPC packet lengths */ |
if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { | if (rlen < 0 || len < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); | rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length"); |
| /* skip entire packet */ |
| break; |
| } |
|
|
rpc->call_argc ^= rpc->call_argc; | /* check integrity of packet */ |
rpc->call_rep.ret = RPC_ERROR(-1); | crc = ntohs(rpc->call_crc); |
rpc->call_rep.eno = RPC_ERROR(errno); | rpc->call_crc ^= rpc->call_crc; |
} else { | if (crc != crcFletcher16((u_short*) rpc, len / 2)) { |
/* execute RPC call */ | rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
schedEvent(TASK_ROOT(task), execCall, c, noreply, rpc, len); | |
} | |
|
|
/* send RPC reply */ | off += len; |
if (!noreply) | /* try next packet remaining into buffer */ |
schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], | continue; |
c, TASK_FD(task), rpc, len); | } |
| |
| noreply = RPC_CHK_NOREPLY(rpc); |
| |
| /* check RPC packet session info */ |
| if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { |
| rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
| rpc->call_argc ^= rpc->call_argc; |
| rpc->call_rep.ret = RPC_ERROR(-1); |
| rpc->call_rep.eno = RPC_ERROR(errno); |
| } else { |
| /* execute RPC call */ |
| schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0); |
| } |
| |
| /* send RPC reply */ |
| if (!noreply) |
| schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], |
| c, TASK_FD(task), rpc, len); |
| |
| off += len; |
| } while (rlen > 0); |
| |
end: |
end: |
if (buf) |
|
e_free(buf); |
|
schedReadSelf(task); |
schedReadSelf(task); |
return NULL; |
return NULL; |
} |
} |
Line 588 rpc_freeBLOBCli(rpc_cli_t * __restrict c)
|
Line 536 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 614 static void *
|
Line 562 static void *
|
txBLOB(sched_task_t *task) |
txBLOB(sched_task_t *task) |
{ |
{ |
rpc_cli_t *c = TASK_ARG(task); |
rpc_cli_t *c = TASK_ARG(task); |
u_char *buf = AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)); | u_char *buf = AIT_GET_BUF(&c->cli_buf); |
int wlen = sizeof(struct tagBLOBHdr); |
int wlen = sizeof(struct tagBLOBHdr); |
|
|
/* send reply */ |
/* send reply */ |
Line 706 rxBLOB(sched_task_t *task)
|
Line 654 rxBLOB(sched_task_t *task)
|
} |
} |
|
|
end: |
end: |
memcpy(AIT_ADDR(array(c->cli_buf, 0, ait_val_t*)), &blob, sizeof blob); | memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob); |
schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); |
schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); |
schedReadSelf(task); |
schedReadSelf(task); |
return NULL; |
return NULL; |
Line 757 acceptBLOBClients(sched_task_t *task)
|
Line 705 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 964 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 906 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 1170 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1112 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); |
} |
} |