From f8fef380090fc61f61852cd37ae5b4dadc6114d7 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 22 Aug 2023 13:47:57 +0200
Subject: [PATCH] Add last-commit for traiff and add info for opkg_commands.

---
 ismas/ismas_client.cpp | 13 +++++++++++++
 ismas/ismas_client.h   | 12 ++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ismas/ismas_client.cpp b/ismas/ismas_client.cpp
index 1f4dd5e..53f24a7 100644
--- a/ismas/ismas_client.cpp
+++ b/ismas/ismas_client.cpp
@@ -432,6 +432,13 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "\"ZONE\" : %d,"
                 "\"INFO\" : \"%s\","
                 "\"BLOB\" : \"%s\","
+                "\"LAST-COMMIT\" : \"%s\","
+                "\"SIZE\" : %d,"
+                "\"LOADED\" : \"%s\""
+            "},"
+            "\"OPKG_COMMANDS\" : {"
+                "\"BLOB\" : \"%s\","
+                "\"LAST-COMMIT\" : \"%s\","
                 "\"SIZE\" : %d,"
                 "\"LOADED\" : \"%s\""
             "},"
@@ -639,9 +646,15 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
         psa.tariff.zone,
         psa.tariff.info.toStdString().c_str(),
         psa.tariff.blob.toStdString().c_str(),
+        psa.tariff.lastCommit.toStdString().c_str(),
         psa.tariff.size,
         psa.tariff.loadTime.toStdString().c_str(),
 
+        psa.opkg.blob.toStdString().c_str(),
+        psa.opkg.lastCommit.toStdString().c_str(),
+        psa.opkg.size,
+        psa.opkg.loadTime.toStdString().c_str(),
+
         psa.cash.blob.toStdString().c_str(),
         psa.cash.size,
         psa.conf.blob.toStdString().c_str(),
diff --git a/ismas/ismas_client.h b/ismas/ismas_client.h
index e5cc70f..4ee47d6 100644
--- a/ismas/ismas_client.h
+++ b/ismas/ismas_client.h
@@ -30,6 +30,13 @@ struct PSAInstalled {
         QString cpuSerial;
     } hw;
 
+    struct Opkg {
+        int size;
+        QString blob;
+        QString lastCommit;
+        QString loadTime;
+    } opkg;
+
     struct DC {
         QString versionHW;
         QString versionSW;
@@ -79,6 +86,11 @@ struct PSAInstalled {
         hw.linuxVersion = "N/A";
         hw.cpuSerial = "N/A";
 
+        opkg.size = -1;
+        opkg.blob = "N/A";
+        opkg.lastCommit = "N/A";
+        opkg.loadTime = "N/A";
+
         dc.versionHW = "N/A";
         dc.versionSW = "N/A";
         dc.gitBlob = "N/A";