version 1.17.4.1, 2013/08/20 23:37:43
|
version 1.18.2.1, 2013/08/23 13:13:07
|
Line 74 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 127 _allocClient(rpc_srv_t * __restrict srv, sockaddr_t *
|
Line 127 _allocClient(rpc_srv_t * __restrict srv, sockaddr_t *
|
} |
} |
|
|
/* alloc empty buffer */ |
/* 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 167 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); |
| struct pollfd pfd; |
|
|
/* 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) { |
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 197 txPacket(sched_task_t *task)
|
Line 198 txPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
rpc->call_len = htons(wlen); | rpc->call_len = htonl(wlen); |
|
|
#if 0 |
#if 0 |
/* calculate CRC */ |
/* calculate CRC */ |
Line 206 txPacket(sched_task_t *task)
|
Line 207 txPacket(sched_task_t *task)
|
#endif |
#endif |
|
|
/* send reply */ |
/* send reply */ |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); | pfd.fd = TASK_FD(task); |
if (ret == -1 || ret != wlen) { | pfd.events = POLLOUT; |
/* close connection */ | for (; wlen > 0; wlen -= ret, buf += ret) { |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
TASK_ARG(task), 0, NULL, 0); | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
| if (ret) |
| LOGERR; |
| else |
| rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
| |
| /* close connection */ |
| schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| TASK_ARG(task), 0, NULL, 0); |
| return NULL; |
| } |
| ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); |
| printf("...ret=%d %s %d\n", ret, strerror(errno), wlen); |
| if (ret == -1) { |
| /* close connection */ |
| schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| TASK_ARG(task), 0, NULL, 0); |
| return NULL; |
| } |
} |
} |
|
|
return NULL; |
return NULL; |
Line 223 execCall(sched_task_t *task)
|
Line 242 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 244 execCall(sched_task_t *task)
|
Line 263 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 276 rxPacket(sched_task_t *task)
|
Line 296 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; |
| struct pollfd pfd; |
|
|
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"); | pfd.fd = TASK_FD(task); |
| pfd.events = POLLIN | POLLPRI; |
/* reminder received previous bytes ;) */ | for (; len > 0; len -= rlen, buf += rlen) { |
schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), | if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
TASK_FD(task), TASK_DATA(task), rlen); | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
return NULL; | if (rlen) |
} else | LOGERR; |
rpc = (struct tagRPCCall*) (buf + off); | else |
| rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
len = ntohs(rpc->call_len); | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
rlen -= len; | TASK_ARG(task), 0, NULL, 0); |
| return NULL; |
/* check RPC packet lengths */ | } |
if (rlen < 0 || len < sizeof(struct tagRPCCall)) { | rlen = recv(TASK_FD(task), buf, len, 0); |
rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length"); | if (rlen == -1) { |
/* skip entire packet */ | /* close connection */ |
break; | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| TASK_ARG(task), 0, NULL, 0); |
| return NULL; |
| } |
} |
} |
|
} |
|
|
#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 393 txUDPPacket(sched_task_t *task)
|
Line 415 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[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, wlen = sizeof(struct tagRPCCall); |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
Line 402 txUDPPacket(sched_task_t *task)
|
Line 424 txUDPPacket(sched_task_t *task)
|
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); |
|
|
/* 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) { |
Line 415 txUDPPacket(sched_task_t *task)
|
Line 434 txUDPPacket(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, 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 428 txUDPPacket(sched_task_t *task)
|
Line 448 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 486 rxUDPPacket(sched_task_t *task)
|
Line 506 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 512 rxUDPPacket(sched_task_t *task)
|
Line 532 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 */ |