version 1.23.6.3, 2014/12/17 01:30:01
|
version 1.23.6.6, 2014/12/18 00:50:06
|
Line 587 rxUDPPacket(sched_task_t *task)
|
Line 587 rxUDPPacket(sched_task_t *task)
|
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); |
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
c, 0, NULL, 0); |
c, 0, NULL, 0); |
return NULL; | goto end; |
} |
} |
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); |
rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); |
Line 595 rxUDPPacket(sched_task_t *task)
|
Line 595 rxUDPPacket(sched_task_t *task)
|
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
c, 0, NULL, 0); |
c, 0, NULL, 0); |
return NULL; | goto end; |
} |
} |
if (e_addrcmp(&c->cli_sa, &sa, 42)) |
if (e_addrcmp(&c->cli_sa, &sa, 42)) |
rlen ^= rlen; /* skip if arrive from different address */ |
rlen ^= rlen; /* skip if arrive from different address */ |
Line 607 rxUDPPacket(sched_task_t *task)
|
Line 607 rxUDPPacket(sched_task_t *task)
|
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; | /* close connection */ |
| schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
| c, 0, NULL, 0); |
| goto end; |
} |
} |
|
|
noreply = RPC_CHK_NOREPLY(rpc); |
noreply = RPC_CHK_NOREPLY(rpc); |
Line 642 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 659 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 670 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 688 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; |
Line 719 rxBPFPacket(sched_task_t *task)
|
Line 715 rxBPFPacket(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; |
int len, rlen, noreply, estlen; | int len, rlen, noreply; |
u_short crc; |
u_short crc; |
u_char *buf, b[sizeof(struct tagRPCCall)]; | struct tagRPCCall *rpc; |
struct tagRPCCall *rpc = (struct tagRPCCall*) b; | |
sockaddr_t sa; |
sockaddr_t sa; |
socklen_t salen; |
|
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct pollfd pfd; |
|
struct bpf_hdr *h; |
struct bpf_hdr *h; |
struct ether_header *eh; |
struct ether_header *eh; |
ait_val_t b = AIT_VAL_INIT; |
ait_val_t b = AIT_VAL_INIT; |
|
|
/* receive connect packet */ |
/* receive connect packet */ |
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
|
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); |
rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); |
if (rlen < sizeof(struct bpf_hdr) + ETHER_HDR_LEN + sizeof(struct tagRPCCall)) { | h = (struct bpf_hdr*) AIT_GET_BUF(&b); |
| rlen -= h->bh_hdrlen; |
| if (rlen < h->bh_caplen || h->bh_caplen != h->bh_datalen || |
| rlen < ETHER_HDR_LEN + sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
goto end; |
goto end; |
} else { |
} else { |
h = (struct bpf_hdr*) AIT_GET_BUF(&b); | rlen = h->bh_caplen; |
eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); |
eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); |
buf = (u_char*) (eh + 1); | rlen -= ETHER_HDR_LEN; |
| rpc = (struct tagRPCCall*) (eh + 1); |
| if (eh->ether_type != ntohs(RPC_DEFPORT)) |
| goto end; |
| else |
| e_getlinkbymac((const ether_addr_t*) eh->ether_shost, &sa); |
} |
} |
if () |
|
|
|
c = _allocClient(srv, &sa); |
c = _allocClient(srv, &sa); |
if (!c) { |
if (!c) { |
Line 751 rxBPFPacket(sched_task_t *task)
|
Line 750 rxBPFPacket(sched_task_t *task)
|
usleep(2000); /* blocked client delay */ |
usleep(2000); /* blocked client delay */ |
goto end; |
goto end; |
} else { |
} else { |
estlen = ntohl(rpc->call_len); | len = ntohl(rpc->call_len); |
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); |
| memcpy(AIT_GET_BUF(&c->cli_buf), rpc, AIT_LEN(&c->cli_buf)); |
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); |
|
len = estlen; |
|
|
|
c->cli_sock = TASK_FD(task); |
c->cli_sock = TASK_FD(task); |
memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); |
memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); |
Line 767 rxBPFPacket(sched_task_t *task)
|
Line 765 rxBPFPacket(sched_task_t *task)
|
c, ts, c, 0); |
c, ts, c, 0); |
} |
} |
|
|
/* get next part of packet */ |
|
memset(buf, 0, len); |
|
pfd.fd = TASK_FD(task); |
|
pfd.events = POLLIN | POLLPRI; |
|
for (; len > 0; len -= rlen, buf += rlen) { |
|
if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
|
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
|
if (rlen) |
|
LOGERR; |
|
else |
|
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); |
|
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
|
c, 0, NULL, 0); |
|
return NULL; |
|
} |
|
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
|
rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); |
|
if (rlen == -1) { |
|
/* close connection */ |
|
schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
|
c, 0, NULL, 0); |
|
return NULL; |
|
} |
|
if (e_addrcmp(&c->cli_sa, &sa, 42)) |
|
rlen ^= rlen; /* skip if arrive from different address */ |
|
} |
|
len = estlen; |
|
|
|
/* 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; | /* close connection */ |
| schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], |
| c, 0, NULL, 0); |
| goto end; |
} |
} |
|
|
noreply = RPC_CHK_NOREPLY(rpc); |
noreply = RPC_CHK_NOREPLY(rpc); |