Make use of new getTmpFolder() function in libmist

src/buffer/buffer.cpp

@@ -31,11 +31,11 @@ namespace Buffer {
       return;
     }
     std::string double_newline = "\n\n";
-    Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
+    Socket::Connection StatsSocket = Socket::Connection(Util::getTmpFolder() + "statistics", true);
     while (buffer_running){
       Util::sleep(1000); //sleep one second
       if ( !StatsSocket.connected()){
-        StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
+        StatsSocket = Socket::Connection(Util::getTmpFolder() + "statistics", true);
       }
       if (StatsSocket.connected()){
         Stream::get()->getReadLock();

src/buffer/player.cpp

@@ -11,6 +11,7 @@
 #include <mist/socket.h>
 #include <mist/timing.h>
 #include <mist/procs.h>
+#include <mist/stream.h>
 
 //under cygwin, recv blocks for ~15ms if no data is available.
 //This is a hack to keep performance decent with that bug present.
@@ -102,7 +103,7 @@ int main(int argc, char** argv){
   pausemark["datatype"] = "pause_marker";
   pausemark["time"] = (long long int)0;
 
-  Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
+  Socket::Connection StatsSocket = Socket::Connection(Util::getTmpFolder() + "statistics", true);
   int lasttime = Util::epoch(); //time last packet was sent
 
   if (meta["video"]["keyms"].asInt() < 11){
@@ -139,7 +140,7 @@ int main(int argc, char** argv){
             }
             case 'S': { //Stats
               if ( !StatsSocket.connected()){
-                StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
+                StatsSocket = Socket::Connection(Util::getTmpFolder() + "statistics", true);
               }
               if (StatsSocket.connected()){
                 sts = Stats(in_out.Received().get().substr(2));

src/connectors/conn_http.cpp

@@ -291,7 +291,7 @@ namespace Connector_HTTP {
         streamname = url.substr(7, url.length() - 10);
       }
       Util::Stream::sanitizeName(streamname);
-      JSON::Value ServConf = JSON::fromFile("/tmp/mist/streamlist");
+      JSON::Value ServConf = JSON::fromFile(Util::getTmpFolder() + "streamlist");
       std::string response;
       std::string host = H.GetHeader("Host");
       if (host.find(':')){
@@ -404,7 +404,7 @@ namespace Connector_HTTP {
         delete connectorConnections[uid];
         connectorConnections.erase(uid);
       }
-      connectorConnections[uid] = new ConnConn(new Socket::Connection("/tmp/mist/" + connector));
+      connectorConnections[uid] = new ConnConn(new Socket::Connection(Util::getTmpFolder() + connector));
       connectorConnections[uid]->conn->setBlocking(false); //do not block on spool() with no data
 #if DEBUG >= 4
       std::cout << "Created new connection " << uid << std::endl;

src/connectors/conn_http_dynamic.cpp

@@ -334,7 +334,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_dynamic");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_json.cpp

@@ -207,7 +207,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_json");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_live.cpp

@@ -352,7 +352,7 @@ int main(int argc, char ** argv){
     return -1;
   }
 
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_live");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_progressive_flv.cpp

@@ -212,7 +212,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_flv");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_progressive_mp3.cpp

@@ -176,7 +176,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_mp3");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_progressive_mp4.cpp

@@ -218,7 +218,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_mp4");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_progressive_ogg.cpp

@@ -286,7 +286,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_ogg");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_smooth.cpp

@@ -495,7 +495,7 @@ int main(int argc, char ** argv){
     return -1;
   }
 
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_smooth");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/connectors/conn_http_srt.cpp

@@ -229,7 +229,7 @@ int main(int argc, char ** argv){
     return -1;
   }
   
-  Socket::Server server_socket = Socket::Server("/tmp/mist/http_srt");
+  Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
   if ( !server_socket.connected()){
     return 1;
   }

src/controller/controller.cpp

@@ -13,6 +13,7 @@
 #include <mist/auth.h>
 #include <mist/timing.h>
 #include <mist/converter.h>
+#include <mist/stream.h>
 #include "controller_storage.h"
 #include "controller_connectors.h"
 #include "controller_streams.h"
@@ -325,8 +326,7 @@ int main(int argc, char ** argv){
   time_t lastuplink = 0;
   time_t processchecker = 0;
   Socket::Server API_Socket = Socket::Server(conf.getInteger("listen_port"), conf.getString("listen_interface"), true);
-  mkdir("/tmp/mist", S_IRWXU | S_IRWXG | S_IRWXO); //attempt to create /tmp/mist/ - ignore failures
-  Socket::Server Stats_Socket = Socket::Server("/tmp/mist/statistics", true);
+  Socket::Server Stats_Socket = Socket::Server(Util::getTmpFolder() + "statistics", true);
   conf.activate();
   Socket::Connection Incoming;
   std::vector<Controller::ConnectedUser> users;

src/controller/controller_streams.cpp

@@ -1,6 +1,7 @@
 #include <mist/procs.h>
 #include <mist/config.h>
 #include <mist/timing.h>
+#include <mist/stream.h>
 #include "controller_streams.h"
 #include "controller_storage.h"
 #include <sys/stat.h>
@@ -147,7 +148,7 @@ namespace Controller {
       changed = true;
     }
     if (changed){
-      WriteFile("/tmp/mist/streamlist", strlist.toString());
+      WriteFile(Util::getTmpFolder() + "streamlist", strlist.toString());
     }
   }