version 1.17.6.2, 2013/08/22 12:22:25
|
version 1.20.4.3, 2013/11/14 13:37:08
|
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); |
| struct pollfd pfd; |
| #ifdef TCP_SESSION_TIMEOUT |
| struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
/* copy RPC header */ | schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
memcpy(buf, TASK_DATA(task), wlen); | schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| TASK_ARG(task), ts, TASK_ARG(task), 0); |
| #endif |
|
|
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 177 txPacket(sched_task_t *task)
|
Line 182 txPacket(sched_task_t *task)
|
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 = (struct tagRPCCall*) 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 201 txPacket(sched_task_t *task)
|
Line 215 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); |
| 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 248 execCall(sched_task_t *task)
|
Line 278 execCall(sched_task_t *task)
|
argc = RPC_CHK_NOREPLY(rpc); |
argc = RPC_CHK_NOREPLY(rpc); |
rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr)); |
rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr)); |
if (rpc->call_rep.ret == htonl(-1)) { |
if (rpc->call_rep.ret == htonl(-1)) { |
rpc->call_rep.eno = RPC_ERROR(errno); | if (!rpc->call_rep.eno) { |
| LOGERR; |
| rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
| } |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
} else { |
} else { |
rpc->call_rep.eno ^= rpc->call_rep.eno; |
rpc->call_rep.eno ^= rpc->call_rep.eno; |
Line 272 rxPacket(sched_task_t *task)
|
Line 305 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; |
| #ifdef TCP_SESSION_TIMEOUT |
| struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
if (!off) | schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
memset(buf, 0, AIT_LEN(&c->cli_buf)); | schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); | TASK_ARG(task), ts, TASK_ARG(task), 0); |
if (rlen < 1) { | #endif |
| |
| memset(buf, 0, sizeof(struct tagRPCCall)); |
| rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK); |
| if (rlen < 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 { |
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); |
| len = estlen; |
} |
} |
|
|
do { | /* get next part of packet */ |
/* check RPC packet */ | memset(buf, 0, len); |
if (rlen < sizeof(struct tagRPCCall)) { | pfd.fd = TASK_FD(task); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); | pfd.events = POLLIN | POLLPRI; |
| for (; len > 0; len -= rlen, buf += rlen) { |
/* reminder received previous bytes ;) */ | if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
TASK_FD(task), TASK_DATA(task), rlen); | if (rlen) |
| LOGERR; |
| else |
| rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
| schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| TASK_ARG(task), 0, NULL, 0); |
return NULL; |
return NULL; |
} else |
|
rpc = (struct tagRPCCall*) (buf + off); |
|
|
|
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; |
|
} |
} |
|
rlen = recv(TASK_FD(task), buf, len, 0); |
|
if (rlen == -1) { |
|
/* close connection */ |
|
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_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, TASK_ARG(task), | schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), (int) noreply, rpc, len); |
(int) noreply, rpc, len); | } |
} | |
|
|
/* 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 362 acceptClients(sched_task_t *task)
|
Line 400 acceptClients(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; |
socklen_t salen = sizeof(sockaddr_t); |
socklen_t salen = sizeof(sockaddr_t); |
|
int sock; |
|
#ifdef TCP_SESSION_TIMEOUT |
|
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
#endif |
|
|
c = _allocClient(srv, NULL); |
c = _allocClient(srv, NULL); |
if (!c) | if (!c) { |
| EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); |
| if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { |
| shutdown(sock, SHUT_RDWR); |
| close(sock); |
| } |
goto end; |
goto end; |
|
} |
|
|
/* 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); |
Line 377 acceptClients(sched_task_t *task)
|
Line 425 acceptClients(sched_task_t *task)
|
} else |
} else |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
|
#ifdef TCP_SESSION_TIMEOUT |
|
/* armed timer for close stateless connection */ |
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); |
|
schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, |
|
ts, c, 0); |
|
#endif |
schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, |
schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, |
c->cli_sock, NULL, 0); |
c->cli_sock, NULL, 0); |
end: |
end: |
Line 391 txUDPPacket(sched_task_t *task)
|
Line 445 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 400 txUDPPacket(sched_task_t *task)
|
Line 454 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 413 txUDPPacket(sched_task_t *task)
|
Line 464 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 690 acceptBLOBClients(sched_task_t *task)
|
Line 742 acceptBLOBClients(sched_task_t *task)
|
rpc_cli_t *c = NULL; |
rpc_cli_t *c = NULL; |
register int i; |
register int i; |
socklen_t salen = sizeof(sockaddr_t); |
socklen_t salen = sizeof(sockaddr_t); |
|
int sock; |
#ifdef TCP_NOPUSH |
#ifdef TCP_NOPUSH |
int n = 1; |
int n = 1; |
#endif |
#endif |
Line 697 acceptBLOBClients(sched_task_t *task)
|
Line 750 acceptBLOBClients(sched_task_t *task)
|
/* check free slots for connect */ |
/* check free slots for connect */ |
for (i = 0; i < array_Size(srv->srv_blob.clients) && |
for (i = 0; i < array_Size(srv->srv_blob.clients) && |
(c = array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); |
(c = array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); |
if (c) /* no more free slots! */ | if (c) { /* no more free slots! */ |
| EVERBOSE(1, "BLOB client quota exceeded! Connection will be shutdown!\n"); |
| if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { |
| shutdown(sock, SHUT_RDWR); |
| close(sock); |
| } |
goto end; |
goto end; |
|
} |
|
|
c = e_malloc(sizeof(rpc_cli_t)); |
c = e_malloc(sizeof(rpc_cli_t)); |
if (!c) { |
if (!c) { |
LOGERR; |
LOGERR; |