version 1.18.2.1, 2013/08/23 13:13:07
|
version 1.18.2.2, 2013/08/23 13:34:52
|
Line 180 txPacket(sched_task_t *task)
|
Line 180 txPacket(sched_task_t *task)
|
if (estlen > AIT_LEN(&c->cli_buf)) |
if (estlen > AIT_LEN(&c->cli_buf)) |
AIT_RE_BUF(&c->cli_buf, estlen); |
AIT_RE_BUF(&c->cli_buf, estlen); |
buf = AIT_GET_BUF(&c->cli_buf); |
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 */ |
Line 216 txPacket(sched_task_t *task)
|
Line 217 txPacket(sched_task_t *task)
|
LOGERR; |
LOGERR; |
else |
else |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
|
|
/* 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; |
} |
} |
ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); |
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) { |
if (ret == -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], |
Line 305 rxPacket(sched_task_t *task)
|
Line 304 rxPacket(sched_task_t *task)
|
struct pollfd pfd; |
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), MSG_PEEK); |
if (rlen < sizeof(struct tagRPCCall)) { |
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], |
Line 316 rxPacket(sched_task_t *task)
|
Line 315 rxPacket(sched_task_t *task)
|
if (estlen > AIT_LEN(&c->cli_buf)) |
if (estlen > AIT_LEN(&c->cli_buf)) |
AIT_RE_BUF(&c->cli_buf, estlen); |
AIT_RE_BUF(&c->cli_buf, estlen); |
rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); |
rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); |
buf = AIT_GET_BUF(&c->cli_buf) + sizeof(struct tagRPCCall); | buf = AIT_GET_BUF(&c->cli_buf); |
len = estlen - sizeof(struct tagRPCCall); | len = estlen; |
} |
} |
|
|
if (len) { | /* get next part of packet */ |
/* get next part of packet */ | memset(buf, 0, len); |
memset(buf, 0, len); | pfd.fd = TASK_FD(task); |
pfd.fd = TASK_FD(task); | pfd.events = POLLIN | POLLPRI; |
pfd.events = POLLIN | POLLPRI; | for (; len > 0; len -= rlen, buf += rlen) { |
for (; len > 0; len -= rlen, buf += rlen) { | if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { | if (rlen) |
if (rlen) | LOGERR; |
LOGERR; | else |
else | rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); | 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; | } |
} | rlen = recv(TASK_FD(task), buf, len, 0); |
rlen = recv(TASK_FD(task), buf, len, 0); | if (rlen == -1) { |
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; | |
} | |
} |
} |
} |
} |
|
|