handle user input

Reviewed-on: #81

.gitignore

@@ -41,4 +41,10 @@
 
 reHDD
 
-reHDD.log
+*.log
+*.ods
+*.txt
+
+.vscode/
+
+ignoreDrives.conf

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tfnoisegen"]
+	path = tfnoisegen
+	url = https://git.mosad.xyz/localhorst/tfnoisegen.git

README.md

@@ -1,79 +1,68 @@
 # reHDD
 
-## Useful for:
-* checking new drives for the first time
-* checking used drives for their next live
+## Features:
+* show S.M.A.R.T values of attached drives
+* checking used drives for their next live based on threshold limits
+* delete a drive instant with wipefs
 * deleting a drive securely via overwriting
+* only needs a display and keyboard
+* process multiple drives at once
+
+## Download USB Image ##
+See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable
+
+Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .
 
 ## Screenshot 
-![alt text](https://git.mosad.xyz/localhorst/reHDD/raw/commit/95828afcc2e417b9cb64a4add98ae9c3c7628e84/doc/screenshot.png "Screenshot")
+![Screenshot of reHDD with multiple drives in different states](https://git.mosad.xyz/localhorst/reHDD/raw/commit/c40dfe2cbb8f86490b49caf82db70a10015f06f9/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++`
+* `git submodule init`
+* `git submodule update`
+* `make release`
 
-## Create Standalone with Debian
+## Enable Label Printer ##
+
+Just install [reHDDPrinter](https://git.mosad.xyz/localhorst/reHDDPrinter).
+No further settings needed.
+
+## 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 htop sudo`
 
-* 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 
+### Installation
 
-### Start reHDD after boot without login (as a tty shell)
+clone this repo into /root/
 
-nano /etc/systemd/system/reHDD.service
 ```
-[Unit]
-Description=Custom user interface on tty1
-Conflicts=getty@tty1.service
-Before=getty.target
-
-[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
-
-[Install]
-WantedBy=multi-user.target
+git submodule init
+git submodule update
 ```
 
-nano /etc/systemd/system/reHDDSettings.service 
-```
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/bash /root/reHDDSettings.sh
+`cd /root/reHDD/`
 
-[Install]
-WantedBy=multi-user.target
-```
+`make release`
 
-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
+`bash scripts/install_reHDD.bash`
 
-systemctl enable reHDD.service
+If you want to upload the logs, edit `scripts/reHDDLogUploader.bash` with your nextcloud token
 
-systemctl enable reHDDSettings.service
+Add your system drive in `/root/reHDD/ignoreDrives.conf` like:
+```e102f49d```
+Get the first 8 Bytes from your UUID via `blkid /dev/sdX`
 
+`reboot`
+
+## Build docs 
+`make docs`
+
+open `doc/html/index.html` in browser

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,3 @@
-
+4673974d
+2cb3dea4
+8ffbc421

include/delete.h

@@ -13,13 +13,11 @@
 class Delete
 {
 protected:
-
 public:
-    static void deleteDrive(Drive* drive);
+    static void deleteDrive(Drive *drive);
 
 private:
     Delete(void);
-
 };
 
-#endif  // DELETE_H_
+#endif // DELETE_H_

include/drive.h

@@ -14,67 +14,123 @@ class Drive
 {
 
 public:
-    enum TaskState {NONE,
-                    SHRED_SELECTED,
-                    SHRED_ACTIVE,
-                    DELETE_SELECTED,
-                    DELETE_ACTIVE,
-                    FROZEN
-                   } state;
+    enum class TaskState
+    {
+        NONE,
+        SHRED_SELECTED,
+        SHRED_ACTIVE, // shred iterations active
+        CHECK_ACTIVE, // optional checking active
+        CHECK_SUCCESSFUL,
+        CHECK_FAILED,
+        DELETE_SELECTED,
+        DELETE_ACTIVE,
+        FROZEN
+    };
 
-    bool bWasShredded = false;
-    bool bWasDeleteted = false;
+    enum class ConnectionType
+    {
+        UNKNOWN,
+        USB,
+        SATA,
+        NVME
+    };
+
+    struct ShredSpeed
+    {
+        time_t u32ShredTimeDelta;
+        std::chrono::time_point<std::chrono::system_clock>
+            chronoShredTimestamp;
+        unsigned long ulWrittenBytes;
+        unsigned long ulSpeedMetricBytesWritten;
+    };
+
+    std::atomic<TaskState> state;
+    std::atomic<ConnectionType> connectionType;
+    std::atomic<ShredSpeed> sShredSpeed;
+
+    bool bWasShredded = false;     // all shred iterations done
+    bool bWasShredStarted = false; // shred was atleast once started
+    bool bWasChecked = false;      // all shred iterations and optional checking done
+    bool bWasDeleted = false;
     bool bIsOffline = false;
+    uint32_t u32DriveChecksumAfterShredding = 0U;
+    uint16_t u16DriveIndex = 0U; // Index of TUI list
 
 private:
-    string sPath;
-    string sModelFamily;
-    string sModelName;
-    string sSerial;
-    uint64_t u64Capacity = 0U; //in byte
-    uint32_t u32ErrorCount = 0U;
-    uint32_t u32PowerOnHours = 0U; //in hours
-    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)
+    std::string sPath;
+    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
+
+    struct
+    {
+        std::string sModelFamily;
+        std::string sModelName;
+        std::string sSerial;
+        uint64_t u64Capacity = 0U; // in byte
+        uint32_t u32ErrorCount = 0U;
+        uint32_t u32PowerOnHours = 0U; // in hours
+        uint32_t u32PowerCycles = 0U;
+        uint32_t u32Temperature = 0U; // in Fahrenheit, just kidding: degree Celsius
+    } sSmartData;
 
 private:
     void setTimestamp();
 
 protected:
-
 public:
-    Drive(string path)
+    // Copy constructor
+    Drive(const Drive &other);
+
+    // Copy assignment operator
+    Drive &operator=(const Drive &other);
+
+    // Move constructor
+    Drive(Drive &&other) noexcept;
+
+    // Move assignment operator
+    Drive &operator=(Drive &&other) noexcept;
+
+    Drive(std::string path)
     {
         this->sPath = path;
     }
 
-    string getPath(void);
-    string getModelFamily(void);
-    string getModelName(void);
-    string getSerial(void);
-    uint64_t getCapacity(void); //in byte
+    std::string getPath(void);
+    std::string getModelFamily(void);
+    std::string getModelName(void);
+    std::string getSerial(void);
+    uint64_t getCapacity(void); // in byte
     uint32_t getErrorCount(void);
-    uint32_t getPowerOnHours(void); //in hours
+    uint32_t getPowerOnHours(void); // in hours
     uint32_t getPowerCycles(void);
+    uint32_t getTemperature(void); // in Fahrenheit, just kidding: degree Celsius
     void checkFrozenDrive(void);
 
-    void setDriveSMARTData( string modelFamily,
-                            string modelName,
-                            string serial,
-                            uint64_t capacity,
-                            uint32_t errorCount,
-                            uint32_t powerOnHours,
-                            uint32_t powerCycles);
+    void setDriveSMARTData(std::string modelFamily,
+                           std::string modelName,
+                           std::string serial,
+                           uint64_t capacity,
+                           uint32_t errorCount,
+                           uint32_t powerOnHours,
+                           uint32_t powerCycles,
+                           uint32_t temperature);
 
-    string sCapacityToText();
-    string sErrorCountToText();
-    string sPowerOnHoursToText();
-    string sPowerCyclesToText();
+    std::string sCapacityToText();
+    std::string sErrorCountToText();
+    std::string sPowerOnHoursToText();
+    std::string sPowerCyclesToText();
+    std::string sTemperatureToText();
 
     void setTaskPercentage(double d32TaskPercentage);
     double getTaskPercentage(void);
 
+    void setActionStartTimestamp();
+    time_t getActionStartTimestamp();
+
+    void calculateTaskDuration();
+    time_t getTaskDuration();
 };
 
-#endif  // DRIVE_H_
+#endif // DRIVE_H_

include/logger/logger.h

@@ -16,6 +16,10 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <ifaddrs.h>
+#include <netpacket/packet.h>
+#include <cstring>
+#include <string>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ -28,26 +32,26 @@
 
 using namespace std;
 
-#define MENU_LINE_SIZE 110 //Size of menu lines
+#define MENU_LINE_SIZE 110 // Size of menu lines
 
 #ifndef LOG_PATH
-//#define LOG_PATH "./test.txt"
+// #define LOG_PATH "./test.txt"
 #endif
 
 #ifndef DESCRIPTION
-#define DESCRIPTION "Software-Name - Copyright Company 2020"        //use your values here
+#define DESCRIPTION "Software-Name - Copyright Company 2020" // use your values here
 #endif
 
 #ifndef DEVICE_ID
-#define DEVICE_ID  "Device-Name"                                    //use your values here
+#define DEVICE_ID "Device-Name" // use your values here
 #endif
 
 #ifndef SOFTWARE_VERSION
-#define SOFTWARE_VERSION  "0.1.1.8"                                 //use your values here
+#define SOFTWARE_VERSION "0.1.1.8" // use your values here
 #endif
 
 #ifndef HARDWARE_VERSION
-#define HARDWARE_VERSION  "7.77.9"                                  //use your values here
+#define HARDWARE_VERSION "7.77.9" // use your values here
 #endif
 
 class Logger
@@ -68,13 +72,12 @@ private:
     ~Logger();
 
 public:
-
     void info(string s);
     void warning(string s);
     void error(string s);
     void newLine();
 
-    static Logger* logThis();
+    static Logger *logThis();
 };
 
-#endif  // LOGGER_H_
+#endif // LOGGER_H_

include/printer.h

@@ -0,0 +1,56 @@
+/**
+ * @file    printer.h
+ * @brief   Send drive data to printer service using ipc msg queue
+ * @author  Hendrik Schutter
+ * @date    24.11.2022
+ */
+
+#ifndef PRINTER_H_
+#define PRINTER_H_
+
+#include "reHDD.h"
+
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#define STR_BUFFER_SIZE 64U
+#define IPC_MSG_QUEUE_KEY 0x1B11193C0
+
+typedef struct
+{
+    char caDriveIndex[STR_BUFFER_SIZE];
+    char caDriveHours[STR_BUFFER_SIZE];
+    char caDriveCycles[STR_BUFFER_SIZE];
+    char caDriveErrors[STR_BUFFER_SIZE];
+    char caDriveShredTimestamp[STR_BUFFER_SIZE];
+    char caDriveShredDuration[STR_BUFFER_SIZE];
+    char caDriveCapacity[STR_BUFFER_SIZE];
+    char caDriveState[STR_BUFFER_SIZE];
+    char caDriveConnectionType[STR_BUFFER_SIZE];
+    char caDriveModelFamily[STR_BUFFER_SIZE];
+    char caDriveModelName[STR_BUFFER_SIZE];
+    char caDriveSerialnumber[STR_BUFFER_SIZE];
+    char caDriveReHddVersion[STR_BUFFER_SIZE];
+} t_driveData;
+
+typedef struct
+{
+    long msg_queue_type;
+    t_driveData driveData;
+} t_msgQueueData;
+
+class Printer
+{
+protected:
+public:
+    static Printer *getPrinter();
+    void print(Drive *drive);
+
+private:
+    static bool instanceFlag;
+    static Printer *single;
+    int msqid;
+    Printer();
+    ~Printer();
+};
+#endif // PRINTER_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,29 +8,34 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "bV0.1.0"
-
-//#define DRYRUN
+#define REHDD_VERSION "V1.2.1"
 
 // 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 WORSE_HOURS 19200    // mark drive if at this limit or beyond
+#define WORSE_POWERUP 10000  // mark drive if at this limit or beyond
+#define WORSE_TEMPERATURE 55 // mark drive if at this limit or beyond
+#define SHRED_ITERATIONS 3U
+#define FROZEN_TIMEOUT 20                           // After this timeout (minutes) the drive will be marked as frozen, if no progress
+#define METRIC_THRESHOLD 3L * 1000L * 1000L * 1000L // calc shred speed with this minimum of time delta
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2020"
-#define DEVICE_ID  "generic"
-#define SOFTWARE_VERSION  "alpha"
-#define HARDWARE_VERSION  "generic"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
+#define DEVICE_ID "generic"
+#define SOFTWARE_VERSION REHDD_VERSION
+#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 
+#define LOG_LEVEL_LOW // log only user actions and tasks
 #endif
 
-//IPC pipes
+// Logic
+#define DRYRUN       // don't touch the drives
+#define FROZEN_ALERT // show alert if drive is frozen
+#define ZERO_CHECK   // check drive after shred if all bytes are zero, show alert if this fails
+
+// IPC pipes
 #define READ 0
 #define WRITE 1
 
@@ -38,7 +43,7 @@
 #include <string>
 #include <fstream>
 #include <tuple>
-#include <vector>
+#include <list>
 #include <time.h>
 #include <chrono>
 #include <curses.h>
@@ -51,19 +56,19 @@
 #include <sstream>
 #include <iomanip>
 #include <signal.h>
-
-using namespace std;
-
+#include <atomic>
 #include "drive.h"
 #include "smart.h"
-#include "shred/shred.h"
+#include "shred.h"
 #include "delete.h"
 #include "tui.h"
+#include "printer.h"
 #include "logger/logger.h"
 
-extern Logger* logging;
+extern Logger *logging;
 
-template <typename T, typename I> T* iterator_to_pointer(I i)
+template <typename T, typename I>
+T *iterator_to_pointer(I i)
 {
     return (&(*i));
 }
@@ -71,28 +76,33 @@ template <typename T, typename I> T* iterator_to_pointer(I i)
 class reHDD
 {
 protected:
-
 public:
     reHDD(void);
     static void app_logic();
 
 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 ThreadScannDevices();
+    static void searchDrives(list<Drive> *plistDrives);
+    static void printDrives(list<Drive> *plistDrives);
+    static void startShredAllDrives(list<Drive> *plistDrives);
+    static void stopShredAllDrives(list<Drive> *plistDrives);
+    static void updateShredMetrics(list<Drive> *plistDrives);
+    static void filterIgnoredDrives(list<Drive> *plistDrives);
+    static void filterInvalidDrives(list<Drive> *plistDrives);
+    static void filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDrives);
+    static void addSMARTData(list<Drive> *plistDrives);
+    static void printAllDrives(list<Drive> *plistDrives);
+    static void printDrive(Drive *const pDrive);
+    static void ThreadScanDevices();
     static void ThreadUserInput();
-    static void ThreadShred();
+    static void ThreadShred(Drive *const pDrive);
+    static void ThreadDelete();
     static void ThreadCheckFrozenDrives();
     static void handleArrowKey(TUI::UserInput userInput);
     static void handleEnter();
     static void handleESC();
     static void handleAbort();
-    static Drive* getSelectedDrive();
+    static Drive *getSelectedDrive();
+    static bool getSystemDrive(string &systemDrive);
 };
 
