Added skipDynamic optional argument to most binary representations of metadata/tracks, which skips sending dynamic parts of the metadata if true.

2016-02-15 11:48:45 +01:00 · 2016-02-15 11:48:45 +01:00 · 668560ff05
commit 668560ff05
parent 10af060ab4
11 changed files with 344 additions and 111 deletions
--- a/src/output/output_dtsc.cpp
+++ b/src/output/output_dtsc.cpp
@ -0,0 +1,147 @@
+#include "output_dtsc.h"
+#include <mist/defines.h>
+#include <mist/stream.h>
+#include <mist/triggers.h>
+#include <mist/auth.h>
+#include <mist/bitfields.h>
+#include <sys/stat.h>
+#include <cstring>
+#include <cstdlib>
+
+namespace Mist {
+  OutDTSC::OutDTSC(Socket::Connection & conn) : Output(conn) {
+    setBlocking(true);
+    JSON::Value prep;
+    prep["cmd"] = "hi";
+    prep["version"] = "MistServer " PACKAGE_VERSION;
+#ifdef BIGMETA
+    prep["pack_method"] = 2ll;
+#else
+    prep["pack_method"] = 1ll;
+#endif
+    salt = Secure::md5("mehstuff"+JSON::Value((long long)time(0)).asString());
+    prep["salt"] = salt;
+    /// \todo Make this securererer.
+    unsigned long sendSize = prep.packedSize();
+    myConn.SendNow("DTCM");
+    char sSize[4] = {0, 0, 0, 0};
+    Bit::htobl(sSize, prep.packedSize());
+    myConn.SendNow(sSize, 4);
+    prep.sendTo(myConn);
+    pushing = false;
+  }
+
+  OutDTSC::~OutDTSC() {}
+
+  void OutDTSC::init(Util::Config * cfg){
+    Output::init(cfg);
+    capa["name"] = "DTSC";
+    capa["desc"] = "Enables the DTSC protocol for efficient inter-server stream exchange.";
+    capa["deps"] = "";
+    capa["codecs"][0u][0u].append("*");
+    cfg->addConnectorOptions(4200, capa);
+    config = cfg;
+  }
+  
+  void OutDTSC::sendNext(){
+    myConn.SendNow(thisPacket.getData(), thisPacket.getDataLen());
+  }
+
+  void OutDTSC::sendHeader(){
+    sentHeader = true;
+    myMeta.send(myConn, true);
+  }
+
+  void OutDTSC::onRequest(){
+    while (myConn.Received().available(8)){
+      if (myConn.Received().copy(4) == "DTCM"){
+        // Command message
+        std::string toRec = myConn.Received().copy(8);
+        unsigned long rSize = Bit::btohl(toRec.c_str()+4);
+        if (!myConn.Received().available(8+rSize)){return;}//abort - not enough data yet
+        myConn.Received().remove(8);
+        std::string dataPacket = myConn.Received().remove(rSize);
+        DTSC::Scan dScan((char*)dataPacket.data(), rSize);
+        if (dScan.getMember("cmd").asString() == "push"){handlePush(dScan); continue;}
+        if (dScan.getMember("cmd").asString() == "play"){handlePlay(dScan); continue;}
+        WARN_MSG("Unhandled DTCM command: '%s'", dScan.getMember("cmd").asString().c_str());
+      }else{
+        // Non-command message
+        //
+      }
+    }
+  }
+
+  void OutDTSC::handlePlay(DTSC::Scan & dScan){
+    streamName = dScan.getMember("stream").asString();
+    Util::sanitizeName(streamName);
+    parseData = true;
+  }
+
+  void OutDTSC::handlePush(DTSC::Scan & dScan){
+    streamName = dScan.getMember("stream").asString();
+    std::string passString = dScan.getMember("password").asString();
+
+    Util::sanitizeName(streamName);
+    //pull the server configuration
+    std::string smp = streamName.substr(0,(streamName.find_first_of("+ ")));
+    IPC::sharedPage serverCfg("!mistConfig", DEFAULT_CONF_PAGE_SIZE); ///< Contains server configuration and capabilities
+    IPC::semaphore configLock("!mistConfLock", O_CREAT | O_RDWR, ACCESSPERMS, 1);
+    configLock.wait();
+    
+    DTSC::Scan streamCfg = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("streams").getMember(smp);
+    if (streamCfg){
+      if (streamCfg.getMember("source").asString().substr(0, 7) != "push://"){
+        DEBUG_MSG(DLVL_FAIL, "Push rejected - stream %s not a push-able stream. (%s != push://*)", streamName.c_str(), streamCfg.getMember("source").asString().c_str());
+        myConn.close();
+      }else{
+        std::string source = streamCfg.getMember("source").asString().substr(7);
+        std::string IP = source.substr(0, source.find('@'));
+        /*LTS-START*/
+        std::string password;
+        if (source.find('@') != std::string::npos){
+          password = source.substr(source.find('@')+1);
+          if (password != ""){
+            if (passString == Secure::md5(salt + password)){
+              DEBUG_MSG(DLVL_DEVEL, "Password accepted - ignoring IP settings.");
+              IP = "";
+            }else{
+              DEBUG_MSG(DLVL_DEVEL, "Password rejected - checking IP.");
+              if (IP == ""){
+                IP = "deny-all.invalid";
+              }
+            }
+          }
+        }
+        if(Triggers::shouldTrigger("STREAM_PUSH", smp)){
+          std::string payload = streamName+"\n" + myConn.getHost() +"\n"+capa["name"].asStringRef()+"\n"+reqUrl;
+          if (!Triggers::doTrigger("STREAM_PUSH", payload, smp)){
+            DEBUG_MSG(DLVL_FAIL, "Push from %s to %s rejected - STREAM_PUSH trigger denied the push", myConn.getHost().c_str(), streamName.c_str());
+            myConn.close();
+            configLock.post();
+            configLock.close();
+            return;
+          }
+        }
+        /*LTS-END*/
+        if (IP != ""){
+          if (!myConn.isAddress(IP)){
+            DEBUG_MSG(DLVL_FAIL, "Push from %s to %s rejected - source host not whitelisted", myConn.getHost().c_str(), streamName.c_str());
+            myConn.close();
+          }
+        }
+      }
+    }else{
+      DEBUG_MSG(DLVL_FAIL, "Push from %s rejected - stream '%s' not configured.", myConn.getHost().c_str(), streamName.c_str());
+      myConn.close();
+    }
+    configLock.post();
+    configLock.close();
+    if (!myConn){return;}//do not initialize if rejected
+    initialize();
+    pushing = true;
+  }
+
+
+}
+