Several small fixes:

- Double ready in track list
- SRT input listener race condition
- metadata sizing fix
- SRT socket address allocation fix for listener mode

Author: Rokamun

lib/defines.h

@@ -177,14 +177,14 @@ static inline void show_stackframe(){}
 #define RAW_FRAME_COUNT 30
 
 /// \TODO These values are hardcoded for now, but the dtsc_sizing_test binary can calculate them accurately.
-#define META_META_OFFSET 138
+#define META_META_OFFSET 136
 #define META_META_RECORDSIZE 548
 
 #define META_TRACK_OFFSET 148
 #define META_TRACK_RECORDSIZE 1893
 
-#define TRACK_TRACK_OFFSET 193
-#define TRACK_TRACK_RECORDSIZE 1049060
+#define TRACK_TRACK_OFFSET 200
+#define TRACK_TRACK_RECORDSIZE 1049068
 
 #define TRACK_FRAGMENT_OFFSET 68
 #define TRACK_FRAGMENT_RECORDSIZE 14

lib/dtsc.cpp

@@ -1202,7 +1202,6 @@ namespace DTSC{
       trackList.addField("playready", RAX_STRING, 1024);
 
       trackList.setRCount(trackCount);
-      trackList.setReady();
       preloadTrackFields();
     }else{
       if (stream.isReady()){streamTracksField = stream.getFieldData("tracks");}

lib/socket_srt.cpp

@@ -117,7 +117,7 @@ namespace Socket{
     close();
     initializeEmpty();
     if (!rhs){return *this;}
-    memcpy(&remoteaddr, &(rhs.remoteaddr), sizeof(sockaddr_in6));
+    memcpy(&remoteaddr, &(rhs.remoteaddr), sizeof(remoteaddr));
     direction = rhs.direction;
     remotehost = rhs.remotehost;
     sock = rhs.sock;
@@ -364,23 +364,29 @@ namespace Socket{
       return;
     }
     if (modeName == "listener"){
-      HIGH_MSG("Going to bind a server on %s:%u", _host.c_str(), _port);
+      std::deque<std::string> addrs = Socket::getAddrs(_host, _port);
+      for (std::deque<std::string>::iterator it = addrs.begin(); it != addrs.end(); ++it){
+        size_t maxSize = it->size();
+        if (maxSize > sizeof(remoteaddr)){maxSize = sizeof(remoteaddr);}
+        memcpy(&remoteaddr, it->data(), maxSize);
 
-      sockaddr_in sa = createInetAddr(_host, _port);
-      sockaddr *psa = (sockaddr *)&sa;
+        sockaddr *psa = (sockaddr *)&remoteaddr;
+        HIGH_MSG("Going to bind a server on %s:%u", _host.c_str(), _port);
 
-      if (srt_bind(sock, psa, sizeof sa) == SRT_ERROR){
-        close();
-        ERROR_MSG("Can't connect SRT Socket: %s", srt_getlasterror_str());
+        if (srt_bind(sock, psa, sizeof remoteaddr) == SRT_ERROR){
+          close();
+          ERROR_MSG("Can't connect SRT Socket: %s", srt_getlasterror_str());
+          continue;
+        }
+        if (srt_listen(sock, 100) == SRT_ERROR){
+          close();
+          ERROR_MSG("Can not listen on Socket");
+          continue;
+        }
+        INFO_MSG("Listener SRT socket success @ %s:%u", _host.c_str(), _port);
+        lastGood = Util::bootMS();
         return;
       }
-      if (srt_listen(sock, 100) == SRT_ERROR){
-        close();
-        ERROR_MSG("Can not listen on Socket");
-      }
-      INFO_MSG("Listener SRT socket success @ %s:%u", _host.c_str(), _port);
-      lastGood = Util::bootMS();
-      return;
     }
     ERROR_MSG("Invalid mode parameter. Use 'caller' or 'listener'");
   }

src/input/input_tssrt.cpp

@@ -39,6 +39,7 @@ static void callThreadCallbackSRT(void *socknum){
   Mist::InputTSSRT inp(cfgPointer, *(Socket::SRTConnection *)socknum);
   inp.setSingular(false);
   inp.run();
+  delete (Socket::SRTConnection *)socknum;
 }
 
 namespace Mist{
@@ -294,13 +295,14 @@ namespace Mist{
       cfgPointer = config;
       baseStreamName = streamName;
       while (config->is_active && sSock.connected()){
-        Socket::SRTConnection S = sSock.accept();
-        if (S.connected()){// check if the new connection is valid
+        Socket::SRTConnection * S = new Socket::SRTConnection();
+        *S = sSock.accept();
+        if (S->connected()){// check if the new connection is valid
           // spawn a new thread for this connection
-          tthread::thread T(callThreadCallbackSRT, (void *)&S);
+          tthread::thread T(callThreadCallbackSRT, (void *)S);
           // detach it, no need to keep track of it anymore
           T.detach();
-          HIGH_MSG("Spawned new thread for socket %i", S.getSocket());
+          HIGH_MSG("Spawned new thread for socket %i", S->getSocket());
         }
       }
       Socket::SRT::libraryCleanup();