eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-15 12:50:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move progress function to utils.

Browse Source
This commit is contained in:
Milan Broz
2017-08-22 16:13:40 +02:00
parent 677adc7adc
commit 540972ff59
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptsetup.h
View File

@@ -51,6 +51,8 @@
#define SECTOR_SIZE 512
#define ROUND_SECTOR(x) (((x) + SECTOR_SIZE - 1) / SECTOR_SIZE)
#define DEFAULT_WIPE_BLOCK 1048576 /* 1 MiB */
extern int opt_debug;
extern int opt_verbose;
extern int opt_batch_mode;
@@ -90,6 +92,7 @@ void tools_clear_line(void);
void tools_time_progress(uint64_t device_size, uint64_t bytes,
struct timeval *start_time, struct timeval *end_time);
int tools_wipe_progress(uint64_t size, uint64_t offset, void *usrptr);
/* Log */
#define log_dbg(x...) clogger(NULL, CRYPT_LOG_DEBUG, __FILE__, __LINE__, x)

19
src/integritysetup.c
View File

@@ -26,7 +26,6 @@
#define DEFAULT_TAG_SIZE 4
#define DEFAULT_ALG_NAME "crc32c"
#define DEFAULT_WIPE_BLOCK 1024*1024 /* 1 MiB */
#define MAX_KEY_SIZE 4096
static const char *opt_journal_size_str = NULL;
@@ -133,22 +132,6 @@ static int _read_keys(char **integrity_key, struct crypt_params_integrity *param
return 0;
}
static int wipe_callback(uint64_t size, uint64_t offset, void *usrptr)
{
static struct timeval start_time = {}, end_time = {};
int r = 0;
tools_time_progress(size, offset, &start_time, &end_time);
check_signal(&r);
if (r) {
tools_clear_line();
log_err("\nWipe interrupted.\n");
}
return r;
}
static int _wipe_data_device(struct crypt_device *cd, const char *integrity_key)
{
char tmp_name[64], tmp_path[128], tmp_uuid[40];
@@ -176,7 +159,7 @@ static int _wipe_data_device(struct crypt_device *cd, const char *integrity_key)
/* Wipe the device */
set_int_handler(0);
r = crypt_wipe(cd, tmp_path, CRYPT_WIPE_ZERO, 0, 0, DEFAULT_WIPE_BLOCK,
0, &wipe_callback, NULL);
0, &tools_wipe_progress, NULL);
if (crypt_deactivate(cd, tmp_name))
log_err(_("Cannot deactivate temporary device %s.\n"), tmp_path);
set_int_block(0);

16
src/utils_tools.c
View File

@@ -393,3 +393,19 @@ void tools_time_progress(uint64_t device_size, uint64_t bytes,
eta / 60, eta % 60, mbytes, mib);
fflush(stdout);
}
int tools_wipe_progress(uint64_t size, uint64_t offset, void *usrptr)
{
static struct timeval start_time = {}, end_time = {};
int r = 0;
tools_time_progress(size, offset, &start_time, &end_time);
check_signal(&r);
if (r) {
tools_clear_line();
log_err("\nWipe interrupted.\n");
}
return r;
}