random

Reviewed-on: #38

.gitignore

@@ -42,3 +42,6 @@
 reHDD
 
 reHDD.log
+
+
+ignoreDrives.conf

README.md

@@ -6,74 +6,44 @@
 * deleting a drive securely via overwriting
 
 ## Screenshot 
-![alt text](https://git.mosad.xyz/localhorst/reHDD/raw/commit/95828afcc2e417b9cb64a4add98ae9c3c7628e84/doc/screenshot.png "Screenshot")
+![alt text](https://git.mosad.xyz/localhorst/reHDD/raw/commit/42bc26eac95429e20c0f0d59f684dfec0d600e75/doc/screenshot.png "Screenshot")
 
 ## Debian Build Notes
 
-* apt-get install ncurses-dev git make g++ 
-* clone repo
-* make release
+* `apt-get install ncurses-dev git make g++`
+* `make release`
 
-## Create Standalone with Debian
+## Create Standalone with Debian 11
 
 Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding.
+* Start reHDD after boot without login (as a tty1 shell)
+* Start dmesg after boot without login (as a tty2 shell)
+* Start htop after boot without login (as a tty3 shell)
+* Upload reHDD log every 12h if wanted
 
 ### Software requirements
+* `apt-get install hwinfo smartmontools curl`
 
-* apt-get install hwinfo
-* wget http://ftp.de.debian.org/debian/pool/main/s/smartmontools/smartmontools_7.1-1_amd64.deb
-* dpkg --install smartmontools_7.1-1_amd64.deb 
 
-### Start reHDD after boot without login (as a tty shell)
+### Installation
 
-nano /etc/systemd/system/reHDD.service
-```
-[Unit]
-Description=Custom user interface on tty1
-Conflicts=getty@tty1.service
-Before=getty.target
+clone this repo into /root/
 
-[Service]
-WorkingDirectory=/root/reHDD
-ExecStart=/root/reHDD/reHDD
-StandardInput=tty
-StandardOutput=tty
-Restart=always
-RestartSec=1
-UtmpIdentifier=tty1
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-SendSIGHUP=yes
+`cd /root/reHDD/`
 
-[Install]
-WantedBy=multi-user.target
-```
+`make release`
 
-nano /etc/systemd/system/reHDDSettings.service 
-```
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/bash /root/reHDDSettings.sh
+`bash scripts/install_reHDD.bash`
 
-[Install]
-WantedBy=multi-user.target
-```
+If you want to upload the logs, edit `scripts/reHDDLogUploader.bash` with your nextcloud token
 
-nano /root/reHDDSettings.sh
-```
-#!/bin/bash
-dmesg -n 1 #disable overlay if a drive is attached/detached
-rm -f /root/reHDD/reHDD.log
-```
-Make sure the binary reHDD is in /root/reHDD/
-Add your system drive in /root/reHDD/ignoreDrives.conf like:
-``` /dev/sdX:e102f49d-5ed5-462b-94c5-ef66a4345671```
-Get your UUID via blkid /dev/sdX
+Add your system drive in `/root/reHDD/ignoreDrives.conf` like:
+```e102f49d```
+Get the first 8 Bytes from your UUID via `blkid /dev/sdX`
 
-systemctl enable reHDD.service
+`reboot`
 
-systemctl enable reHDDSettings.service
+## Build docs 
+`make docs`
 
+open `doc/html/index.html` in browser

astyle.sh

@@ -0,0 +1,17 @@
+#! /bin/bash
+
+echo starting astyle for $PWD
+
+astyle --style=gnu src/*.cpp
+rm -f src/*.orig
+
+astyle --style=gnu src/logger/*.cpp
+rm -f src/logger/*.orig
+
+astyle --style=gnu include/*.h
+rm -f include/*.orig
+
+astyle --style=gnu include/logger/*.h
+rm -f include//logger/*.orig
+
+echo finished astyle for $PWD

doc/doxyfile

@@ -467,7 +467,7 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@@ -904,7 +904,7 @@ FILE_PATTERNS          = *.c \
 # be searched for input files as well.
 # The default value is: NO.
 
-RECURSIVE              = NO
+RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -1493,7 +1493,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1510,7 +1510,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -2260,7 +2260,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2326,7 +2326,7 @@ GROUP_GRAPHS           = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LOOK               = NO
+UML_LOOK               = YES
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may
@@ -2377,7 +2377,7 @@ INCLUDED_BY_GRAPH      = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CALL_GRAPH             = NO
+CALL_GRAPH             = YES
 
 # If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
 # dependency graph for every global function or class method.
@@ -2389,7 +2389,7 @@ CALL_GRAPH             = NO
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CALLER_GRAPH           = NO
+CALLER_GRAPH           = YES
 
 # If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
 # hierarchy of all classes instead of a textual one.

doc/prototype_manual_DE.md

@@ -1,60 +0,0 @@
-# Installation
-**[1]** In terminal als root einloggen\
-**[2]** In reHDD_prototype wechseln\
-**[3]** Abhängigkeiten installieren\
-`apt-get install smartmontools`\
-`apt-get install hwinfo`\
-`apt-get install util-linux`
-
-**[4]** reHDD ausführbar machen\
-`chmod +x reHDD`\
-**[5]** ignoreDrives.conf bearbeiten
-##### Ein Eintrag in der ignoreDrives-Datei sorgt dafür das die Software bestimmte Festplatten ignoriert. Dies ist wichtig damit nicht unbeabsichtigt die Systemfestplatte oder weitere Festplatten bearbeitet (gelöscht) werden.
-Beispiel Inhalt:
-```
-/dev/sda:508eff7d-f039-4efb-9e2c-22dffdfdfdfd
-/dev/sdb:07dfffff-c4b6-46e7-9cdf-3cfdfdffd53d
-/dev/sdc:dfff974d-1af2-4dfd-9dfd-a2d8e4c43dff
-```
-Ein Eintrag setzt sich aus zwei Teilen zusammen:
-
-**[Pfad]:[PARTUUID]**
-
-Der Pfad kann mittels `fdisk -l` ermittelt werden.\
-Die PARTUUID kann mittels `blkid /dev/sda` ermittelt werden, wobei `/dev/sda` derzuvor ermittelte Pfad ist.
- 
-# Benutzung
-reHDD starten mit `./reHDD`  (Wichtig ist das reHDD mit root-Rechen ausgeführt wird, entwender als root einloggen oder mit `sudo`)
-
-reHDD sucht automatisch nach allen verfügbaren Festplatten und filtert die zu ignorierenden heraus.\
-Für die verbleibenden Festplatten wird eine Übersicht ausgegeben. 
-Der Nutzer wird gefragt, welche Festplatte bearbeitet werden soll und gibt die Nummer ein.
-
-Beispiel:
-
-```
-hostname@hendrik:/reHDD_prototype # ./reHDD 
-refurbishingHddTool
-created app
-app logic
-search drives ...
-------------DRIVES---------------
-        Drive: 0
-Path:          /dev/sdd
-ModelFamily:   
-ModelName:     ADATA SU650
-Capacity:      120034123776
-Serial:        H50125K001601
-PowerOnHours:  93
-PowerCycle:    187
-ErrorCount:    0
-
----------------------------------
-Select drive to wipe:
-0
-Selected drive index: 0
-wipe: shred -v /dev/sdd
-shred: /dev/sdd: Durchgang 1/3 (random)…
-shred: /dev/sdd: Durchgang 1/3 (random)…847MiB/112GiB 0%
-...
-```

ignoreDrives.conf

@@ -1 +1,2 @@
-
+4673974d
+2cb3dea4

include/drive.h

@@ -22,9 +22,17 @@ public:
                     FROZEN
                    } state;
 
+    struct
+    {
+        time_t u32ShredTimeDelta;
+        std::chrono::time_point<std::chrono::system_clock> chronoShredTimestamp;
+        unsigned long ulWrittenBytes;
+    } sShredSpeed;
+
     bool bWasShredded = false;
     bool bWasDeleteted = false;
     bool bIsOffline = false;
+    uint32_t u32DriveChecksumAferShredding = 0U;
 
 private:
     string sPath;
@@ -37,6 +45,8 @@ private:
     uint32_t u32PowerCycles = 0U;
     time_t u32Timestamp = 0U; //unix timestamp for detecting a frozen drive
     double d32TaskPercentage = 0U; //in percent for Shred (1 to 100)
+    time_t u32TimestampTaskStart = 0U; //unix timestamp for duration of an action
+    time_t u32TaskDuration = 0U; //time needed to complete the task
 
 private:
     void setTimestamp();
@@ -75,6 +85,12 @@ public:
     void setTaskPercentage(double d32TaskPercentage);
     double getTaskPercentage(void);
 
+    void setActionStartTimestamp();
+    time_t getActionStartTimestamp();
+
+    void calculateTaskDuration();
+    time_t getTaskDuration();
+
 };
 
 #endif  // DRIVE_H_

include/reHDD.h

@@ -1,6 +1,6 @@
 /**
  * @file    reHDD.h
- * @brief   represent
+ * @brief   app logic header
  * @author  hendrik schutter
  * @date    01.05.2020
  */
@@ -8,28 +8,31 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "bV0.1.0"
-
-//#define DRYRUN
+#define REHDD_VERSION "bV0.2.2"
 
 // Drive handling Settings
 #define WORSE_HOURS   19200 //mark drive if at this limit or beyond
 #define WORSE_POWERUP 10000  //mark drive if at this limit or beyond
-#define SHRED_ITERATIONS 3
-#define FROZEN_TIMEOUT 5 //After this timeout (minutes) the drive will be marked as frozen
+#define SHRED_ITERATIONS 1U
+#define FROZEN_TIMEOUT 10 //After this timeout (minutes) the drive will be marked as frozen
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2020"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
 #define DEVICE_ID  "generic"
 #define SOFTWARE_VERSION  "alpha"
 #define HARDWARE_VERSION  "generic"
 
-#define LOG_LEVEL_HIGH  //log everything, like drive scann thread
+//#define LOG_LEVEL_HIGH  //log everything, like drive scan thread
 #ifndef LOG_LEVEL_HIGH
 #define LOG_LEVEL_LOW   //log only user actions and tasks 
 #endif
 
+// Logic
+//#define DRYRUN //don´t touch the drives
+#define FROZEN_ALERT //show alert if drive is frozen
+#define ZERO_CHECK_ALERT //check drive after shred if all bytes are zero, show alert if this fails
+
 //IPC pipes
 #define READ 0
 #define WRITE 1
@@ -38,7 +41,7 @@
 #include <string>
 #include <fstream>
 #include <tuple>
-#include <vector>
+#include <list>
 #include <time.h>
 #include <chrono>
 #include <curses.h>
@@ -56,7 +59,7 @@ using namespace std;
 
 #include "drive.h"
 #include "smart.h"
-#include "shred/shred.h"
+#include "shred.h"
 #include "delete.h"
 #include "tui.h"
 #include "logger/logger.h"
@@ -78,14 +81,15 @@ public:
 
 private:
 
-    static void searchDrives(vector <Drive>* pvecDrives);
-    static void printDrives(vector <Drive>* pvecDrives);
-    static  void filterIgnoredDrives(vector <Drive>* pvecDrives);
-    static void filterNewDrives(vector <Drive>* pvecOldDrives, vector <Drive>* pvecNewDrives);
-    static void addSMARTData(vector <Drive>* pvecDrives);
+    static void searchDrives(list <Drive>* plistDrives);
+    static void printDrives(list <Drive>* plistDrives);
+    static  void filterIgnoredDrives(list <Drive>* plistDrives);
+    static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
+    static void addSMARTData(list <Drive>* plistDrives);
     static void ThreadScannDevices();
     static void ThreadUserInput();
     static void ThreadShred();
+    static void ThreadDelete();
     static void ThreadCheckFrozenDrives();
     static void handleArrowKey(TUI::UserInput userInput);
     static void handleEnter();
@@ -94,5 +98,4 @@ private:
     static Drive* getSelectedDrive();
 };
 
-
 #endif  // REHDD_H_

include/shred.h

@@ -0,0 +1,56 @@
+/**
+ * @file    shred.h
+ * @brief   shred drive
+ * @author  hendrik schutter
+ * @date    03.05.2020
+ */
+
+#ifndef SHRED_H_
+#define SHRED_H_
+
+#include "reHDD.h"
+
+#include <iostream>
+#include <fstream>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+
+#define CHUNK_SIZE 1024*1024*2 //amount of bytes that are overwritten at once --> 2MB
+#define CHUNK_DIMENSION 100U //amount of chunks are read at once from random source
+
+//#define DEMO_DRIVE_SIZE 1024*1024*256L // 256MB
+//#define DEMO_DRIVE_SIZE 1024*1024*1024L // 1GB
+//#define DEMO_DRIVE_SIZE 1024*1024*1024*10L // 10GB
+
+typedef int fileDescriptor;
+
+class Shred
+{
+protected:
+
+public:
+
+    Shred();
+    ~Shred();
+    int shredDrive(Drive* drive, int* ipSignalFd);
+
+private:
+    fileDescriptor randomSrcFileDiscr;
+    fileDescriptor driveFileDiscr;
+    unsigned char caChunk[CHUNK_DIMENSION][CHUNK_SIZE];
+    unsigned long ulDriveByteSize;
+    unsigned long ulDriveByteOverallCount = 0; //all bytes shredded in all iterations + checking -> used for progress calculation
+    double d32Percent = 0.0;
+    double d32TmpPercent = 0.0;
+
+    inline double calcProgress();
+    int iRewindDrive(fileDescriptor file);
+    unsigned long getDriveSizeInBytes(fileDescriptor file);
+    unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
+    void cleanup();
+
+};
+
+#endif  // SHRED_H_

include/shred/machdefs.h

@@ -1,19 +0,0 @@
-#ifndef _MACHINE_DEFINITIONS_HEADER
-#define _MACHINE_DEFINITIONS_HEADER
-
-#include <stdint.h>
-#include <limits.h>
-
-#undef MACHINE_16BIT
-#undef MACHINE_32BIT
-#undef MACHINE_64BIT
-
-#if UINTPTR_MAX == UINT32_MAX
-#define MACHINE_32BIT
-#elif UINTPTR_MAX == UINT64_MAX
-#define MACHINE_64BIT
-#elif UINTPTR_MAX == UINT16_MAX
-#define MACHINE_16BIT
-#endif
-
-#endif

include/shred/shred.h

@@ -1,98 +0,0 @@
-/**
- * @file    shred.h
- * @brief   shred drive
- * @author  hendrik schutter
- * @date    03.05.2020
- */
-
-#ifndef SHRED_H_
-#define SHRED_H_
-
-#include "../reHDD.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-
-
-#include "tfdef.h"
-#include "tfcore.h"
-//#include "tfe.h"
-
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE
-#endif
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 700
-#endif
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-
-#ifndef _TFNG_STREAM_CIPHER_DEFS
-#define _TFNG_STREAM_CIPHER_DEFS
-#endif
-
-#define PROCESS_BLOCKP(x,k1,k2,k3,k4,k5,k6)						\
-	do {										\
-		KE_MIX(Y, X, k1 + k2, k3, TFS_KS01);					\
-		KE_MIX(T, Z, k4 + x, k5 + k6, TFS_KS02);				\
-											\
-		BE_MIX(X, T, TFS_BS01); BE_MIX(Z, Y, TFS_BS02);				\
-		BE_MIX(X, Y, TFS_BS03); BE_MIX(Z, T, TFS_BS04);				\
-		BE_MIX(X, T, TFS_BS05); BE_MIX(Z, Y, TFS_BS06);				\
-	} while (0)
-
-#define PROCESS_BLOCKN(x,k1,k2,k3,k4,k5,k6)						\
-	do {										\
-		KE_MIX(Y, X, k1 + k2, k3, TFS_KS03);					\
-		KE_MIX(T, Z, k4 + x, k5 + k6, TFS_KS04);				\
-											\
-		BE_MIX(X, T, TFS_BS07); BE_MIX(Z, Y, TFS_BS08);				\
-		BE_MIX(X, Y, TFS_BS09); BE_MIX(Z, T, TFS_BS10);				\
-		BE_MIX(X, T, TFS_BS11); BE_MIX(Z, Y, TFS_BS12);				\
-	} while (0)
-
-
-#define NOSIZE ((size_t)-1)
-
-#define XRET(x) if (!xret && xret < x) xret = x
-
-class Shred
-{
-protected:
-
-public:
-
-    Shred();
-    ~Shred();
-    void shredDrive(Drive* drive, int* ipSignalFd);
-
-private:
-
-    unsigned long blockcount = 0UL;
-    long blockcount_max;
-    double d32Percent;
-
-    inline double calcProgress();
-    inline void tfnge_init_iv(struct tfnge_stream *tfe, const void *key, const void *iv);
-    inline void tfnge_init(struct tfnge_stream *tfe, const void *key);
-    inline void tfng_encrypt_rawblk(TFNG_UNIT_TYPE *O, const TFNG_UNIT_TYPE *I, const TFNG_UNIT_TYPE *K);
-    inline void tfnge_emit(void *dst, size_t szdst, struct tfnge_stream *tfe);
-
-};
-
-#endif  // SHRED_H_

include/shred/tfcore.h

@@ -1,51 +0,0 @@
-#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_CORE_HEADER
-#define _THREEFISH_NOISE_GENERATOR_CIPHER_CORE_HEADER
-
-#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
-#error Threefish definitions header is required! Include tfdef.h first.
-#endif
-
-#define ROL(x, s, max) ((x << s) | (x >> (-s & (max-1))))
-#define ROR(x, s, max) ((x >> s) | (x << (-s & (max-1))))
-
-#define KE_MIX(x, y, k1, k2, sl)				\
-	do {							\
-		x += k1;					\
-		y += x;						\
-		y += k2;					\
-		x = ROL(x, sl, TFNG_UNIT_BITS);			\
-		x ^= y;						\
-	} while (0)
-
-#define BE_MIX(x, y, sl)					\
-	do {							\
-		x += y;						\
-		y = ROL(y, sl, TFNG_UNIT_BITS);			\
-		y ^= x;						\
-	} while (0)
-
-#define KD_MIX(x, y, k1, k2, sr)				\
-	do {							\
-		x ^= y;						\
-		x = ROR(x, sr, TFNG_UNIT_BITS);			\
-		y -= x;						\
-		y -= k2;					\
-		x -= k1;					\
-	} while (0)
-
-#define BD_MIX(x, y, sr)					\
-	do {							\
-		y ^= x;						\
-		y = ROR(y, sr, TFNG_UNIT_BITS);			\
-		x -= y;						\
-	} while (0)
-
-enum tfng_rotations
-{
-    TFS_KS01 =  7, TFS_KS02 = 25, TFS_KS03 = 19, TFS_KS04 =  7,
-    TFS_BS01 =  5, TFS_BS02 = 27, TFS_BS03 = 26, TFS_BS04 =  6,
-    TFS_BS05 = 14, TFS_BS06 = 11, TFS_BS07 = 24, TFS_BS08 = 18,
-    TFS_BS09 =  9, TFS_BS10 = 24, TFS_BS11 =  6, TFS_BS12 =  7,
-};
-
-#endif

include/shred/tfdef.h

@@ -1,39 +0,0 @@
-#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
-#define _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
-
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE
-#endif
-
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
-#include <stddef.h>
-#include <stdint.h>
-#include "machdefs.h"
-
-#if defined(MACHINE_64BIT)
-#define TFNG_UNIT_TYPE uint64_t
-#define TFNG_NR_BLOCK_BITS 256
-#define TFNG_NR_KEY_BITS 512
-#else
-#define TFNG_UNIT_TYPE uint32_t
-#define TFNG_NR_BLOCK_BITS 128
-#define TFNG_NR_KEY_BITS 256
-#endif
-
-#define TFNG_NR_BLOCK_UNITS 4
-#define TFNG_NR_KEY_UNITS 8
-
-#define TFNG_BYTE_TYPE uint8_t
-#define TFNG_SIZE_UNIT (sizeof(TFNG_UNIT_TYPE))
-#define TFNG_BLOCK_SIZE (TFNG_SIZE_UNIT * TFNG_NR_BLOCK_UNITS)
-#define TFNG_KEY_SIZE (TFNG_SIZE_UNIT * TFNG_NR_KEY_UNITS)
-
-#define TFNG_TO_BITS(x) ((x) * 8)
-#define TFNG_FROM_BITS(x) ((x) / 8)
-#define TFNG_MAX_BITS TFNG_NR_BLOCK_BITS
-#define TFNG_UNIT_BITS (TFNG_SIZE_UNIT * 8)
-
-#endif

include/tui.h

@@ -36,7 +36,7 @@ public:
 
     static void initTUI();
 
-    void updateTUI(vector <Drive>* pvecDrives,  uint8_t u8SelectedEntry);
+    void updateTUI(list <Drive>* plistDrives,  uint8_t u8SelectedEntry);
 
     static enum UserInput readUserInput();
 
@@ -45,24 +45,28 @@ private:
     static string sRamUsage;
     static string sLocalTime;
 
-
     WINDOW* overview;
     WINDOW* systemview;
     WINDOW* detailview;
     WINDOW* menuview;
     WINDOW* dialog;
+    WINDOW* smartWarning;
 
     static void centerTitle(WINDOW *pwin, const char * title);
     static WINDOW *createOverViewWindow( int iXSize, int iYSize);
     static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
     static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
-    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, bool bSelected);
-    static WINDOW *createSystemStats(int iXSize, int iYSize, int iYStart);
+    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, bool bSelected);
+    static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart);
     static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate);
     static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB);
