onebinary: it almost works!

Author: iameli

src/controller/controller.cpp

@@ -618,7 +618,7 @@ int main_loop(int argc, char **argv){
 
 ///\brief The controller angel process.
 /// Starts a forked main_loop in a loop. Yes, you read that right.
-int main(int argc, char **argv){
+int ControllerMain(int argc, char **argv){
   Util::Procs::setHandler(); // set child handler
   {
     struct sigaction new_action;

src/controller/controller_capabilities.cpp

@@ -1,4 +1,8 @@
 #include "controller_capabilities.h"
+#include "../output/output_rtmp.h"
+#include "../output/output_hls.h"
+#include "../output/output_http_internal.h"
+#include "../input/input_buffer.h"
 #include <fstream>
 #include <mist/config.h>
 #include <mist/defines.h>
@@ -249,6 +253,7 @@ namespace Controller{
 
   /// Aquire list of available protocols, storing in global 'capabilities' JSON::Value.
   void checkAvailProtocols(){
+    #ifdef GO_AWAY
     std::deque<std::string> execs;
     Util::getMyExec(execs);
     std::string arg_one;
@@ -313,6 +318,15 @@ namespace Controller{
         }
       }
     }
+    #else
+    // Mist::OutHTTP
+    // Mist::OutRTMP
+    // Mist::inputBuffer
+    capabilities["inputs"]["Buffer"] = JSON::fromString(Mist::inputBuffer::capa.toString());
+    capabilities["connectors"]["HLS"] = JSON::fromString(Mist::OutHLS::capa.toString());
+    capabilities["connectors"]["HTTP"] = JSON::fromString(Mist::OutHTTP::capa.toString());
+    capabilities["connectors"]["RTMP"] = JSON::fromString(Mist::OutRTMP::capa.toString());
+    #endif
   }
 
   ///\brief A class storing information about the cpu the server is running on.

src/controller/controller_connectors.cpp

@@ -126,14 +126,14 @@ namespace Controller{
   }
 
   static inline void buildPipedArguments(JSON::Value &p, char *argarr[], const JSON::Value &capabilities){
-    int argnum = 0;
+    int argnum = 1;
     static std::string tmparg;
-    tmparg = Util::getMyPath() + std::string("MistOut") + p["connector"].asStringRef();
-    struct stat buf;
-    if (::stat(tmparg.c_str(), &buf) != 0){
-      tmparg = Util::getMyPath() + std::string("MistConn") + p["connector"].asStringRef();
-    }
-    if (::stat(tmparg.c_str(), &buf) != 0){return;}
+    tmparg = std::string("MistOut") + p["connector"].asStringRef();
+    // struct stat buf;
+    // if (::stat(tmparg.c_str(), &buf) != 0){
+    //   tmparg = Util::getMyPath() + std::string("MistConn") + p["connector"].asStringRef();
+    // }
+    // if (::stat(tmparg.c_str(), &buf) != 0){return;}
     argarr[argnum++] = (char *)tmparg.c_str();
     const JSON::Value &pipedCapa = capabilities["connectors"][p["connector"].asStringRef()];
     if (pipedCapa.isMember("required")){builPipedPart(p, argarr, argnum, pipedCapa["required"]);}
@@ -160,7 +160,7 @@ namespace Controller{
 
     // used for building args
     int err = fileno(stderr);
-    char *argarr[15]; // approx max # of args (with a wide margin)
+    char *argarr[16] = {"/home/iameli/code/mistserver/build/MistServer"}; // approx max # of args (with a wide margin)
     int i;
 
     std::string tmp;
@@ -255,11 +255,12 @@ namespace Controller{
         Log("CONF", "Starting connector: " + *runningConns.begin());
         action = true;
         // clear out old args
-        for (i = 0; i < 15; i++){argarr[i] = 0;}
+        for (i = 1; i < 16; i++){argarr[i] = 0;}
         // get args for this connector
         JSON::Value p = JSON::fromString(*runningConns.begin());
         buildPipedArguments(p, (char **)&argarr, capabilities);
         // start piped w/ generated args
+        INFO_MSG("piped command[0]: %s [1]: %s", argarr[0], argarr[1])
         currentConnectors[*runningConns.begin()] = Util::Procs::StartPiped(argarr, 0, 0, &err);
         Triggers::doTrigger("OUTPUT_START", *runningConns.begin()); // LTS
       }

src/input/input.cpp

@@ -18,6 +18,7 @@
 
 namespace Mist{
   Util::Config *Input::config = NULL;
+  JSON::Value Input::capa = JSON::Value();
 
   void Input::userLeadIn(){
     connectedUsers = 0;

src/input/input.h

@@ -54,6 +54,8 @@ namespace Mist{
     virtual bool needsLock(){return !config->getBool("realtime");}
     virtual bool publishesTracks(){return true;}
 
+    static JSON::Value capa;
+
   protected:
     bool internalOnly;
     bool isBuffer;
@@ -104,8 +106,6 @@ namespace Mist{
 
     uint64_t activityCounter;
 
-    JSON::Value capa;
-
     std::map<size_t, std::set<uint64_t> > keyTimes;
     std::map<trackKey, uint64_t> keyLoadPriority;
 

src/meson.build

@@ -27,14 +27,28 @@ executables += {
       'output/output_http_internal.cpp',
       'output/output_ts.cpp',
       'output/output_ts_base.cpp',
-      'output/output_rtmp.cpp'
+      'output/output_rtmp.cpp',
+      'controller/controller_external_writers.cpp',
+      'controller/controller_updater.cpp',
+      'controller/controller_streams.cpp',
+      'controller/controller_storage.cpp',
+      'controller/controller_connectors.cpp',
+      'controller/controller_statistics.cpp',
+      'controller/controller_limits.cpp',
+      'controller/controller_capabilities.cpp',
+      'controller/controller_uplink.cpp',
+      'controller/controller_api.cpp',
+      'controller/controller_push.cpp',
+      'controller/controller_variables.cpp',
     ),
     io_cpp,
     header_tgts,
-    embed_tgts
+    embed_tgts,
+    server_html
   ],
   'defines': [
     '-DTS_BASECLASS=HTTPOutput',
+    '-DONE_BINARY=true',
   ],
   'deps' : [libmist_dep]
 }

src/mistserver.cpp

@@ -10,11 +10,12 @@
 #include "input/mist_in.cpp"
 #include "input/input_buffer.h"
 #include "session.cpp"
+#include "controller/controller.cpp"
 
 int main(int argc, char *argv[]){
+  INFO_MSG("starting")
   if (argc < 2) {
-    INFO_MSG("usage: %s [MistSomething]", argv[0]);
-    return 1;
+    return 201;
   }
   // Create a new argv array without argv[1]
   int new_argc = argc - 1;
@@ -24,6 +25,9 @@ int main(int argc, char *argv[]){
           new_argv[j++] = argv[i];
       }
   }
+ if (strcmp(argv[1], "MistController") == 0) {
+    return ControllerMain(new_argc, new_argv);
+  }
   if (strcmp(argv[1], "MistOutHLS") == 0) {
     return OutputMain<Mist::OutHLS>(new_argc, new_argv);
   }
@@ -39,6 +43,9 @@ int main(int argc, char *argv[]){
   else if (strcmp(argv[1], "MistSession") == 0) {
     return SessionMain(new_argc, new_argv);
   }
+  else {
+    return ControllerMain(argc, argv);
+  }
   INFO_MSG("binary not found: %s", argv[1]);
-  return 0;
+  return 202;
 }

src/output/mist_out.cpp

@@ -17,7 +17,7 @@ int spawnForked(Socket::Connection &S){
   return tmp.run();
 }
 
-void handleUSR1(int signum, siginfo_t *sigInfo, void *ignore){
+void handleUSR1Output(int signum, siginfo_t *sigInfo, void *ignore){
   HIGH_MSG("USR1 received - triggering rolling restart");
   Util::Config::is_restarting = true;
   Util::logExitReason(ER_CLEAN_SIGNAL, "signal USR1");
@@ -54,7 +54,7 @@ int OutputMain(int argc, char *argv[]){
     if (T::listenMode()){
       {
         struct sigaction new_action;
-        new_action.sa_sigaction = handleUSR1;
+        new_action.sa_sigaction = handleUSR1Output;
         sigemptyset(&new_action.sa_mask);
         new_action.sa_flags = 0;
         sigaction(SIGUSR1, &new_action, NULL);