the torchlight packets are now also checked before being send. hopefully it prevents buffer overflow. the packet size for players was also slightly increased

extension.cpp

@@ -53,7 +53,9 @@
 // with 22050 samplerate and 512 frames per packet -> 23.22ms per packet
 // SVC_VoiceData overhead = 5 bytes
 // sensible limit of 8 packets per frame = 552 bytes -> 185.76ms of voice data per frame
-#define NET_MAX_VOICE_BYTES_FRAME (8 * (5 + 64))
+//#define NET_MAX_VOICE_BYTES_FRAME (8 * (5 + 64))
+#define NET_MAX_VOICE_BYTES_FRAME (10 * (5 + 64))
+#define NET_MAX_VOICE_BYTES_FRAME_TORCHLIGHT (22 * (5 + 64))
 
 ConVar g_SmVoiceAddr("sm_voice_addr", "127.0.0.1", FCVAR_PROTECTED, "Voice server listen ip address.");
 ConVar g_SmVoicePort("sm_voice_port", "27020", FCVAR_PROTECTED, "Voice server listen port.", true, 1025.0, true, 65535.0);
@@ -138,7 +140,7 @@ int g_aFrameVoiceBytes[SM_MAXPLAYERS + 1];
 
 DETOUR_DECL_STATIC4(SV_BroadcastVoiceData, void, IClient *, pClient, int, nBytes, char *, data, int64, xuid)
 {
-    if(g_Interface.OnBroadcastVoiceData(pClient, nBytes, data))
+    if(g_Interface.OnBroadcastVoiceData(pClient, nBytes, data, false))
         DETOUR_STATIC_CALL(SV_BroadcastVoiceData)(pClient, nBytes, data, xuid);
 }
 
@@ -151,7 +153,7 @@ DETOUR_DECL_STATIC2(SV_BroadcastVoiceData_LTCG, void, char *, data, int64, xuid)
     __asm mov pClient, ecx;
     __asm mov nBytes, edx;
 
-    bool ret = g_Interface.OnBroadcastVoiceData(pClient, nBytes, data);
+    bool ret = g_Interface.OnBroadcastVoiceData(pClient, nBytes, data, false);
 
     __asm mov ecx, pClient;
     __asm mov edx, nBytes;
@@ -488,7 +490,7 @@ void CVoice::OnGameFrame(bool simulating)
     memset(g_aFrameVoiceBytes, 0, sizeof(g_aFrameVoiceBytes));
 }
 
-bool CVoice::OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data)
+bool CVoice::OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data, bool isSourceTV)
 {
     // Reject empty packets
     if(nBytes < 1)
@@ -500,10 +502,18 @@ bool CVoice::OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data)
     // 5 = SVC_VoiceData header/overhead
     g_aFrameVoiceBytes[client] += 5 + nBytes;
     
-    if(g_aFrameVoiceBytes[client] > NET_MAX_VOICE_BYTES_FRAME)
+    if (!isSourceTV && g_aFrameVoiceBytes[client] > NET_MAX_VOICE_BYTES_FRAME)
     {
         return false;
     }
+    if (isSourceTV)
+    {
+        if (g_aFrameVoiceBytes[client] > NET_MAX_VOICE_BYTES_FRAME_TORCHLIGHT)
+        {
+            smutils->LogMessage(myself, "inside interface BroadcastVoiceData with torchlight. g_aFrameVoiceBytes[client]: %d. NET_MAX_VOICE_BYTES_FRAME_TORCHLIGHT: %d", g_aFrameVoiceBytes[client], NET_MAX_VOICE_BYTES_FRAME_TORCHLIGHT);
+            return false;
+        }
+    }
 
     g_fLastVoiceData[client] = gpGlobals->curtime;
 
@@ -701,6 +711,7 @@ void CVoice::HandleVoiceData()
     if(!FramesAvailable)
         return;
 
+    //int FramesMax = 5; //used to be 5
     int FramesMax = 2; //used to be 5
     bool reset_state = false;
     if (FramesAvailable <= FramesMax)
@@ -714,13 +725,11 @@ void CVoice::HandleVoiceData()
         return;
 
     float TimeAvailable = (float)m_Buffer.TotalLength() / sampleRate;
-    if(m_AvailableTime < getTime() && TimeAvailable < 0.2)
+    if (m_AvailableTime < getTime() && TimeAvailable < 0.2)
-    //if(m_AvailableTime < getTime() && TimeAvailable < 0.1)
         return;
 
     double maxBuffer = (m_AvailableTime < getTime()) ? 0.2 : 0.04;
-    //double maxBuffer = (m_AvailableTime < getTime()) ? 0.1 : 0.02;
+    if (m_AvailableTime > getTime() + maxBuffer)
-    if(m_AvailableTime > getTime() + maxBuffer)
         return;
     
 
@@ -744,12 +753,11 @@ void CVoice::HandleVoiceData()
     // 3. Payload Type 11 (1 byte)
     aFinal[FinalSize++] = 0x0B;
 
-
     // 4. Sample Rate (2 bytes little-endian)
     memcpy(&aFinal[FinalSize], &sampleRate, sizeof(uint16_t));
     FinalSize += sizeof(uint16_t);
 
-    // 5. Payload Type 6 for Opus (1 byte)
+    // 5. Payload Type 5 for Opus. 6 for opus plc (1 byte)
     aFinal[FinalSize++] = 0x05;
 
     // 6. Reserve space for total data length (2 bytes little-endian)
@@ -777,6 +785,7 @@ void CVoice::HandleVoiceData()
         *pFrameSize = sizeof(aFinal) - sizeof(uint32_t) - FinalSize;
 
         // Encode with Opus
+        //pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
         int nbBytes = opus_encode(m_OpusEncoder, (const opus_int16*)aBuffer, SamplesPerChannel,
                                   &aFinal[FinalSize], *pFrameSize);
         if (nbBytes <= 1)
@@ -814,7 +823,6 @@ void CVoice::HandleVoiceData()
     FinalSize += sizeof(uint32_t);
 
     BroadcastVoiceData(pClient, FinalSize, aFinal);
-    //smutils->LogMessage(myself, "FinalSize: %d", FinalSize);
 
     if (m_AvailableTime < getTime())
         m_AvailableTime = getTime();
@@ -834,6 +842,9 @@ void CVoice::BroadcastVoiceData(IClient *pClient, int nBytes, unsigned char *pDa
 
     DETOUR_STATIC_CALL(SV_BroadcastVoiceData_LTCG)((char *)pData, 0);
     #else
+    if (g_Interface.OnBroadcastVoiceData(pClient, nBytes, (char *)pData, true))
+    {
         DETOUR_STATIC_CALL(SV_BroadcastVoiceData)(pClient, nBytes, (char *)pData, 0);
+    }
     #endif
 }

extension.h

@@ -136,7 +136,7 @@ public:  // IConCommandBaseAccessor
 public:
 	CVoice();
 	void OnGameFrame(bool simulating);
-	bool OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data);
+	bool OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data, bool isSourceTV);
 
 	void ListenSocket();