version 1.1.2.4, 2010/06/24 11:01:46
|
version 1.1.2.11, 2010/07/08 07:32:53
|
Line 13 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
Line 13 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
rpc_blob_t *blob = NULL; |
rpc_blob_t *blob = NULL; |
char szFName[MAXPATHLEN]; |
char szFName[MAXPATHLEN]; |
int f; |
int f; |
|
u_int rnd; |
|
|
|
srandomdev(); |
|
srandom(getpid() ^ time(NULL)); |
|
again: |
|
rnd = random() % UINT_MAX; |
|
|
memset(szFName, 0, MAXPATHLEN); |
memset(szFName, 0, MAXPATHLEN); |
snprintf(szFName, MAXPATHLEN, "%s/BLOB-XXXXXXXX", srv->srv_blob.dir); | snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, rnd); |
f = mkstemp(szFName); | f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); |
if (f == -1) { |
if (f == -1) { |
|
if (errno == EEXIST) |
|
goto again; |
|
|
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
} |
} |
Line 48 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
Line 57 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
close(f); |
close(f); |
|
|
blob->blob_len = len; |
blob->blob_len = len; |
blob->blob_var = strtol(strrchr(szFName, '-') + 1, NULL, 16); | blob->blob_var = rnd; |
return blob; |
return blob; |
} |
} |
|
|
Line 72 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
Line 81 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
|
|
memset(szFName, 0, MAXPATHLEN); |
memset(szFName, 0, MAXPATHLEN); |
snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); |
snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); |
f = open(szFName, O_RDONLY); | f = open(szFName, O_RDWR); |
if (f == -1) { |
if (f == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 83 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
Line 92 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
return -1; |
return -1; |
} |
} |
|
|
blob->blob_data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, f, 0); | blob->blob_data = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); |
if (blob->blob_data == MAP_FAILED) { |
if (blob->blob_data == MAP_FAILED) { |
LOGERR; |
LOGERR; |
close(f); |
close(f); |
Line 208 rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
Line 217 rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
|
} |
} |
|
|
return ret; |
return ret; |
|
} |
|
|
|
// ------------------------------------------------------------ |
|
|
|
/* |
|
* rpc_cli_sendBLOB() Send BLOB to server |
|
* @cli = Client instance |
|
* @var = BLOB variable |
|
* @data = BLOB data |
|
* 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 = 0; |
|
hdr.hdr_ret = 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; |
|
} |
|
|
|
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; |
|
} |
|
if (hdr.hdr_cmd != error) { |
|
if (hdr.hdr_len != var->val_len) { |
|
rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); |
|
return -1; |
|
} |
|
|
|
var->val.blob = hdr.hdr_var; |
|
} |
|
|
|
return hdr.hdr_cmd == error; |
|
} |
|
|
|
/* |
|
* rpc_cli_recvBLOB() Receive BLOB from server |
|
* @cli = Client instance |
|
* @var = BLOB variable |
|
* @data = BLOB data, must be free after use! |
|
* return: -1 error, 0 ok, 1 remote error |
|
*/ |
|
int |
|
rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data) |
|
{ |
|
int ret, len; |
|
uint8_t *pos; |
|
fd_set fds; |
|
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
|
struct tagBLOBHdr hdr; |
|
|
|
if (!cli || !var || !data) { |
|
rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); |
|
return -1; |
|
} |
|
|
|
*data = malloc(var->val_len); |
|
if (!*data) { |
|
LOGERR; |
|
return -1; |
|
} else |
|
memset(*data, 0, var->val_len); |
|
|
|
memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); |
|
hdr.hdr_cmd = get; |
|
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; |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
|
|
for (ret = var->val_len, pos = *data; ret > 0; ret -= len, pos += len) { |
|
FD_ZERO(&fds); |
|
FD_SET(cli->cli_sock, &fds); |
|
len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv); |
|
if (len < 1) { |
|
LOGERR; |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
|
|
if ((len = recv(cli->cli_sock, pos, BLOBSIZ, 0)) == -1) { |
|
LOGERR; |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
} |
|
printf("get all bytes ret=%d *data=%s", ret, *data); |
|
|
|
FD_ZERO(&fds); |
|
FD_SET(cli->cli_sock, &fds); |
|
switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { |
|
case -1: |
|
LOGERR; |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
case 0: |
|
rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { |
|
LOGERR; |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
if (hdr.hdr_cmd != error) { |
|
if (hdr.hdr_len != var->val_len) { |
|
rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); |
|
free(*data); |
|
*data = NULL; |
|
return -1; |
|
} |
|
} |
|
|
|
return hdr.hdr_cmd == error; |
} |
} |