version 1.7.2.1, 2012/03/28 11:07:36
|
version 1.8, 2012/03/29 01:34:16
|
Line 163 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 163 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
int n; |
int n; |
|
|
if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); | rpc_SetErr(EINVAL, "Invalid parameters can`t connect to RPC server ..."); |
return NULL; |
return NULL; |
} |
} |
if (!Port) |
if (!Port) |
Line 175 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 175 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
if (csHost && family != AF_LOCAL) { |
if (csHost && family != AF_LOCAL) { |
host = gethostbyname2(csHost, family); |
host = gethostbyname2(csHost, family); |
if (!host) { |
if (!host) { |
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno)); | rpc_SetErr(h_errno, "%s", hstrerror(h_errno)); |
return NULL; |
return NULL; |
} |
} |
} |
} |
Line 200 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 200 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); |
strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); |
break; |
break; |
default: |
default: |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); | rpc_SetErr(EINVAL, "Invalid parameters can`t connect to RPC server ..."); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 305 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
Line 305 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
int ret = 0, wlen = sizeof(struct tagRPCCall); |
int ret = 0, wlen = sizeof(struct tagRPCCall); |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
uint16_t tag; | uint16_t tag, crc; |
uint32_t hash; |
uint32_t hash; |
|
|
if (!cli || !csFunc) { |
if (!cli || !csFunc) { |
Line 353 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
Line 353 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
wlen += ret; |
wlen += ret; |
} |
} |
|
|
|
rpc->call_len = htons(wlen); |
|
|
/* calculate CRC */ |
/* calculate CRC */ |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2)); | rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
|
if ((ret = send(cli->cli_sock, buf, wlen, 0)) == -1) { |
if ((ret = send(cli->cli_sock, buf, wlen, 0)) == -1) { |
LOGERR; |
LOGERR; |
Line 381 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
Line 383 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
if (ret) |
if (ret) |
LOGERR; |
LOGERR; |
else |
else |
rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n"); | rpc_SetErr(ETIMEDOUT, "Timeout, no return from RPC server?"); |
|
|
free(buf); |
free(buf); |
return -1; |
return -1; |
Line 390 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
Line 392 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const ch
|
if ((ret = recv(cli->cli_sock, buf, cli->cli_netbuf, 0)) == -1) { |
if ((ret = recv(cli->cli_sock, buf, cli->cli_netbuf, 0)) == -1) { |
LOGERR; |
LOGERR; |
free(buf); |
free(buf); |
return -3; | return -1; |
} |
} |
if (!ret) { /* receive EOF! */ |
if (!ret) { /* receive EOF! */ |
free(buf); |
free(buf); |
return 0; |
return 0; |
} |
} |
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); | rpc_SetErr(ERPCMISMATCH, "Too short RPC packet ..."); |
free(buf); |
free(buf); |
return -4; | return -1; |
} |
} |
|
|
|
/* calculate CRC */ |
|
crc = ntohs(rpc->call_crc); |
|
rpc->call_crc ^= rpc->call_crc; |
|
if (crc != crcFletcher16((u_short*) buf, ret / 2)) { |
|
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
|
free(buf); |
|
return -1; |
|
} |
|
|
/* check RPC packet session info */ |
/* check RPC packet session info */ |
if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) { |
if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); | rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session ..."); |
free(buf); |
free(buf); |
return -5; | return -1; |
} else |
} else |
wlen = sizeof(struct tagRPCCall); |
wlen = sizeof(struct tagRPCCall); |
if (rpc->call_tag != tag || rpc->call_hash != hash) { |
if (rpc->call_tag != tag || rpc->call_hash != hash) { |
rpc_SetErr(ERPCMISMATCH, "Error:: get wrong RPC reply ...\n"); | rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply ..."); |
free(buf); |
free(buf); |
return -5; | return -1; |
} |
} |
if (ntohl(rpc->call_rep.ret) < 0 && ntohl(rpc->call_rep.eno)) { |
if (ntohl(rpc->call_rep.ret) < 0 && ntohl(rpc->call_rep.eno)) { |
rpc_SetErr(ntohl(rpc->call_rep.eno), "Error::Server side: retcode=%d #%d %s\n", | rpc_SetErr(ntohl(rpc->call_rep.eno), "Server side: retcode=%d #%d %s", |
ntohl(rpc->call_rep.ret), ntohl(rpc->call_rep.eno), |
ntohl(rpc->call_rep.ret), ntohl(rpc->call_rep.eno), |
strerror(ntohl(rpc->call_rep.eno))); |
strerror(ntohl(rpc->call_rep.eno))); |
free(buf); |
free(buf); |
return -6; | return -1; |
} |
} |
if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > cli->cli_netbuf - wlen) { |
if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > cli->cli_netbuf - wlen) { |
rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n"); | rpc_SetErr(EMSGSIZE, "Reply RPC packet is too long ..."); |
free(buf); |
free(buf); |
return -7; | return -1; |
} |
} |
|
|
/* RPC is OK! Go de-marshaling variables ... */ |
/* RPC is OK! Go de-marshaling variables ... */ |