-    static WINDOW* createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial);
+    static WINDOW* createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
+    static WINDOW* createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles,  uint32_t u32ErrorCount);
+    static WINDOW* createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
 
     void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY);
+    string formatTimeDuration(time_t u32Duration);
+    string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
 
 };
 #endif  // TUI_H_

makefile

@@ -1,6 +1,6 @@
 #### PROJECT SETTINGS ####
 # The name of the executable to be created
-BIN_NAME := reHDD
+BIN_NAME := shredTest
 # Compiler used
 CXX ?= g++
 # Extension of source files used in the project
@@ -12,7 +12,7 @@ LIBS =
 # General compiler flags
 COMPILE_FLAGS = -std=c++17 -Wall -Wextra -g
 # Additional release-specific flags
-RCOMPILE_FLAGS = -D NDEBUG
+RCOMPILE_FLAGS = -D NDEBUG -O3
 # Additional debug-specific flags
 DCOMPILE_FLAGS = -D DEBUG
 # Add additional include paths
@@ -167,6 +167,7 @@ clean:
 	@echo "Deleting directories"
 	@$(RM) -r build
 	@$(RM) -r bin
+	@$(RM) -f reHDD.log
 
 # Main rule, checks the executable and symlinks to the output
 all: $(BIN_PATH)/$(BIN_NAME)
