version 1.26.2.2, 2015/06/24 22:39:32
|
version 1.26.2.7, 2015/06/29 17:05:27
|
Line 183 txPacket(sched_task_t *task)
|
Line 183 txPacket(sched_task_t *task)
|
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, estlen, wlen = sizeof(struct tagRPCCall); |
struct pollfd pfd; |
|
#ifdef TCP_SESSION_TIMEOUT |
#ifdef TCP_SESSION_TIMEOUT |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
Line 212 txPacket(sched_task_t *task)
|
Line 211 txPacket(sched_task_t *task)
|
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
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 */ |
|
ait_freeVars(&c->cli_vars); |
|
if (ret == -1) { |
if (ret == -1) { |
rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); |
rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); |
|
|
Line 225 txPacket(sched_task_t *task)
|
Line 222 txPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* Free return values */ |
|
ait_freeVars(&c->cli_vars); |
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
rpc->call_io = RPC_ACK; |
rpc->call_io = RPC_ACK; |
|
|
Line 235 txPacket(sched_task_t *task)
|
Line 235 txPacket(sched_task_t *task)
|
#endif |
#endif |
|
|
/* send reply */ |
/* send reply */ |
pfd.fd = TASK_FD(task); | ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); |
pfd.events = POLLOUT; | if (ret == -1) { |
for (; wlen > 0; wlen -= ret, buf += ret) { | /* close connection */ |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { | TASK_ARG(task), 0, NULL, 0); |
if (ret) | return NULL; |
LOGERR; | |
else | |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); | |
/* close connection */ | |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | |
TASK_ARG(task), 0, NULL, 0); | |
return NULL; | |
} | |
ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); | |
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 303 execCall(sched_task_t *task)
|
Line 288 execCall(sched_task_t *task)
|
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
rpc->call_rep.eno = RPC_ERROR(rpc_Errno); |
} |
} |
rpc->call_argc ^= rpc->call_argc; |
rpc->call_argc ^= rpc->call_argc; |
|
ait_freeVars(&c->cli_vars); |
} else { |
} else { |
rpc->call_rep.eno ^= rpc->call_rep.eno; |
rpc->call_rep.eno ^= rpc->call_rep.eno; |
if (argc) { |
if (argc) { |
Line 476 txUDPPacket(sched_task_t *task)
|
Line 462 txUDPPacket(sched_task_t *task)
|
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; |
int ret, estlen, wlen = sizeof(struct tagRPCCall); |
int ret, estlen, wlen = sizeof(struct tagRPCCall); |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct pollfd pfd; |
|
|
|
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 501 txUDPPacket(sched_task_t *task)
|
Line 486 txUDPPacket(sched_task_t *task)
|
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
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 */ |
|
ait_freeVars(&c->cli_vars); |
|
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 513 txUDPPacket(sched_task_t *task)
|
Line 496 txUDPPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* Free return values */ |
|
ait_freeVars(&c->cli_vars); |
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
rpc->call_io = RPC_ACK; |
rpc->call_io = RPC_ACK; |
|
|
Line 521 txUDPPacket(sched_task_t *task)
|
Line 507 txUDPPacket(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); | ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, |
pfd.events = POLLOUT; | &c->cli_sa.sa, c->cli_sa.sa.sa_len); |
for (; wlen > 0; wlen -= ret, buf += ret) { | if (ret == -1) { |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || | /* close connection */ |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
if (ret) | TASK_ARG(task), 0, NULL, 0); |
LOGERR; | return NULL; |
else | |
rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); | |
/* close connection */ | |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], | |
TASK_ARG(task), 0, NULL, 0); | |
return NULL; | |
} | |
ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, | |
&c->cli_sa.sa, c->cli_sa.sa.sa_len); | |
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 553 rxUDPPacket(sched_task_t *task)
|
Line 524 rxUDPPacket(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; |
socklen_t salen; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct pollfd pfd; | ait_val_t b = AIT_VAL_INIT; |
|
|
/* receive connect packet */ |
/* receive connect packet */ |
|
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
salen = sa.ss.ss_len = sizeof(sockaddr_t); |
rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen); | rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); |
if (rlen < sizeof(struct tagRPCCall)) { | rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
| if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
goto end; |
goto end; |
} |
} |
|
|
|
/* skip loop packet */ |
|
if (rpc->call_io & RPC_ACK) |
|
goto end; |
|
|
c = _allocClient(srv, &sa); |
c = _allocClient(srv, &sa); |
if (!c) { |
if (!c) { |
EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); |
EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); |
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), AIT_GET_BUF(&b), len); |
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 592 rxUDPPacket(sched_task_t *task)
|
Line 567 rxUDPPacket(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); |
|
goto end; |
|
} |
|
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); |
|
goto end; |
|
} |
|
if (e_addrcmp(&c->cli_sa, &sa, 42)) |
|
rlen ^= rlen; /* skip if arrive from different address */ |
|
} |
|
len = estlen; |
|
|
|
/* skip loop packet */ |
|
if (rpc->call_io & RPC_ACK) |
|
goto end; |
|
|
|
/* 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 654 rxUDPPacket(sched_task_t *task)
|
Line 597 rxUDPPacket(sched_task_t *task)
|
schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], |
schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], |
c, TASK_FD(task), rpc, len); |
c, TASK_FD(task), rpc, len); |
end: |
end: |
|
AIT_FREE_VAL(&b); |
schedReadSelf(task); |
schedReadSelf(task); |
return NULL; |
return NULL; |
} |
} |
Line 693 txRAWPacket(sched_task_t *task)
|
Line 637 txRAWPacket(sched_task_t *task)
|
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
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 */ |
|
ait_freeVars(&c->cli_vars); |
|
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 705 txRAWPacket(sched_task_t *task)
|
Line 647 txRAWPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* Free return values */ |
|
ait_freeVars(&c->cli_vars); |
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
rpc->call_io = RPC_ACK; |
rpc->call_io = RPC_ACK; |
|
|
Line 764 rxRAWPacket(sched_task_t *task)
|
Line 709 rxRAWPacket(sched_task_t *task)
|
(AIT_GET_BUF(&b) + sizeof(struct ip6_hdr)); |
(AIT_GET_BUF(&b) + sizeof(struct ip6_hdr)); |
} |
} |
} |
} |
if (rlen < sizeof(struct tagRPCCall)) { | if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
goto end; |
goto end; |
} |
} |
Line 866 txBPFPacket(sched_task_t *task)
|
Line 811 txBPFPacket(sched_task_t *task)
|
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
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 */ |
|
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 878 txBPFPacket(sched_task_t *task)
|
Line 821 txBPFPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* Free return values */ |
|
ait_freeVars(&RPC_RETVARS(c)); |
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
rpc->call_io = RPC_ACK; |
rpc->call_io = RPC_ACK; |
|
|
Line 1036 txEXTPacket(sched_task_t *task)
|
Line 982 txEXTPacket(sched_task_t *task)
|
/* Go Encapsulate variables */ |
/* Go Encapsulate variables */ |
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 */ |
|
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 1048 txEXTPacket(sched_task_t *task)
|
Line 992 txEXTPacket(sched_task_t *task)
|
} |
} |
} |
} |
|
|
|
/* Free return values */ |
|
ait_freeVars(&RPC_RETVARS(c)); |
|
|
rpc->call_len = htonl(wlen); |
rpc->call_len = htonl(wlen); |
rpc->call_io = RPC_ACK; |
rpc->call_io = RPC_ACK; |
|
|
Line 1078 rxEXTPacket(sched_task_t *task)
|
Line 1025 rxEXTPacket(sched_task_t *task)
|
/* receive connect packet */ |
/* receive connect packet */ |
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 tagRPCCall)) { | rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
| if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); |
goto end; |
goto end; |
} else { |
|
rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
|
|
|
/* skip loop packet */ |
|
if (rpc->call_io & RPC_ACK) |
|
goto end; |
|
} |
} |
|
|
|
/* skip loop packet */ |
|
if (rpc->call_io & RPC_ACK) |
|
goto end; |
|
|
c = _allocClient(srv, &sa); |
c = _allocClient(srv, &sa); |
if (!c) { |
if (!c) { |
EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); |
EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); |
Line 1478 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 1424 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
srv->srv_blob.kill = 1; |
srv->srv_blob.kill = 1; |
|
|
schedEnd(&srv->srv_blob.root); |
schedEnd(&srv->srv_blob.root); |
|
|
|
if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL) |
|
unlink(srv->srv_blob.server.cli_sa.sun.sun_path); |
} |
} |
|
|
/* |
/* |
Line 1579 rpc_srv_initServer(u_char InstID, int concurentClients
|
Line 1528 rpc_srv_initServer(u_char InstID, int concurentClients
|
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
return NULL; |
return NULL; |
} |
} |
if (!Port) | if (!Port && proto < SOCK_RAW) |
Port = RPC_DEFPORT; |
Port = RPC_DEFPORT; |
if (!e_gethostbyname(csHost, Port, &sa)) |
if (!e_gethostbyname(csHost, Port, &sa)) |
return NULL; |
return NULL; |
Line 1700 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 1649 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
schedEnd(&(*psrv)->srv_root); |
schedEnd(&(*psrv)->srv_root); |
|
|
|
if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL) |
|
unlink((*psrv)->srv_server.cli_sa.sun.sun_path); |
|
|
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
e_free(*psrv); |
e_free(*psrv); |