-
-#endif  // REHDD_H_
+#endif // REHDD_H_

include/shred.h

@@ -0,0 +1,55 @@
+/**
+ * @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 * 32 // amount of bytes that are overwritten at once --> 32MB
+#define TFNG_DATA_SIZE CHUNK_SIZE   // amount of bytes used by tfng
+
+// #define DEMO_DRIVE_SIZE 1024*1024*256L // 256MB
+// #define DEMO_DRIVE_SIZE 1024*1024*1024L // 1GB
+// #define DEMO_DRIVE_SIZE 5*1024*1024*1024L // 5GB
+// #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 caTfngData[TFNG_DATA_SIZE];
+    unsigned char caReadBuffer[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);
+    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/smart.h

@@ -13,28 +13,21 @@
 class SMART
 {
 protected:
-
 public:
-    static void readSMARTData(Drive* drive);
+    static void readSMARTData(Drive *drive);
 
 private:
     SMART(void);
 
-    static void parseModelFamily(string sLine);
-    static void parseModelName(string sLine);
-    static void parseSerial(string sLine);
-    static void parseCapacity(string sLine);
-    static void parseErrorCount(string sLine);
-    static void parsePowerOnHours(string sLine);
-    static void parsePowerCycle(string sLine);
-
-    static  string modelFamily;
-    static  string modelName;
-    static  string serial;
-    static  uint64_t capacity;
-    static  uint32_t errorCount;
-    static  uint32_t powerOnHours;
-    static  uint32_t powerCycle;
+    static bool parseExitStatus(std::string sLine, uint8_t &status);
+    static bool parseModelFamily(std::string sLine, std::string &modelFamily);
+    static bool parseModelName(std::string sLine, std::string &modelName);
+    static bool parseSerial(std::string sLine, std::string &serial);
+    static bool parseCapacity(std::string sLine, uint64_t &capacity);
+    static bool parseErrorCount(std::string sLine, uint32_t &errorCount);
+    static bool parsePowerOnHours(std::string sLine, uint32_t &powerOnHours);
+    static bool parsePowerCycles(std::string sLine, uint32_t &powerCycles);
+    static bool parseTemperature(std::string sLine, uint32_t &temperature);
 };
 
-#endif  // SMART_H_
+#endif // SMART_H_

include/tui.h

@@ -12,17 +12,30 @@
 
 #define COLOR_AREA_STDSCR 1
 #define COLOR_AREA_OVERVIEW 2
-#define COLOR_AREA_ENTRY 3
-#define COLOR_AREA_ENTRY_SELECTED 4
-#define COLOR_AREA_DETAIL 5
+#define COLOR_AREA_ENTRY_EVEN 3
+#define COLOR_AREA_ENTRY_ODD 4
+#define COLOR_AREA_ENTRY_SELECTED 5
+#define COLOR_AREA_DETAIL 6
 
 class TUI
 {
 protected:
-
 public:
-
-    enum UserInput { UpKey, DownKey, Abort, Shred, Delete, Enter, ESC, Undefined};
+    enum UserInput
+    {
+        UpKey,
+        DownKey,
+        Abort,
+        Shred,
+        ShredAll,
+        Delete,
+        Enter,
+        ESC,
+        Terminate,
+        Print,
+        PrintAll,
+        Undefined
+    };
     struct MenuState
     {
         bool bAbort;
@@ -36,33 +49,39 @@ public:
 
     static void initTUI();
 
-    void updateTUI(vector <Drive>* pvecDrives,  uint8_t u8SelectedEntry);
+    void updateTUI(std::list<Drive> *plistDrives, uint8_t u8SelectedEntry);
 
     static enum UserInput readUserInput();
 
+    static void terminateTUI();
+
 private:
-    static string sCpuUsage;
-    static string sRamUsage;
-    static string sLocalTime;
+    static std::string sCpuUsage;
+    static std::string sRamUsage;
+    static std::string sLocalTime;
 
+    WINDOW *overview;
+    WINDOW *systemview;
+    WINDOW *detailview;
+    WINDOW *menuview;
+    WINDOW *dialog;
+    WINDOW *smartWarning;
 
-    WINDOW* overview;
-    WINDOW* systemview;
-    WINDOW* detailview;
-    WINDOW* menuview;
-    WINDOW* dialog;
-
-    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 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, int iListIndex, std::string sModelFamily, std::string sSerial, std::string sCapacity, std::string sState, std::string sTime, std::string sSpeed, std::string sTemp, std::string sConnection, 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);
-
-    void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY);
+    static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, std::string selectedTask, std::string optionA, std::string optionB);
+    static WINDOW *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, std::string sProgress);
+    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
+    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, uint32_t u32Checksum);
 
+    void displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY);
+    std::string formatTimeDuration(time_t u32Duration);
+    std::string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
+    static void vTruncateText(std::string *psText, uint16_t u16MaxLenght);
 };
-#endif  // TUI_H_
+#endif // TUI_H_

makefile

@@ -8,19 +8,22 @@ SRC_EXT = cpp
 # Path to the source directory, relative to the makefile
 SRC_PATH = src
 # Space-separated pkg-config libraries used by this project
-LIBS =
+LIBS = lib
 # General compiler flags
-COMPILE_FLAGS = -std=c++17 -Wall -Wextra -g
+COMPILE_FLAGS = -std=c++23 -Wall -Wextra -g
 # Additional release-specific flags
-RCOMPILE_FLAGS = -D NDEBUG
+RCOMPILE_FLAGS = -D NDEBUG -Ofast
 # Additional debug-specific flags
 DCOMPILE_FLAGS = -D DEBUG
 # Add additional include paths
 INCLUDES = include
 # General linker settings
-LINK_FLAGS = -lpthread -lncurses
+LINK_FLAGS = -Llib -lpthread -lncurses -ltfng -latomic
+
 # Doc
 DOCDIR = doc
+TFRANDDIR = tfnoisegen
+TFRANDLIB = libtfng.a
 #### END PROJECT SETTINGS ####
 
 # Optionally you may move the section above to a separate config.mk file, and
@@ -158,6 +161,7 @@ dirs:
 	@echo "Creating directories"
 	@mkdir -p $(dir $(OBJECTS))
 	@mkdir -p $(BIN_PATH)
+	@mkdir -p $(LIBS)
 
 # Removes all build files
 .PHONY: clean
@@ -167,15 +171,22 @@ clean:
 	@echo "Deleting directories"
 	@$(RM) -r build
 	@$(RM) -r bin
+	@$(RM) -r $(LIBS)
+	@$(RM) -f reHDD.log
+	$(MAKE) clean -C tfnoisegen 
 
 # Main rule, checks the executable and symlinks to the output
 all: $(BIN_PATH)/$(BIN_NAME)
+	$(MAKE) libtfng.a -C tfnoisegen
+	@cp $(TFRANDDIR)/$(TFRANDLIB) $(LIBS)
 	@echo "Making symlink: $(BIN_NAME) -> $<"
 	@$(RM) $(BIN_NAME)
 	@ln -s $(BIN_PATH)/$(BIN_NAME) $(BIN_NAME)
 
 # Link the executable
 $(BIN_PATH)/$(BIN_NAME): $(OBJECTS)
+	$(MAKE) libtfng.a -C tfnoisegen
+	@cp $(TFRANDDIR)/$(TFRANDLIB) $(LIBS)
 	@echo "Linking: $@"
 	@$(START_TIME)
 	$(CMD_PREFIX)$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
@@ -200,5 +211,6 @@ docs:
 	@$(RM) -r $(DOCDIR)/html
 	@doxygen $(DOCDIR)/doxyfile
 	
-	
-	
+.PHONY: style	
+style:
+	@bash astyle.sh

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 -wHT
+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,36 @@
+#! /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 already"
+else
+    cp /root/reHDD/ignoreDrives.conf /root/ignoreDrives.conf
+fi
+
+git reset
+
+git stash force 
+
+git stash
+
+git checkout master
+
+git pull
+
+git submodule init
+
+git submodule update
+
+make clean
+
+make release
+
+cp  /root/ignoreDrives.conf /root/reHDD/ignoreDrives.conf
+
+systemctl start /lib/systemd/system/getty@tty1.service.d

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

@@ -6,36 +6,44 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 /**
  * \brief   delete drive with wipefs
  * \param	pointer of Drive instance
  * \return  void
  */