@@ -200,5 +201,6 @@ docs:
 	@$(RM) -r $(DOCDIR)/html
 	@doxygen $(DOCDIR)/doxyfile
 	
-	
-	
+.PHONY: style	
+style:
+	@bash astyle.sh

reHDDShred

@@ -0,0 +1 @@
+bin/release/reHDDShred

scripts/getty@tty1.service.d_override.conf

@@ -0,0 +1,17 @@
+[Unit]
+Description=reHDD on tty1
+
+[Service]
+WorkingDirectory=/root/reHDD/
+ExecStart=
+ExecStart=-/root/reHDD/reHDD
+StandardInput=tty
+StandardOutput=tty
+Restart=always
+RestartSec=1
+UtmpIdentifier=tty1
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+SendSIGHUP=yes

scripts/getty@tty2.service.d_override.conf

@@ -0,0 +1,17 @@
+[Unit]
+Description=dmesg on tty2
+
+[Service]
+WorkingDirectory=/usr/bin/
+ExecStart=
+ExecStart=-/usr/bin/dmesg -wH
+StandardInput=tty
+StandardOutput=tty
+Restart=always
+RestartSec=1
+UtmpIdentifier=tty2
+TTYPath=/dev/tty2
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+SendSIGHUP=yes

scripts/getty@tty3.service.d_override.conf

@@ -0,0 +1,17 @@
+[Unit]
+Description=htop on tty3
+
+[Service]
+WorkingDirectory=/usr/bin/
+ExecStart=
+ExecStart=-/usr/bin/htop
+StandardInput=tty
+StandardOutput=tty
+Restart=always
+RestartSec=1
+UtmpIdentifier=tty3
+TTYPath=/dev/tty3
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+SendSIGHUP=yes

scripts/install_reHDD.bash

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd /root/reHDD/scripts/
+
+chmod +x reHDDLogUploader.bash
+cp reHDDLogUploader.service /lib/systemd/system/reHDDLogUploader.service
+cp reHDDLogUploader.timer /lib/systemd/system/reHDDLogUploader.timer
+systemctl daemon-reload
+systemctl enable /lib/systemd/system/reHDDLogUploader.timer
+
+chmod +x reHDDStartHelper.bash
+cp reHDDStartHelper.service /lib/systemd/system/reHDDStartHelper.service
+systemctl daemon-reload
+systemctl enable /lib/systemd/system/reHDDStartHelper.service
+
+mkdir -p /lib/systemd/system/getty@tty1.service.d
+cp getty@tty1.service.d_override.conf /lib/systemd/system/getty@tty1.service.d/override.conf
+systemctl daemon-reload
+
+mkdir -p /lib/systemd/system/getty@tty2.service.d
+cp getty@tty2.service.d_override.conf /lib/systemd/system/getty@tty2.service.d/override.conf
+systemctl daemon-reload
+
+mkdir -p /lib/systemd/system/getty@tty3.service.d
+cp getty@tty3.service.d_override.conf /lib/systemd/system/getty@tty3.service.d/override.conf
+systemctl daemon-reload
+

scripts/reHDDLogUploader.bash

@@ -0,0 +1,6 @@
+#!/bin/bash
+# remove comment for the following to activate log telemetie
+curl -k -T /root/reHDD/reHDD.log -u "__Place_your_token_here__:" -H 'X-Requested-With: XMLHttpRequest' https://schuttercloud.com/public.php/webdav/`echo $(date '+%Y-%m-%d_%H-%M')`_reHDD.log
+rm -f /root/reHDD/reHDD.log
+
+

scripts/reHDDLogUploader.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=reHDD log uploader
+After=syslog.target
+After=network.target
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+User=root
+Group=root
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash /root/reHDD/scripts/reHDDLogUploader.bash
+
+[Install]
+WantedBy=multi-user.target
+
+

scripts/reHDDLogUploader.timer

@@ -0,0 +1,11 @@
+[Unit]
+Description=reHDD log uploader timer
+
+[Timer]
+OnActiveSec=30s
+OnBootSec=10min
+OnUnitActiveSec=12h
+
+[Install]
+WantedBy=basic.target
+

scripts/reHDDStartHelper.bash

@@ -0,0 +1,4 @@
+#!/bin/bash
+dmesg -n 1 #disable overlay if a drive is attached/detached
+
+

scripts/reHDDStartHelper.service

@@ -0,0 +1,16 @@
+[Install]
+WantedBy=multi-user.target
+
+[Unit]
+Description=reHDD start helper
+After=syslog.target
+
+[Service]
+Type=oneshot
+User=root
+Group=root
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash /root/reHDD/scripts/reHDDStartHelper.bash
+
+[Install]
+WantedBy=multi-user.target

scripts/update.sh

@@ -0,0 +1,30 @@
+#! /usr/bin/bash
+
+echo starting update
+
+systemctl stop /lib/systemd/system/getty@tty1.service.d
+
+cd /root/reHDD/
+
+FILE=./ignoreDrives.conf
+if test -f "$FILE"; then
+   echo backup exits
+else
+    cp /root/reHDD/ignoreDrives.conf /root/ignoreDrives.conf
+fi
+
+git reset
+
+git stash force 
+
+git stash
+
+git checkout master
+
+git pull
+
+make release
+
+cp  /root/ignoreDrives.conf /root/reHDD/ignoreDrives.conf
+
+systemctl start /lib/systemd/system/getty@tty1.service.d

shredTest

@@ -0,0 +1 @@
+bin/release/shredTest

shred_dummy.sh

@@ -1,12 +0,0 @@
-#! /bin/bash
-
-echo "starting SHRED DUMMY"
-
-for i in {0..100..10}
-do
-   #echo "DUMMY shred  $i%"
-   echo $date > out.txt
-   sleep 1
-done
-
-echo "finished SHRED DUMMY"

src/delete.cpp

@@ -21,6 +21,7 @@ void Delete::deleteDrive(Drive* drive)
 #ifndef DRYRUN
     string sCMD = ("wipefs -af ");
     sCMD.append(drive->getPath());
+    sCMD.append("*");
 #endif
 
 #ifdef DRYRUN
@@ -37,5 +38,5 @@ void Delete::deleteDrive(Drive* drive)
         {
             //wipefs running
         }
-    fclose(deleteCmdOutput);
+    pclose(deleteCmdOutput);
 }

src/drive.cpp

@@ -48,17 +48,18 @@ uint32_t Drive::getPowerCycles(void)
 
 string Drive::sCapacityToText()
 {
-    if(getCapacity() <= (999*1000000000UL))
+    char acBuffer[16];
+    double dSize = (double) getCapacity();
+    uint16_t u16UnitIndex = 0;
+    const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+    while (dSize >= 1000)   //using the marketing capacity
         {
-            // Less or even 999 GB --> GB
-            return  to_string(getCapacity() / 1000000000UL) + " GB";
+            dSize /= 1000;
+            u16UnitIndex++;
         }
-    else
-        {
-            // More 999 GB --> TB
-            return  to_string(getCapacity() / 1000000000000UL) + " TB";
-        }
-    return "ERROR";
+
+    sprintf(acBuffer, "%.*f %s", u16UnitIndex-3, dSize, units[u16UnitIndex]);
+    return acBuffer;
 }
 
 string Drive::sErrorCountToText()
@@ -69,14 +70,19 @@ string Drive::sErrorCountToText()
 
 string Drive::sPowerOnHoursToText()
 {
+    double dDays = 0U;
     double dYears = 0U;
     uint32_t u32Hours = getPowerOnHours();
-    stringstream stream;
+    stringstream streamDays;
+    stringstream streamYears;
 
+    dDays = (double) ((double)u32Hours/(double)24U);
     dYears = (double) ((double)u32Hours/(double)8760U);
 
-    stream << fixed << setprecision(2) << dYears;
-    string sRet = to_string(getPowerOnHours()) + " hours or " + stream.str() + " years";
+    streamDays << fixed << setprecision(0) << dDays;
+    streamYears << fixed << setprecision(1) << dYears;
+
+    string sRet = to_string(getPowerOnHours()) + " hours or " + streamDays.str() + " days or " + streamYears.str() + " years";
 
     return sRet;
 }
@@ -126,14 +132,37 @@ void Drive::setDriveSMARTData( string modelFamily,
     u32ErrorCount = errorCount;
     u32PowerOnHours = powerOnHours;
     u32PowerCycles = powerCycle;
-}
 
+}
 
 void Drive::setTimestamp()
 {
     time(&this->u32Timestamp);
 }
 
