simple ipc send

include/drive.h

@@ -20,21 +20,11 @@ public:
         SHRED_SELECTED,
         SHRED_ACTIVE, // shred iterations active
         CHECK_ACTIVE, // optional checking active
-        CHECK_SUCCESSFUL,
-        CHECK_FAILED,
         DELETE_SELECTED,
         DELETE_ACTIVE,
         FROZEN
     } state;
 
-    enum ConnectionType
-    {
-        UNKNOWN,
-        USB,
-        SATA,
-        NVME
-    } connectionType;
-
     struct
     {
         time_t u32ShredTimeDelta;

include/printer.h

@@ -26,11 +26,11 @@ typedef struct
     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

include/reHDD.h

@@ -8,7 +8,7 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.2.1"
+#define REHDD_VERSION "V1.1.3"
 
 // Drive handling Settings
 #define WORSE_HOURS 19200    // mark drive if at this limit or beyond
@@ -20,7 +20,7 @@
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2024"
 #define DEVICE_ID "generic"
 #define SOFTWARE_VERSION REHDD_VERSION
 #define HARDWARE_VERSION "generic"
@@ -86,7 +86,6 @@ private:
     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);

include/tui.h

@@ -31,7 +31,6 @@ public:
         Delete,
         Enter,
         ESC,
-        Terminate,
         Undefined
     };
     struct MenuState
@@ -51,8 +50,6 @@ public:
 
     static enum UserInput readUserInput();
 
-    static void terminateTUI();
-
 private:
     static string sCpuUsage;
     static string sRamUsage;
@@ -69,7 +66,7 @@ private:
     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, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected);
+    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, 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);

src/main.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+#include "../include/printer.h"
 
 /**
  * \brief   app entry point
@@ -14,9 +15,32 @@
  */
 int main(void)
 {
-    // cout << "refurbishingHddTool" << endl;
+    cout << "refurbishingHddTool" << endl;
 
-    reHDD *app = new reHDD();
+    Drive *tmpDrive = new Drive("/dev/");
-    app->app_logic();
+    tmpDrive->setActionStartTimestamp();
+    tmpDrive->bWasShredded = true;
+    tmpDrive->setDriveSMARTData("modelFamily",
+        "modelName",
+        "serial",
+         420000,
+         43,
+         44,
+         45,
+         46);
+
+    while(true){
+        cout << "send" << endl;
+        Printer::getPrinter()->print(tmpDrive);
+        sleep(5); // sleep 5 sec
+        break;
+    }
+
+    
+
+    cout << "exit" << endl;
+
+    // reHDD *app = new reHDD();
+    // app->app_logic();
     return EXIT_SUCCESS;
 }

src/printer.cpp

@@ -53,23 +53,6 @@ void Printer::print(Drive *drive)
     sprintf(msgQueueData.driveData.caDriveErrors, "%i", drive->getErrorCount());
     sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li", drive->getActionStartTimestamp());
     sprintf(msgQueueData.driveData.caDriveShredDuration, "%li", drive->getTaskDuration());
-
-    switch (drive->connectionType)
-    {
-    case Drive::USB:
-        strcpy(msgQueueData.driveData.caDriveConnectionType, "usb");
-        break;
-    case Drive::SATA:
-        strcpy(msgQueueData.driveData.caDriveConnectionType, "sata");
-        break;
-    case Drive::NVME:
-        strcpy(msgQueueData.driveData.caDriveConnectionType, "nvme");
-        break;
-    case Drive::UNKNOWN:
-    default:
-        strcpy(msgQueueData.driveData.caDriveConnectionType, "na");
-    }
-
     sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION);
 
     if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))

src/reHDD.cpp

@@ -197,13 +197,6 @@ void reHDD::ThreadUserInput()
             handleESC();
             ui->updateTUI(&listDrives, u8SelectedEntry);
             break;
-        case TUI::UserInput::Terminate:
-            // cout << "Terminate" << endl;
-            stopShredAllDrives(&listDrives);
-            ui->terminateTUI();
-            sleep(5);     // sleep 5 sec
-            std::exit(1); // Terminates main, doesn't wait for threads
-            break;
         default:
             break;
         }
