Add emiso files and align cpp code with gcc-12 version

Author: daniel-rossier

buildroot/.gitignore

@@ -0,0 +1,2 @@
+dl
+

linux/rootfs/configs/virt64_defconfig

@@ -441,15 +441,10 @@ BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y
 # BR2_PACKAGE_FLUID_SOUNDFONT is not set
 # BR2_PACKAGE_FLUIDSYNTH is not set
 # BR2_PACKAGE_GMRENDER_RESURRECT is not set
-BR2_PACKAGE_GSTREAMER1=y
-BR2_PACKAGE_GSTREAMER1_CHECK=y
-BR2_PACKAGE_GSTREAMER1_PARSE=y
-BR2_PACKAGE_GSTREAMER1_TRACE=y
-BR2_PACKAGE_GSTREAMER1_GST_DEBUG=y
-BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY=y
-BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE=y
-# BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS is not set
+# BR2_PACKAGE_GSTREAMER1 is not set
+# BR2_PACKAGE_JACK1 is not set
+# BR2_PACKAGE_JACK2 is not set
+BR2_PACKAGE_KODI_ARCH_SUPPORTS=y
 
 #
 # dependency-less plugins
@@ -1852,7 +1847,7 @@ BR2_PACKAGE_EXPAT=y
 BR2_PACKAGE_JSON_C=y
 # BR2_PACKAGE_JSON_FOR_MODERN_CPP is not set
 # BR2_PACKAGE_JSON_GLIB is not set
-# BR2_PACKAGE_JSONCPP is not set
+BR2_PACKAGE_JSONCPP=y
 # BR2_PACKAGE_LIBBSON is not set
 # BR2_PACKAGE_LIBFASTJSON is not set
 # BR2_PACKAGE_LIBJSON is not set
@@ -2003,7 +1998,7 @@ BR2_PACKAGE_LIBCURL_TLS_NONE=y
 # BR2_PACKAGE_LIBGSASL is not set
 # BR2_PACKAGE_LIBHTP is not set
 # BR2_PACKAGE_LIBHTTPPARSER is not set
-# BR2_PACKAGE_LIBHTTPSERVER is not set
+BR2_PACKAGE_LIBHTTPSERVER=y
 # BR2_PACKAGE_LIBIDN is not set
 # BR2_PACKAGE_LIBIDN2 is not set
 # BR2_PACKAGE_LIBISCSI is not set
@@ -2012,7 +2007,8 @@ BR2_PACKAGE_LIBCURL_TLS_NONE=y
 # BR2_PACKAGE_LIBMAXMINDDB is not set
 # BR2_PACKAGE_LIBMBUS is not set
 # BR2_PACKAGE_LIBMEMCACHED is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
+BR2_PACKAGE_LIBMICROHTTPD=y
+BR2_PACKAGE_LIBMICROHTTPD_SSL=y
 # BR2_PACKAGE_LIBMINIUPNPC is not set
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBMODBUS is not set
@@ -2088,8 +2084,8 @@ BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS=y
 # BR2_PACKAGE_OPENPGM is not set
 # BR2_PACKAGE_OPENZWAVE is not set
 # BR2_PACKAGE_ORTP is not set
-# BR2_PACKAGE_PAHO_MQTT_C is not set
-# BR2_PACKAGE_PAHO_MQTT_CPP is not set
+BR2_PACKAGE_PAHO_MQTT_C=y
+BR2_PACKAGE_PAHO_MQTT_CPP=y
 # BR2_PACKAGE_PISTACHE is not set
 # BR2_PACKAGE_QDECODER is not set
 # BR2_PACKAGE_QPID_PROTON is not set
@@ -2320,7 +2316,7 @@ BR2_PACKAGE_FMT=y
 # BR2_PACKAGE_LIBENCA is not set
 # BR2_PACKAGE_LIBESTR is not set
 BR2_PACKAGE_LIBFRIBIDI=y
-# BR2_PACKAGE_LIBUNIBREAK is not set
+BR2_PACKAGE_LIBUNISTRING=y
 # BR2_PACKAGE_LIBUNISTRING is not set
 # BR2_PACKAGE_LINENOISE is not set
 BR2_PACKAGE_NCURSES=y
