version 1.14.2.1, 2013/04/02 09:17:06
|
version 1.17.6.1, 2013/08/22 11:55:45
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
Line 67 static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
|
}; |
}; |
|
|
|
|
inline void | void |
rpc_freeCli(rpc_cli_t * __restrict c) |
rpc_freeCli(rpc_cli_t * __restrict c) |
{ |
{ |
rpc_srv_t *s = c->cli_parent; |
rpc_srv_t *s = c->cli_parent; |
Line 191 txPacket(sched_task_t *task)
|
Line 191 txPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
rpc->call_len = htons(wlen); | rpc->call_len = htonl(wlen); |
|
|
|
#if 0 |
/* calculate CRC */ |
/* calculate CRC */ |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
#endif |
|
|
/* send reply */ |
/* send reply */ |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
Line 269 rxPacket(sched_task_t *task)
|
Line 271 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; |
int len, rlen, noreply; |
int len, rlen, noreply; |
u_short crc, off = TASK_DATLEN(task); | u_short off = TASK_DATLEN(task); |
| #if 0 |
| u_short crc; |
| #endif |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
|
|
Line 298 rxPacket(sched_task_t *task)
|
Line 303 rxPacket(sched_task_t *task)
|
} else |
} else |
rpc = (struct tagRPCCall*) (buf + off); |
rpc = (struct tagRPCCall*) (buf + off); |
|
|
len = ntohs(rpc->call_len); | len = ntohl(rpc->call_len); |
rlen -= len; |
rlen -= len; |
|
|
/* check RPC packet lengths */ |
/* check RPC packet lengths */ |
Line 308 rxPacket(sched_task_t *task)
|
Line 313 rxPacket(sched_task_t *task)
|
break; |
break; |
} |
} |
|
|
|
#if 0 |
/* 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; |
Line 318 rxPacket(sched_task_t *task)
|
Line 324 rxPacket(sched_task_t *task)
|
/* try next packet remaining into buffer */ |
/* try next packet remaining into buffer */ |
continue; |
continue; |
} |
} |
|
#endif |
|
|
noreply = RPC_CHK_NOREPLY(rpc); |
noreply = RPC_CHK_NOREPLY(rpc); |
|
|
Line 415 txUDPPacket(sched_task_t *task)
|
Line 422 txUDPPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
rpc->call_len = htons(wlen); | rpc->call_len = htonl(wlen); |
|
|
/* calculate CRC */ |
/* calculate CRC */ |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
Line 473 rxUDPPacket(sched_task_t *task)
|
Line 480 rxUDPPacket(sched_task_t *task)
|
} else |
} else |
rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); |
rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); |
|
|
len = ntohs(rpc->call_len); | len = ntohl(rpc->call_len); |
rlen -= len; |
rlen -= len; |
|
|
/* check RPC packet lengths */ |
/* check RPC packet lengths */ |
Line 522 end:
|
Line 529 end:
|
|
|
/* ------------------------------------------------------ */ |
/* ------------------------------------------------------ */ |
|
|
inline void | void |
rpc_freeBLOBCli(rpc_cli_t * __restrict c) |
rpc_freeBLOBCli(rpc_cli_t * __restrict c) |
{ |
{ |
rpc_srv_t *s = c->cli_parent; |
rpc_srv_t *s = c->cli_parent; |
Line 576 rxBLOB(sched_task_t *task)
|
Line 583 rxBLOB(sched_task_t *task)
|
rpc_blob_t *b; |
rpc_blob_t *b; |
struct tagBLOBHdr blob; |
struct tagBLOBHdr blob; |
int rlen; |
int rlen; |
u_short crc; |
|
|
|
memset(&blob, 0, sizeof blob); |
memset(&blob, 0, sizeof blob); |
rlen = recv(TASK_FD(task), &blob, sizeof blob, 0); |
rlen = recv(TASK_FD(task), &blob, sizeof blob, 0); |
Line 595 rxBLOB(sched_task_t *task)
|
Line 601 rxBLOB(sched_task_t *task)
|
} |
} |
|
|
/* check RPC packet session info */ |
/* check RPC packet session info */ |
if ((crc = rpc_chkPktSession(&blob.hdr_session, &s->srv_session))) { | if (rpc_chkPktSession(&blob.hdr_session, &s->srv_session)) { |
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; |
Line 622 rxBLOB(sched_task_t *task)
|
Line 628 rxBLOB(sched_task_t *task)
|
} |
} |
break; |
break; |
case set: |
case set: |
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len)))) { | if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), |
| ntohl(blob.hdr_ret)))) { |
/* set new BLOB variable for reply :) */ |
/* set new BLOB variable for reply :) */ |
blob.hdr_var = htonl(b->blob_var); |
blob.hdr_var = htonl(b->blob_var); |
|
|
Line 654 end:
|
Line 661 end:
|
} |
} |
|
|
static void * |
static void * |
|
flushBLOB(sched_task_t *task) |
|
{ |
|
rpc_srv_t *srv = TASK_ARG(task); |
|
rpc_blob_t *b, *tmp; |
|
|
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedSignalSelf(task); |
|
return NULL; |
|
} |
|
|
|
static void * |
acceptBLOBClients(sched_task_t *task) |
acceptBLOBClients(sched_task_t *task) |
{ |
{ |
rpc_srv_t *srv = TASK_ARG(task); |
rpc_srv_t *srv = TASK_ARG(task); |
Line 820 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 844 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* return: none |
* return: none |
*/ |
*/ |
inline void | void |
rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) |
rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) |
{ |
{ |
if (!srv) |
if (!srv) |
return; |
return; |
|
|
srv->srv_blob.kill = 1; |
srv->srv_blob.kill = 1; |
|
|
|
schedEnd(&srv->srv_blob.root); |
} |
} |
|
|
/* |
/* |
Line 853 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 879 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
|
schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0); |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
Line 863 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 890 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
/* main rpc loop */ |
/* main rpc loop */ |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
|
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
/* close all clients connections & server socket */ |
/* close all clients connections & server socket */ |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
Line 879 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 914 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
|
|
close(srv->srv_blob.server.cli_sock); |
close(srv->srv_blob.server.cli_sock); |
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedEnd(&srv->srv_blob.root); |
|
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
return 0; |
return 0; |
} |
} |
Line 1023 err: /* error condition */
|
Line 1049 err: /* error condition */
|
* @psrv = RPC Server instance |
* @psrv = RPC Server instance |
* return: none |
* return: none |
*/ |
*/ |
inline void | void |
rpc_srv_endServer(rpc_srv_t ** __restrict psrv) |
rpc_srv_endServer(rpc_srv_t ** __restrict psrv) |
{ |
{ |
if (!psrv || !*psrv) |
if (!psrv || !*psrv) |
return; |
return; |
|
|
/* if send kill to blob server */ |
/* if send kill to blob server */ |
if (!(*psrv)->srv_blob.kill) | rpc_srv_endBLOBServer(*psrv); |
rpc_srv_endBLOBServer(*psrv); | |
|
|
(*psrv)->srv_kill = 1; |
(*psrv)->srv_kill = 1; |
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
|
schedEnd(&(*psrv)->srv_root); |
|
|
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
e_free(*psrv); |
e_free(*psrv); |
*psrv = NULL; |
*psrv = NULL; |
Line 1104 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1131 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
srv->srv_funcs.avlh_root = NULL; |
srv->srv_funcs.avlh_root = NULL; |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
|
|
schedEnd(&srv->srv_root); |
|
return 0; |
return 0; |
} |
} |
|
|