--- libaitrpc/src/blob.c 2010/06/28 15:54:05 1.1.2.5 +++ libaitrpc/src/blob.c 2010/06/28 17:10:39 1.1.2.6 @@ -217,26 +217,54 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ * @cli = Client instance * @var = BLOB variable * @data = BLOB data - * return: -1 error, 0 ok + * return: -1 error, 0 ok, 1 remote error */ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void * __restrict data) { int ret, len; uint8_t *pos; + struct tagBLOBHdr hdr; + fd_set fds; + struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; if (!cli || !var || !data) { rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); return -1; } + memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); + hdr.hdr_cmd = set; + hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); + hdr.hdr_seq = 0; + hdr.hdr_len = var->val_len; + if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + for (ret = var->val_len, pos = data; ret > 0; ret -= len, pos += len) if ((len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0)) == -1) { LOGERR; return -1; } - return ret; + 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 (read(cli->cli_sock, &hdr, sizeof hdr) == -1) { + LOGERR; + return -1; + } + + return hdr.hdr_cmd == error; } /*