version 1.2.4.2, 2011/08/19 12:51:50
|
version 1.2.4.5, 2011/08/19 14:10:53
|
Line 70 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
Line 70 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
again: |
again: |
rnd = random() % UINT_MAX; |
rnd = random() % UINT_MAX; |
|
|
memset(szFName, 0, MAXPATHLEN); | memset(szFName, 0, sizeof szFName); |
snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, rnd); | snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, rnd); |
f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); |
f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); |
if (f == -1) { |
if (f == -1) { |
if (errno == EEXIST) |
if (errno == EEXIST) |
Line 128 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
Line 128 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
return -1; |
return -1; |
} |
} |
|
|
memset(szFName, 0, MAXPATHLEN); | memset(szFName, 0, sizeof szFName); |
snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); | snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); |
f = open(szFName, O_RDWR); |
f = open(szFName, O_RDWR); |
if (f == -1) { |
if (f == -1) { |
LOGERR; |
LOGERR; |
Line 186 rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
|
Line 186 rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
|
if (blob->blob_data) |
if (blob->blob_data) |
rpc_srv_blobUnmap(blob); |
rpc_srv_blobUnmap(blob); |
|
|
memset(szFName, 0, MAXPATHLEN); | memset(szFName, 0, sizeof szFName); |
snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); | snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); |
if (remove(szFName) == -1) { | if (unlink(szFName) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |
Line 216 rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
Line 216 rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
} |
} |
|
|
for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { |
for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { |
len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0); | len = send(cli->cli_sock, pos, ret, 0); |
if (len == -1) { |
if (len == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 254 rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
Line 254 rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
return -1; |
return -1; |
} |
} |
|
|
len = recv(cli->cli_sock, pos, BLOBSIZ, 0); | len = recv(cli->cli_sock, pos, ret, 0); |
if (len == -1) { |
if (len == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 292 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 292 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
hdr.hdr_var = 0; |
hdr.hdr_var = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = var->val_len; |
hdr.hdr_len = var->val_len; |
if (write(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |
|
|
for (ret = var->val_len, pos = data; ret > 0; ret -= len, pos += len) |
for (ret = var->val_len, pos = data; ret > 0; ret -= len, pos += len) |
if ((len = write(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret)) == -1) { | if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |
Line 313 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 313 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); |
rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); |
return -1; |
return -1; |
} |
} |
if (read(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |
Line 362 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 362 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); |
hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = 0; |
hdr.hdr_len = 0; |
if (write(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
free(*data); |
free(*data); |
*data = NULL; |
*data = NULL; |
Line 380 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 380 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
return -1; |
return -1; |
} |
} |
|
|
if ((len = read(cli->cli_sock, pos, BLOBSIZ)) == -1) { | if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { |
LOGERR; |
LOGERR; |
free(*data); |
free(*data); |
*data = NULL; |
*data = NULL; |
Line 402 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 402 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
*data = NULL; |
*data = NULL; |
return -1; |
return -1; |
} |
} |
if (read(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
free(*data); |
free(*data); |
*data = NULL; |
*data = NULL; |
Line 443 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 443 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); |
hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); |
hdr.hdr_ret = 0; |
hdr.hdr_ret = 0; |
hdr.hdr_len = 0; |
hdr.hdr_len = 0; |
if (write(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |
Line 458 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
Line 458 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t
|
rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); |
rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); |
return -1; |
return -1; |
} |
} |
if (read(cli->cli_sock, &hdr, sizeof hdr) == -1) { | if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} |
} |