+void Drive::setActionStartTimestamp()
+{
+    time(&this->u32TimestampTaskStart);
+}
+
+time_t Drive::getActionStartTimestamp()
+{
+    return this->u32TimestampTaskStart;
+}
+
+void Drive::calculateTaskDuration()
+{
+    time_t u32localtime;
+    time(&u32localtime);
+
+    this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart;
+}
+
+time_t Drive::getTaskDuration()
+{
+    return this->u32TaskDuration;
+}
+
 void Drive::checkFrozenDrive(void)
 {
     time_t u32localtime;

src/reHDD.cpp

@@ -11,20 +11,12 @@ static int fdNewDrivesInformPipe[2];//File descriptor for pipe that informs if n
 
 static int fdShredInformPipe[2];//File descriptor for pipe that informs if a wipe thread signals
 
-static std::mutex mxScannDrives;
-
-vector <Drive> vecNewDrives; //store found drives that are updated every 5sec
-
-static vector <Drive> vecDrives; //stores all drive data from scann thread
-
-TUI *ui;
+static Drive* pDummyDrive;
 
 static  uint8_t u8SelectedEntry;
 
 static fd_set selectSet;
 
-//static struct TUI::MenuState menustate;
-
 /**
  * \brief   app constructor
  * \param	void
@@ -33,8 +25,6 @@ static fd_set selectSet;
 reHDD::reHDD(void)
 {
     u8SelectedEntry = 0U;
-
-    vecDrives.reserve(128);
 }
 
 /**
@@ -44,15 +34,15 @@ reHDD::reHDD(void)
  */
 void reHDD::app_logic(void)
 {
-    ui = new TUI();
-    ui->initTUI();
+    pDummyDrive = new Drive("/dev/sdc");
+    pDummyDrive->state = Drive::NONE;
+    pDummyDrive->bIsOffline = false;
 
     pipe(fdNewDrivesInformPipe);
     pipe(fdShredInformPipe);
 
-    thread thDevices(ThreadScannDevices); //start thread that scanns for drives
-    thread thUserInput(ThreadUserInput); //start thread that reads user input
-    thread thCheckFrozenDrives(ThreadCheckFrozenDrives); //start thread that checks timeout for drives
+    getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
+    thread(ThreadShred).detach();
 
     while(1)
         {
@@ -61,470 +51,41 @@ void reHDD::app_logic(void)
             FD_SET(fdShredInformPipe[0], &selectSet);
 
             select(FD_SETSIZE, &selectSet, NULL, NULL, NULL);
-            mxScannDrives.lock();
-            if( FD_ISSET(fdNewDrivesInformPipe[0], &selectSet))
-                {
-                    char dummy;
-                    read (fdNewDrivesInformPipe[0],&dummy,1);
-                    filterNewDrives(&vecDrives, &vecNewDrives); //filter and copy to app logic vector
-                    printDrives(&vecDrives);
-
-                }
 
             if(FD_ISSET(fdShredInformPipe[0], &selectSet))
                 {
                     char dummy;
                     read (fdShredInformPipe[0],&dummy,1);
+
+                    stringstream stream; 
+                    stream << fixed << setprecision(3) << (getSelectedDrive()->getTaskPercentage());
+                    string sState = "Shredding: " + stream.str() + "%";
+
+                    std::ostringstream out;
+                    double dDeltaSec = ((double)((getSelectedDrive()->sShredSpeed.u32ShredTimeDelta)/1000000000.0)); //convert nano in sec
+                    double speed = ((getSelectedDrive()->sShredSpeed.ulWrittenBytes/1000000.0)/dDeltaSec);
+                    char s[25];
+                    sprintf(s, "%0.2lf MB/s", speed);
+                    out << s;
+                    Logger::logThis()->info(sState + " - " + out.str());
                 }
-            ui->updateTUI(&vecDrives, u8SelectedEntry);
-            mxScannDrives.unlock();
         } //endless loop
-    thDevices.join();
-    thUserInput.join();
-    thCheckFrozenDrives.join();
 }
 
 Drive* reHDD::getSelectedDrive()
 {
-    if(u8SelectedEntry < vecDrives.size() )
-        {
-            return &(vecDrives.at(u8SelectedEntry));
-        }
-    else
-        {
-            Logger::logThis()->warning("selected drive not present");
-            return {};
-        }
-}
-
-void reHDD::ThreadScannDevices()
-{
-    while(true)
-        {
-            mxScannDrives.lock();
-            vecNewDrives.clear();
-            searchDrives(&vecNewDrives);           //search for new drives and store them in list
-            filterIgnoredDrives(&vecNewDrives);    //filter out ignored drives
-            addSMARTData(&vecNewDrives);           //add S.M.A.R.T. Data to the drives
-            mxScannDrives.unlock();
-            write(fdNewDrivesInformPipe[1], "A",1);
-            sleep(5); //sleep 5 sec
-        }
-}
-
-
-
-void reHDD::ThreadCheckFrozenDrives()
-{
-    while(true)
-        {
-            mxScannDrives.lock();
-            for(auto it = begin(vecDrives); it != end(vecDrives); ++it)
-                {
-                    if(it->state == Drive::SHRED_ACTIVE)
-                        {
-                            it->checkFrozenDrive();
-                        }
-                }
-            mxScannDrives.unlock();
-            sleep(5); //sleep 5 sec
-        }
-}
-
-void reHDD::ThreadUserInput()
-{
-    while(true)
-        {
-            // cout << TUI::readUserInput() << endl;
-            switch (TUI::readUserInput())
-                {
-                case TUI::UserInput::DownKey:
-                    //cout << "Down" << endl;
-                    handleArrowKey(TUI::UserInput::DownKey);
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::UpKey:
-                    //cout << "Up" << endl;
-                    handleArrowKey(TUI::UserInput::UpKey);
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::Undefined:
-                    //cout << "Undefined" << endl;
-                    break;
-                case TUI::UserInput::Abort:
-                    //cout << "Abort" << endl;
-                    handleAbort();
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::Delete:
-                    //cout << "Delete" << endl;
-
-                    if (getSelectedDrive() != nullptr)
-                        {
-                            if(getSelectedDrive()->state == Drive::NONE)
-                                {
-                                    getSelectedDrive()->state = Drive::DELETE_SELECTED;
-                                }
-                        }
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::Shred:
-                    //cout << "Shred" << endl;
-
-                    if (getSelectedDrive() != nullptr)
-                        {
-                            if(getSelectedDrive()->state == Drive::NONE)
-                                {
-                                    getSelectedDrive()->state = Drive::SHRED_SELECTED;
-                                }
-                        }
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::Enter:
-                    //cout << "Enter" << endl;
-                    handleEnter();
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                case TUI::UserInput::ESC:
-                    //cout << "ESC" << endl;
-                    handleESC();
-                    ui->updateTUI(&vecDrives, u8SelectedEntry);
-                    break;
-                default:
-                    break;
-                }
-        }
+    return pDummyDrive;
 }
 
 void reHDD::ThreadShred()
 {
     if (getSelectedDrive() != nullptr)
         {
+            Logger::logThis()->info("Starting Shred Thread");
+            getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of shredding
             Shred* pShredTask = new Shred(); //create new shred task
             pShredTask->shredDrive(getSelectedDrive(), &fdShredInformPipe[1]); //start new shred task
             delete pShredTask; //delete shred task
-            ui->updateTUI(&vecDrives, u8SelectedEntry);
         }
 }
 
-void reHDD::filterNewDrives(vector <Drive>* pvecOldDrives, vector <Drive>* pvecNewDrives)
-{
-    vector <Drive>::iterator itOld; //Iterator for current (old) drive list
-    vector <Drive>::iterator itNew; //Iterator for new drive list that was created from to scann thread
-
-    //remove offline old drives from previously run
-    for (itOld = pvecOldDrives->begin(); itOld != pvecOldDrives->end();)
-        {
-            if(itOld->bIsOffline == true)
-                {
-                    Logger::logThis()->warning("Offline drive found: " + itOld->getPath());
-                    itOld = pvecOldDrives->erase(itOld);
-                    /*
-                    if(pvecOldDrives->size() > 0){ //This can be a risk if the user starts a task for the selected drive and the selected drive changes
-                        u8SelectedEntry = 0U;
-                    }
-                    */
-                }
-            else
-                {
-                    ++itOld;
-                }
-        }
-
-    //search offline drives and mark them
-    for (itOld = pvecOldDrives->begin(); itOld != pvecOldDrives->end(); ++itOld)
-        {
-            itOld->bIsOffline = true; //set offline befor seachring in the new list
-            for (itNew = pvecNewDrives->begin(); itNew != pvecNewDrives->end();)
-                {
-                    if((itOld->getSerial() == itNew->getSerial()) || (itOld->getPath() == itNew->getPath()))
-                        {
-                            itOld->bIsOffline = false; //drive is still attached
-#ifdef LOG_LEVEL_HIGH
-                            Logger::logThis()->info("Delete new drive, because allready attached: " + itNew->getModelName());
-#endif
-                            itNew = pvecNewDrives->erase(itNew); //This drive is allready attached, remove from new list
-                        }
-                    else
-                        {
-                            ++itNew;
-                        }
-                }
-        }
-
-    //mark offline old drives
-    for (itOld = pvecOldDrives->begin(); itOld != pvecOldDrives->end(); ++itOld)
-        {
-            if(itOld->bIsOffline == true)
-                {
-                    //cout << "offline drive found: " << itOld->getPath() << endl;
-                    Logger::logThis()->warning("Mark offline drive found: " + itOld->getPath());
-                    itOld->state = Drive::NONE; //clear state --> shred task will terminate
-                }
-        }
-
-    //add new drives to drive list
-    for (itNew = pvecNewDrives->begin(); itNew != pvecNewDrives->end(); ++itNew)
-        {
-            pvecOldDrives->push_back(pvecNewDrives->at(itNew - pvecNewDrives->begin()));
-            Logger::logThis()->info("Add new drive: " + itNew->getModelName());
-        }
-    pvecNewDrives->clear();
-}
-
-/**
- * \brief   search attached drives on /dev/sd*
- * \param	pointer of vector <Drive>* pvecDrives
- * \return  void
- */
-void reHDD::searchDrives(vector <Drive>* pvecDrives)
-{
-    // cout << "search drives ..." << endl;
-    Logger::logThis()->info("-->    search drives   <--");
-    char * cLine = NULL;
-    size_t len = 0;
-
-    FILE* outputfileHwinfo = popen("hwinfo --short --disk", "r");
-
-    if (outputfileHwinfo == NULL)
-        {
-            exit(EXIT_FAILURE);
-        }
-
-    while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
-        {
-            if (string(cLine).find("/dev/sd") != string::npos)
-                {
-                    Drive* tmpDrive = new Drive(string(cLine).substr (2,8));
-                    tmpDrive->state = Drive::NONE;
-                    tmpDrive->bIsOffline = false;
-                    pvecDrives->push_back(*tmpDrive);
-                }
-        }
-    fclose(outputfileHwinfo);
-}
-
-/**
- * \brief   filter out drives that are listed in "ignoreDrives.conf"
- * \param	pointer of vector <Drive>* pvecDrives
- * \return  void
- */
-void reHDD::filterIgnoredDrives(vector <Drive>* pvecDrives)
-{
-    string sDelimiter = ":";
-    string sIgnoredDrivePath;
-    string sIgnoredDriveUUID;
-
-    vector<tuple<string, string>> vtlIgnoredDevices; //store drives from ingnore file
-
-    ifstream input( "ignoreDrives.conf" ); //read ingnore file
-
-    for(string sLine; getline( input, sLine );)
-        {
-            if (string(sLine).find("/dev/sd") != string::npos)
-                {
-                    size_t pos = 0;
-                    string token;
-                    while ((pos = sLine.find(sDelimiter)) != string::npos)
-                        {
-                            token = sLine.substr(0, pos);
-                            sIgnoredDrivePath = token;
-                            sLine.erase(0, pos + sDelimiter.length());
-                            sIgnoredDriveUUID = sLine;
-                        } //end while
-                    vtlIgnoredDevices.emplace_back(sIgnoredDrivePath, sIgnoredDriveUUID); //add found path and uuid from ingnore file to vector
-                }
-        }
-    //loop through found entries in ingnore file
-    for(auto row : vtlIgnoredDevices)
-        {
-            vector <Drive>::iterator it;
-            for (it = pvecDrives->begin(); it != pvecDrives->end(); ++it)
-                {
-                    string sUUID;
-                    if (!get<0>(row).compare(it->getPath())) //find same drive based on path
-                        {
-                            char * cLine = NULL;
-                            size_t len = 0;
-                            string sCMD = "blkid ";
-                            sCMD.append(it->getPath());
-                            //cout << "cmd: " << sCMD << endl;
-                            FILE* outputfileBlkid = popen(sCMD.c_str(), "r"); //get UUID from drive
-                            if (outputfileBlkid == NULL)
-                                {
-                                    exit(EXIT_FAILURE);
-                                }
-
-                            while ((getline(&cLine, &len, outputfileBlkid)) != -1) //parse UUID from blkid
-                                {
-                                    if (string(cLine).find("PTUUID") != string::npos)
-                                        {
-                                            string sBlkidOut = string(cLine);
-                                            sBlkidOut.erase(0, 18);
-                                            sBlkidOut.erase(36, sBlkidOut.length() - 36);
-                                            sUUID = sBlkidOut;
-                                            //cout << "blkid uuid:" << sUUID << endl;
-                                        }
-                                }
-                            fclose(outputfileBlkid);
-                            //cout << "blkid uuid:" << sUUID << endl;
-
-                            if (get<1>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
-                                {
-                                    cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
-                                    Logger::logThis()->error("[ERROR] different uuid found than in ignore file: " + it->getPath());
-                                    exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
-                                }
-                            else
-                                {
-                                    // same uuid found than in ignore file --> ignore this drive
-#ifdef LOG_LEVEL_HIGH
-                                    Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
-#endif
-                                    it = pvecDrives->erase(it);
-                                    it--;
-                                }
-                        }
-                }
-        }
-}
-
-/**
- * \brief   print drives with all information
- * \param	pointer of vector <Drive>* pvecDrives
- * \return  void
- */
-void reHDD::printDrives(vector <Drive>* pvecDrives)
-{
-#ifdef LOG_LEVEL_HIGH
-    Logger::logThis()->info("------------DRIVES---------------");
-    //cout << "------------DRIVES---------------" << endl;
-    vector <Drive>::iterator it;
-    for (it = pvecDrives->begin(); it != pvecDrives->end(); ++it)
-        {
-            /*
-               cout << "        Drive: " << distance(pvecDrives->begin(), it) << endl;
-               cout << "Path:          " << it->getPath() << endl;
-               cout << "ModelFamily:   " << it->getModelFamily() << endl;
-               cout << "ModelName:     " << it->getModelName() << endl;
-               cout << "Capacity:      " << it->getCapacity() << endl;
-               cout << "Serial:        " << it->getSerial() << endl;
-               cout << "PowerOnHours:  " << it->getPowerOnHours() << endl;
-               cout << "PowerCycle:    " << it->getPowerCycles() << endl;
-               cout << "ErrorCount:    " << it->getErrorCount() << endl;
-               cout << endl;*/
-
-            ostringstream address;
-            address << (void const *)&pvecDrives->at(it - pvecDrives->begin());
-
-
-            Logger::logThis()->info(to_string(it - pvecDrives->begin()) + ": " + it->getPath() + " - " + it->getModelFamily() + " - " + it->getSerial() + " @" + address.str());
-        }
-    Logger::logThis()->info("---------------------------------");
-    //cout << "---------------------------------" << endl;
-#endif
-}
-
-/**
- * \brief   add S.M.A.R.T data from SMART
- * \param	pointer of vector <Drive>* pvecDrives
- * \return  void
- */
-void reHDD::addSMARTData(vector <Drive>* pvecDrives)
-{
-    vector <Drive>::iterator it;
-    for (it = pvecDrives->begin(); it != pvecDrives->end(); ++it)
-        {
-            Drive* pTmpDrive = iterator_to_pointer<Drive, std::vector<Drive>::iterator > (it);
-            SMART::readSMARTData(pTmpDrive);
-        }
-}
-
-void reHDD::handleArrowKey(TUI::UserInput userInput)
-{
-    int8_t u8EntrySize = (int8_t) vecDrives.size();
-    switch (userInput)
-        {
-        case TUI::UserInput::DownKey:
-            u8SelectedEntry++;
-            if(u8SelectedEntry >= u8EntrySize)
-                {
-                    u8SelectedEntry = 0;
-                }
-            break;
-        case TUI::UserInput::UpKey:
-            if(u8SelectedEntry == 0)
-                {
-                    u8SelectedEntry = (u8EntrySize-1);
-                }
-            else
-                {
-                    u8SelectedEntry--;
-                }
-            break;
-        default:
-            u8SelectedEntry = 0;
-            break;
-        }
-
-    Logger::logThis()->info("ArrowKey - selected drive: " + to_string(u8SelectedEntry));
-}
-
-void reHDD::handleEnter()
-{
-    if (getSelectedDrive() != nullptr)
-        {
-            if(getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
-                {
-                    Logger::logThis()->info("Started shred for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
-                    getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
-                    //task for drive is running --> don´t show  more task options
-                    thread(ThreadShred).detach();
-                }
-
-            if(getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
-                {
-                    Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
-                    getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
-                    //task for drive is running --> don´t show  more task options
-                    Delete::deleteDrive(getSelectedDrive()); //blocking, no thread
-                    getSelectedDrive()->state = Drive::TaskState::NONE; //delete finished
-                    getSelectedDrive()->bWasDeleteted = true;
-                    Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
-                }
-        }
-}
-
-void reHDD::handleESC()
-{
-    if (getSelectedDrive() != nullptr)
-        {
-            if(getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
-                {
-                    getSelectedDrive()->state = Drive::TaskState::NONE;
-                    //task for drive is selected --> remove selection
-                }
-
-            if(getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
-                {
-                    getSelectedDrive()->state = Drive::TaskState::NONE;
-                    //task for drive is selected --> remove selection
-                }
-        }
-}
-
-void reHDD::handleAbort()
-{
-    if (getSelectedDrive() != nullptr)
-        {
-            if(getSelectedDrive()->state == Drive::SHRED_ACTIVE || getSelectedDrive()->state == Drive::DELETE_ACTIVE  )
-                {
-                    getSelectedDrive()->state = Drive::NONE;
-                    Logger::logThis()->info("Abort-Shred-Signal for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
-                    //task for drive is running --> remove selection
-                }
-        }
-}
-
-
-

src/shred.cpp

@@ -0,0 +1,293 @@
+/**
+ * @file    shred.cpp
+ * @brief   shred drive
+ * @author  hendrik schutter
+ * @date    03.05.2020
+ */
+
+#include "../include/reHDD.h"
+
+const static char *randomsrc = (char*) "/dev/urandom";
+
+Shred::Shred()
+{
+}
+
+Shred::~Shred()
+{
+}
+
+/**
+ * \brief   shred drive with shred
+ * \param	pointer of Drive instance
+ * \return  void
+ */
+int Shred::shredDrive(Drive* drive, int* ipSignalFd)
+{
+
+#ifdef DRYRUN
+    for(int i = 0; i<=500; i++)
+        {
+            if(drive->state != Drive::SHRED_ACTIVE)
+                {
+                    return 0;
+                }
+            drive->setTaskPercentage(i+0.05);
+            write(*ipSignalFd, "A",1);
+            usleep(20000);
+        }
+#endif
+
+#ifndef DRYRUN
+    const char *cpDrivePath = drive->getPath().c_str();
+
+    //open random source
+    randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
+    if (randomSrcFileDiscr == -1)
+        {
+            std::string errorMsg(strerror(randomSrcFileDiscr));
+            Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
+            perror(randomsrc);
+            cleanup();
+            return -1;
+        }
+
+    //open disk
+    driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
+    if (driveFileDiscr == -1)
+        {
+            std::string errorMsg(strerror(driveFileDiscr));
+            Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+            perror(cpDrivePath);
+            cleanup();
+            return -1;
+        }
+
+    this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
+    drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();; //set inital timestamp for speed metric
+    unsigned long ulSpeedMetricBytesWritten = 0U; //uses to calculate speed metric
+
+#ifdef LOG_LEVEL_HIGH
+    Logger::logThis()->info("Shred-Task: Bytes-Size of Drive: " + to_string(this->ulDriveByteSize) + " - Drive: " + drive->getSerial());
+#endif
+
+    for (unsigned int uiShredIterationCounter = 0U; uiShredIterationCounter < SHRED_ITERATIONS; uiShredIterationCounter++)
+        {
+            unsigned long ulDriveByteCounter = 0U; //used for one shred-iteration to keep track of the current drive position
+            uint32_t u32ChunkDimensionIndex = 0U;
+
+/*
+            if(uiShredIterationCounter == (SHRED_ITERATIONS-1))
+                {
+                    //last shred iteration --> overwrite with zeros instead with random data
+                    memset(caChunk, 0U, CHUNK_DIMENSION*CHUNK_SIZE);
+                }
+                */
+
+            while (ulDriveByteCounter < ulDriveByteSize)
+                {
+                    int iBytesToShred = 0; //Bytes that will be overwritten in this chunk-iteration
+
+                    if((u32ChunkDimensionIndex == 0U))
+                        {
+                            //read new chunks from random source if needed and this is NOT the last shred iteration
+                            unsigned long ulBytesInChunkBuffer = 0U;
+
+                            while (ulBytesInChunkBuffer < CHUNK_DIMENSION*CHUNK_SIZE)
+                                {
+                                    //read new random bytes
+                                    int iReadBytes = read(randomSrcFileDiscr, caChunk, ((CHUNK_DIMENSION*CHUNK_SIZE)-ulBytesInChunkBuffer));
+                                    if (iReadBytes > 0)
+                                        {
+                                            ulBytesInChunkBuffer += iReadBytes;
+                                        }
+                                    else
+                                        {
+                                            std::string errorMsg(strerror(iReadBytes));
+                                            Logger::logThis()->error("Shred-Task: Read from random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                                            perror("unable to read random data");
+                                            cleanup();
+                                            return -1;;
+                                        }
+                                } //end chunk read
+#ifdef LOG_LEVEL_HIGH
+                            Logger::logThis()->info("Shred-Task: Read new random data - Drive: " + drive->getSerial());
+#endif
+
+                        }
+
+                    if((ulDriveByteSize-ulDriveByteCounter) < CHUNK_SIZE)
+                        {
+                            iBytesToShred = (ulDriveByteSize-ulDriveByteCounter);
+                        }
+                    else
+                        {
+                            iBytesToShred = CHUNK_SIZE;
+                        }
+
+                    int iByteShredded = write(driveFileDiscr, caChunk[u32ChunkDimensionIndex], iBytesToShred);
+
+                    if(iByteShredded <= 0)
+                        {
+                            std::string errorMsg(strerror(iByteShredded));
+                            Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                            perror("unable to write random data");
+                            cleanup();
+                            return -1;
+                        }
+
+                    u32ChunkDimensionIndex = (u32ChunkDimensionIndex+1)%CHUNK_DIMENSION;
+                    ulDriveByteCounter += iByteShredded;
+                    ulDriveByteOverallCount += iByteShredded;
+                    d32Percent = this->calcProgress();
+                    ulSpeedMetricBytesWritten += iByteShredded;
+
+#ifdef LOG_LEVEL_HIGH
+                    Logger::logThis()->info("Shred-Task: ByteCount: " + to_string(ulDriveByteCounter) +  " - iteration: " + to_string((uiShredIterationCounter+1)) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+#endif
+                    if((d32Percent-d32TmpPercent) >= 0.01)
+                        {
+                            //set shred percantage
+                            drive->setTaskPercentage(d32TmpPercent);
+                            d32TmpPercent = d32Percent;
+
+                            //set metrics for calculating shred speed
+                            std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
+                            drive->sShredSpeed.u32ShredTimeDelta = (chronoCurrentTimestamp - drive->sShredSpeed.chronoShredTimestamp).count();
+                            drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
+                            drive->sShredSpeed.ulWrittenBytes = ulSpeedMetricBytesWritten;
+                            ulSpeedMetricBytesWritten = 0U;
+
+                            //signal process in shreding
+                            write(*ipSignalFd, "A",1);
+                        }
+
+                    if(drive->state != Drive::SHRED_ACTIVE)
+                        {
+                            drive->setTaskPercentage(0);
+                            d32Percent = 0.00;
+                            d32TmpPercent = 0.00;
+                            ulDriveByteCounter = 0U;
+                            Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" +  drive->getSerial());
+                            cleanup();
+                            return -1;
+                        }
+                }//end one chunk write
+            if(0 != iRewindDrive(driveFileDiscr))
+                {
+                    cleanup();
+                    return -1;
+                }
+        } //end one shred iteration
+
+#ifdef ZERO_CHECK_ALERT
+    drive->u32DriveChecksumAferShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
+#ifdef LOG_LEVEL_HIGH
+    if (drive->u32DriveChecksumAferShredding != 0)
+        {
+            Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial());
+        }
+    else
+        {
+            Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial());
+        }
+#endif
+#endif
+#endif
+
+    cleanup();
+
+    if(drive->state == Drive::SHRED_ACTIVE)
+        {
+            drive->bWasShredded = true;
+            drive->state= Drive::NONE;
+            drive->setTaskPercentage(0.0);
+            Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" +  drive->getSerial());
+        }
+    return 0;
+}
+/**
+ * \brief   calc shredding progress in %
+ * \param	current byte index of the drive
+ * \param	current shred iteration
+ * \return  double percentage
+ */
+double Shred::calcProgress()
+{
+    unsigned int uiMaxShredIteration = SHRED_ITERATIONS;
+
+#ifdef ZERO_CHECK_ALERT
+    uiMaxShredIteration++; //increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
+#endif
+    return (double) (((double) ulDriveByteOverallCount) / ((double)this->ulDriveByteSize*uiMaxShredIteration))*100.0f;
+}
+
+int Shred::iRewindDrive(fileDescriptor file)
+{
+    if(0 != lseek(file, 0L, SEEK_SET))
+        {
+            perror("unable to rewind drive");
+            return -1;
+        }
+    else
+        {
+            return 0;
+        }
+}
+
+unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
+{
+    unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
+
+    if(0 != iRewindDrive(file))
+        {
+            ulDriveSizeTmp = 0U;
+        }
+
+#ifdef DEMO_DRIVE_SIZE
+    ulDriveSizeTmp = DEMO_DRIVE_SIZE;
+#endif
+    return ulDriveSizeTmp;
+}
+
+unsigned int Shred::uiCalcChecksum(fileDescriptor file,Drive* drive, int* ipSignalFd)
+{
+    unsigned int uiChecksum = 0;
+    unsigned long ulDriveByteCounter = 0U;
+    while (ulDriveByteCounter < ulDriveByteSize)
+        {
+            int iBytesToCheck = 0;
+            if((ulDriveByteSize-ulDriveByteCounter) < CHUNK_SIZE)
+                {
+                    iBytesToCheck = (ulDriveByteSize-ulDriveByteCounter);
+                }
+            else
+                {
+                    iBytesToCheck = CHUNK_SIZE;
+                }
+            int iReadBytes = read(file, caChunk, iBytesToCheck);
+            for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
+                {
+                    uiChecksum += caChunk[0][iReadBytesCounter];
+                }
+            ulDriveByteCounter += iReadBytes;
+            ulDriveByteOverallCount += iReadBytes;
+            d32Percent = this->calcProgress();
+#ifdef LOG_LEVEL_HIGH
+            Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+#endif
+            if((d32Percent-d32TmpPercent) >= 0.9)
+                {
+                    drive->setTaskPercentage(d32TmpPercent);
+                    d32TmpPercent = d32Percent;
+                    write(*ipSignalFd, "A",1);
+                }
+        }
+    return uiChecksum;
+}
+
+void Shred::cleanup()
+{
+    close(driveFileDiscr);
+    close( randomSrcFileDiscr);
+}

src/shred/shred.cpp

@@ -1,404 +0,0 @@
-/**
- * @file    shred.cpp
- * @brief   shred drive
- * @author  hendrik schutter
- * @date    03.05.2020
- */
-
-#include "../../include/reHDD.h"
-#ifndef DRYRUN
-static char *randsrc = (char*) "/dev/urandom";
-static int force = 0, rmf = 0, zrf = 0, noround = 0, verbose = 0, syncio = 0, alwaysrand = 0, reqrand = 0;
-
-static char sfbuf[PATH_MAX*2];
-
-struct tfnge_stream
-{
-    TFNG_UNIT_TYPE key[TFNG_NR_KEY_UNITS];
-    TFNG_UNIT_TYPE iv[TFNG_NR_BLOCK_UNITS];
-    TFNG_BYTE_TYPE carry_block[TFNG_BLOCK_SIZE];
-    size_t carry_bytes;
-};
-
-static struct tfnge_stream tfnge;
-#endif
-
-Shred::Shred()
-{
-
-}
-
-
-Shred::~Shred()
-{
-
-}
-
-
-
-/**
- * \brief   shred drive with shred
- * \param	pointer of Drive instance
- * \return  void
- */
-void Shred::shredDrive(Drive* drive, int* ipSignalFd)
-{
-#ifdef DRYRUN
-    for(int i = 0; i<=100; i++)
-        {
-            if(drive->state != Drive::SHRED_ACTIVE)
-                {
-                    return;
-                }
-            drive->setTaskPercentage(i+0.05);
-            write(*ipSignalFd, "A",1);
-            usleep(20000);
-        }
-#endif
-
-#ifndef DRYRUN
-
-    struct stat st;
-    char *buf, *s, *d, rc = 0;
-    int f, rsf;
-    int xret = 0, pat = 0, last = 0, special = 0, iIteration = 0;
-    size_t blksz = 0, x, y;
-    size_t l, ll = NOSIZE;
-
-    const char *cpDrivePath = drive->getPath().c_str();
-
-    blockcount_max = SHRED_ITERATIONS*(drive->getCapacity()/4096);
-
-#ifdef LOG_LEVEL_HIGH
-    Logger::logThis()->info("Shred-Task: Max-BlockCount: " + to_string(blockcount_max) + " - Drive: " + drive->getSerial());
-#endif
-
-    d32Percent = 0U;
-
-    rsf = open(randsrc, O_RDONLY | O_LARGEFILE);
-    if (rsf == -1)
-        {
-            perror(randsrc);
-            exit(1);
-        }
-
-    special = pat = 0;
-    iIteration = SHRED_ITERATIONS;
-    if (verbose) fprintf(stderr, "destroying %s ...\n", cpDrivePath);
-
-    if (stat(cpDrivePath, &st) == -1)
-        {
-            perror(cpDrivePath);
-            XRET(1);
-            goto _return;
-        }
-    if (!blksz) blksz = (size_t)st.st_blksize;
-
-    else l = ll = st.st_size;
-    if (l == 0 && !S_ISREG(st.st_mode)) special = 1;
-    memset(&st, 0, sizeof(struct stat));
-
-    if (force) if (chmod(cpDrivePath, S_IRUSR|S_IWUSR) == -1)
-            {
-                perror(cpDrivePath);
-                XRET(1);
-            }
-    f = open(cpDrivePath, O_WRONLY | O_LARGEFILE | O_NOCTTY | syncio);
-    if (f == -1)
-        {
-            XRET(1);
-            perror(cpDrivePath);
-            goto _return;
-        }
-
-    buf = (char*) malloc(blksz);
-    if (!buf)
-        {
-            perror("malloc");
-            XRET(2);
-            fprintf(stderr, "Continuing with fixed buffer (%zu bytes long)\n", sizeof(sfbuf));
-            buf = sfbuf;
-            blksz = sizeof(sfbuf);
-        }
-    memset(buf, 0, blksz);
-
-    if (read(rsf, buf, blksz) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted %zu)\n", randsrc, blksz);
-    tfnge_init(&tfnge, buf);
-
-    //iteration loop
-    while (iIteration)
-        {
-            lseek(f, 0L, SEEK_SET);
-
-            if (iIteration <= 1 && zrf)
-                {
-                    pat = 1;
-                    rc = 0;
-                }
-            else if (iIteration == SHRED_ITERATIONS && reqrand)
-                {
-                    pat = 0;
-                }
-            else if (!alwaysrand)
-                {
-                    if (read(rsf, &rc, 1) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted 1)\n", randsrc);
-                    pat = rc%2;
-                    if (read(rsf, &rc, 1) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted 1)\n", randsrc);
-                }
-            else pat = 0;
-
-            if (verbose)
-                {
-                    if (pat) fprintf(stderr, "iteration (pat) %d (%02hhx%02hhx%02hhx) ...\n", SHRED_ITERATIONS-iIteration+1, rc, rc, rc);
-                    else fprintf(stderr, "iteration (!pat)  %d (random) ...\n", SHRED_ITERATIONS-iIteration+1);
-                }
-            // write block loop
-            while (1)
-                {
-                    if(drive->state != Drive::SHRED_ACTIVE)
-                        {
-                            drive->setTaskPercentage(0);
-                            d32Percent = 0.00;
-                            blockcount = 0;
-                            blockcount_max = 0;
-                            Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" +  drive->getSerial());
-                            goto _return;
-                        }
-
-                    double d32TmpPercent = calcProgress();
-
-
-
-                    if((d32TmpPercent-d32Percent) >= 0.09)
-                        {
-                            drive->setTaskPercentage(d32TmpPercent);
-                            d32Percent = d32TmpPercent;
-#ifdef LOG_LEVEL_HIGH
-                            Logger::logThis()->info("Shred-Task: BlockCount: " + to_string(blockcount) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
-#endif
-                            write(*ipSignalFd, "A",1);
-                        }
-
-                    if (!pat)
-                        {
-                            tfnge_emit(buf, blksz, &tfnge);
-                        }
-                    else
-                        {
-                            memset(buf, rc, blksz);
-                        }
-
-                    if (l <= blksz && !special)
-                        {
-                            last = 1;
-                        }
-                    errno = 0;
-                    l -= write(f, buf, (noround && last) ? l : blksz);
-                    if (errno)
-                        {
-                            perror(cpDrivePath);
-                            errno = 0;
-                            break;
-                        }
-
-                    if (last)
-                        {
-                            last = 0;
-                            break;
-                        }
-                }
-            // write block loop end
-            l = ll;
-            fdatasync(f);
-            iIteration--;
-        } //iteration loop end
-
-    if (rmf)
-        {
-            close(f);
-            f = open(cpDrivePath, O_WRONLY | O_TRUNC | O_LARGEFILE | O_NOCTTY | syncio);
-            if (verbose) fprintf(stderr, "removing %s ...\n", cpDrivePath);
-            x = strnlen(cpDrivePath, sizeof(sfbuf)/2);
-            s = sfbuf+(sizeof(sfbuf)/2);
-            memcpy(sfbuf, cpDrivePath, x);
-            *(sfbuf+x) = 0;
-            d = strrchr(sfbuf, '/');
-            if (d)
-                {
-                    d++;
-                    y = d-sfbuf;
-                    memset(d, '0', x-(d-sfbuf));
-                }
-            else
-                {
-                    y = 0;
-                    memset(sfbuf, '0', x);
-                }
-            memcpy(s, sfbuf, x);
-            *(s+x) = 0;
-
-            /* Somehow I need to rename original to destination */
-            if (access(s, R_OK) != -1)
-                {
-                    fprintf(stderr, "%s already exists!\n", s);
-                    unlink(cpDrivePath);
-                    goto _return;
-                }
-            if (verbose) fprintf(stderr, "%s -> %s\n", cpDrivePath, s);
-            if (rename(cpDrivePath, s) == -1)
-                {
-                    perror(s);
-                    goto _return;
-                }
-
-            while (x > y+1)
-                {
-                    *(sfbuf+x) = 0;
-                    x--;
-                    *(s+x) = 0;
-                    if (access(s, R_OK) != -1)
-                        {
-                            fprintf(stderr, "%s already exists!\n", s);
-                            unlink(sfbuf);
-                            goto _return;
-                        }
-                    if (verbose) fprintf(stderr, "%s -> %s\n", sfbuf, s);
-                    if (rename(sfbuf, s) == -1)
-                        {
-                            perror(s);
-                            goto _return;
-                        }
-                }
-
-            if (verbose) fprintf(stderr, "remove %s\n", s);
-            unlink(s);
-            if (verbose) fprintf(stderr, "done away with %s.\n", cpDrivePath);
-        }
-
-    tfnge_emit(NULL, 0, &tfnge);
-    if (buf && buf != sfbuf) free(buf);
-    if (f != -1) close(f);
-
-_return:
-    optind++;
-    close(rsf);
-#endif
-    if(drive->state == Drive::SHRED_ACTIVE)
-        {
-            drive->bWasShredded = true;
-            drive->state= Drive::NONE;
-            drive->setTaskPercentage(0);
-            Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" +  drive->getSerial());
-        }
-}
-#ifndef DRYRUN
-
-double Shred::calcProgress()
-{
-    blockcount++;
-    return ((((double)blockcount/(double)blockcount_max))*100);
-}
-
-
-void Shred::tfnge_init_iv(struct tfnge_stream *tfe, const void *key, const void *iv)
-{
-    memset(tfe, 0, sizeof(struct tfnge_stream));
-    memcpy(tfe->key, key, TFNG_KEY_SIZE);
-    if (iv) memcpy(tfe->iv, iv, TFNG_BLOCK_SIZE);
-    tfe->carry_bytes = 0;
-}
-
-void Shred::tfnge_init(struct tfnge_stream *tfe, const void *key)
-{
-    tfnge_init_iv(tfe, key, NULL);
-}
-
-void Shred::tfng_encrypt_rawblk(TFNG_UNIT_TYPE *O, const TFNG_UNIT_TYPE *I, const TFNG_UNIT_TYPE *K)
-{
-    TFNG_UNIT_TYPE X, Y, Z, T;
-    TFNG_UNIT_TYPE K0, K1, K2, K3;
-    TFNG_UNIT_TYPE K4, T0, T1, T2;
-
-    X = I[0];
-    Y = I[1];
-    Z = I[2];
-    T = I[3];
-
-    K0 = K[0];
-    K1 = K[1];
-    K2 = K[2];
-    K3 = K[3];
-    K4 = K[4];
-    T0 = K[5];
-    T1 = K[6];
-    T2 = K[7];
-
-    PROCESS_BLOCKP( 1,K1,T0,K0,K3,K2,T1);
-    PROCESS_BLOCKN( 2,K2,T1,K1,K4,K3,T2);
-    PROCESS_BLOCKP( 3,K3,T2,K2,K0,K4,T0);
-    PROCESS_BLOCKN( 4,K4,T0,K3,K1,K0,T1);
-
-    PROCESS_BLOCKP( 5,K0,T1,K4,K2,K1,T2);
-    PROCESS_BLOCKN( 6,K1,T2,K0,K3,K2,T0);
-    PROCESS_BLOCKP( 7,K2,T0,K1,K4,K3,T1);
-    PROCESS_BLOCKN( 8,K3,T1,K2,K0,K4,T2);
-
-    PROCESS_BLOCKP( 9,K4,T2,K3,K1,K0,T0);
-    PROCESS_BLOCKN(10,K0,T0,K4,K2,K1,T1);
-    PROCESS_BLOCKP(11,K1,T1,K0,K3,K2,T2);
-    PROCESS_BLOCKN(12,K2,T2,K1,K4,K3,T0);
-
-    O[0] = X + K3;
-    O[1] = Y + K4 + T0;
-    O[2] = Z + K0 + T1;
-    O[3] = T + K1 + 18;
-}
-
-void Shred::tfnge_emit(void *dst, size_t szdst, struct tfnge_stream *tfe)
-{
-    TFNG_BYTE_TYPE *udst = (uint8_t*) dst;
-    size_t sz = szdst;
-
-    if (!dst && szdst == 0)
-        {
-            memset(tfe, 0, sizeof(struct tfnge_stream));
-            return;
-        }
-
-    if (tfe->carry_bytes > 0)
-        {
-            if (tfe->carry_bytes > szdst)
-                {
-                    memcpy(udst, tfe->carry_block, szdst);
-                    memmove(tfe->carry_block, tfe->carry_block+szdst, tfe->carry_bytes-szdst);
-                    tfe->carry_bytes -= szdst;
-                    return;
-                }
-
-            memcpy(udst, tfe->carry_block, tfe->carry_bytes);
-            udst += tfe->carry_bytes;
-            sz -= tfe->carry_bytes;
-            tfe->carry_bytes = 0;
-        }
-
-    if (sz >= TFNG_BLOCK_SIZE)
-        {
-            do
-                {
-                    tfng_encrypt_rawblk(tfe->iv, tfe->iv, tfe->key);
-                    memcpy(udst, tfe->iv, TFNG_BLOCK_SIZE);
-                    udst += TFNG_BLOCK_SIZE;
-                }
-            while ((sz -= TFNG_BLOCK_SIZE) >= TFNG_BLOCK_SIZE);
-        }
-
-    if (sz)
-        {
-            tfng_encrypt_rawblk(tfe->iv, tfe->iv, tfe->key);
-            memcpy(udst, tfe->iv, sz);
-            udst = (TFNG_BYTE_TYPE *)tfe->iv;
-            tfe->carry_bytes = TFNG_BLOCK_SIZE-sz;
-            memcpy(tfe->carry_block, udst+sz, tfe->carry_bytes);
-        }
-}
-#endif

src/smart.cpp

@@ -51,7 +51,7 @@ void SMART::readSMARTData(Drive* drive)
             SMART::parsePowerOnHours(sLine);
             SMART::parsePowerCycle(sLine);
         }
-    fclose(outputfileSmart);
+    pclose(outputfileSmart);
     drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle); //wirte data in drive
 }
 

src/tui.cpp

@@ -50,53 +50,69 @@ void TUI::initTUI()
     Logger::logThis()->info("UI successfully initialized");
 }
 
-void TUI::updateTUI(vector <Drive>* pvecDrives, uint8_t u8SelectedEntry)
+void TUI::updateTUI(list <Drive>* plistDrives, uint8_t u8SelectedEntry)
 {
     mxUIrefresh.lock();
-    int stdscrX, stdscrY;
-    getmaxyx(stdscr, stdscrY, stdscrX);
+    uint16_t u16StdscrX, u16StdscrY;
+    getmaxyx(stdscr, u16StdscrY, u16StdscrX);
 
     init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE);
     wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR));
 
     refresh();
 
-    overview=createOverViewWindow((int)(stdscrX/3), (stdscrY-15));
+    overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3));
     wrefresh(overview);
 
-    systemview=createSystemStats((int)(stdscrX/3), 10, (stdscrY-11));
+    systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 ));
     wrefresh(systemview);
 
     delwin(detailview);
 
