Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3db5d42
Merge pull request #794 from namore/reduce_checksum_overhead
Vsevolod Stakhov committed 12 years ago
commit 3db5d42ec3789ce0d73b9194f8ae45a2e36932d1
parent e7d4a26
1 file changed +13 -2
modified libpkg/pkg_repo.c
@@ -117,6 +117,8 @@ pkg_repo_fetch_package(struct pkg *pkg)
	char url[MAXPATHLEN];

	int fetched = 0;

	char cksum[SHA256_DIGEST_LENGTH * 2 +1];
+ 
	int64_t pkgsize;
+ 
	struct stat st;

	char *path = NULL;

	const char *packagesite = NULL;
@@ -126,8 +128,8 @@ pkg_repo_fetch_package(struct pkg *pkg)


	assert((pkg->type & PKG_REMOTE) == PKG_REMOTE);
- 
	pkg_get(pkg, PKG_REPONAME, &reponame,
- 
			PKG_CKSUM, &sum, PKG_NAME, &name, PKG_VERSION, &version);
+ 
	pkg_get(pkg, PKG_REPONAME, &reponame, PKG_CKSUM, &sum,
+ 
			PKG_NAME, &name, PKG_VERSION, &version, PKG_PKGSIZE, &pkgsize);

	pkg_repo_cached_name(pkg, dest, sizeof(dest));



	/* If it is already in the local cachedir, dont bother to
@@ -176,6 +178,15 @@ pkg_repo_fetch_package(struct pkg *pkg)
		goto cleanup;



	checksum:
+ 
	/*	checksum calculation is expensive, if size does not
+ 
		match, skip it and assume failed checksum. */
+ 
	if (stat(path, &st) == -1 || pkgsize != st.st_size) {
+ 
		pkg_emit_error("cached package %s-%s: "
+ 
			"size mismatch, fetching from remote",
+ 
			name, version);
+ 
		unlink(dest);
+ 
		return (pkg_repo_fetch_package(pkg));
+ 
	}

	retcode = sha256_file(dest, cksum);

	if (retcode == EPKG_OK)

		if (strcmp(cksum, sum)) {