-void Delete::deleteDrive(Drive* drive)
+void Delete::deleteDrive(Drive *drive)
 
 {
-    size_t len = 0; //lenght of found line
-    char* cLine = NULL; //found line
+    size_t len = 0;     // lenght of found line
+    char *cLine = NULL; // found line
 
 #ifndef DRYRUN
     string sCMD = ("wipefs -af ");
     sCMD.append(drive->getPath());
+    sCMD.append("*");
 #endif
 
 #ifdef DRYRUN
-    //cout << "dryrun for " << drive->getPath() << endl;
+    // cout << "dryrun for " << drive->getPath() << endl;
     string sCMD = ("echo");
 #endif
 
-    const char* cpComand = sCMD.c_str();
-    //cout << "delete: " << cpComand << endl;
+    const char *cpComand = sCMD.c_str();
+    // cout << "delete: " << cpComand << endl;
 
-    FILE* deleteCmdOutput = popen(cpComand, "r");
+    if (drive->bWasShredStarted == false)
+    {
+        // only start delete if the drive was not shredded before
+        FILE *deleteCmdOutput = popen(cpComand, "r");
 
-    while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
+        while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
         {
-            //wipefs running
+            // wipefs running
         }
-    fclose(deleteCmdOutput);
+
+        free(cLine);
+        pclose(deleteCmdOutput);
+    }
 }

