[core] Replaced reorder_prevent_lossreport with initial_loss_ttl.

gou4shi1 · maxsharabayko · commit daf91f3d65a0 · 2022-09-29T16:08:15.000+02:00
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -10052,7 +10052,6 @@ int srt::CUDT::processData(CUnit* in_unit)
     loss_seqs_t                             srt_loss_seqs;
     vector<CUnit *>                         incoming;
     bool                                    was_sent_in_order          = true;
-    bool                                    reorder_prevent_lossreport = false;
 
     // If the peer doesn't understand REXMIT flag, send rexmit request
     // always immediately.
@@ -10367,7 +10366,6 @@ int srt::CUDT::processData(CUnit* in_unit)
                 HLOGC(qrlog.Debug,
                       log << CONID() << "FreshLoss: added sequences: " << Printable(srt_loss_seqs)
                           << " tolerance: " << initial_loss_ttl);
-                reorder_prevent_lossreport = true;
             }
         }
 
@@ -10416,7 +10414,7 @@ int srt::CUDT::processData(CUnit* in_unit)
     if (!srt_loss_seqs.empty())
     {
         const bool report_recorded_loss = !m_PacketFilter || m_PktFilterRexmitLevel == SRT_ARQ_ALWAYS;
-        if (!reorder_prevent_lossreport && report_recorded_loss)
+        if (!initial_loss_ttl && report_recorded_loss)
         {
             HLOGC(qrlog.Debug, log << CONID() << "WILL REPORT LOSSES (SRT): " << Printable(srt_loss_seqs));
             sendLossReport(srt_loss_seqs);

Original file line number	Diff line number	Diff line change
`@@ -10052,7 +10052,6 @@ int srt::CUDT::processData(CUnit* in_unit)`
`10052`	`10052`	`loss_seqs_t srt_loss_seqs;`
`10053`	`10053`	`vector<CUnit *> incoming;`
`10054`	`10054`	`bool was_sent_in_order = true;`
`10055`		`- bool reorder_prevent_lossreport = false;`
`10056`	`10055`
`10057`	`10056`	`// If the peer doesn't understand REXMIT flag, send rexmit request`
`10058`	`10057`	`// always immediately.`
`@@ -10367,7 +10366,6 @@ int srt::CUDT::processData(CUnit* in_unit)`
`10367`	`10366`	`HLOGC(qrlog.Debug,`
`10368`	`10367`	`log << CONID() << "FreshLoss: added sequences: " << Printable(srt_loss_seqs)`
`10369`	`10368`	`<< " tolerance: " << initial_loss_ttl);`
`10370`		`- reorder_prevent_lossreport = true;`
`10371`	`10369`	`}`
`10372`	`10370`	`}`
`10373`	`10371`
`@@ -10416,7 +10414,7 @@ int srt::CUDT::processData(CUnit* in_unit)`
`10416`	`10414`	`if (!srt_loss_seqs.empty())`
`10417`	`10415`	`{`
`10418`	`10416`	`const bool report_recorded_loss = !m_PacketFilter \|\| m_PktFilterRexmitLevel == SRT_ARQ_ALWAYS;`
`10419`		`- if (!reorder_prevent_lossreport && report_recorded_loss)`
	`10417`	`+ if (!initial_loss_ttl && report_recorded_loss)`
`10420`	`10418`	`{`
`10421`	`10419`	`HLOGC(qrlog.Debug, log << CONID() << "WILL REPORT LOSSES (SRT): " << Printable(srt_loss_seqs));`
`10422`	`10420`	`sendLossReport(srt_loss_seqs);`