--- libaitrpc/src/blob.c 2010/07/08 08:02:02 1.1.2.12 +++ libaitrpc/src/blob.c 2011/03/15 15:13:22 1.1.2.15 @@ -16,7 +16,6 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len u_int rnd; srandomdev(); - srandom(getpid() ^ time(NULL)); again: rnd = random() % UINT_MAX; @@ -266,7 +265,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t } if (hdr.hdr_cmd != error) { if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); return -1; } @@ -357,7 +356,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } if (hdr.hdr_cmd != error) { if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); free(*data); *data = NULL; return -1; @@ -365,4 +364,68 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } return hdr.hdr_cmd == error; +} + +/* + * rpc_cli_delBLOB() Delete BLOB from server + * @cli = Client instance + * @var = BLOB variable + * return: -1 error, 0 ok, 1 remote error + */ +int +rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var) +{ + struct tagBLOBHdr hdr; + fd_set fds; + struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + + if (!cli || !var) { + rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + return -1; + } + + memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); + hdr.hdr_cmd = unset; + hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); + hdr.hdr_ret = 0; + hdr.hdr_len = 0; + if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + + FD_ZERO(&fds); + FD_SET(cli->cli_sock, &fds); + switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { + case -1: + LOGERR; + return -1; + case 0: + rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); + return -1; + } + if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + + return hdr.hdr_cmd == error; +} + +/* + * rpc_cli_getBLOB() Receive BLOB from server and Delete after that + * @cli = Client instance + * @var = BLOB variable + * @data = BLOB data, must be free after use! + * return: -1 error, 0 ok, 1 remote error + */ +inline int +rpc_cli_getBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data) +{ + int ret; + + ret = rpc_cli_recvBLOB(cli, var, data); + ret |= rpc_cli_delBLOB(cli, var) > 0 ? 2 : 0; + + return ret; }