src/drive.cpp

@@ -6,6 +6,95 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
+
+// Copy constructor
+Drive::Drive(const Drive &other)
+    : state(other.state.load()),
+      connectionType(other.connectionType.load()),
+      sShredSpeed(other.sShredSpeed.load()),
+      bWasShredded(other.bWasShredded),
+      bWasShredStarted(other.bWasShredStarted),
+      bWasChecked(other.bWasChecked),
+      bWasDeleted(other.bWasDeleted),
+      bIsOffline(other.bIsOffline),
+      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
+      sPath(other.sPath),
+      u32Timestamp(other.u32Timestamp),
+      d32TaskPercentage(other.d32TaskPercentage),
+      u32TimestampTaskStart(other.u32TimestampTaskStart),
+      u32TaskDuration(other.u32TaskDuration),
+      sSmartData(other.sSmartData)
+{
+}
+
+// Copy assignment operator
+Drive &Drive::operator=(const Drive &other)
+{
+    if (this != &other)
+    {
+        state = other.state.load();
+        connectionType = other.connectionType.load();
+        sShredSpeed = other.sShredSpeed.load();
+        bWasShredded = other.bWasShredded;
+        bWasShredStarted = other.bWasShredStarted;
+        bWasChecked = other.bWasChecked;
+        bWasDeleted = other.bWasDeleted;
+        bIsOffline = other.bIsOffline;
+        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
+        sPath = other.sPath;
+        u32Timestamp = other.u32Timestamp;
+        d32TaskPercentage = other.d32TaskPercentage;
+        u32TimestampTaskStart = other.u32TimestampTaskStart;
+        u32TaskDuration = other.u32TaskDuration;
+        sSmartData = other.sSmartData;
+    }
+    return *this;
+}
+
+// Move constructor
+Drive::Drive(Drive &&other) noexcept
+    : state(other.state.load()),
+      connectionType(other.connectionType.load()),
+      sShredSpeed(other.sShredSpeed.load()),
+      bWasShredded(other.bWasShredded),
+      bWasShredStarted(other.bWasShredStarted),
+      bWasChecked(other.bWasChecked),
+      bWasDeleted(other.bWasDeleted),
+      bIsOffline(other.bIsOffline),
+      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
+      sPath(std::move(other.sPath)),
+      u32Timestamp(other.u32Timestamp),
+      d32TaskPercentage(other.d32TaskPercentage),
+      u32TimestampTaskStart(other.u32TimestampTaskStart),
+      u32TaskDuration(other.u32TaskDuration),
+      sSmartData(std::move(other.sSmartData))
+{
+}
+
+// Move assignment operator
+Drive &Drive::operator=(Drive &&other) noexcept
+{
+    if (this != &other)
+    {
+        state = other.state.load();
+        connectionType = other.connectionType.load();
+        sShredSpeed = other.sShredSpeed.load();
+        bWasShredded = other.bWasShredded;
+        bWasShredStarted = other.bWasShredStarted;
+        bWasChecked = other.bWasChecked;
+        bWasDeleted = other.bWasDeleted;
+        bIsOffline = other.bIsOffline;
+        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
+        sPath = std::move(other.sPath);
+        u32Timestamp = other.u32Timestamp;
+        d32TaskPercentage = other.d32TaskPercentage;
+        u32TimestampTaskStart = other.u32TimestampTaskStart;
+        u32TaskDuration = other.u32TaskDuration;
+        sSmartData = std::move(other.sSmartData);
+    }
+    return *this;
+}
 
 string Drive::getPath(void)
 {
@@ -14,51 +103,61 @@ string Drive::getPath(void)
 
 string Drive::getModelFamily(void)
 {
-    return sModelFamily;
+    return sSmartData.sModelFamily;
 }
 
 string Drive::getModelName(void)
 {
-    return sModelName;
+    return sSmartData.sModelName;
 }
 
 string Drive::getSerial(void)
 {
-    return sSerial;
+    return sSmartData.sSerial;
 }
 
 uint64_t Drive::getCapacity(void)
 {
-    return u64Capacity;
+    return sSmartData.u64Capacity;
 }
 
 uint32_t Drive::getErrorCount(void)
 {
-    return u32ErrorCount;
+    return sSmartData.u32ErrorCount;
 }
 uint32_t Drive::getPowerOnHours(void)
 {
-    return u32PowerOnHours;
+    return sSmartData.u32PowerOnHours;
 }
 
 uint32_t Drive::getPowerCycles(void)
 {
-    return u32PowerCycles;
+    return sSmartData.u32PowerCycles;
+}
+
+uint32_t Drive::getTemperature(void)
+{
+    return sSmartData.u32Temperature;
 }
 
 string Drive::sCapacityToText()
 {
-    if(getCapacity() <= (999*1000000000UL))
-        {
-            // Less or even 999 GB --> GB
-            return  to_string(getCapacity() / 1000000000UL) + " GB";
-        }
-    else
-        {
-            // More 999 GB --> TB
-            return  to_string(getCapacity() / 1000000000000UL) + " TB";
-        }
-    return "ERROR";
+    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
+    {
+        dSize /= 1000;
+        u16UnitIndex++;
+    }
+    if (u16UnitIndex >= 9)
+    {
+        u16UnitIndex = 8;
+    }
+    int precision = (u16UnitIndex >= 3) ? (u16UnitIndex - 3) : 0;
+    sprintf(acBuffer, "%.*f %s", precision, dSize, units[u16UnitIndex]);
+    return acBuffer;
 }
 
 string Drive::sErrorCountToText()
@@ -66,17 +165,21 @@ string Drive::sErrorCountToText()
     return to_string(getErrorCount());
 }
 
