version 1.9.2.13, 2012/05/16 09:09:42
|
version 1.9.2.14, 2012/05/16 12:20:05
|
Line 186 rxPacket(sched_task_t *task)
|
Line 186 rxPacket(sched_task_t *task)
|
rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); |
rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); |
if (rlen < 1) { |
if (rlen < 1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), closeClient, c, 0, NULL, 0); | schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); |
return NULL; |
return NULL; |
} |
} |
|
|
do { |
do { |
/* check RPC packet */ |
/* check RPC packet */ |
if (rlen < sizeof(struct tagRPCCall)) { |
if (rlen < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); | rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
|
|
schedReadSelf(task); |
schedReadSelf(task); |
return NULL; |
return NULL; |
Line 287 end:
|
Line 287 end:
|
|
|
/* ------------------------------------------------------ */ |
/* ------------------------------------------------------ */ |
|
|
#if 0 |
|
static void * |
static void * |
|
closeBLOBClient(sched_task_t *task) |
|
{ |
|
rpc_cli_t *c = TASK_ARG(task); |
|
rpc_srv_t *s = c->cli_parent; |
|
|
|
schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); |
|
|
|
/* close client socket */ |
|
if (TASK_VAL(task)) |
|
shutdown(c->cli_sock, SHUT_RDWR); |
|
close(c->cli_sock); |
|
|
|
/* free buffer */ |
|
AIT_FREE_VAL(&c->cli_buf); |
|
|
|
io_arrayDel(s->srv_blob.clients, c->cli_id, 42); |
|
return NULL; |
|
} |
|
|
|
static void * |
txBLOB(sched_task_t *task) |
txBLOB(sched_task_t *task) |
{ |
{ |
u_char *buf = TASK_DATA(task); | rpc_cli_t *c = TASK_ARG(task); |
| u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; |
struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; |
int wlen = sizeof(struct tagBLOBHdr); |
int wlen = sizeof(struct tagBLOBHdr); |
|
|
Line 300 txBLOB(sched_task_t *task)
|
Line 320 txBLOB(sched_task_t *task)
|
blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
|
/* send reply */ |
/* send reply */ |
wlen = send(TASK_FD(task), buf, wlen, 0); | wlen = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
if (wlen == -1) | if (wlen == -1 || wlen != sizeof(struct tagBLOBHdr)) { |
LOGERR; | /* close blob connection */ |
else if (wlen != sizeof(struct tagBLOBHdr)) | schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); |
rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " | } |
"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen); | |
|
|
return NULL; |
return NULL; |
} |
} |
Line 316 rxBLOB(sched_task_t *task)
|
Line 335 rxBLOB(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; |
rpc_blob_t *b; |
rpc_blob_t *b; |
u_char *buf = TASK_DATA(task); | u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; |
struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; |
int rlen; |
int rlen; |
u_short crc; |
u_short crc; |
struct timespec ts; |
|
|
|
/* check for disable service at this moment? */ | memset(buf, 0, AIT_LEN(&c->cli_buf)); |
if (!s || s->srv_blob.state == disable) { | rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); |
usleep(100000); | if (rlen < 1) { |
#ifdef HAVE_PTHREAD_YIELD | /* close blob connection */ |
pthread_yield(); | schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); |
#endif | |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), | |
TASK_DATA(task), TASK_DATLEN(task)); | |
return NULL; |
return NULL; |
} |
} |
|
|
memset(buf, 0, TASK_DATLEN(task)); | /* check BLOB packet */ |
rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0); | |
if (rlen == -1) { | |
LOGERR; | |
c->cli_kill = kill; | |
return NULL; | |
} else if (!rlen) { /* receive EOF */ | |
c->cli_kill = kill; | |
return NULL; | |
} | |
| |
if (rlen < sizeof(struct tagBLOBHdr)) { |
if (rlen < sizeof(struct tagBLOBHdr)) { |
rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet"); | rpc_SetErr(ERPCMISMATCH, "Short BLOB packet"); |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), | |
TASK_DATA(task), TASK_DATLEN(task)); | schedReadSelf(task); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 356 rxBLOB(sched_task_t *task)
|
Line 361 rxBLOB(sched_task_t *task)
|
blob->hdr_crc ^= blob->hdr_crc; |
blob->hdr_crc ^= blob->hdr_crc; |
if (crc != crcFletcher16((u_short*) buf, rlen / 2)) { |
if (crc != crcFletcher16((u_short*) buf, rlen / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), | |
TASK_DATA(task), TASK_DATLEN(task)); | schedReadSelf(task); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 366 rxBLOB(sched_task_t *task)
|
Line 371 rxBLOB(sched_task_t *task)
|
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); |
blob->hdr_cmd = error; |
blob->hdr_cmd = error; |
goto end; |
goto end; |
} else { |
|
/* change socket timeout from last packet */ |
|
ts.tv_sec = blob->hdr_session.sess_timeout; |
|
ts.tv_nsec = 0; |
|
schedPolling(TASK_ROOT(task), &ts, NULL); |
|
} |
} |
|
|
/* Go to proceed packet ... */ |
/* Go to proceed packet ... */ |
Line 419 rxBLOB(sched_task_t *task)
|
Line 419 rxBLOB(sched_task_t *task)
|
} |
} |
|
|
end: |
end: |
schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), | schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); |
TASK_DATA(task), TASK_DATLEN(task)); | schedReadSelf(task); |
schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), | |
TASK_DATA(task), TASK_DATLEN(task)); | |
return NULL; |
return NULL; |
} |
} |
#endif |
|
|
|
static void * |
static void * |
acceptBLOBClients(sched_task_t *task) |
acceptBLOBClients(sched_task_t *task) |
Line 465 acceptBLOBClients(sched_task_t *task)
|
Line 462 acceptBLOBClients(sched_task_t *task)
|
} else |
} else |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
// schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); | schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); |
end: |
end: |
schedReadSelf(task); |
schedReadSelf(task); |
return NULL; |
return NULL; |