version 1.11, 2013/03/07 23:10:50
|
version 1.12, 2013/04/02 15:50:14
|
Line 293 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 293 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
hdr.hdr_var = 0; |
hdr.hdr_var = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = htonl(AIT_LEN(var)); |
hdr.hdr_len = htonl(AIT_LEN(var)); |
/* calculate CRC */ |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); |
|
|
|
/* send SET request */ |
/* send SET request */ |
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
Line 331 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 328 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
LOGERR; |
LOGERR; |
return 1; |
return 1; |
} |
} |
/* check CRC */ |
|
ret = ntohs(hdr.hdr_crc); |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { |
|
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
|
return 1; |
|
} |
|
|
|
if (hdr.hdr_cmd != error) { |
if (hdr.hdr_cmd != error) { |
if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { |
if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { |
Line 386 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 376 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); |
hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = 0; |
hdr.hdr_len = 0; |
/* calculate CRC */ |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); |
|
|
|
/* send GET request */ |
/* send GET request */ |
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
Line 443 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 430 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
*data = NULL; |
*data = NULL; |
return 1; |
return 1; |
} |
} |
/* check CRC */ |
|
ret = ntohs(hdr.hdr_crc); |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { |
|
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
|
e_free(*data); |
|
*data = NULL; |
|
return 1; |
|
} |
|
if (hdr.hdr_cmd != error) { |
if (hdr.hdr_cmd != error) { |
if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { |
if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { |
rpc_SetErr(ECANCELED, "Bad return length packet"); |
rpc_SetErr(ECANCELED, "Bad return length packet"); |
Line 489 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 467 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); |
hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = 0; |
hdr.hdr_len = 0; |
/* calculate CRC */ |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); |
|
|
|
/* send UNSET request */ |
/* send UNSET request */ |
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
Line 518 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 493 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
} |
} |
if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
return 1; |
|
} |
|
/* check CRC */ |
|
ret = ntohs(hdr.hdr_crc); |
|
hdr.hdr_crc ^= hdr.hdr_crc; |
|
if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { |
|
rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); |
|
return 1; |
return 1; |
} |
} |
|
|