@@ -2508,6 +2504,7 @@ BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS=y
 # BR2_PACKAGE_IFPLUGD is not set
 # BR2_PACKAGE_IFTOP is not set
 # BR2_PACKAGE_IFUPDOWN is not set
+BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
 # BR2_PACKAGE_IGD2_FOR_LINUX is not set
 
 #
@@ -2581,8 +2578,11 @@ BR2_PACKAGE_NETCAT=y
 # BR2_PACKAGE_NETPLUG is not set
 # BR2_PACKAGE_NETSNMP is not set
 # BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NETWORK_MANAGER is not set
-# BR2_PACKAGE_NETWORKD_DISPATCHER is not set
+BR2_PACKAGE_NETWORK_MANAGER=y
+# BR2_PACKAGE_NETWORK_MANAGER_TUI is not set
+# BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER is not set
+# BR2_PACKAGE_NETWORK_MANAGER_PPPD is not set
+# BR2_PACKAGE_NETWORK_MANAGER_OVS is not set
 # BR2_PACKAGE_NFACCT is not set
 # BR2_PACKAGE_NFTABLES is not set
 # BR2_PACKAGE_NGINX is not set
@@ -2891,8 +2891,8 @@ BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y
 #
 # BR2_PACKAGE_CONMON is not set
 # BR2_PACKAGE_CONTAINERD is not set
-# BR2_PACKAGE_COREUTILS is not set
-# BR2_PACKAGE_CPULIMIT is not set
+BR2_PACKAGE_COREUTILS=y
+# BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES is not set
 # BR2_PACKAGE_CPULOAD is not set
 BR2_PACKAGE_CRIU_ARCH_SUPPORTS=y
 # BR2_PACKAGE_CRIU is not set
@@ -2924,10 +2924,8 @@ BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y
 # BR2_PACKAGE_GKRELLM is not set
 # BR2_PACKAGE_HTOP is not set
 # BR2_PACKAGE_IBM_SW_TPM2 is not set
-
-#
-# iotop depends on python3
-#
+BR2_PACKAGE_INITSCRIPTS=y
+# BR2_PACKAGE_IOTOP is not set
 # BR2_PACKAGE_IPRUTILS is not set
 # BR2_PACKAGE_IRQBALANCE is not set
 
@@ -3009,7 +3007,7 @@ BR2_PACKAGE_SEATD_DAEMON=y
 #
 # BR2_PACKAGE_SWUPDATE is not set
 # BR2_PACKAGE_SYSKLOGD is not set
-# BR2_PACKAGE_SYSLOG_NG is not set
+BR2_PACKAGE_SYSLOG_NG=y
 BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y
 BR2_PACKAGE_SYSTEMD=y
 # BR2_PACKAGE_SYSTEMD_INITRD is not set
@@ -3246,6 +3244,7 @@ BR2_PACKAGE_HOST_DEPOT_TOOLS=y
 # BR2_PACKAGE_HOST_E2TOOLS is not set
 # BR2_PACKAGE_HOST_ENVIRONMENT_SETUP is not set
 # BR2_PACKAGE_HOST_EROFS_UTILS is not set
+BR2_PACKAGE_HOST_EUDEV=y
 # BR2_PACKAGE_HOST_EXFATPROGS is not set
 # BR2_PACKAGE_HOST_F2FS_TOOLS is not set
 # BR2_PACKAGE_HOST_FAKETIME is not set

linux/usr/CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-project(agency-usr LANGUAGES C)
+project(agency-usr LANGUAGES C CXX)
 
 option(WITH_LED_ACTIVITIES "LED activities during migration" OFF)
 
@@ -26,3 +26,5 @@ add_subdirectory(lib)
 
 #add_subdirectory(wago_client)
 
+# EMISO
+add_subdirectory(emiso_engine)

linux/usr/emiso_engine/CMakeLists.txt

@@ -0,0 +1,24 @@
+project(emiso_engine LANGUAGES C CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(${PROJECT_NAME} emiso_engine.cpp
+                               utils.cpp
+                               webserver/webserver.cpp
+                               webserver/system/system.cpp
+                               webserver/container/container.cpp
+                               webserver/image/image.cpp
+                               webserver/network/network.cpp
+                               webserver/volume/volume.cpp
+                               daemon/image.cpp
+                               daemon/container.cpp
+                               daemon/daemon.cpp
+                               #cli/cli.cpp
+)
+
+target_include_directories(${PROJECT_NAME} PRIVATE include)
+
+target_link_libraries(${PROJECT_NAME} httpserver jsoncpp readline)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_BINARY_DIR}/bin)

