version 1.9.2.21, 2012/05/17 11:16:20
|
version 1.9.2.22, 2012/05/17 12:52:30
|
Line 178 rxPacket(sched_task_t *task)
|
Line 178 rxPacket(sched_task_t *task)
|
{ |
{ |
rpc_cli_t *c = TASK_ARG(task); |
rpc_cli_t *c = TASK_ARG(task); |
rpc_srv_t *s = c->cli_parent; |
rpc_srv_t *s = c->cli_parent; |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
|
int len, rlen, noreply; |
int len, rlen, noreply; |
u_short crc, off = 0; | u_short crc, off = TASK_DATLEN(task); |
| u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
|
|
memset(buf, 0, AIT_LEN(&c->cli_buf)); |
memset(buf, 0, AIT_LEN(&c->cli_buf)); |
rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); | rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
if (rlen < 1) { |
if (rlen < 1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); |
schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); |
return NULL; |
return NULL; |
|
} else { |
|
rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ |
|
off = 0; /* process buffer from start offset == 0 */ |
} |
} |
|
|
do { |
do { |
Line 196 rxPacket(sched_task_t *task)
|
Line 199 rxPacket(sched_task_t *task)
|
if (rlen < sizeof(struct tagRPCCall)) { |
if (rlen < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
|
|
schedReadSelf(task); | /* reminder received previous bytes ;) */ |
| schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), |
| TASK_FD(task), TASK_DATA(task), rlen); |
return NULL; |
return NULL; |
} else |
} else |
rpc = (struct tagRPCCall*) (buf + off); |
rpc = (struct tagRPCCall*) (buf + off); |
Line 204 rxPacket(sched_task_t *task)
|
Line 209 rxPacket(sched_task_t *task)
|
len = ntohs(rpc->call_len); |
len = ntohs(rpc->call_len); |
rlen -= len; |
rlen -= len; |
|
|
|
/* check RPC packet lengths */ |
|
if (rlen < 0 || len < sizeof(struct tagRPCCall)) { |
|
rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length"); |
|
/* skip entire packet */ |
|
break; |
|
} |
|
|
/* 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*) (buf + off), len / 2)) { | if (crc != crcFletcher16((u_short*) rpc, len / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
|
|
off += len; |
off += len; |
if (rlen < 1) | /* try next packet remaining into buffer */ |
break; | continue; |
else | |
continue; | |
} |
} |
|
|
noreply = rpc->call_req.flags & RPC_NOREPLY; |
noreply = rpc->call_req.flags & RPC_NOREPLY; |
Line 238 rxPacket(sched_task_t *task)
|
Line 248 rxPacket(sched_task_t *task)
|
} while (rlen > 0); |
} while (rlen > 0); |
|
|
/* lets get next packet */ |
/* lets get next packet */ |
schedReadSelf(task); | schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); |
return NULL; |
return NULL; |
} |
} |
|
|