libaitrpc/src/blob.c - diff

Return to blob.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/blob.c between versions 1.1.2.16 and 1.2.4.3

version 1.1.2.16, 2011/05/02 23:07:55	version 1.2.4.3, 2011/08/19 13:03:06
Line 60 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len	Line 60 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
int f;	int f;
u_int rnd;	u_int rnd;

	#ifdef HAVE_SRANDOMDEV
srandomdev();	srandomdev();
	#else
	time_t tim;

	srandom((time(&tim) ^ getpid()));
	#endif
again:	again:
rnd = random() % UINT_MAX;	rnd = random() % UINT_MAX;

Line 182 rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_	Line 188 rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_

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);
if (remove(szFName) == -1) {	if (unlink(szFName) == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
}	}
Line 209 rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_	Line 215 rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_
return -1;	return -1;
}	}

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) {
if ((len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0)) == -1) {	len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0);
	if (len == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
}	}
	}

return ret;	return ret;
}	}
Line 246 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;
}	}

if ((len = recv(cli->cli_sock, pos, BLOBSIZ, 0)) == -1) {	len = recv(cli->cli_sock, pos, BLOBSIZ, 0);
	if (len == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.16
changed lines
	Added in v.1.2.4.3