-    vector <Drive>::iterator it;
-    for (it = pvecDrives->begin(); it != pvecDrives->end(); ++it)
+    list <Drive>::iterator it;
+    uint8_t u8Index = 0U;
+    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
         {
             string sModelFamily = it->getModelFamily();
             string sModelName = it->getModelName();
             string sCapacity = it->sCapacityToText();
             string sState = " ";
+            string sSpeed = " ";
+            string sTime = " ";
 
             bool bSelectedEntry = false;
 
-            if(u8SelectedEntry == (it - pvecDrives->begin()))
+            if(u8SelectedEntry == u8Index)
                 {
                     bSelectedEntry = true; //mark this drive in entries list
-                    displaySelectedDrive(pvecDrives->at(u8SelectedEntry), stdscrX, stdscrY);
+                    displaySelectedDrive(*it, u16StdscrX, u16StdscrY);
+
+                    if((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0))
+                        {
+                            // smart values are bad --> show warning
+                            smartWarning=createSmartWarning(50, 10, ((u16StdscrX)-(int)(u16StdscrX/2)+35),(int)(u16StdscrY/2)-5, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount());
+                            wrefresh(smartWarning);
+                        }
                 }
 
             stringstream stream;
 
+
             switch (it->state)
                 {
                 case Drive::SHRED_ACTIVE:
 
-                    stream << fixed << setprecision(2) << (it->getTaskPercentage());
+                    stream << fixed << setprecision(3) << (it->getTaskPercentage());
                     sState = "Shredding: " + stream.str() + "%";
-                    break;
 
+                    it->calculateTaskDuration();
+                    sTime = this->formatTimeDuration(it->getTaskDuration());
+                    sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
+                    break;
                 case Drive::DELETE_ACTIVE:
                     sState = "Deleting ...";
+                    it->calculateTaskDuration();
+                    sTime = this->formatTimeDuration(it->getTaskDuration());
                     break;
 
                 case Drive::NONE:
@@ -109,21 +125,39 @@ void TUI::updateTUI(vector <Drive>* pvecDrives, uint8_t u8SelectedEntry)
                     if (it->bWasShredded)
                         {
                             sState = "SHREDDED"; //mark drive as shreded previously, overwrite if deleted
+                            sTime = this->formatTimeDuration(it->getTaskDuration());
                         }
+
+#ifdef ZERO_CHECK_ALERT
+                    if(bSelectedEntry && it->bWasShredded && (it->u32DriveChecksumAferShredding != 0U))
+                        {
+                            dialog=createZeroChecksumWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAferShredding);
+                            wrefresh(dialog);
+                        }
+#endif
+
                     break;
                 case Drive::FROZEN:
-                    dialog=createFrozenWarning(70, 16, ((stdscrX)-(int)(stdscrX/2)-35),(int)(stdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial());
+                    stream << fixed << setprecision(3) << (it->getTaskPercentage());
+#ifdef FROZEN_ALERT
+                    if(bSelectedEntry)
+                        {
+                            dialog=createFrozenWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), stream.str() + "%");
                             wrefresh(dialog);
+                        }
+#endif
+                    sState = "FROZEN " + stream.str() + "%"; //mark drive as frozen and reached progress
                     break;
                 default:
                     break;
                 }
 