-
 string Drive::sPowerOnHoursToText()
 {
+    double dDays = 0U;
     double dYears = 0U;
     uint32_t u32Hours = getPowerOnHours();
-    stringstream stream;
+    stringstream streamDays;
+    stringstream streamYears;
 
-    dYears = (double) ((double)u32Hours/(double)8760U);
+    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;
 }
@@ -86,20 +189,24 @@ string Drive::sPowerCyclesToText()
     return to_string(getPowerCycles());
 }
 
+string Drive::sTemperatureToText()
+{
+    return to_string(getTemperature()) + " C";
+}
+
 void Drive::setTaskPercentage(double d32TaskPercentage)
 {
-    if(d32TaskPercentage <= 100)
-        {
-            this->d32TaskPercentage = d32TaskPercentage;
-            this->setTimestamp(); //set timestamp for this progress for detecting a frozen drive
-        }
+    if (d32TaskPercentage <= 100)
+    {
+        this->d32TaskPercentage = d32TaskPercentage;
+        this->setTimestamp(); // set timestamp for this progress for detecting a frozen drive
+    }
 }
 double Drive::getTaskPercentage(void)
 {
     return this->d32TaskPercentage;
 }
 
-
 /**
  * \brief   set S.M.A.R.T. values in model
  * \param	string modelFamily
@@ -109,41 +216,83 @@ double Drive::getTaskPercentage(void)
  * \param   uint32_t errorCount
  * \param   uint32_t powerOnHours
  * \param   uint32_t powerCycle
+ * \param   uint32_t temperature
  * \return  void
  */
-void Drive::setDriveSMARTData( string modelFamily,
-                               string modelName,
-                               string serial,
-                               uint64_t capacity,
-                               uint32_t errorCount,
-                               uint32_t powerOnHours,
-                               uint32_t powerCycle)
+void Drive::setDriveSMARTData(string modelFamily,
+                              string modelName,
+                              string serial,
+                              uint64_t capacity,
+                              uint32_t errorCount,
+                              uint32_t powerOnHours,
+                              uint32_t powerCycle,
+                              uint32_t temperature)
 {
-    this->sModelFamily = modelFamily;
-    sModelName = modelName;
-    sSerial = serial;
-    u64Capacity = capacity;
-    u32ErrorCount = errorCount;
-    u32PowerOnHours = powerOnHours;
-    u32PowerCycles = powerCycle;
+    this->sSmartData.sModelFamily = modelFamily;
+    this->sSmartData.sModelName = modelName;
+    this->sSmartData.sSerial = serial;
+    this->sSmartData.u64Capacity = capacity;
+    this->sSmartData.u32ErrorCount = errorCount;
+    this->sSmartData.u32PowerOnHours = powerOnHours;
+    this->sSmartData.u32PowerCycles = powerCycle;
+    this->sSmartData.u32Temperature = temperature;
 }
 
-
 void Drive::setTimestamp()
 {
-    time(&this->u32Timestamp);
+    if (time(&this->u32Timestamp) == -1)
+    {
+        // handle error
+        this->u32Timestamp = 0U;
+    }
+}
+
+void Drive::setActionStartTimestamp()
+{
+    if (time(&this->u32TimestampTaskStart) == -1)
+    {
+        // handle error
+        this->u32TimestampTaskStart = 0U;
+    }
+}
+
+time_t Drive::getActionStartTimestamp()
+{
+    return this->u32TimestampTaskStart;
+}
+
+void Drive::calculateTaskDuration()
+{
+    time_t u32localtime;
+    if (time(&u32localtime) == -1)
+    {
+        // handle error
+        u32localtime = 0U;
+    }
+
+    this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart;
+}
+
+time_t Drive::getTaskDuration()
+{
+    return this->u32TaskDuration;
 }
 
 void Drive::checkFrozenDrive(void)
 {
     time_t u32localtime;
     time(&u32localtime);
+    if (time(&u32localtime) == -1)
+    {
+        // handle error
+        u32localtime = 0U;
+    }
 
-    if((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT*60) && (this->u32Timestamp > 0))
-        {
-            Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
-            this->bWasDeleteted = false;
-            this->bWasShredded = false;
-            this->state = Drive::FROZEN;
-        }
+    if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0))
+    {
+        Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
+        this->bWasDeleted = false;
+        this->bWasShredded = false;
+        this->state = Drive::TaskState::FROZEN;
+    }
 }

src/logger/logger.cpp

@@ -5,21 +5,18 @@
  * @date    04.09.2020
  */
 
-
 #include "../../include/reHDD.h" //for logger settings
 #include "../../include/logger/logger.h"
 
 using namespace std;
 
-string version =  "0.2.1"; //logger version
+string version = "0.2.1"; // logger version
 
 bool Logger::instanceFlag = false;
-Logger* Logger::single = NULL;
+Logger *Logger::single = NULL;
 
 /**
  * \brief   create new logger instance
- * \param	path to log file
- * \param	struct with data
  * \return  instance of Logger
  */
 Logger::Logger()
@@ -97,13 +94,13 @@ void Logger::error(string s)
 void Logger::writeLog(string s)
 {
     ofstream logFile;
-    Logger::mtxLog.lock(); //lock this section for other threads
+    Logger::mtxLog.lock(); // lock this section for other threads
     logFile.open(this->logPath, ios_base::app);
 
-    logFile << (s + "\n"); //append to existing file
+    logFile << (s + "\n"); // append to existing file
 
     logFile.close();
-    Logger::mtxLog.unlock(); //unlock this section for other threads
+    Logger::mtxLog.unlock(); // unlock this section for other threads
 }
 
 /**
@@ -122,22 +119,22 @@ void Logger::newLine()
  */
 string Logger::getTimestamp()
 {
-    struct tm * timeinfo;
+    struct tm *timeinfo;
     struct timeval tv;
     int millisec;
-    char cpDate [80];
-    char buffer [120];
+    char cpDate[80];
+    char buffer[120];
 
     gettimeofday(&tv, NULL);
-    millisec = lrint(tv.tv_usec/1000.0); // Round to nearest millisec
-    if (millisec>=1000)   // Allow for rounding up to nearest second
-        {
-            millisec -=1000;
-            tv.tv_sec++;
-        }
+    millisec = lrint(tv.tv_usec / 1000.0); // Round to nearest millisec
+    if (millisec >= 1000)                  // Allow for rounding up to nearest second
+    {
+        millisec -= 1000;
+        tv.tv_sec++;
+    }
     timeinfo = localtime(&tv.tv_sec);
-    strftime (cpDate,80,"%d/%m/%Y %T",timeinfo);
-    sprintf(buffer, "%s.%03d", cpDate, millisec);
+    strftime(cpDate, 80, "%d/%m/%Y %T", timeinfo);
+    snprintf(buffer, sizeof(buffer), "%s.%03d", cpDate, millisec);
     return buffer;
 }
 
@@ -146,25 +143,44 @@ string Logger::getTimestamp()
  * \param	void
  * \return  string MAC address (formatted)
  */
