b3b9d77 Honor timeout while fetching via ssh. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Honor timeout while fetching via ssh.

Vsevolod Stakhov committed 13 years ago

commit b3b9d77bc75aa499bcc99b32a8cb4e5e18de4319
parent c1dd378

1 file changed +4 -1

modified libpkg/fetch.c

@@ -232,6 +232,7 @@ pkg_fetch_file_to_fd(struct pkg_fetch *f, const char *url, int dest, time_t *t)

 	off_t sz = 0;
 	int kq = -1;
 	struct kevent e, ev;
 	struct timespec ts;
 	if (pkg_config_int64(PKG_CONFIG_FETCH_RETRY, &max_retry) == EPKG_FATAL)
 		max_retry = 3;

@@ -347,7 +348,9 @@ pkg_fetch_file_to_fd(struct pkg_fetch *f, const char *url, int dest, time_t *t)

 			if ((r = fread(buf, 1, sizeof(buf), remote)) < 1)
 				break;
 		} else {
 			if (kevent(kq, &e, 1, &ev, 1, NULL) == -1) {
 			ts.tv_sec = fetch_timeout;
 			ts.tv_nsec = 0;
 			if (kevent(kq, &e, 1, &ev, 1, &ts) == -1) {
 				pkg_emit_errno("kevent", "ssh");
 				retcode = EPKG_FATAL;
 				goto cleanup;