version 1.26, 2015/07/02 22:28:15
|
version 1.26.4.2, 2016/08/02 10:26:58
|
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 111 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 111 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
e_free(cli); |
e_free(cli); |
return NULL; |
return NULL; |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { | if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
e_free(cli); |
e_free(cli); |
Line 221 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
Line 221 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
} |
} |
if (cli->cli_id == SOCK_STREAM) { |
if (cli->cli_id == SOCK_STREAM) { |
setsockopt(cli->cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n); |
setsockopt(cli->cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n); |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { | if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { |
LOGERR; |
LOGERR; |
goto err; |
goto err; |
} |
} |
Line 231 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
Line 231 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
|
|
if (!e_gethostbyname(csHost, 0, &sa2)) |
if (!e_gethostbyname(csHost, 0, &sa2)) |
goto err; |
goto err; |
if (bind(cli->cli_sock, &sa2.sa, sa2.sa.sa_len) == -1) { | if (bind(cli->cli_sock, &sa2.sa, sizeof sa2.sa) == -1) { |
LOGERR; |
LOGERR; |
goto err; |
goto err; |
} |
} |
Line 268 rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
|
Line 268 rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
|
shutdown(cli->cli_sock, SHUT_RDWR); |
shutdown(cli->cli_sock, SHUT_RDWR); |
if (cli->cli_id == SOCK_DGRAM && cli->cli_sa.sa.sa_family == AF_LOCAL) { |
if (cli->cli_id == SOCK_DGRAM && cli->cli_sa.sa.sa_family == AF_LOCAL) { |
sockaddr_t sa2 = E_SOCKADDR_INIT; |
sockaddr_t sa2 = E_SOCKADDR_INIT; |
socklen_t salen; | socklen_t salen = sizeof sa2; |
|
|
sa2.sa.sa_len = salen = sizeof sa2; | #ifndef __linux__ |
| sa2.sa.sa_len = salen; |
| #endif |
if (!getsockname(cli->cli_sock, &sa2.sa, &salen)) |
if (!getsockname(cli->cli_sock, &sa2.sa, &salen)) |
unlink(sa2.sun.sun_path); |
unlink(sa2.sun.sun_path); |
} |
} |
Line 296 rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
|
Line 298 rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
|
return -1; |
return -1; |
} |
} |
if (cli->cli_id == SOCK_STREAM) |
if (cli->cli_id == SOCK_STREAM) |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { | if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
return -1; |
return -1; |
Line 322 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 324 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
shutdown((*cli)->cli_sock, SHUT_RDWR); |
shutdown((*cli)->cli_sock, SHUT_RDWR); |
if ((*cli)->cli_id == SOCK_DGRAM && (*cli)->cli_sa.sa.sa_family == AF_LOCAL) { |
if ((*cli)->cli_id == SOCK_DGRAM && (*cli)->cli_sa.sa.sa_family == AF_LOCAL) { |
sockaddr_t sa2 = E_SOCKADDR_INIT; |
sockaddr_t sa2 = E_SOCKADDR_INIT; |
socklen_t salen; | socklen_t salen = sizeof sa2; |
|
|
sa2.sa.sa_len = salen = sizeof sa2; | #ifndef __linux__ |
| sa2.sa.sa_len = salen; |
| #endif |
if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen)) |
if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen)) |
unlink(sa2.sun.sun_path); |
unlink(sa2.sun.sun_path); |
} |
} |
Line 570 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 574 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
array_t * __restrict in_vars, array_t ** __restrict out_vars) |
array_t * __restrict in_vars, array_t ** __restrict out_vars) |
{ |
{ |
int type = 0, wlen; |
int type = 0, wlen; |
u_char *buf; |
|
u_int seq = 0; |
u_int seq = 0; |
|
|
if (!cli) { |
if (!cli) { |
Line 581 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 584 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
type = cli->cli_id; |
type = cli->cli_id; |
else |
else |
seq = random(); /* sign package */ |
seq = random(); /* sign package */ |
buf = AIT_GET_BUF(&cli->cli_buf); |
|
} |
} |
if (out_vars) |
if (out_vars) |
*out_vars = NULL; |
*out_vars = NULL; |
Line 665 rpc_cli_ping(rpc_cli_t *cli)
|
Line 667 rpc_cli_ping(rpc_cli_t *cli)
|
rpc_cli_t * |
rpc_cli_t * |
rpc_cli_openClient2(u_char InstID, int netBuf, const char *csIface, const char *csHost) |
rpc_cli_openClient2(u_char InstID, int netBuf, const char *csIface, const char *csHost) |
{ |
{ |
|
#ifndef __linux__ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT; |
sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT; |
char szIface[64], szStr[STRSIZ]; |
char szIface[64], szStr[STRSIZ]; |
Line 759 err:
|
Line 762 err:
|
close(cli->cli_sock); |
close(cli->cli_sock); |
e_free(cli->cli_parent); |
e_free(cli->cli_parent); |
e_free(cli); |
e_free(cli); |
|
#else |
|
rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); |
|
#endif |
return NULL; |
return NULL; |
} |
} |
|
|