version 1.9.2.13, 2012/05/16 09:09:42
|
version 1.9.2.17, 2012/05/16 16:36:10
|
Line 82 txPacket(sched_task_t *task)
|
Line 82 txPacket(sched_task_t *task)
|
if (rpc->call_argc) { |
if (rpc->call_argc) { |
f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); |
f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); |
if (!f) { |
if (!f) { |
|
rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.ret = RPC_ERROR(-1); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
Line 186 rxPacket(sched_task_t *task)
|
Line 187 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 288 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 321 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 336 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 362 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 372 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 420 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 463 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; |
Line 485 int
|
Line 483 int
|
rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) |
rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) |
{ |
{ |
int n = 1; |
int n = 1; |
io_sockaddr_t sa; |
|
|
|
if (!srv || srv->srv_kill) { |
if (!srv || srv->srv_kill) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
Line 505 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 502 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
srv->srv_blob.server.cli_parent = srv; |
srv->srv_blob.server.cli_parent = srv; |
|
|
memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t)); |
memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t)); |
switch (sa.sa.sa_family) { | switch (srv->srv_blob.server.cli_sa.sa.sa_family) { |
case AF_INET: |
case AF_INET: |
sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); | srv->srv_blob.server.cli_sa.sin.sin_port = |
| htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1); |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); | srv->srv_blob.server.cli_sa.sin6.sin6_port = |
| htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1); |
break; |
break; |
case AF_LOCAL: |
case AF_LOCAL: |
strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); | strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", |
| sizeof srv->srv_blob.server.cli_sa.sun.sun_path); |
break; |
break; |
default: |
default: |
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
Line 707 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 707 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
else |
else |
netBuf = io_align(netBuf, 1); /* align netBuf length */ |
netBuf = io_align(netBuf, 1); /* align netBuf length */ |
|
|
|
#ifdef HAVE_SRANDOMDEV |
|
srandomdev(); |
|
#else |
|
time_t tim; |
|
|
|
srandom((time(&tim) ^ getpid())); |
|
#endif |
|
|
srv = malloc(sizeof(rpc_srv_t)); |
srv = malloc(sizeof(rpc_srv_t)); |
if (!srv) { |
if (!srv) { |
LOGERR; |
LOGERR; |
Line 792 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 800 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
register int i; |
register int i; |
rpc_func_t *f, *tmp; |
rpc_func_t *f, *tmp; |
|
|
if (!psrv || !*psrv) { | if (!psrv || !*psrv) |
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); | |
return; |
return; |
} |
|
|
|
if (!(*psrv)->srv_blob.kill) |
if (!(*psrv)->srv_blob.kill) |
rpc_srv_endBLOBServer(*psrv); |
rpc_srv_endBLOBServer(*psrv); |