version 1.9.2.14, 2012/05/16 12:20:05
|
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 482 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 502 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 704 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 789 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); |