version 1.23.6.5, 2014/12/18 00:28:47
|
version 1.23.6.6, 2014/12/18 00:50:06
|
Line 645 txBPFPacket(sched_task_t *task)
|
Line 645 txBPFPacket(sched_task_t *task)
|
rpc_func_t *f = NULL; |
rpc_func_t *f = NULL; |
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, len, wlen = sizeof(struct tagRPCCall); |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct pollfd pfd; | struct ether_header *eh; |
| ait_val_t b = AIT_VAL_INIT; |
|
|
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 662 txBPFPacket(sched_task_t *task)
|
Line 663 txBPFPacket(sched_task_t *task)
|
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
} else { |
} else { |
/* calc estimated length */ |
/* calc estimated length */ |
estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; | len = ait_resideVars(RPC_RETVARS(c)) + wlen; |
if (estlen > AIT_LEN(&c->cli_buf)) | if (len > AIT_LEN(&c->cli_buf)) |
AIT_RE_BUF(&c->cli_buf, estlen); | AIT_RE_BUF(&c->cli_buf, len); |
buf = AIT_GET_BUF(&c->cli_buf); |
buf = AIT_GET_BUF(&c->cli_buf); |
rpc = (struct tagRPCCall*) buf; |
rpc = (struct tagRPCCall*) buf; |
|
|
Line 673 txBPFPacket(sched_task_t *task)
|
Line 674 txBPFPacket(sched_task_t *task)
|
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, |
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, |
RPC_RETVARS(c)); |
RPC_RETVARS(c)); |
/* Free return values */ |
/* Free return values */ |
ait_freeVars(&c->cli_vars); | ait_freeVars(&RPC_RETVARS(c)); |
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; |
Line 691 txBPFPacket(sched_task_t *task)
|
Line 692 txBPFPacket(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 */ |
pfd.fd = TASK_FD(task); | AIT_SET_BUF(&b, NULL, MIN(wlen, s->srv_netbuf) + ETHER_HDR_LEN); |
pfd.events = POLLOUT; | eh = (struct ether_header*) AIT_GET_BUF(&b); |
for (; wlen > 0; wlen -= ret, buf += ret) { | memcpy(eh->ether_dhost, LLADDR(&c->cli_sa.sdl), ETHER_ADDR_LEN); |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || | eh->ether_type = htons(RPC_DEFPORT); |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { | memcpy(eh + 1, buf, MIN(wlen, s->srv_netbuf)); |
if (ret) | |
LOGERR; | ret = write(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); |
else | AIT_FREE_VAL(&b); |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); | 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], |
TASK_ARG(task), 0, NULL, 0); | TASK_ARG(task), 0, NULL, 0); |
return NULL; | return NULL; |
} | |
ret = write(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf)); | |
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; |