xlxd version 1.4.3

Protection against sid=0

src/creflector.cpp

@@ -173,52 +173,61 @@ CPacketStream *CReflector::OpenStream(CDvHeaderPacket *DvHeader, CClient *client
     // clients MUST have bee locked by the caller
     // so we can freely access it within the fuction
 
-    // check if client is valid candidate
+    // check if streamid is valid
-    if ( m_Clients.IsClient(client) && !client->IsAMaster() )
+    if ( DvHeader->GetStreamId() != 0 )
     {
-        // check if no stream with same streamid already open
+        // check if client is valid candidate
-        // to prevent loops
+        if ( m_Clients.IsClient(client) && !client->IsAMaster() )
-        if ( !IsStreamOpen(DvHeader) )
         {
-            // get the module's queue
+            // check if no stream with same streamid already open
-            char module = DvHeader->GetRpt2Module();
+            // to prevent loops
-            CPacketStream *stream = GetStream(module);
+            if ( !IsStreamOpen(DvHeader) )
-            if ( stream != NULL )
             {
-                // lock it
+                // get the module's queue
-                stream->Lock();
+                char module = DvHeader->GetRpt2Module();
-                // is it available ?
+                CPacketStream *stream = GetStream(module);
-                if ( stream->Open(*DvHeader, client) )
+                if ( stream != NULL )
                 {
-                    // stream open, mark client as master
+                    // lock it
-                    // so that it can't be deleted
+                    stream->Lock();
-                    client->SetMasterOfModule(module);
+                    // is it available ?
-
+                    if ( stream->Open(*DvHeader, client) )
-                    // update last heard time
+                    {
-                    client->Heard();
+                        // stream open, mark client as master
-                    retStream = stream;
+                        // so that it can't be deleted
-
+                        client->SetMasterOfModule(module);
-                    // and push header packet
+
-                    stream->Push(DvHeader);
+                        // update last heard time
-
+                        client->Heard();
-                    // report
+                        retStream = stream;
-                    std::cout << "Opening stream on module " << module << " for client " << client->GetCallsign()
+
-                              << " with sid " << DvHeader->GetStreamId() << std::endl;
+                        // and push header packet
-
+                        stream->Push(DvHeader);
-                    // notify
+
-                    g_Reflector.OnStreamOpen(stream->GetUserCallsign());
+                        // report
-
+                        std::cout << "Opening stream on module " << module << " for client " << client->GetCallsign()
+                                  << " with sid " << DvHeader->GetStreamId() << std::endl;
+
+                        // notify
+                        g_Reflector.OnStreamOpen(stream->GetUserCallsign());
+
+                    }
+                    // unlock now
+                    stream->Unlock();
                 }
-                // unlock now
+            }
-                stream->Unlock();
+            else
+            {
+                // report
+                std::cout << "Detected stream loop on module " << DvHeader->GetRpt2Module() << " for client " << client->GetCallsign()
+                          << " with sid " << DvHeader->GetStreamId() << std::endl;
             }
         }
-        else
+    }
-        {
+    else
-            // report
+    {
-            std::cout << "Detected stream loop on module " << DvHeader->GetRpt2Module() << " for client " << client->GetCallsign()
+        // report
-                      << " with sid " << DvHeader->GetStreamId() << std::endl;
+        std::cout << "Detected null stream id for client " << client->GetCallsign() << std::endl;
-        }
     }
 
     // done

src/main.h

@@ -48,7 +48,7 @@
 
 #define VERSION_MAJOR               1
 #define VERSION_MINOR               4
-#define VERSION_REVISION            2
+#define VERSION_REVISION            3
 
 // global ------------------------------------------------------