-string Logger::getMacAddress()
+std::string Logger::getMacAddress()
 {
-    struct ifreq ifr;
-    int s = socket(AF_INET, SOCK_STREAM,0);
+    struct ifaddrs *ifaddr, *ifa;
 
-    strcpy(ifr.ifr_name, "eth0");
-    if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
+    // default MAC if none found
+    std::string result = "00:00:00:00:00:00";
+
+    if (getifaddrs(&ifaddr) == -1)
+        return result;
+
+    for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
+    {
+        if (!ifa->ifa_addr)
+            continue;
+
+        // We want AF_PACKET interfaces (Ethernet)
+        if (ifa->ifa_addr->sa_family == AF_PACKET &&
+            !(ifa->ifa_flags & IFF_LOOPBACK) && // skip loopback interface
+            (ifa->ifa_flags & IFF_UP))          // must be up
         {
-            strcpy(ifr.ifr_name, "eno1");
+            struct sockaddr_ll *s = (struct sockaddr_ll *)ifa->ifa_addr;
 
+            if (s->sll_halen == 6)
+            {
+                char buf[32];
+                snprintf(buf, sizeof(buf),
+                         "%02X:%02X:%02X:%02X:%02X:%02X",
+                         s->sll_addr[0], s->sll_addr[1], s->sll_addr[2],
+                         s->sll_addr[3], s->sll_addr[4], s->sll_addr[5]);
+
+                freeifaddrs(ifaddr);
+                return std::string(buf);
+            }
         }
+    }
 
-    unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
-    char buffer [80];
-    sprintf(buffer,"%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
-            hwaddr[3], hwaddr[4], hwaddr[5]);
-    close(s);
-    string tmp = buffer;
-    return tmp;
+    freeifaddrs(ifaddr);
+    return result;
 }
 
 /**
@@ -176,22 +192,22 @@ string Logger::getMacAddress()
  */
 string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
 {
-    string result(1,cBorder);
+    string result(1, cBorder);
     uint8_t u8TextSize = text.length();
-    uint8_t u8Padding = ((u8LineLenght-u8TextSize)/2);
+    uint8_t u8Padding = ((u8LineLenght - u8TextSize) / 2);
 
-    for(uint8_t i = 0 ; i < u8Padding; i++)
-        {
-            result.append(" ");
-        }
+    for (uint8_t i = 0; i < u8Padding; i++)
+    {
+        result.append(" ");
+    }
 
     result.append(text);
 
-    while((uint8_t)result.length() < (u8LineLenght-1))
-        {
+    while ((uint8_t)result.length() < (u8LineLenght - 1))
+    {
 
-            result.append(" ");
-        }
+        result.append(" ");
+    }
 
     result.append(string(1, cBorder));
     return result;
@@ -205,12 +221,12 @@ string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
  */
 string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
 {
-    string result(1,cBorder);
+    string result(1, cBorder);
 
-    while((uint8_t)result.length() < u8LineLenght)
-        {
-            result.append(string(1, cBorder));
-        }
+    while ((uint8_t)result.length() < u8LineLenght)
+    {
+        result.append(string(1, cBorder));
+    }
     return result;
 }
 
@@ -218,18 +234,16 @@ string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
  * \brief   return a instance of the logger
  * \return  logger obj
  */
-Logger* Logger::logThis()
+Logger *Logger::logThis()
 {
     if (!instanceFlag)
-        {
-            single = new Logger(); //create new obj
-            instanceFlag = true;
-            return single;
-        }
+    {
+        single = new Logger(); // create new obj
+        instanceFlag = true;
+        return single;
+    }
     else
-        {
-            return single; //return existing obj
-        }
+    {
+        return single; // return existing obj
+    }
 }
-
-

src/main.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 /**
  * \brief   app entry point
@@ -16,7 +17,7 @@ int main(void)
 {
     // cout << "refurbishingHddTool" << endl;
 
-    reHDD* app = new reHDD();
-    app->app_logic();
+    reHDD app;
+    app.app_logic();
     return EXIT_SUCCESS;
 }

src/printer.cpp

@@ -0,0 +1,101 @@
+/**
+ * @file    printer.cpp
+ * @brief   Send drive data to printer service using ipc msg queue
+ * @author  Hendrik Schutter
+ * @date    24.11.2022
+ */
+
+#include "../include/reHDD.h"
+
+bool Printer::instanceFlag = false;
+Printer *Printer::single = NULL;
+
+/**
+ * \brief   create new Printer instance
+ * \param	path to log file
+ * \param	struct with data
+ * \return  instance of Printer
+ */
+Printer::Printer()
+{
+    if (-1 == (this->msqid = msgget((key_t)IPC_MSG_QUEUE_KEY, IPC_CREAT | 0666)))
+    {
+        Logger::logThis()->error("Printer: Create mgs queue failed!");
+    }
+}
+
+/**
+ * \brief   deconstructor
+ * \return  void
+ */
+Printer::~Printer()
+{
+    instanceFlag = false;
+}
+
+/**
+ * \brief   send data to msg queue
+ * \return  void
+ */
+void Printer::print(Drive *drive)
+{
+    t_msgQueueData msgQueueData;
+    msgQueueData.msg_queue_type = 1;
+
+    snprintf(msgQueueData.driveData.caDriveIndex, STR_BUFFER_SIZE, "%i", drive->u16DriveIndex);
+    snprintf(msgQueueData.driveData.caDriveState, STR_BUFFER_SIZE, "shredded");
+    snprintf(msgQueueData.driveData.caDriveModelFamily, STR_BUFFER_SIZE, "%s", drive->getModelFamily().c_str());
+    snprintf(msgQueueData.driveData.caDriveModelName, STR_BUFFER_SIZE, "%s", drive->getModelName().c_str());
+    snprintf(msgQueueData.driveData.caDriveCapacity, STR_BUFFER_SIZE, "%li", drive->getCapacity());
+    snprintf(msgQueueData.driveData.caDriveSerialnumber, STR_BUFFER_SIZE, "%s", drive->getSerial().c_str());
+    snprintf(msgQueueData.driveData.caDriveHours, STR_BUFFER_SIZE, "%i", drive->getPowerOnHours());
+    snprintf(msgQueueData.driveData.caDriveCycles, STR_BUFFER_SIZE, "%i", drive->getPowerCycles());
+    snprintf(msgQueueData.driveData.caDriveErrors, STR_BUFFER_SIZE, "%i", drive->getErrorCount());
+    snprintf(msgQueueData.driveData.caDriveShredTimestamp, STR_BUFFER_SIZE, "%li", drive->getActionStartTimestamp());
+    snprintf(msgQueueData.driveData.caDriveShredDuration, STR_BUFFER_SIZE, "%li", drive->getTaskDuration());
+
+    switch (drive->connectionType)
+    {
+    case Drive::ConnectionType::USB:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "usb", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::SATA:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "sata", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::NVME:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "nvme", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::UNKNOWN:
+    default:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "na", STR_BUFFER_SIZE);
+    }
+
+    snprintf(msgQueueData.driveData.caDriveReHddVersion, STR_BUFFER_SIZE, "%s", REHDD_VERSION);
+
+    if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))
+    {
+        Logger::logThis()->error("Printer: Send mgs queue failed!");
+    }
+    else
+    {
+        Logger::logThis()->info("Printer: print triggered - Drive: " + drive->getSerial());
+    }
+}
+
+/**
+ * \brief   return a instance of the printer
+ * \return  printer obj
+ */
+Printer *Printer::getPrinter()
+{
+    if (!instanceFlag)
+    {
+        single = new Printer(); // create new obj
+        instanceFlag = true;
+        return single;
+    }
+    else
+    {
+        return single; // return existing obj
+    }
+}

src/shred.cpp

