version 1.27.2.2, 2015/07/02 23:21:06
|
version 1.28.2.4, 2016/08/02 15:18:41
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004 - 2015 | Copyright 2004 - 2016 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 312 rxPacket(sched_task_t *task)
|
Line 312 rxPacket(sched_task_t *task)
|
u_short crc; |
u_short crc; |
#endif |
#endif |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char *buf = AIT_GET_BUF(&c->cli_buf); |
u_char b[sizeof(struct tagRPCCall)]; | struct tagRPCCall b, *rpc = (struct tagRPCCall*) buf; |
struct tagRPCCall *rpc = (struct tagRPCCall*) buf; | |
#ifdef TCP_SESSION_TIMEOUT |
#ifdef TCP_SESSION_TIMEOUT |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
|
|
Line 323 rxPacket(sched_task_t *task)
|
Line 322 rxPacket(sched_task_t *task)
|
#endif |
#endif |
|
|
/* prepare rx */ |
/* prepare rx */ |
len = recv(TASK_FD(task), b, sizeof b, MSG_PEEK); | len = recv(TASK_FD(task), &b, sizeof b, MSG_PEEK); |
if (len == sizeof b) |
if (len == sizeof b) |
rlen = ntohl(((struct tagRPCCall*) b)->call_len); | rlen = ntohl(b.call_len); |
|
|
rlen = recv(TASK_FD(task), buf, rlen, 0); |
rlen = recv(TASK_FD(task), buf, rlen, 0); |
if (rlen == -1) { |
if (rlen == -1) { |
Line 402 acceptClients(sched_task_t *task)
|
Line 401 acceptClients(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; |
socklen_t salen = sizeof(sockaddr_t); | socklen_t salen = E_SOCKADDR_MAX; |
int sock; |
int sock; |
#ifdef TCP_SESSION_TIMEOUT |
#ifdef TCP_SESSION_TIMEOUT |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
Line 499 txUDPPacket(sched_task_t *task)
|
Line 498 txUDPPacket(sched_task_t *task)
|
|
|
/* send reply */ |
/* send reply */ |
ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, |
ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, |
&c->cli_sa.sa, c->cli_sa.sa.sa_len); | &c->cli_sa.sa, e_addrlen(&c->cli_sa)); |
if (ret == -1) { |
if (ret == -1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
Line 518 rxUDPPacket(sched_task_t *task)
|
Line 517 rxUDPPacket(sched_task_t *task)
|
u_short crc; |
u_short crc; |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
sockaddr_t sa; |
sockaddr_t sa; |
socklen_t salen; | socklen_t salen = E_SOCKADDR_MAX; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
ait_val_t b = AIT_VAL_INIT; |
ait_val_t b = AIT_VAL_INIT; |
|
|
/* receive connect packet */ |
/* receive connect packet */ |
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
salen = sa.ss.ss_len = (u_char) sizeof(sockaddr_t); | #ifndef __linux__ |
| sa.ss.ss_len = salen; |
| #endif |
rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); |
rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); |
rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
if (rlen < sizeof(struct tagRPCCall)) |
if (rlen < sizeof(struct tagRPCCall)) |
Line 639 txRAWPacket(sched_task_t *task)
|
Line 640 txRAWPacket(sched_task_t *task)
|
|
|
/* send reply */ |
/* send reply */ |
ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, |
ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, |
&c->cli_sa.sa, c->cli_sa.sa.sa_len); | &c->cli_sa.sa, e_addrlen(&c->cli_sa)); |
if (ret == -1) { |
if (ret == -1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
Line 658 rxRAWPacket(sched_task_t *task)
|
Line 659 rxRAWPacket(sched_task_t *task)
|
u_short crc; |
u_short crc; |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
sockaddr_t sa; |
sockaddr_t sa; |
socklen_t salen; | socklen_t salen = E_SOCKADDR_MAX; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; |
ait_val_t b = AIT_VAL_INIT; |
ait_val_t b = AIT_VAL_INIT; |
|
|
/* receive connect packet */ |
/* receive connect packet */ |
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
AIT_SET_BUF(&b, NULL, srv->srv_netbuf); |
salen = sa.ss.ss_len = (u_char) sizeof(sockaddr_t); | #ifndef __linux__ |
| sa.ss.ss_len = salen; |
| #endif |
rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); |
rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); |
if (sa.sa.sa_family == AF_INET) { |
if (sa.sa.sa_family == AF_INET) { |
struct ip *h; |
struct ip *h; |
Line 676 rxRAWPacket(sched_task_t *task)
|
Line 679 rxRAWPacket(sched_task_t *task)
|
rpc = (struct tagRPCCall*) (h + 1); |
rpc = (struct tagRPCCall*) (h + 1); |
} |
} |
} else { |
} else { |
|
#ifdef IPV6_REMOVE_HEADER |
struct ip6_hdr *h; |
struct ip6_hdr *h; |
h = (struct ip6_hdr*) AIT_GET_BUF(&b); |
h = (struct ip6_hdr*) AIT_GET_BUF(&b); |
if (rlen < (ntohs(h->ip6_plen) + sizeof(struct ip6_hdr)) || | if (rlen < ntohs(h->ip6_plen) || h->ip6_nxt != IPPROTO_ERPC) |
h->ip6_nxt != IPPROTO_ERPC) | |
goto end; |
goto end; |
else { |
else { |
rlen -= sizeof(struct ip6_hdr); |
rlen -= sizeof(struct ip6_hdr); |
rpc = (struct tagRPCCall*) (h + 1); |
rpc = (struct tagRPCCall*) (h + 1); |
} |
} |
|
#else |
|
rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); |
|
#endif |
} |
} |
if (rlen < sizeof(struct tagRPCCall)) |
if (rlen < sizeof(struct tagRPCCall)) |
goto end; |
goto end; |
Line 744 end:
|
Line 750 end:
|
static void * |
static void * |
txBPFPacket(sched_task_t *task) |
txBPFPacket(sched_task_t *task) |
{ |
{ |
|
#ifndef __linux__ |
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_func_t *f = NULL; |
rpc_func_t *f = NULL; |
Line 812 txBPFPacket(sched_task_t *task)
|
Line 819 txBPFPacket(sched_task_t *task)
|
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
TASK_ARG(task), 0, NULL, 0); |
TASK_ARG(task), 0, NULL, 0); |
} |
} |
|
#else |
|
rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); |
|
#endif |
|
|
taskExit(task, NULL); |
taskExit(task, NULL); |
} |
} |
Line 819 txBPFPacket(sched_task_t *task)
|
Line 829 txBPFPacket(sched_task_t *task)
|
static void * |
static void * |
rxBPFPacket(sched_task_t *task) |
rxBPFPacket(sched_task_t *task) |
{ |
{ |
|
#ifndef __linux__ |
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; |
int len, rlen, noreply; |
Line 902 rxBPFPacket(sched_task_t *task)
|
Line 913 rxBPFPacket(sched_task_t *task)
|
end: |
end: |
AIT_FREE_VAL(&b); |
AIT_FREE_VAL(&b); |
schedReadSelf(task); |
schedReadSelf(task); |
|
#else |
|
rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); |
|
#endif |
|
|
taskExit(task, NULL); |
taskExit(task, NULL); |
} |
} |
|
|
Line 1167 end:
|
Line 1182 end:
|
static void * |
static void * |
flushBLOB(sched_task_t *task) |
flushBLOB(sched_task_t *task) |
{ |
{ |
#ifndef atomic_load_acq_ptr | #ifdef atomic_load_acq_ptr |
uintptr_t sigArg = atomic_load_acq_ptr(&_glSigArg); |
uintptr_t sigArg = atomic_load_acq_ptr(&_glSigArg); |
#else |
#else |
uintptr_t sigArg = *((volatile uintptr_t*) &_glSigArg); |
uintptr_t sigArg = *((volatile uintptr_t*) &_glSigArg); |
Line 1202 acceptBLOBClients(sched_task_t *task)
|
Line 1217 acceptBLOBClients(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; |
register int i; |
register int i; |
socklen_t salen = sizeof(sockaddr_t); | socklen_t salen = E_SOCKADDR_MAX; |
int sock; |
int sock; |
#ifdef TCP_NOPUSH |
#ifdef TCP_NOPUSH |
int n = 1; |
int n = 1; |
Line 1269 int
|
Line 1284 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; |
|
socklen_t salen; |
|
|
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 1287 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 1303 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(sockaddr_t)); | memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof srv->srv_blob.server.cli_sa); |
switch (srv->srv_blob.server.cli_sa.sa.sa_family) { |
switch (srv->srv_blob.server.cli_sa.sa.sa_family) { |
case AF_INET: |
case AF_INET: |
srv->srv_blob.server.cli_sa.sin.sin_port = |
srv->srv_blob.server.cli_sa.sin.sin_port = |
htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1); |
htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1); |
|
salen = sizeof srv->srv_blob.server.cli_sa.sin; |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
srv->srv_blob.server.cli_sa.sin6.sin6_port = |
srv->srv_blob.server.cli_sa.sin6.sin6_port = |
htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1); |
htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1); |
|
salen = sizeof srv->srv_blob.server.cli_sa.sin6; |
break; |
break; |
case AF_LOCAL: |
case AF_LOCAL: |
strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", |
strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", |
sizeof srv->srv_blob.server.cli_sa.sun.sun_path); |
sizeof srv->srv_blob.server.cli_sa.sun.sun_path); |
|
salen = sizeof srv->srv_blob.server.cli_sa.sun; |
break; |
break; |
default: |
default: |
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
Line 1332 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 1351 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
return -1; |
return -1; |
} |
} |
if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, | if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, salen) == -1) { |
srv->srv_blob.server.cli_sa.sa.sa_len) == -1) { | |
LOGERR; |
LOGERR; |
close(srv->srv_blob.server.cli_sock); |
close(srv->srv_blob.server.cli_sock); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
Line 1379 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 1397 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
|
|
srv->srv_blob.kill = 1; |
srv->srv_blob.kill = 1; |
|
|
schedEnd(&srv->srv_blob.root); |
|
|
|
if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL) |
if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL) |
unlink(srv->srv_blob.server.cli_sa.sun.sun_path); |
unlink(srv->srv_blob.server.cli_sa.sun.sun_path); |
|
|
|
schedEnd(&srv->srv_blob.root); |
} |
} |
|
|
/* |
/* |
Line 1413 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 1431 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
/* disabled kqueue support in libaitsched */ |
/* disabled kqueue support in libaitsched */ |
struct sigaction sa; |
struct sigaction sa; |
|
|
#ifndef atomic_store_rel_ptr | #ifdef atomic_store_rel_ptr |
atomic_store_rel_ptr(&_glSigArg, (uintptr_t) srv); |
atomic_store_rel_ptr(&_glSigArg, (uintptr_t) srv); |
#else |
#else |
*((volatile uintptr_t*) &_glSigArg) = (uintptr_t) srv; |
*((volatile uintptr_t*) &_glSigArg) = (uintptr_t) srv; |
Line 1483 rpc_srv_initServer(u_char InstID, int concurentClients
|
Line 1501 rpc_srv_initServer(u_char InstID, int concurentClients
|
int n = 1; |
int n = 1; |
rpc_srv_t *srv = NULL; |
rpc_srv_t *srv = NULL; |
sockaddr_t sa = E_SOCKADDR_INIT; |
sockaddr_t sa = E_SOCKADDR_INIT; |
|
socklen_t salen; |
|
|
if (!concurentClients || (proto < 0 || proto > SOCK_RAW)) { |
if (!concurentClients || (proto < 0 || proto > SOCK_RAW)) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
Line 1490 rpc_srv_initServer(u_char InstID, int concurentClients
|
Line 1509 rpc_srv_initServer(u_char InstID, int concurentClients
|
} |
} |
if (!Port && proto < SOCK_RAW) |
if (!Port && proto < SOCK_RAW) |
Port = RPC_DEFPORT; |
Port = RPC_DEFPORT; |
if (!e_gethostbyname(csHost, Port, &sa)) | if (!(salen = e_gethostbyname(csHost, Port, &sa))) |
return NULL; |
return NULL; |
if (!proto) |
if (!proto) |
proto = SOCK_STREAM; |
proto = SOCK_STREAM; |
Line 1572 rpc_srv_initServer(u_char InstID, int concurentClients
|
Line 1591 rpc_srv_initServer(u_char InstID, int concurentClients
|
LOGERR; |
LOGERR; |
goto err; |
goto err; |
} |
} |
if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, | if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, salen) == -1) { |
srv->srv_server.cli_sa.sa.sa_len) == -1) { | |
LOGERR; |
LOGERR; |
goto err; |
goto err; |
} else |
} else |
Line 1606 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 1624 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
|
|
/* if send kill to blob server */ |
/* if send kill to blob server */ |
rpc_srv_endBLOBServer(*psrv); |
rpc_srv_endBLOBServer(*psrv); |
|
/* wait for BLOB server done */ |
|
while (*(&(*psrv)->srv_blob.root)) |
|
usleep(1000); |
|
|
(*psrv)->srv_kill = 1; |
(*psrv)->srv_kill = 1; |
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
schedEnd(&(*psrv)->srv_root); |
|
|
|
if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL) |
if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL) |
unlink((*psrv)->srv_server.cli_sa.sun.sun_path); |
unlink((*psrv)->srv_server.cli_sa.sun.sun_path); |
|
|
|
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 1727 rpc_srv_execCall(rpc_cli_t * __restrict cli, struct ta
|
Line 1748 rpc_srv_execCall(rpc_cli_t * __restrict cli, struct ta
|
rpc_srv_t * |
rpc_srv_t * |
rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, const char *csIface) |
rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, const char *csIface) |
{ |
{ |
|
#ifndef __linux__ |
int n = 1; |
int n = 1; |
rpc_srv_t *srv = NULL; |
rpc_srv_t *srv = NULL; |
sockaddr_t sa = E_SOCKADDR_INIT; |
sockaddr_t sa = E_SOCKADDR_INIT; |
Line 1853 err: /* error condition */
|
Line 1875 err: /* error condition */
|
schedEnd(&srv->srv_root); |
schedEnd(&srv->srv_root); |
pthread_mutex_destroy(&srv->srv_funcs.mtx); |
pthread_mutex_destroy(&srv->srv_funcs.mtx); |
e_free(srv); |
e_free(srv); |
|
#else |
|
rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); |
|
#endif |
|
|
return NULL; |
return NULL; |
} |
} |
|
|