version 1.16.2.3, 2013/07/15 14:54:40
|
version 1.17.6.3, 2013/08/22 13:09:53
|
Line 161 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[USHRT_MAX] = { 0 }; | u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
int ret, wlen = sizeof(struct tagRPCCall); | int ret, estlen, wlen = sizeof(struct tagRPCCall); |
|
|
/* copy RPC header */ |
|
memcpy(buf, TASK_DATA(task), wlen); |
|
|
|
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 { |
|
/* calc estimated length */ |
|
estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; |
|
if (estlen > AIT_LEN(&c->cli_buf)) |
|
AIT_RE_BUF(&c->cli_buf, estlen); |
|
buf = AIT_GET_BUF(&c->cli_buf); |
|
|
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, sizeof buf - wlen, RPC_RETVARS(c)); | ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_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) { |
Line 191 txPacket(sched_task_t *task)
|
Line 196 txPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
rpc->call_len = htons(wlen); | rpc->call_len = htonl(wlen); |
|
|
#if 0 |
#if 0 |
/* calculate CRC */ |
/* calculate CRC */ |
Line 217 execCall(sched_task_t *task)
|
Line 222 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 = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
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 + sizeof(struct tagRPCCall), |
arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), |
AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), | AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42); |
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 238 execCall(sched_task_t *task)
|
Line 243 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 270 rxPacket(sched_task_t *task)
|
Line 276 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, estlen; |
u_short off = TASK_DATLEN(task); | |
#if 0 |
#if 0 |
u_short crc; |
u_short crc; |
#endif |
#endif |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc; | struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
|
|
if (!off) | memset(buf, 0, sizeof(struct tagRPCCall)); |
memset(buf, 0, AIT_LEN(&c->cli_buf)); | rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), 0); |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); | if (rlen < sizeof(struct tagRPCCall)) { |
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 { |
} else { |
rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ | estlen = ntohl(rpc->call_len); |
off = 0; /* process buffer from start offset == 0 */ | if (estlen > AIT_LEN(&c->cli_buf)) |
| AIT_RE_BUF(&c->cli_buf, estlen); |
| rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); |
| buf = AIT_GET_BUF(&c->cli_buf) + sizeof(struct tagRPCCall); |
| len = estlen - sizeof(struct tagRPCCall); |
} |
} |
|
|
do { | if (len) { |
/* check RPC packet */ | /* get next part of packet */ |
if (rlen < sizeof(struct tagRPCCall)) { | memset(buf, 0, len); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); | rlen = recv(TASK_FD(task), buf, len, 0); |
| if (rlen == -1) { |
/* reminder received previous bytes ;) */ | /* close connection */ |
schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
TASK_FD(task), TASK_DATA(task), rlen); | TASK_ARG(task), 0, NULL, 0); |
return NULL; |
return NULL; |
} else |
|
rpc = (struct tagRPCCall*) (buf + off); |
|
|
|
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; |
|
} |
} |
|
} |
|
|
#if 0 |
#if 0 |
/* check integrity of packet */ | /* check integrity of packet */ |
crc = ntohs(rpc->call_crc); | crc = ntohs(rpc->call_crc); |
rpc->call_crc ^= rpc->call_crc; | rpc->call_crc ^= rpc->call_crc; |
if (crc != crcFletcher16((u_short*) rpc, len / 2)) { | if (crc != crcFletcher16((u_short*) rpc, len / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); | rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
| return NULL; |
off += len; | } |
/* try next packet remaining into buffer */ | |
continue; | |
} | |
#endif |
#endif |
|
|
noreply = RPC_CHK_NOREPLY(rpc); | noreply = RPC_CHK_NOREPLY(rpc); |
|
|
/* check RPC packet session info */ | /* check RPC packet session info */ |
if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { | if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC 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, TASK_ARG(task), off, NULL, 0); | |
} | |
|
|
/* 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); |
| } |
|
|
off += len; | /* send RPC reply */ |
} while (rlen > 0); | if (!noreply) |
| schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], |
| TASK_ARG(task), TASK_FD(task), rpc, len); |
|
|
/* 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 422 txUDPPacket(sched_task_t *task)
|
Line 415 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 480 rxUDPPacket(sched_task_t *task)
|
Line 473 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 506 rxUDPPacket(sched_task_t *task)
|
Line 499 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 629 rxBLOB(sched_task_t *task)
|
Line 624 rxBLOB(sched_task_t *task)
|
break; |
break; |
case set: |
case set: |
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), |
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), |
ntohl(blob.hdr_ret), task))) { | ntohl(blob.hdr_ret)))) { |
/* set new BLOB variable for reply :) */ |
/* set new BLOB variable for reply :) */ |
blob.hdr_var = htonl(b->blob_var); |
blob.hdr_var = htonl(b->blob_var); |
|
|
Line 646 rxBLOB(sched_task_t *task)
|
Line 641 rxBLOB(sched_task_t *task)
|
blob.hdr_cmd = error; |
blob.hdr_cmd = error; |
blob.hdr_ret = RPC_ERROR(-1); |
blob.hdr_ret = RPC_ERROR(-1); |
} |
} |
|
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, |
|
(void*) (intptr_t) ntohl(blob.hdr_var), NULL); |
|
break; |
break; |
default: |
default: |
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); |
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); |
Line 664 end:
|
Line 656 end:
|
} |
} |
|
|
static void * |
static void * |
|
flushBLOB(sched_task_t *task) |
|
{ |
|
rpc_srv_t *srv = TASK_ARG(task); |
|
rpc_blob_t *b, *tmp; |
|
|
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedSignalSelf(task); |
|
return NULL; |
|
} |
|
|
|
static void * |
acceptBLOBClients(sched_task_t *task) |
acceptBLOBClients(sched_task_t *task) |
{ |
{ |
rpc_srv_t *srv = TASK_ARG(task); |
rpc_srv_t *srv = TASK_ARG(task); |
Line 837 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 846 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
return; |
return; |
|
|
srv->srv_blob.kill = 1; |
srv->srv_blob.kill = 1; |
|
|
|
schedEnd(&srv->srv_blob.root); |
} |
} |
|
|
/* |
/* |
Line 863 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 874 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
|
schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0); |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
Line 873 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 885 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
/* main rpc loop */ |
/* main rpc loop */ |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
|
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
/* close all clients connections & server socket */ |
/* close all clients connections & server socket */ |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
Line 889 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 909 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
|
|
close(srv->srv_blob.server.cli_sock); |
close(srv->srv_blob.server.cli_sock); |
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedEnd(&srv->srv_blob.root); |
|
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
return 0; |
return 0; |
} |
} |
Line 1040 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 1051 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
return; |
return; |
|
|
/* if send kill to blob server */ |
/* if send kill to blob server */ |
if (!(*psrv)->srv_blob.kill) | rpc_srv_endBLOBServer(*psrv); |
rpc_srv_endBLOBServer(*psrv); | |
|
|
(*psrv)->srv_kill = 1; |
(*psrv)->srv_kill = 1; |
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
|
schedEnd(&(*psrv)->srv_root); |
|
|
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
e_free(*psrv); |
e_free(*psrv); |
*psrv = NULL; |
*psrv = NULL; |
Line 1114 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1126 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
srv->srv_funcs.avlh_root = NULL; |
srv->srv_funcs.avlh_root = NULL; |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
|
|
schedEnd(&srv->srv_root); |
|
return 0; |
return 0; |
} |
} |
|
|