@@ -0,0 +1,326 @@
+/**
+ * @file    shred.cpp
+ * @brief   shred drive
+ * @author  hendrik schutter
+ * @date    22.08.2022
+ */
+
+#include "../include/reHDD.h"
+using namespace std;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include "../tfnoisegen/tfprng.h"
+#ifdef __cplusplus
+}
+#endif
+
+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)
+{
+    ostringstream address;
+    address << (void const *)&(*drive);
+    Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+    drive->bWasShredStarted = true; // Mark drive as partly shredded
+
+#ifdef DRYRUN
+    for (int i = 0; i <= 500; i++)
+    {
+        if (drive->state.load() != Drive::TaskState::SHRED_ACTIVE)
+        {
+            return 0;
+        }
+        drive->setTaskPercentage(i + 0.05);
+        write(*ipSignalFd, "A", 1);
+        usleep(20000);
+    }
+    drive->bWasShredded = true;
+#endif
+
+#ifndef DRYRUN
+    const char *cpDrivePath = drive->getPath().c_str();
+    unsigned char ucKey[TFNG_KEY_SIZE];
+
+    // open random source
+    randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
+    if (randomSrcFileDiscr == -1)
+    {
+        std::string errorMsg(strerror(errno));
+        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(errno));
+        Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+        perror(cpDrivePath);
+        cleanup();
+        return -1;
+    }
+
+    // read key for random generator
+    ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
+    if (readRet <= 0)
+    {
+        std::string errorMsg(strerror(errno));
+        Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
+        perror(randomsrc);
+        cleanup();
+        return -1;
+    }
+
+    tfng_prng_seedkey(ucKey);
+
+    this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
+    Drive::ShredSpeed shredSpeed = drive->sShredSpeed.load();
+    shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
+    shredSpeed.ulSpeedMetricBytesWritten = 0U;                          // uses to calculate speed metric
+    drive->sShredSpeed.store(shredSpeed);
+
+#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
+
+        if (uiShredIterationCounter == (SHRED_ITERATIONS - 1))
+        {
+            // last shred iteration --> overwrite (just the write chunk) bytes with zeros instead with random data
+            memset(caTfngData, 0U, CHUNK_SIZE);
+        }
+
+        while (ulDriveByteCounter < ulDriveByteSize)
+        {
+            int iBytesToShred = 0; // Bytes that will be overwritten in this chunk-iteration
+
+            if (uiShredIterationCounter != (SHRED_ITERATIONS - 1))
+            {
+                // NOT last shred iteration --> generate new random data
+                tfng_prng_genrandom(caTfngData, TFNG_DATA_SIZE);
+            }
+
+            if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
+            {
+                iBytesToShred = (ulDriveByteSize - ulDriveByteCounter);
+            }
+            else
+            {
+                iBytesToShred = CHUNK_SIZE;
+            }
+
+            int iByteShredded = write(driveFileDiscr, caTfngData, iBytesToShred);
+
+            if (iByteShredded <= 0)
+            {
+                std::string errorMsg(strerror(errno));
+                Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                perror("unable to write random data");
+                cleanup();
+                return -1;
+            }
+
+            auto shredSpeed = drive->sShredSpeed.load();
+            shredSpeed.ulSpeedMetricBytesWritten += iByteShredded;
+            drive->sShredSpeed.store(shredSpeed);
+
+            ulDriveByteCounter += iByteShredded;
+            ulDriveByteOverallCount += iByteShredded;
+            d32Percent = this->calcProgress();
+#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;
+                // signal process in shreding
+                write(*ipSignalFd, "A", 1);
+            }
+
+            if (drive->state != Drive::TaskState::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))
+        {
+            Logger::logThis()->error("Shred-Task: Unable to rewind drive! - Drive: " + drive->getSerial());
+            cleanup();
+            return -1;
+        }
+        // end one shred iteration
+    }
+    // end of all shred iteratio
+
+    tfng_prng_seedkey(NULL); // reset random generator
+
+    drive->bWasShredded = true;
+    Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+#ifdef ZERO_CHECK
+    drive->state = Drive::TaskState::CHECK_ACTIVE;
+    Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+    drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
+
+    if (drive->u32DriveChecksumAfterShredding != 0)
+    {
+        drive->state = Drive::TaskState::CHECK_FAILED;
+        Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
+    }
+    else
+    {
+        drive->state = Drive::TaskState::CHECK_SUCCESSFUL;
+        Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
+    }
+#endif
+#endif
+
+    cleanup();
+
+    if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_SUCCESSFUL) || (drive->state == Drive::TaskState::CHECK_FAILED))
+    {
+        if (drive->state != Drive::TaskState::CHECK_FAILED)
+        {
+            Printer::getPrinter()->print(drive);
+        }
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        Logger::logThis()->info("Finished shred/check 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
+    uiMaxShredIteration++; // increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
+#endif
+    if (this->ulDriveByteSize == 0)
+        return 0.0;
+    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");
+        Logger::logThis()->info("Unable to rewind drive! - fileDescriptor: " + to_string(file));
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+long Shred::getDriveSizeInBytes(fileDescriptor file)
+{
+    long liDriveSizeTmp = lseek(file, 0L, SEEK_END);
+
+    if (liDriveSizeTmp == -1)
+    {
+        perror("unable to get drive size");
+        Logger::logThis()->info("Unable to get drive size! - fileDescriptor: " + to_string(file));
+        return 0L;
+    }
+
+    if (0 != iRewindDrive(file))
+    {
+        liDriveSizeTmp = 0L;
+    }
+
+#ifdef DEMO_DRIVE_SIZE
+    liDriveSizeTmp = DEMO_DRIVE_SIZE;
+#endif
+    return liDriveSizeTmp;
+}
+
+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, caReadBuffer, iBytesToCheck);
+        for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
+        {
+            uiChecksum += caReadBuffer[iReadBytesCounter];
+        }
+        ulDriveByteCounter += iReadBytes;
+        ulDriveByteOverallCount += iReadBytes;
+        d32Percent = this->calcProgress();
+        auto shredSpeed = drive->sShredSpeed.load();
+        shredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
+        drive->sShredSpeed.store(shredSpeed);
+
+#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.01) || (d32Percent == 100.0))
+        {
+            drive->setTaskPercentage(d32TmpPercent);
+            d32TmpPercent = d32Percent;
+#ifdef LOG_LEVEL_HIGH
+            Logger::logThis()->info("send progress signal to main loop (check)");
+#endif
+            write(*ipSignalFd, "A", 1);
+        }
+    }
+    drive->bWasChecked = true;
+    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

@@ -6,173 +6,306 @@
  */
 
 #include "../include/reHDD.h"
-
-string SMART::modelFamily;
-string SMART::modelName;
-string SMART::serial;
-uint64_t SMART::capacity = 0U;
-uint32_t SMART::errorCount = 0U;
-uint32_t SMART::powerOnHours = 0U;
-uint32_t SMART::powerCycle = 0U;
+using namespace std;
 
 /**
  * \brief   get and set S.M.A.R.T. values in Drive
  * \param	pointer of Drive instance
  * \return  void
  */