-            WINDOW * tmp = createEntryWindow( ((int)(stdscrX/3) - 2), 5, 3, (5* (it - pvecDrives->begin()) )+3, sModelFamily, sModelName, sCapacity, sState, bSelectedEntry);
+            WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 5, 3, (5* (u8Index) )+3, sModelFamily, sModelName, sCapacity, sState, sTime, sSpeed, bSelectedEntry);
             wrefresh(tmp);
+            u8Index++;
         }//end loop though drives
 
-    if(pvecDrives->size() == 0)
+    if(plistDrives->size() == 0)
         {
             //no selected drive present
             Logger::logThis()->warning("no selected drive present");
@@ -134,10 +168,10 @@ void TUI::updateTUI(vector <Drive>* pvecDrives, uint8_t u8SelectedEntry)
             menustate.bDelete = false;
             menustate.bShred = false;
 
-            menuview=createMenuView(((stdscrX)-(int)(stdscrX/3)-7), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
+            menuview=createMenuView(((int)(u16StdscrX/3)-10 ), 10, (int)(u16StdscrX/3)+5,(u16StdscrY-11), menustate);
             wrefresh(menuview);
 
-            detailview=overwriteDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5);
+            detailview=overwriteDetailViewWindow(((u16StdscrX)-(int)(u16StdscrX/3)-7), (u16StdscrY-15), (int)(u16StdscrX/3)+5);
             wrefresh(detailview);
         }
 
