From ebe52b71c8f8409f055b0c68ef76f29c2db8437f Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 27 Feb 2014 16:43:37 +0000 Subject: [PATCH] Implement blkmk_get_data's out_expire argument --- blkmaker.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/blkmaker.c b/blkmaker.c index 1ff20f7..07ebab0 100644 --- a/blkmaker.c +++ b/blkmaker.c @@ -150,12 +150,14 @@ size_t blkmk_get_data(blktemplate_t *tmpl, void *buf, size_t bufsz, time_t useti if (!build_merkle_root(&cbuf[36], tmpl, cbtxndata, cbtxndatasz)) return 0; - blktime_t timehdr = tmpl->curtime + difftime(usetime, tmpl->_time_rcvd); + double time_passed = difftime(usetime, tmpl->_time_rcvd); + blktime_t timehdr = tmpl->curtime + time_passed; if (timehdr > tmpl->maxtime) timehdr = tmpl->maxtime; my_htole32(&cbuf[68], timehdr); memcpy(&cbuf[72], &tmpl->diffbits, 4); - // TODO: set *out_expire if provided + if (out_expire) + *out_expire = tmpl->expires - time_passed - 1; // TEMPORARY HACK: memcpy(tmpl->_mrklroot, &cbuf[36], 32);