version 1.9.2.18, 2012/05/18 23:03:00
|
version 1.11, 2012/07/22 20:44:13
|
Line 63 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 63 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
return NULL; |
return NULL; |
} |
} |
|
|
cli = malloc(sizeof(rpc_cli_t)); | cli = io_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 94 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 94 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); |
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); |
if (cli->cli_sock == -1) { |
if (cli->cli_sock == -1) { |
LOGERR; |
LOGERR; |
free(cli); | io_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, cli->cli_sa.sa.sa_len) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} else |
} else |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
Line 125 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 125 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
|
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
free(*cli); | io_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|
Line 145 rpc_cli_t *
|
Line 145 rpc_cli_t *
|
rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port) |
rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port) |
{ |
{ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
io_sockaddr_t sa; | io_sockaddr_t sa = IO_SOCKADDR_INIT; |
|
|
if (!io_gethostbyname(csHost, Port, &sa)) |
if (!io_gethostbyname(csHost, Port, &sa)) |
return NULL; |
return NULL; |
Line 164 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 164 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
srandom((time(&tim) ^ getpid())); |
srandom((time(&tim) ^ getpid())); |
#endif |
#endif |
|
|
cli = malloc(sizeof(rpc_cli_t)); | cli = io_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
memset(cli, 0, sizeof(rpc_cli_t)); |
memset(cli, 0, sizeof(rpc_cli_t)); |
|
|
/* build session */ |
/* build session */ |
cli->cli_parent = malloc(sizeof(rpc_sess_t)); | cli->cli_parent = io_malloc(sizeof(rpc_sess_t)); |
if (!cli->cli_parent) { |
if (!cli->cli_parent) { |
LOGERR; |
LOGERR; |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} else { |
} else { |
((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; |
((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; |
Line 191 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 191 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
if (cli->cli_sock == -1) { |
if (cli->cli_sock == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&cli->cli_buf); |
AIT_FREE_VAL(&cli->cli_buf); |
free(cli->cli_parent); | io_free(cli->cli_parent); |
free(cli); | io_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, cli->cli_sa.sa.sa_len) == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&cli->cli_buf); |
AIT_FREE_VAL(&cli->cli_buf); |
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli->cli_parent); | io_free(cli->cli_parent); |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} else |
} else |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
Line 226 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 226 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
if ((*cli)->cli_parent) |
if ((*cli)->cli_parent) |
free((*cli)->cli_parent); | io_free((*cli)->cli_parent); |
|
|
free(*cli); | io_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|