@@ -232,38 +266,9 @@ WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive
 
     attroff(COLOR_PAIR(COLOR_AREA_DETAIL));
 
-    if(drive.getPowerOnHours() >= WORSE_HOURS)
-        {
-            mvwaddstr(newWindow,u16Line++, 3, "------------> WARNING: OPERATING HOURS <-----------");
     mvwaddstr(newWindow,u16Line++, 3, sPowerOnHours.c_str());
-            mvwaddstr(newWindow,u16Line++, 3, "---------------------------------------------------");
-        }
-    else
-        {
-            mvwaddstr(newWindow,u16Line++, 3, sPowerOnHours.c_str());
-        }
-
-    if(drive.getPowerCycles() >= WORSE_POWERUP)
-        {
-            mvwaddstr(newWindow,u16Line++, 3, "------------> WARNING: POWER-ON <------------------");
     mvwaddstr(newWindow,u16Line++, 3, sPowerCycle.c_str());
-            mvwaddstr(newWindow,u16Line++, 3, "---------------------------------------------------");
-        }
-    else
-        {
-            mvwaddstr(newWindow,u16Line++, 3, sPowerCycle.c_str());
-        }
-
-    if(drive.getErrorCount() > 0)
-        {
-            mvwaddstr(newWindow,u16Line++, 3, "------------> WARNING: S.M.A.R.T ERROR <-----------");
     mvwaddstr(newWindow,u16Line++, 3, sErrorCount.c_str());
-            mvwaddstr(newWindow,u16Line++, 3, "---------------------------------------------------");
-        }
-    else
-        {
-            mvwaddstr(newWindow,u16Line++, 3, sErrorCount.c_str());
-        }
 
     return newWindow;
 }