-void SMART::readSMARTData(Drive* drive)
+void SMART::readSMARTData(Drive *drive)
 {
+    string modelFamily;
+    string modelName;
+    string serial;
+    uint64_t capacity = 0U;
+    uint32_t errorCount = 0U;
+    uint32_t powerOnHours = 0U;
+    uint32_t powerCycles = 0U;
+    uint32_t temperature = 0U;
+
     modelFamily.clear();
     modelName.clear();
     serial.clear();
-    capacity = 0U;
-    errorCount = 0U;
-    powerOnHours = 0U;
-    powerCycle = 0U;
 
-    size_t len = 0; //lenght of found line
-    char* cLine = NULL; //found line
+    string sSmartctlCommands[] = {" --json -a ", " --json -d sntjmicron -a ", " --json -d sntasmedia -a ", " --json -d sntrealtek -a ", " --json -d sat -a "};
 
-    string sCMD = ("smartctl --json -a ");
-    sCMD.append(drive->getPath());
-    const char* cpComand = sCMD.c_str();
+    for (string sSmartctlCommand : sSmartctlCommands)
+    {
+        string sCMD = ("smartctl");
+        sCMD.append(sSmartctlCommand);
+        sCMD.append(drive->getPath());
+        const char *cpComand = sCMD.c_str();
 
-    FILE* outputfileSmart = popen(cpComand, "r");
+        // Logger::logThis()->info(cpComand);
 
-    while ((getline(&cLine, &len, outputfileSmart)) != -1)
+        FILE *outputfileSmart = popen(cpComand, "r");
+        size_t len = 0U;    // length of found line
+        char *cLine = NULL; // found line
+        uint8_t status = 255U;
+
+        while ((getline(&cLine, &len, outputfileSmart)) != -1)
         {
             string sLine = string(cLine);
 
-            SMART::parseModelFamily(sLine);
-            SMART::parseModelName(sLine);
-            SMART::parseSerial(sLine);
-            SMART::parseCapacity(sLine);
-            SMART::parseErrorCount(sLine);
-            SMART::parsePowerOnHours(sLine);
-            SMART::parsePowerCycle(sLine);
+            SMART::parseExitStatus(sLine, status);
+            SMART::parseModelFamily(sLine, modelFamily);
+            SMART::parseModelName(sLine, modelName);
+            SMART::parseSerial(sLine, serial);
+            SMART::parseCapacity(sLine, capacity);
+            SMART::parseErrorCount(sLine, errorCount);
+            SMART::parsePowerOnHours(sLine, powerOnHours);
+            SMART::parsePowerCycles(sLine, powerCycles);
+            SMART::parseTemperature(sLine, temperature);
         }
-    fclose(outputfileSmart);
-    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle); //wirte data in drive
+
+        free(cLine);
+        pclose(outputfileSmart);
+
+        if (status == 0U)
+        {
+            // Found S.M.A.R.T. data with this command
+            // Logger::logThis()->info("Found S.M.A.R.T. data with this command");
+            break;
+        }
+    }
+
+    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycles, temperature); // write data in drive
 }
 
 /**
- * \brief   parse ModelFamiliy
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse ExitStatus
+ * \param string output line of smartctl
+ * \param uint8_t parsed status
+ * \return bool if parsing was possible
  */
-void SMART::parseModelFamily(string sLine)
+bool SMART::parseExitStatus(string sLine, uint8_t &status)
+{
+    string search("\"exit_status\": ");
+    size_t found = sLine.find(search);
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 1U);
+        status = stol(sLine);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+/**
+ * \brief parse ModelFamily
+ * \param string output line of smartctl
+ * \param string parsed model family
+ * \return bool if parsing was possible
+ */
+bool SMART::parseModelFamily(string sLine, string &modelFamily)
 {
     string search("\"model_family\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 3U);
+        if (sLine.length() >= 3U)
         {
-            sLine.erase(0, sLine.find(": ") + 3);
-            sLine.erase(sLine.length()-3, 3);
-            modelFamily = sLine;
+            sLine.erase(sLine.length() - 3U, 3U);
         }
+        modelFamily = sLine;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse ModelName
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse ModelName
+ * \param string output line of smartctl
+ * \param string parsed model name
+ * \return bool if parsing was possible
  */
-void SMART::parseModelName(string sLine)
+bool SMART::parseModelName(string sLine, string &modelName)
 {
     string search("\"model_name\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 3U);
+        if (sLine.length() >= 3U)
         {
-            sLine.erase(0, sLine.find(": ") + 3);
-            sLine.erase(sLine.length()-3, 3);
-            modelName = sLine;
+            sLine.erase(sLine.length() - 3U, 3U);
         }
+        modelName = sLine;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse Serial
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse Serial
+ * \param string output line of smartctl
+ * \param string parsed serial
+ * \return bool if parsing was possible
  */
-void SMART::parseSerial(string sLine)
+bool SMART::parseSerial(string sLine, string &serial)
 {
     string search("\"serial_number\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0, sLine.find(": ") + 3);
+        if (sLine.length() >= 3U)
         {
-            sLine.erase(0, sLine.find(": ") + 3);
-            sLine.erase(sLine.length()-3, 3);
-            serial = sLine;
+            sLine.erase(sLine.length() - 3U, 3U);
         }
+        serial = sLine;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse Capacity
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse Capacity
+ * \param string output line of smartctl
+ *  \param string parsed capacity
+ * \return bool if parsing was possible
  */
-void SMART::parseCapacity(string sLine)
+bool SMART::parseCapacity(string sLine, uint64_t &capacity)
 {
     string search("\"bytes\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0, sLine.find(": ") + 2);
+        if (sLine.length() >= 1U)
         {
-            sLine.erase(0, sLine.find(": ") + 2);
-            sLine.erase(sLine.length()-1, 1);
-            capacity = stol(sLine);
+            sLine.erase(sLine.length() - 1U, 1U);
         }
+        capacity = stol(sLine);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse ErrorCount
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse ErrorCount
+ * \param string output line of smartctl
+ * \param uint32_t parsed error count
+ * \return bool if parsing was possible
  */
-void SMART::parseErrorCount(string sLine)
+bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
 {
     string search("\"error_count_total\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 2U);
+        if (sLine.length() >= 2U)
         {
-            sLine.erase(0, sLine.find(": ")+2);
-            sLine.erase(sLine.length()-2, 2);
-            errorCount = stol(sLine);
+            sLine.erase(sLine.length() - 2U, 2U);
         }
+        errorCount = stol(sLine);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse PowerOnHours
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse PowerOnHours
+ * \param string output line of smartctl\
+ * \param uint32_t parsed power on hours
+ * \return bool if parsing was possible
  */
-void SMART::parsePowerOnHours(string sLine)
+bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
 {
     string search("\"hours\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 2U);
+        if (sLine.length() >= 1U)
         {
-            sLine.erase(0, sLine.find(": ") + 2);
-            sLine.erase(sLine.length()-1, 1);
-            powerOnHours = stol(sLine);
-
+            sLine.erase(sLine.length() - 1U, 1U);
         }
+        powerOnHours = stol(sLine);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 /**
- * \brief   parse PowerCycle
- * \param	string output line of smartctl
- * \return  void
+ * \brief parse PowerCycle
+ * \param string output line of smartctl
+ * \param uint32_t parsed power cycles
+ * \return bool if parsing was possible
  */
-void SMART::parsePowerCycle(string sLine)
+bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
 {
     string search("\"power_cycle_count\": ");
     size_t found = sLine.find(search);
-    if (found!=string::npos)
+    if (found != string::npos)
+    {
+        sLine.erase(0, sLine.find(": ") + 2);
+        if (sLine.length() >= 2U)
         {
-            sLine.erase(0, sLine.find(": ") + 2);
-            sLine.erase(sLine.length()-2, 2);
-            powerCycle = stol(sLine);
-
+            sLine.erase(sLine.length() - 2U, 2U);
         }
+        powerCycles = stol(sLine);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
+/**
+ * \brief parse temperature
+ * \param string output line of smartctl
+ * \param uint32_t parsed temperature
+ * \return bool if parsing was possible
+ */
+bool SMART::parseTemperature(string sLine, uint32_t &temperature)
+{
+    string search("\"current\": ");
+    size_t found = sLine.find(search);
+    if (found != string::npos)
+    {
+        sLine.erase(0U, sLine.find(": ") + 2U);
+        if (sLine.length() >= 1U)
+        {
+            sLine.erase(sLine.length() - 1U, 2U);
+        }
+        if (sLine == "{")
+        {
+            temperature = 0U; // this drive doesn't support temperature
+        }
+        else
+        {
+            temperature = stol(sLine);
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}