version 1.18, 2013/08/22 15:31:09
|
version 1.18.2.1, 2013/08/23 13:13:07
|
Line 164 txPacket(sched_task_t *task)
|
Line 164 txPacket(sched_task_t *task)
|
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
int ret, estlen, wlen = sizeof(struct tagRPCCall); |
int ret, estlen, wlen = sizeof(struct tagRPCCall); |
|
struct pollfd pfd; |
|
|
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 188 txPacket(sched_task_t *task)
|
Line 189 txPacket(sched_task_t *task)
|
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 205 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 282 rxPacket(sched_task_t *task)
|
Line 302 rxPacket(sched_task_t *task)
|
#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*) buf; |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
|
struct pollfd pfd; |
|
|
memset(buf, 0, sizeof(struct tagRPCCall)); |
memset(buf, 0, sizeof(struct tagRPCCall)); |
rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), 0); |
rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), 0); |
Line 302 rxPacket(sched_task_t *task)
|
Line 323 rxPacket(sched_task_t *task)
|
if (len) { |
if (len) { |
/* get next part of packet */ |
/* get next part of packet */ |
memset(buf, 0, len); |
memset(buf, 0, len); |
rlen = recv(TASK_FD(task), buf, len, 0); | pfd.fd = TASK_FD(task); |
if (rlen == -1) { | pfd.events = POLLIN | POLLPRI; |
/* close connection */ | for (; len > 0; len -= rlen, buf += rlen) { |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
TASK_ARG(task), 0, NULL, 0); | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
return NULL; | 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; |
| } |
| 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; |
| } |
} |
} |
} |
} |
|
|