@@ -301,7 +306,7 @@ WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart)
     return newWindow;
 }
 
-WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, bool bSelected)
+WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, bool bSelected)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -325,15 +330,17 @@ WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
     mvwaddstr(newWindow,2, 1, sModelName.c_str());
     mvwaddstr(newWindow,3, 1, sCapacity.c_str());
 
+    mvwaddstr(newWindow,1, iXSize-sSpeed.length()-5, sSpeed.c_str());
     mvwaddstr(newWindow,2, iXSize-sState.length()-5, sState.c_str());
+    mvwaddstr(newWindow,3, iXSize-sTime.length()-5, sTime.c_str());
 
     return newWindow;
 }
 
-WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iYStart)
+WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
 {
     WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, iYStart, 2);
+    newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
 
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW));
     box(newWindow, ACS_VLINE, ACS_HLINE);
@@ -348,7 +355,19 @@ WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iYStart)
     strftime(buffer,sizeof(buffer),"Date: %d-%m-%Y   Time: %H:%M",timeinfo);
     string time(buffer);
 
-    mvwaddstr(newWindow,2, 2, time.c_str());
+    string sLine01 =  "reHDD - hard drive refurbishing tool";
+    string sLine02 =  "Version: " + string(REHDD_VERSION);
+    string sLine03 =  "Available under GPL 3.0";
+    string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
+
+    uint16_t u16Line = 2;
+
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine04.c_str());
+    u16Line++;
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), time.c_str());
 
     return newWindow;
 }
@@ -363,20 +382,24 @@ WINDOW* TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
 
     centerTitle(newWindow, "Controls");
 
-
     uint16_t u16Line = 2;
 
     if(menustate.bAbort)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press A for Abort");
+            string sLineTmp = "Press A for Abort";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
+            u16Line++;
         }
     if(menustate.bShred)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press S for Shred");
+            string sLineTmp = "Press S for Shred ";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
+            u16Line++;
         }
     if(menustate.bDelete)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press D for Delete");
+            string sLineTmp = "Press D for Delete";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
         }
 
     return newWindow;
@@ -392,14 +415,15 @@ WINDOW* TUI::createDialog(int iXSize, int iYSize, int iXStart, int iYStart, stri
 
     centerTitle(newWindow, task.c_str());
 
-    uint16_t u16Line = 2;
-    mvwaddstr(newWindow,u16Line++, 3, optionA.c_str());
-    mvwaddstr(newWindow,u16Line++, 3, optionB.c_str());
+    uint16_t u16Line = 3;
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(optionA.size()/2), optionA.c_str());
+    u16Line++;
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(optionB.size()/2), optionB.c_str());
 
     return newWindow;
 }
 
-WINDOW* TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial)
+WINDOW* TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -409,6 +433,7 @@ WINDOW* TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStar
 
     string sHeader = "Drive " + sPath + " is frozen";
     string sLine01 = "Please detach this drive and check it manually:";
+    string sShredState = "Shredding stopped after " + sProgress;
     string sLinePath =  "Path:          " +sPath;
     string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
     string sLineModelName =  "ModelName:     " + sModelName;
@@ -429,10 +454,71 @@ WINDOW* TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStar
     u16Line++;
     mvwaddstr(newWindow,u16Line++, 3, sLine02.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sShredState.c_str());
 
     return newWindow;
 }
 
+WINDOW* TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum)
+{
+    WINDOW *newWindow;
+    newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
+
+    wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
+    box(newWindow, ACS_VLINE, ACS_HLINE);
+
+    string sHeader = "Drive " + sPath + " is NOT successfully shredded!";
+    string sLine01 = "Please detach this drive and check it manually:";
+    string sShredChecksum = "After shredding the checksum was: " + to_string(u32Checksum);
+    string sLinePath =  "Path:          " +sPath;
+    string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
+    string sLineModelName =  "ModelName:     " + sModelName;
+    string sLineSerial =  "Serial:        " + sSerial;
+
+    string sLine02 = "reHDD was not able to write zero into every byte on the drive.";
+    string sLine03 = "This can be caused by an malfunctioning drive.";
+
+    centerTitle(newWindow, sHeader.c_str());
+
+    uint16_t u16Line = 2;
+    mvwaddstr(newWindow,u16Line++, 3, sLine01.c_str());
+    u16Line++;
+    mvwaddstr(newWindow,u16Line++, 3, sLinePath.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelFamlily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelName.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str());
+    u16Line++;
+    mvwaddstr(newWindow,u16Line++, 3, sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sShredChecksum.c_str());
+
+    return newWindow;
+}
+
+string TUI::formatTimeDuration(time_t u32Duration)
+{
+    std::ostringstream out;
+    int dy=(int)((u32Duration)/86400);
+    int hr=(int)(((u32Duration)/3600)%24);
+    int min=((int)((u32Duration)/60))%60;
+    int sec=(int)((u32Duration)%60);
+    char s[25];
+    sprintf(s, "%02d:%02d:%02d:%02d", dy,  hr, min, sec);
+    out << s;
+    return out.str();
+}
+
+string TUI::formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes)
+{
+    std::ostringstream out;
+    double dDeltaSec = ((double)((u32ShredTimeDelta)/1000000000.0)); //convert nano in sec
+    double speed = ((ulWrittenBytes/1000000.0)/dDeltaSec);
+    char s[25];
+    sprintf(s, "%0.2lf MB/s", speed);
+    out << s;
+    return out.str();
+}
+
 void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
 {
     struct MenuState menustate;
@@ -471,17 +557,17 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
     detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
     wrefresh(detailview);
 
-    menuview=createMenuView(((stdscrX)-(int)(stdscrX/3)-7), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
+    menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
     wrefresh(menuview);
 
     if(menustate.bConfirmShred == true)
         {
-            dialog=createDialog(70, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
+            dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
             wrefresh(dialog);
         }
     else if(menustate.bConfirmDelete == true)
         {
-            dialog=createDialog(70, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
+            dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
             wrefresh(dialog);
         }
     else
@@ -489,3 +575,42 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
             delwin(dialog);
         }
 }
+
+WINDOW* TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles,  uint32_t u32ErrorCount)
+{
+    WINDOW *newWindow;
+    newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
+
+    wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
+    box(newWindow, ACS_VLINE, ACS_HLINE);
+
+    string sHeader = "Drive " + sPath + " is suspicious";
+    string sLine01 = "Please evaluate this drive carefully.";
+
+    centerTitle(newWindow, sHeader.c_str());
+
+    uint16_t u16Line = 2;
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
+    u16Line++;
+
+    if(u32PowerOnHours > WORSE_HOURS)
+        {
+            string sLineTmp = "Operating hours exceeded " + to_string(WORSE_HOURS) + " hours: " + to_string(u32PowerOnHours);
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
+            u16Line++;
+        }
+
+    if(u32PowerCycles > WORSE_POWERUP)
+        {
+            string sLineTmp = "Power-on exceeded " + to_string(WORSE_POWERUP) + " cycles: " + to_string(u32PowerCycles);
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
+            u16Line++;
+        }
+
+    if(u32ErrorCount > 0)
+        {
+            string sLineTmp = "S.M.A.R.T. erros detected: " + to_string(u32ErrorCount);
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
+        }
+    return newWindow;
+}