@@ -307,51 +300,41 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
  * \param	pointer of list <Drive>* plistDrives
  * \return  void
  */
-void reHDD::searchDrives(std::list<Drive> *plistDrives)
+void reHDD::searchDrives(list<Drive> *plistDrives)
 {
-    FILE *fp = popen("lsblk -d -n -o NAME,TRAN", "r");
+    // Logger::logThis()->info("-->    search drives   <--");
-    if (!fp)
+    char *cLine = NULL;
+    size_t len = 0;
+
+    FILE *outputfileHwinfo = popen("lsblk -e 11 -d -o NAME", "r");
+
+    if (outputfileHwinfo == NULL)
     {
-        Logger::logThis()->error("Unable to execute lsblk to scan drives");
+        Logger::logThis()->error("Unable to scan attached drives");
         exit(EXIT_FAILURE);
     }
 
-    char line[256];
+    while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
-    while (fgets(line, sizeof(line), fp))
     {
-        std::string devName, transport;
+        if (string(cLine).length() == 4)
-        std::istringstream iss(line);
+        {
-        iss >> devName >> transport;
+            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
-
-        if (devName.empty())
-            continue;
-
-        Drive *tmpDrive = new Drive("/dev/" + devName);
             tmpDrive->state = Drive::NONE;
             tmpDrive->bIsOffline = false;
-
-        // Set connection type
-        if (transport == "sata")
-            tmpDrive->connectionType = Drive::SATA;
-        else if (transport == "usb")
-            tmpDrive->connectionType = Drive::USB;
-        else if (transport == "nvme")
-            tmpDrive->connectionType = Drive::NVME;
-        else
-            tmpDrive->connectionType = Drive::UNKNOWN;
-
             plistDrives->push_back(*tmpDrive);
-
+            // Logger::logThis()->info("SATA drive found: " + tmpDrive->getPath());
-        Logger::logThis()->info(
-            "Drive found: " + tmpDrive->getPath() +
-            " (type: " +
-            (tmpDrive->connectionType == Drive::USB ? "USB" : tmpDrive->connectionType == Drive::SATA ? "SATA"
-                                                          : tmpDrive->connectionType == Drive::NVME   ? "NVME"
-                                                                                                      : "UNKNOWN") +
-            ")");
         }
 
-    pclose(fp);
+        if (string(cLine).length() == 8)
+        {
+            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 7));
+            tmpDrive->state = Drive::NONE;
+            tmpDrive->bIsOffline = false;
+            plistDrives->push_back(*tmpDrive);
+            // Logger::logThis()->info("NVME drive found: " + tmpDrive->getPath());
+        }
+    }
+    pclose(outputfileHwinfo);
 }
 
 /**
@@ -409,11 +392,10 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
 
             while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid
             {
-                size_t ptuuidPos = string(cLine).find("PTUUID");
+                if (string(cLine).find("PTUUID") != string::npos)
-                if (ptuuidPos != string::npos)
                 {
                     string sBlkidOut = string(cLine);
-                    sBlkidOut.erase(0, ptuuidPos + 8);
+                    sBlkidOut.erase(0, 18);
                     sBlkidOut.erase(8, sBlkidOut.length());
                     sUUID = sBlkidOut;
                     // cout << "blkid uuid:" << sUUID << endl;
@@ -482,34 +464,6 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
     mxDrives.unlock();
 }
 
-/**
- * \brief   stop shred for all drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    mxDrives.lock();
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-
-        if (it->state == Drive::SHRED_ACTIVE || it->state == Drive::DELETE_ACTIVE)
-        {
-            it->state = Drive::NONE;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
-            // task for drive is running --> remove selection
-        }
-
-#ifdef LOG_LEVEL_HIGH
-        ostringstream address;
-        address << (void const *)&(*it);
-        Logger::logThis()->info("Started shred (all) for: " + it->getModelName() + "-" + it->getSerial() + " @" + address.str());
-#endif
-    }
-    mxDrives.unlock();
-}
-
 /**
  * \brief   print drives with all information
  * \param	pointer of list <Drive>* plistDrives

src/shred.cpp

@@ -186,23 +186,22 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     drive->state = Drive::CHECK_ACTIVE;
     Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
     drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
-
+#ifdef LOG_LEVEL_HIGH
-    if (drive->u32DriveChecksumAfterShredding != 0)
+    if (drive->u32DriveChecksumAferShredding != 0)
     {
-        drive->state = Drive::CHECK_FAILED;
         Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }
     else
     {
-        drive->state = Drive::CHECK_SUCCESSFUL;
         Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }
 #endif
+#endif
 #endif
 
     cleanup();
 
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_SUCCESSFUL) || (drive->state == Drive::CHECK_FAILED))
+    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
     {
         drive->state = Drive::NONE;
         drive->setTaskPercentage(0.0);

src/tui.cpp

@@ -63,11 +63,6 @@ void TUI::initTUI()
 
 void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 {
-    if (isendwin())
-    {
-        return;
-    }
-
     mxUIrefresh.lock();
     uint16_t u16StdscrX, u16StdscrY;
     getmaxyx(stdscr, u16StdscrY, u16StdscrX);
@@ -98,9 +93,6 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
         string sSpeed = " ";
         string sTime = " ";
         string sTemp = it->sTemperatureToText();
-        string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA"
-                                                                     : it->connectionType == Drive::NVME   ? "NVME"
-                                                                                                           : "");
 
         bool bSelectedEntry = false;
 
@@ -145,7 +137,6 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
         case Drive::NONE:
         case Drive::SHRED_SELECTED:
         case Drive::DELETE_SELECTED:
-        case Drive::CHECK_SUCCESSFUL:
             if (it->bWasDeleted)
             {
                 sState = "DELETED"; // mark drive as deleted previously
@@ -166,7 +157,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
             }
 
 #ifdef ZERO_CHECK
-            if (bSelectedEntry && it->bWasChecked && (it->state == Drive::CHECK_FAILED))
+            if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U))
             {
                 dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
                 wrefresh(dialog);
@@ -191,7 +182,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 
         uint16_t u16StartOffsetY = (2 * (u8Index));
 
-        WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, sConnection, bSelectedEntry);
+        WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry);
         wrefresh(tmp);
         u8Index++;
     } // end loop though drives
@@ -246,9 +237,6 @@ enum TUI::UserInput TUI::readUserInput()
     case 'S':
         return TUI::UserInput::ShredAll;
         break;
-    case 'T':
-        return TUI::UserInput::Terminate;
-        break;
     default:
         return TUI::UserInput::Undefined;
         break;
@@ -256,11 +244,6 @@ enum TUI::UserInput TUI::readUserInput()
     return TUI::UserInput::Undefined;
 }
 
-void TUI::terminateTUI()
-{
-    endwin();
-}
-
 void TUI::centerTitle(WINDOW *pwin, const char *title)
 {
     int x, maxX, stringSize;
@@ -359,7 +342,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
     return newWindow;
 }
 
-WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected)
+WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -404,7 +387,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
         37-43:  Capacity
         44:     space
         47-49:  Temp
-        57-60:  Connection Type
 
     line:02
         0-2:    space
@@ -421,7 +403,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
     mvwaddstr(newWindow, 0, 3, sModelFamily.c_str());
     mvwaddstr(newWindow, 0, 37, sCapacity.c_str());
     mvwaddstr(newWindow, 0, 47, sTemp.c_str());
-    mvwaddstr(newWindow, 0, 57, sConnection.c_str());
 
     vTruncateText(&sSerial, 28);
     mvwaddstr(newWindow, 1, 3, sSerial.c_str());
@@ -501,12 +482,8 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
     {
         string sLineTmp = "Press d for Delete";
         mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
-        u16Line++;
     }
 
-    string sLineTmp = "Press T for terminating reHDD";
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
-
     return newWindow;
 }