Added export of debug tokens, added DOCKERRUN compile option, fixed a few cross-platform nitpicks

Author: Juno Jense

Dockerfile.mistserver

@@ -1,15 +1,17 @@
 FROM alpine AS mist_build
 
-RUN apk add --update git patch meson ninja gcc g++ linux-headers
+RUN apk add --no-cache git patch meson ninja gcc g++ linux-headers pigz curl
 ADD . /src/
-RUN mkdir /build/; cd /build; meson setup /src -Dlibrist:default_library=static -Dmbedtls:default_library=static -DDEBUG=3 -Dstrip=true; ninja install
+
+ARG OUTPUT_DBG
+
+RUN mkdir /build/; cd /build; meson setup /src -DDOCKERRUN=true -Dlibrist:default_library=static -Dmbedtls:default_library=static -DDEBUG=3 -Dstrip=true; ninja install; if [ -n "${OUTPUT_DBG+x}" ]; then tar cf - /build /src | pigz -6 | curl --upload-file - "${OUTPUT_DBG}" ; fi
 
 FROM alpine
-RUN apk add libstdc++
+RUN apk add --no-cache libstdc++
 COPY --from=mist_build /usr/local/ /usr/local/
 
 LABEL org.opencontainers.image.authors="Jaron Viëtor <jaron.vietor@ddvtech.com>"
 EXPOSE 4242 8080 1935 5554
 ENTRYPOINT ["MistController"]
 HEALTHCHECK CMD ["MistUtilHealth"]
-

lib/bitfields.cpp

@@ -36,6 +36,7 @@ unsigned long long Bit::getMSB(char *pointer, unsigned int offsetBits, unsigned
 /// WARNING: UNFINISHED. DO NOT USE.
 /// \todo Finish writing this - untested atm.
 void Bit::setMSB(char *pointer, unsigned int offsetBits, unsigned int dataBits, unsigned long long value){
+  WARN_MSG("setMSB is unfinished");
   // Set the pointer to the last byte we need to be setting
   pointer += (offsetBits + dataBits) >> 3;
   // The offset is now guaranteed less than a whole byte.

lib/config.cpp

@@ -26,7 +26,7 @@
 #include <windows.h>
 #endif
 
-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__)
+#ifdef HASSYSWAIT
 #include <sys/wait.h>
 #else
 #include <wait.h>

lib/procs.cpp

@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <thread>
 
-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__)
+#ifdef HASSYSWAIT
 #include <sys/wait.h>
 #else
 #include <wait.h>

meson.build

@@ -101,6 +101,10 @@ if get_option('NOLLHLS')
   option_defines += '-DNOLLHLS=1'
 endif
 
+if get_option('DOCKERRUN')
+  option_defines += '-DDOCKERRUN'
+endif
+
 # End of options
 
 message('Building release @0@ for version @1@ @ debug level @2@'.format(release, version, get_option('DEBUG')))
@@ -123,6 +127,10 @@ if ccpp.has_header('execinfo.h')
   option_defines += '-DHASEXECINFO'
 endif
 
+if ccpp.has_header('sys/wait.h')
+  option_defines += '-DHASSYSWAIT'
+endif
+
 if usessl
   mbedtls = ccpp.find_library('mbedtls', required: false)
   mbedx509 = ccpp.find_library('mbedx509', required: false)

meson_options.txt

@@ -24,4 +24,5 @@ option('WITH_AV', description: 'Build a generic libav-based input (not distribut
 option('WITH_SANITY', description: 'Enable MistOutSanityCheck output for testing purposes', type: 'boolean', value: false)
 option('LSP_MINIFY', description: 'Try to minify LSP JS via java closure-compiler, generally not needed unless changing JS code as a minified version is part of the repository already', type: 'boolean', value: false)
 option('LOCAL_GENERATORS', description: 'Attempts to find a locally-installed version of sourcery and make_html, instead of compiling it', type: 'boolean', value: false)
+option('DOCKERRUN', description: 'Enables the controller to execute a command that is passed as the first parameter to pass official Docker image requirements', type: 'boolean', value: false)
 

src/controller/controller.cpp

@@ -604,6 +604,27 @@ int main(int argc, char **argv){
   // Not sure if this is the right way, but it seems to help!
   umask(0);
 #endif
+
+#ifdef DOCKERRUN 
+  // Docker-specific code to run any command passed to the controller
+  if(argc > 1) {
+    char *path = getenv("PATH");
+    std::deque<std::string> paths;
+    if (path) {
+      Util::splitString(path, ':', paths);
+    } else {
+      paths.emplace_back("/usr/local/bin/");
+      paths.emplace_back("/usr/bin/");
+    }
+
+    for (const std::string &p : paths) {
+      struct stat buf;
+      if(stat((p + '/' + argv[1]).c_str(), &buf)) continue;
+      if (buf.st_mode & S_IXOTH) execvp(argv[1], argv + 1);
+    }
+  }
+#endif
+
   Controller::conf = Util::Config(argv[0]);
   Util::Config::binaryType = Util::CONTROLLER;
   Controller::conf.activate();