From 088b917b523834d543def929aa9cd7a1ac0c8a95 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 25 Nov 2013 12:21:51 +0100
Subject: [PATCH] Merged non-LTS code from LTS branch into other repositories.

---
 src/buffer/buffer_stream.cpp          | 27 ++++++++++++++-------
 src/controller/controller_streams.cpp | 34 ++++++++-------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/buffer/buffer_stream.cpp b/src/buffer/buffer_stream.cpp
index 7e6c388c..2e6b6ed7 100644
--- a/src/buffer/buffer_stream.cpp
+++ b/src/buffer/buffer_stream.cpp
@@ -80,15 +80,26 @@ namespace Buffer {
     waiting_ip = ip;
   }
 
-  /// Check if this is the IP address to accept push data from.
-  /// \param ip The IP address to check.
-  /// \return True if it is the correct address, false otherwise.
-  bool Stream::checkWaitingIP(std::string ip){
-    if (ip == waiting_ip || ip == "::ffff:" + waiting_ip){
-      return true;
+  ///\brief Check if this is the IP address to accept push data from.
+  ///\param ip The IP address to check, followed by a space and the password to check.
+  ///\return True if it is the correct address or password, false otherwise.
+  bool Stream::checkWaitingIP(std::string push_request){
+    std::string ip = push_request.substr(0, push_request.find(' '));
+    std::string pass = push_request.substr(push_request.find(' ') + 1);
+    if (waiting_ip.length() > 0 && waiting_ip[0] == '@'){
+      if (pass == waiting_ip.substr(1)){
+        return true;
+      }else{
+        std::cout << "Password '" << pass << "' incorrect" << std::endl;
+        return false;
+      }
     }else{
-      std::cout << ip << " != (::ffff:)" << waiting_ip << std::endl;
-      return false;
+      if (ip == waiting_ip || ip == "::ffff:" + waiting_ip){
+        return true;
+      }else{
+        std::cout << ip << " != (::ffff:)" << waiting_ip << std::endl;
+        return false;
+      }
     }
   }
 
diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index 3d86e04b..d64faf3b 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -42,21 +42,21 @@ namespace Controller {
     if (data.isMember("source")){
       URL = data["source"].asString();
     }
-    std::string cmd1, cmd2, cmd3;
+    std::string buffcmd;
     if (URL == ""){
       Log("STRM", "Error for stream " + name + "! Source parameter missing.");
       data["error"] = "Missing source parameter!";
       return;
     }
+    buffcmd = "MistBuffer";
+    if (data.isMember("DVR") && data["DVR"].asInt() > 0){
+      data["DVR"] = data["DVR"].asInt();
+      buffcmd += " -t " + data["DVR"].asString();
+    }
+    buffcmd += " -s " + name;
     if (URL.substr(0, 4) == "push"){
       std::string pusher = URL.substr(7);
-      if (data.isMember("DVR") && data["DVR"].asInt() > 0){
-        data["DVR"] = data["DVR"].asInt();
-        cmd2 = "MistBuffer -t " + data["DVR"].asString() + " -s " + name + " " + pusher;
-      }else{
-        cmd2 = "MistBuffer -s " + name + " " + pusher;
-      }
-      Util::Procs::Start(name, Util::getMyPath() + cmd2);
+      Util::Procs::Start(name, Util::getMyPath() + buffcmd + " " + pusher);
       Log("BUFF", "(re)starting stream buffer " + name + " for push data from " + pusher);
     }else{
       if (URL.substr(0, 1) == "/"){
@@ -123,23 +123,9 @@ namespace Controller {
           data["online"] = 1;
         }
         return; //MistPlayer handles VoD
-      }else{
-        cmd1 = "ffmpeg -re -async 2 -i " + URL + " -f flv -";
-        cmd2 = "MistFLV2DTSC";
-      }
-      if (data.isMember("DVR") && data["DVR"].asInt() > 0){
-        data["DVR"] = data["DVR"].asInt();
-        cmd3 = "MistBuffer -t " + data["DVR"].asString() + " -s " + name;
-      }else{
-        cmd3 = "MistBuffer -s " + name;
-      }
-      if (cmd2 != ""){
-        Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd2, Util::getMyPath() + cmd3);
-        Log("BUFF", "(re)starting stream buffer " + name + " for ffmpeg data: " + cmd1);
-      }else{
-        Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd3);
-        Log("BUFF", "(re)starting stream buffer " + name + " using input file " + URL);
       }
+      Util::Procs::Start(name, "ffmpeg -re -async 2 -i " + URL + " -f flv -", Util::getMyPath() + "MistFLV2DTSC", Util::getMyPath() + buffcmd);
+      Log("BUFF", "(re)starting stream buffer " + name + " for ffmpeg data: ffmpeg -re -async 2 -i " + URL + " -f flv -");
     }
   }