version 1.20.4.3, 2013/11/14 13:37:08
|
version 1.21.2.1, 2013/11/14 22:29:31
|
Line 449 txUDPPacket(sched_task_t *task)
|
Line 449 txUDPPacket(sched_task_t *task)
|
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 }; |
|
struct pollfd pfd; |
|
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); |
schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
Line 485 txUDPPacket(sched_task_t *task)
|
Line 486 txUDPPacket(sched_task_t *task)
|
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
|
/* send reply */ |
/* send reply */ |
ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, | pfd.fd = TASK_FD(task); |
&c->cli_sa.sa, c->cli_sa.sa.sa_len); | pfd.events = POLLOUT; |
if (ret == -1 || ret != wlen) { | for (; wlen > 0; wlen -= ret, buf += ret) { |
/* close connection */ | if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
TASK_ARG(task), 0, NULL, 0); | 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 = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, |
| &c->cli_sa.sa, c->cli_sa.sa.sa_len); |
| 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; |