linux/usr/emiso_engine/cli/cli.cpp

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2023 Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <vector>
+#include <sstream>
+
+#include "cli.hpp"
+
+#define EMISO_CLI_PROMPT "(emiso)>> "
+
+namespace emiso {
+
+Cli::Cli() {}
+
+Cli::~Cli() {}
+
+void Cli::splitCmd(std::string const &str, const char delim, std::vector<std::string> &out)
+{
+    // create a stream from the string
+    std::stringstream s(str);
+
+    std::string s2;
+    while (std::getline (s, s2, delim)) {
+        out.push_back(s2); // store the string in s2
+    }
+}
+
+
+// Function to handle the "hello" command
+void Cli::handleHelloCommand() {
+    std::cout << "Hello, World!" << std::endl;
+}
+
+// Function to handle the "help" command
+void Cli::handleHelpCommand() {
+    std::cout << "Available commands:" << std::endl;
+    std::cout << "  hello - Print a greeting" << std::endl;
+    std::cout << "  help  - Show available commands" << std::endl;
+    std::cout << "  exit  - Exit the program" << std::endl;
+}
+
+
+void Cli::handleImagesCommand(std::vector<std::string> &tokens)
+{
+    std::map<std::string, daemon::ImageInfo> info;
+
+    // TODO - Add checks on 'tokens'
+    if (tokens[1] == "info") {
+         _image.info(info);
+
+        for (auto it = info.begin(); it != info.end(); ++it) {
+            std::string name = it->second.name;
+            size_t size = it->second.size;
+            std::string id = it->second.id;
+            auto date = it->second.date;
+
+            std::cout << name << std::endl;
+            std::cout << "    Size: " << size <<  std::endl;
+            std::cout << "    ID: " << id << std::endl;
+            std::cout << "    date: " << date << std::endl;
+        }
+    } else if (tokens[1] == "rm") {
+        // TODO - Add checks on 'tokens[2]'
+         _image.remove(tokens[2]);
+    } else {
+        std::cout << "[ERROR] image cmd '" << tokens[1] << "' is not supported" << std::endl;
+    }
+}
+
+void Cli::start()
+{
+    std::cout << "Starting interactive mode" << std::endl;
+    while (true) {
+       char* input = readline(EMISO_CLI_PROMPT);
+        if (!input) {
+            break; // User pressed Ctrl+D (EOF)
+        }
+
+        std::string command(input);
+        free(input);
+
+        // Add the command to readline's history
+        if (!command.empty()) {
+            add_history(command.c_str());
+        }
+
+        std::vector<std::string> tokens;
+        Cli::splitCmd(command, ' ', tokens);
+
+
+        if (tokens[0] == "hello") {
+            Cli::handleHelloCommand();
+        } else if (tokens[0] == "help") {
+            Cli::handleHelpCommand();
+        } else if (tokens[0] == "image") {
+            Cli::handleImagesCommand(tokens);
+        } else if (tokens[0] == "exit") {
+            break; // Exit the program
+        } else {
+            std::cout << "Unknown command. Type 'help' for a list of available commands." << std::endl;
+        }
+    }
+
+    std::cout << "Stopping interactive mode" << std::endl;
+
+}
+
+} // emiso

linux/usr/emiso_engine/cli/cli.hpp

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2023 Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef EMISO_CLI_H
+#define EMISO_CLI_H
+
+#include <iostream>
+#include <readline/readline.h>
+#include <readline/history.h>
+
+#include "../daemon/image.hpp"
+
+namespace emiso {
+
+    class Cli {
+    public:
+        Cli();
+
+        // Destructor
+        ~Cli();
+
+        void start();
+
+    private:
+        daemon::Image _image;
+
+        void splitCmd(std::string const &str, const char delim, std::vector<std::string> &out);
+
+        void handleHelloCommand();
+        void handleHelpCommand();
+        void handleImagesCommand(std::vector<std::string> &tockens);
+    };
+}
+
+#endif // EMISO_CLI_H