Merge branch 'myChanges' into sovereignrealm
This commit is contained in:
commit
2f81086157
43 changed files with 2093 additions and 418 deletions
|
|
@ -50,9 +50,6 @@ public static class MovementThrottle
|
|||
private const int ClientMaxUnackedMovements = 5;
|
||||
private const int MaxQueueWithUnmodifiedClient = ClientMaxUnackedMovements - 1; // 4
|
||||
|
||||
// Debug logging - enable for testing speed hack detection
|
||||
private static bool _debugLogging = false;
|
||||
|
||||
// Track NetStates with queued movements for efficient processing
|
||||
private static readonly HashSet<NetState> _netStatesWithQueuedMovements = new(256);
|
||||
|
||||
|
|
@ -83,15 +80,9 @@ public static class MovementThrottle
|
|||
|
||||
public static void Configure()
|
||||
{
|
||||
_maxCredit = ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.maxCredit",
|
||||
_maxCredit
|
||||
);
|
||||
|
||||
_hardQueueLimit = ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.hardQueueLimit",
|
||||
_hardQueueLimit
|
||||
);
|
||||
_maxCredit = ServerConfiguration.GetOrUpdateSetting("movementThrottle.maxCredit", _maxCredit);
|
||||
_maxRttBonus = ServerConfiguration.GetOrUpdateSetting("movementThrottle.maxRttBonus", _maxRttBonus);
|
||||
_hardQueueLimit = ServerConfiguration.GetOrUpdateSetting("movementThrottle.hardQueueLimit", _hardQueueLimit);
|
||||
|
||||
_movementHistorySize = ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.movementHistorySize",
|
||||
|
|
@ -103,6 +94,13 @@ public static class MovementThrottle
|
|||
_minSamplesForRate
|
||||
);
|
||||
|
||||
_maxChainGap = ServerConfiguration.GetOrUpdateSetting("movementThrottle.maxChainGap", _maxChainGap);
|
||||
|
||||
_speedHackNotificationCooldown = ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.speedHackNotificationCooldown",
|
||||
_speedHackNotificationCooldown
|
||||
);
|
||||
|
||||
_suspiciousRateThreshold = (float)ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.suspiciousRateThreshold",
|
||||
_suspiciousRateThreshold
|
||||
|
|
@ -112,11 +110,6 @@ public static class MovementThrottle
|
|||
"movementThrottle.definiteRateThreshold",
|
||||
_definiteRateThreshold
|
||||
);
|
||||
|
||||
_debugLogging = ServerConfiguration.GetOrUpdateSetting(
|
||||
"movementThrottle.debugLogging",
|
||||
_debugLogging
|
||||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -191,15 +184,16 @@ public static class MovementThrottle
|
|||
// Credit can go negative up to -dynamicCredit (debt limit)
|
||||
if (ns._movementCredit - earlyAmount >= -dynamicCredit)
|
||||
{
|
||||
var prevCredit = ns._movementCredit;
|
||||
// Use credit to cover early arrival
|
||||
ns._movementCredit -= earlyAmount;
|
||||
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
var prevCredit = ns._movementCredit + earlyAmount;
|
||||
|
||||
logger.Debug(
|
||||
"[Credit] {Name}: delta={Delta}ms early={Early}ms credit={PrevCredit}->{Credit}/{MaxCredit} action=execute",
|
||||
mobile.RawName, delta, earlyAmount, prevCredit, ns._movementCredit, dynamicCredit
|
||||
mobile, delta, earlyAmount, prevCredit, ns._movementCredit, dynamicCredit
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -208,11 +202,11 @@ public static class MovementThrottle
|
|||
return;
|
||||
}
|
||||
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Credit] {Name}: delta={Delta}ms early={Early}ms credit={Credit}/{MaxCredit} EXHAUSTED -> queue",
|
||||
mobile.RawName, delta, earlyAmount, ns._movementCredit, dynamicCredit
|
||||
mobile, delta, earlyAmount, ns._movementCredit, dynamicCredit
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -227,11 +221,11 @@ public static class MovementThrottle
|
|||
var prevCredit = ns._movementCredit;
|
||||
ns._movementCredit = Math.Min(ns._movementCredit + delta, dynamicCredit);
|
||||
|
||||
if (_debugLogging && ns._movementLogging && ns._movementCredit != prevCredit)
|
||||
if (ns._movementLogging && ns._movementCredit != prevCredit)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Credit] {Name}: delta=+{Delta}ms credit={PrevCredit}->{Credit}/{MaxCredit} action=execute",
|
||||
mobile.RawName, delta, prevCredit, ns._movementCredit, dynamicCredit
|
||||
mobile, delta, prevCredit, ns._movementCredit, dynamicCredit
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -247,12 +241,9 @@ public static class MovementThrottle
|
|||
{
|
||||
if (!mobile.Move(dir))
|
||||
{
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Execute] {Name}: Move FAILED dir={Dir} seq={Seq} -> reject+reset",
|
||||
mobile.RawName, dir, seq
|
||||
);
|
||||
logger.Debug("[Execute] {Name}: Move FAILED dir={Dir} seq={Seq} -> reject+reset", mobile, dir, seq);
|
||||
}
|
||||
|
||||
// Movement failed (blocked, paralyzed, frozen, etc.)
|
||||
|
|
@ -260,11 +251,11 @@ public static class MovementThrottle
|
|||
return;
|
||||
}
|
||||
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Execute] {Name}: Move OK dir={Dir} seq={Seq} nextMove={NextMove}ms",
|
||||
mobile.RawName, dir, seq, ns._nextMovementTime - Core.TickCount
|
||||
mobile, dir, seq, ns._nextMovementTime - Core.TickCount
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -304,11 +295,11 @@ public static class MovementThrottle
|
|||
ns._hasQueuedMovements = true;
|
||||
_netStatesWithQueuedMovements.Add(ns);
|
||||
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Queue] {Name}: enqueued dir={Dir} seq={Seq} (depth={Depth})",
|
||||
ns.Mobile?.RawName, dir, seq, ns._movementQueue.Count
|
||||
ns.Mobile, dir, seq, ns._movementQueue.Count
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -320,7 +311,6 @@ public static class MovementThrottle
|
|||
{
|
||||
ns.SendMovementRej(seq, mobile);
|
||||
ns.ResetMovementState();
|
||||
_netStatesWithQueuedMovements.Remove(ns);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -333,20 +323,18 @@ public static class MovementThrottle
|
|||
return;
|
||||
}
|
||||
|
||||
// Process each NetState with queued movements
|
||||
// Use a snapshot to avoid modification during iteration
|
||||
var toProcess = new List<NetState>(_netStatesWithQueuedMovements);
|
||||
|
||||
for (var i = 0; i < toProcess.Count; i++)
|
||||
foreach (var ns in _netStatesWithQueuedMovements)
|
||||
{
|
||||
var ns = toProcess[i];
|
||||
if (!ns.Running)
|
||||
if (ns.Running)
|
||||
{
|
||||
_netStatesWithQueuedMovements.Remove(ns);
|
||||
continue;
|
||||
ProcessMovementQueue(ns);
|
||||
if (ns._hasQueuedMovements)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
ProcessMovementQueue(ns);
|
||||
_netStatesWithQueuedMovements.Remove(ns);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -356,6 +344,7 @@ public static class MovementThrottle
|
|||
public static void ProcessMovementQueue(NetState ns)
|
||||
{
|
||||
var mobile = ns.Mobile;
|
||||
|
||||
if (mobile?.Deleted != false)
|
||||
{
|
||||
ClearQueue(ns);
|
||||
|
|
@ -374,7 +363,7 @@ public static class MovementThrottle
|
|||
while (ns._movementQueue?.Count > 0)
|
||||
{
|
||||
// Check if it's time to execute
|
||||
if (now < ns._nextMovementTime)
|
||||
if (now - ns._nextMovementTime < 0)
|
||||
{
|
||||
// Not yet - leave remaining items in queue for next Slice
|
||||
break;
|
||||
|
|
@ -394,11 +383,11 @@ public static class MovementThrottle
|
|||
// Execute the move
|
||||
if (!mobile.Move(movement.Direction))
|
||||
{
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Queue] {Name}: dequeued FAILED dir={Dir} (remaining={Remaining})",
|
||||
mobile.RawName, movement.Direction, remaining
|
||||
mobile, movement.Direction, remaining
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -407,12 +396,12 @@ public static class MovementThrottle
|
|||
return;
|
||||
}
|
||||
|
||||
if (_debugLogging && ns._movementLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
var waited = now - ns._nextMovementTime;
|
||||
logger.Debug(
|
||||
"[Queue] {Name}: dequeued OK dir={Dir} (remaining={Remaining}, waited={Waited}ms)",
|
||||
mobile.RawName, movement.Direction, remaining, waited >= 0 ? waited : 0
|
||||
mobile, movement.Direction, remaining, waited >= 0 ? waited : 0
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -430,10 +419,6 @@ public static class MovementThrottle
|
|||
|
||||
// Update tracking
|
||||
ns._hasQueuedMovements = ns._movementQueue?.Count > 0;
|
||||
if (!ns._hasQueuedMovements)
|
||||
{
|
||||
_netStatesWithQueuedMovements.Remove(ns);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -469,7 +454,6 @@ public static class MovementThrottle
|
|||
{
|
||||
ns._movementQueue?.Clear();
|
||||
ns._hasQueuedMovements = false;
|
||||
_netStatesWithQueuedMovements.Remove(ns);
|
||||
}
|
||||
|
||||
// Maximum expected packets per second (mounted running = 100ms = 10/sec, plus tolerance)
|
||||
|
|
@ -484,7 +468,7 @@ public static class MovementThrottle
|
|||
logger.Information(
|
||||
"Movement queue overflow: {Character} ({Account}) | " +
|
||||
"Queue reached hard limit: {Limit} | IP: {IP}",
|
||||
mobile?.RawName ?? "Unknown",
|
||||
mobile,
|
||||
ns.Account?.Username ?? "Unknown",
|
||||
_hardQueueLimit,
|
||||
ns.Address
|
||||
|
|
@ -516,7 +500,7 @@ public static class MovementThrottle
|
|||
private static void RecordMovement(NetState ns, long now, int cost, Direction dir, Mobile mobile)
|
||||
{
|
||||
// Calculate interval since last movement
|
||||
var interval = ns._lastMovementRecordTime > 0
|
||||
var interval = ns._hasMovementRecord
|
||||
? (int)(now - ns._lastMovementRecordTime)
|
||||
: -1; // -1 indicates first movement (no previous time)
|
||||
|
||||
|
|
@ -525,6 +509,7 @@ public static class MovementThrottle
|
|||
if (interval <= 0 || interval > _maxChainGap)
|
||||
{
|
||||
ns._lastMovementRecordTime = now;
|
||||
ns._hasMovementRecord = true;
|
||||
|
||||
// Use RTT to distinguish "stopped moving" vs "lagged"
|
||||
// - Stable low-latency connection with gap >> RTT → player stopped, reset history
|
||||
|
|
@ -544,19 +529,19 @@ public static class MovementThrottle
|
|||
// A large gap followed by a burst of packets = likely lag recovery, not speed hack
|
||||
ns._lastGapDuration = interval;
|
||||
|
||||
if (_debugLogging && mobile?.RawName != null)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
var action = shouldReset ? "history reset" : "history preserved (possible lag)";
|
||||
logger.Debug(
|
||||
"[Movement] {Name}: SKIP recording (gap {Gap}ms > {MaxGap}ms, " +
|
||||
"RTT={RTT}ms stable={Stable} → {Action})",
|
||||
mobile.RawName, interval, _maxChainGap, avgRtt, ns.HasStableConnection, action
|
||||
mobile, interval, _maxChainGap, avgRtt, ns.HasStableConnection, action
|
||||
);
|
||||
}
|
||||
}
|
||||
else if (_debugLogging && mobile?.RawName != null)
|
||||
else if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug("[Movement] {Name}: SKIP recording (first in chain)", mobile.RawName);
|
||||
logger.Debug("[Movement] {Name}: SKIP recording (first in chain)", mobile);
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -572,12 +557,9 @@ public static class MovementThrottle
|
|||
// the next real move's interval artificially short, inflating rate.
|
||||
if (cost == 0)
|
||||
{
|
||||
if (_debugLogging && mobile?.RawName != null)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[Movement] {Name}: SKIP direction-only change (preserves interval measurement)",
|
||||
mobile.RawName
|
||||
);
|
||||
logger.Debug("[Movement] {Name}: SKIP direction-only change (preserves interval measurement)", mobile);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -613,15 +595,16 @@ public static class MovementThrottle
|
|||
}
|
||||
|
||||
ns._lastMovementRecordTime = now;
|
||||
ns._hasMovementRecord = true;
|
||||
|
||||
// Debug logging
|
||||
if (_debugLogging && mobile?.RawName != null)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
var historyCount = ns._movementHistoryFull ? _movementHistorySize : ns._movementHistoryIndex;
|
||||
logger.Debug(
|
||||
"[Movement] {Name}: interval={Interval}ms target={Target}ms queue={Queue} " +
|
||||
"flags={Flags} history={History}/{MaxHistory} RTT={RTT}ms",
|
||||
mobile.RawName, interval, cost, record.QueueDepth,
|
||||
mobile, interval, cost, record.QueueDepth,
|
||||
flags, historyCount, _movementHistorySize, ns.AverageRtt
|
||||
);
|
||||
}
|
||||
|
|
@ -814,7 +797,7 @@ public static class MovementThrottle
|
|||
var averageRtt = ns.AverageRtt;
|
||||
|
||||
// Detailed rate breakdown for debugging
|
||||
if (_debugLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug("[MovementAnalysis] Rate={Rate:F3}, Samples={Samples}, RTT={RTT}ms",
|
||||
rate, sampleCount, averageRtt);
|
||||
|
|
@ -977,19 +960,19 @@ public static class MovementThrottle
|
|||
var verdict = AnalyzeMovement(ns, out var rate, out var sampleCount, out var confidence);
|
||||
|
||||
// Debug logging
|
||||
if (_debugLogging && ns.Mobile?.RawName != null)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
var (burstSize, _) = DetectRecentBurst(ns);
|
||||
var probeStatus = ns._rttProbeTime > 0 ? "pending" : "idle";
|
||||
var probeStatus = ns._rttProbePending ? "pending" : "idle";
|
||||
var queueDepth = ns._movementQueue?.Count ?? 0;
|
||||
logger.Debug(
|
||||
"[RateCheck] {Name}: rate={Rate:F3} samples={Samples} verdict={Verdict} " +
|
||||
"confidence={Confidence:P0} queue={Queue} burst={Burst} sustained={Sustained}s",
|
||||
ns.Mobile.RawName, rate, sampleCount, verdict, confidence, queueDepth, burstSize, ns._consecutiveHighRateSeconds
|
||||
ns.Mobile, rate, sampleCount, verdict, confidence, queueDepth, burstSize, ns._consecutiveHighRateSeconds
|
||||
);
|
||||
logger.Debug(
|
||||
" RTT: avg={Avg}ms last={Last}ms var={Var} samples={RttSamples} stable={Stable} probe={Probe}",
|
||||
ns.AverageRtt, ns._lastRtt, ns._rttVariance, ns._rttSampleCount, ns.HasStableConnection, probeStatus
|
||||
ns.AverageRtt, ns.LastRtt, ns._rttVariance, ns._rttSampleCount, ns.HasStableConnection, probeStatus
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -1025,11 +1008,11 @@ public static class MovementThrottle
|
|||
|
||||
if (shouldNotify)
|
||||
{
|
||||
if (_debugLogging)
|
||||
if (ns._movementLogging)
|
||||
{
|
||||
logger.Debug(
|
||||
"[ALERT] {Urgency} - {Name}: rate={Rate:F3} verdict={Verdict} confidence={Confidence:P0}",
|
||||
urgency, ns.Mobile?.RawName, rate, verdict, confidence
|
||||
urgency, ns.Mobile, rate, verdict, confidence
|
||||
);
|
||||
}
|
||||
NotifyStaff(ns, rate, sampleCount, confidence, verdict, urgency);
|
||||
|
|
@ -1054,11 +1037,12 @@ public static class MovementThrottle
|
|||
var now = Core.TickCount;
|
||||
|
||||
// Rate-limit notifications per player
|
||||
if (now - ns._lastSpeedHackNotification < _speedHackNotificationCooldown)
|
||||
if (ns._speedHackNotified && now - ns._lastSpeedHackNotification < _speedHackNotificationCooldown)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ns._speedHackNotified = true;
|
||||
ns._lastSpeedHackNotification = now;
|
||||
|
||||
var mobile = ns.Mobile;
|
||||
|
|
@ -1070,7 +1054,7 @@ public static class MovementThrottle
|
|||
"PacketRate: {PacketRate}/s (peak: {PeakRate}/s) | RTT: {Rtt}ms (stable: {Stable}) | " +
|
||||
"Sustained: {Sustained}s | Queue: {Queue} | Location: {Location} Map: {Map} | IP: {IP}",
|
||||
urgency,
|
||||
mobile?.RawName ?? "Unknown",
|
||||
mobile,
|
||||
ns.Account?.Username ?? "Unknown",
|
||||
rate,
|
||||
sampleCount,
|
||||
|
|
@ -1138,7 +1122,7 @@ public static class MovementThrottle
|
|||
Verdict = verdict,
|
||||
Confidence = confidence,
|
||||
AverageRtt = ns.AverageRtt,
|
||||
LastRtt = ns._lastRtt,
|
||||
LastRtt = ns.LastRtt,
|
||||
RttVariance = ns._rttVariance,
|
||||
StableConnection = ns.HasStableConnection,
|
||||
RttSampleCount = ns._rttSampleCount,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Runtime.InteropServices;
|
||||
using Server.Logging;
|
||||
|
||||
|
|
@ -70,23 +69,24 @@ public partial class NetState
|
|||
internal Queue<QueuedMovement> _movementQueue; // Lazy initialized
|
||||
internal long _movementCredit; // Credit buffer for timing jitter
|
||||
internal long _nextMovementTime = Core.TickCount; // When next movement is allowed
|
||||
internal int _sustainedQueueDepth; // Tracks sustained high queue depth
|
||||
internal long _lastQueueDepthCheck; // Throttle depth check frequency
|
||||
internal long _lastQueueDepthCheck = Core.TickCount; // Throttle depth check frequency
|
||||
internal bool _hasQueuedMovements; // Fast check for Slice()
|
||||
|
||||
// Movement history for rate-based speed hack detection (lazy initialized)
|
||||
internal MovementRecord[] _movementHistory; // Circular buffer
|
||||
internal int _movementHistoryIndex; // Next write position (also serves as count until full)
|
||||
internal bool _movementHistoryFull; // True once buffer has wrapped
|
||||
internal long _lastMovementRecordTime; // For calculating intervals
|
||||
internal long _lastMovementRecordTime; // For calculating intervals (valid only when _hasMovementRecord)
|
||||
internal bool _hasMovementRecord; // False until the first movement in a chain is seen
|
||||
|
||||
// Detection state
|
||||
internal int _consecutiveHighRateSeconds; // Sustained detection counter
|
||||
internal long _lastSpeedHackNotification; // Rate-limit notifications
|
||||
internal long _lastSpeedHackNotification; // Rate-limit notifications (valid only when _speedHackNotified)
|
||||
internal bool _speedHackNotified; // False until the first notification is sent
|
||||
internal int _lastGapDuration; // Duration of last gap > maxChainGap (for burst forgiveness)
|
||||
|
||||
// Movement packet rate tracking (for speed hack detection)
|
||||
internal long _movementWindowStart; // Start of current 1-second window
|
||||
internal long _movementWindowStart = Core.TickCount; // Start of current 1-second window
|
||||
internal int _movementsInWindow; // Count in current window
|
||||
internal int _peakMovementRate; // Highest rate seen (packets/sec)
|
||||
|
||||
|
|
@ -100,10 +100,9 @@ public partial class NetState
|
|||
_nextMovementTime = Core.TickCount;
|
||||
_movementCredit = 0;
|
||||
_hasQueuedMovements = false;
|
||||
_sustainedQueueDepth = 0;
|
||||
|
||||
// Reset movement history - next movement starts a new chain
|
||||
_lastMovementRecordTime = 0;
|
||||
_hasMovementRecord = false;
|
||||
_movementHistoryIndex = 0;
|
||||
_movementHistoryFull = false;
|
||||
|
||||
|
|
@ -113,7 +112,7 @@ public partial class NetState
|
|||
_rttProbeInterval = RttProbeIntervalNormal;
|
||||
|
||||
// Reset packet rate window
|
||||
_movementWindowStart = 0;
|
||||
_movementWindowStart = Core.TickCount;
|
||||
_movementsInWindow = 0;
|
||||
}
|
||||
|
||||
|
|
@ -165,17 +164,19 @@ public partial class NetState
|
|||
private const long MaxStableLatency = 200; // Max RTT (ms) for "stable" connection
|
||||
|
||||
// RTT state
|
||||
internal long _rttProbeTime; // When we sent the probe (0 = not waiting)
|
||||
internal long _lastRtt; // Most recent RTT measurement
|
||||
internal bool _rttProbePending; // True while waiting for a probe response
|
||||
internal long _rttProbeTime; // When we sent the probe (valid only when _rttProbePending)
|
||||
internal long[] _rttHistory; // Rolling history (lazy init)
|
||||
internal int _rttHistoryIndex; // Current position in history
|
||||
internal int _rttSampleCount; // Number of samples collected (saturates at RttHistorySize)
|
||||
internal long _rttVariance; // Calculated variance for stability
|
||||
internal long _nextRttProbe; // When to send next probe
|
||||
internal long _nextRttProbe = Core.TickCount; // When to send next probe
|
||||
internal int _rttProbeInterval = RttProbeIntervalNormal; // Current probe interval
|
||||
|
||||
// High-resolution timestamp for RTT measurement (Stopwatch ticks, not game loop ticks)
|
||||
private long _rttProbeTimestampHiRes;
|
||||
/// <summary>
|
||||
/// Gets the most recent RTT measurement, or 0 if none has been recorded.
|
||||
/// </summary>
|
||||
public long LastRtt => _rttSampleCount > 0 ? _rttHistory[(_rttHistoryIndex - 1) & (RttHistorySize - 1)] : 0;
|
||||
|
||||
/// <summary>
|
||||
/// Sets the RTT probe interval based on suspicion level.
|
||||
|
|
@ -206,23 +207,22 @@ public partial class NetState
|
|||
var now = Core.TickCount;
|
||||
|
||||
// Don't send if we're still waiting for a response
|
||||
if (_rttProbeTime > 0)
|
||||
if (_rttProbePending)
|
||||
{
|
||||
// Timeout after 10 seconds - connection is probably dead or very laggy
|
||||
if (now - _rttProbeTime > 10000)
|
||||
{
|
||||
_rttProbeTime = 0;
|
||||
_rttProbeTimestampHiRes = 0;
|
||||
_rttProbePending = false;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// First probe: send immediately when player starts moving
|
||||
// Subsequent probes: send when interval has passed
|
||||
if (_nextRttProbe == 0 || now >= _nextRttProbe)
|
||||
if (now - _nextRttProbe >= 0)
|
||||
{
|
||||
_rttProbePending = true;
|
||||
_rttProbeTime = now;
|
||||
_rttProbeTimestampHiRes = Stopwatch.GetTimestamp();
|
||||
_nextRttProbe = now + _rttProbeInterval + Utility.Random(RttProbeJitter);
|
||||
|
||||
if (_movementLogging)
|
||||
|
|
@ -242,10 +242,9 @@ public partial class NetState
|
|||
/// </summary>
|
||||
public void RecordRttMeasurement()
|
||||
{
|
||||
var nowHiRes = Stopwatch.GetTimestamp();
|
||||
var now = Core.TickCount;
|
||||
|
||||
if (_rttProbeTime <= 0)
|
||||
if (!_rttProbePending)
|
||||
{
|
||||
// Not expecting a response (client-initiated version send) - ignore silently
|
||||
return;
|
||||
|
|
@ -253,19 +252,15 @@ public partial class NetState
|
|||
|
||||
var rtt = now - _rttProbeTime;
|
||||
|
||||
// High-resolution RTT in microseconds
|
||||
var rttHiResUs = (nowHiRes - _rttProbeTimestampHiRes) * 1_000_000 / Stopwatch.Frequency;
|
||||
|
||||
if (_movementLogging)
|
||||
{
|
||||
movementLogger.Debug(
|
||||
"[RTT-Response] {Account}: {Rtt}ms (HiRes: {RttHiRes:F2}ms)",
|
||||
Account?.Username ?? _toString, rtt, rttHiResUs / 1000.0
|
||||
"[RTT-Response] {Account}: {Rtt}ms",
|
||||
Account?.Username ?? _toString, rtt
|
||||
);
|
||||
}
|
||||
|
||||
_rttProbeTime = 0;
|
||||
_rttProbeTimestampHiRes = 0;
|
||||
_rttProbePending = false;
|
||||
|
||||
// Sanity check - RTT should be positive and reasonable
|
||||
if (rtt is <= 0 or > 10000)
|
||||
|
|
@ -285,7 +280,6 @@ public partial class NetState
|
|||
|
||||
// Update history
|
||||
_rttHistory[_rttHistoryIndex++ & (RttHistorySize - 1)] = rtt;
|
||||
_lastRtt = rtt;
|
||||
|
||||
// Track sample count (saturates at buffer size)
|
||||
if (_rttSampleCount < RttHistorySize)
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
private static readonly Queue<NetState> _connectingQueue = new(2048);
|
||||
private static readonly HashSet<NetState> _instances = new(2048);
|
||||
public static IReadOnlySet<NetState> Instances => _instances;
|
||||
public static HashSet<NetState> Instances => _instances;
|
||||
|
||||
private readonly string _toString;
|
||||
private ClientVersion _version;
|
||||
|
|
@ -109,9 +109,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
Address = address;
|
||||
|
||||
Seeded = false;
|
||||
HuePickers = [];
|
||||
Menus = [];
|
||||
Trades = [];
|
||||
NextActivityCheck = Core.TickCount + 30000;
|
||||
ConnectedOn = Core.Now;
|
||||
_toString = address?.ToString() ?? "(error)";
|
||||
|
|
@ -166,7 +163,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
public bool BlockAllPackets { get; set; }
|
||||
|
||||
public List<SecureTrade> Trades { get; }
|
||||
public List<SecureTrade> Trades { get; private set; }
|
||||
|
||||
public bool Seeded { get; set; }
|
||||
|
||||
|
|
@ -260,8 +257,18 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
public void ValidateAllTrades()
|
||||
{
|
||||
if (Trades == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (var i = Trades.Count - 1; i >= 0; --i)
|
||||
{
|
||||
if (Trades == null)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (i >= Trades.Count)
|
||||
{
|
||||
continue;
|
||||
|
|
@ -280,8 +287,18 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
public void CancelAllTrades()
|
||||
{
|
||||
if (Trades == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (var i = Trades.Count - 1; i >= 0; --i)
|
||||
{
|
||||
if (Trades != null)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (i < Trades.Count)
|
||||
{
|
||||
Trades[i].Cancel();
|
||||
|
|
@ -291,11 +308,21 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
public void RemoveTrade(SecureTrade trade)
|
||||
{
|
||||
Trades.Remove(trade);
|
||||
Trades?.Remove(trade);
|
||||
|
||||
if (Trades?.Count == 0)
|
||||
{
|
||||
Trades = null;
|
||||
}
|
||||
}
|
||||
|
||||
public SecureTrade FindTrade(Mobile m)
|
||||
{
|
||||
if (Trades == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
for (var i = 0; i < Trades.Count; ++i)
|
||||
{
|
||||
var trade = Trades[i];
|
||||
|
|
@ -311,6 +338,11 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
public SecureTradeContainer FindTradeContainer(Mobile m)
|
||||
{
|
||||
if (Trades == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
for (var i = 0; i < Trades.Count; ++i)
|
||||
{
|
||||
var trade = Trades[i];
|
||||
|
|
@ -336,7 +368,11 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
{
|
||||
var newTrade = new SecureTrade(Mobile, state.Mobile);
|
||||
|
||||
Trades ??= [];
|
||||
|
||||
Trades.Add(newTrade);
|
||||
|
||||
state.Trades ??= [];
|
||||
state.Trades.Add(newTrade);
|
||||
|
||||
return newTrade.From.Container;
|
||||
|
|
@ -1176,8 +1212,16 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
|
|||
|
||||
var a = Account;
|
||||
|
||||
Menus.Clear();
|
||||
HuePickers.Clear();
|
||||
Menus?.Clear();
|
||||
Menus = null;
|
||||
|
||||
HuePickers?.Clear();
|
||||
HuePickers = null;
|
||||
|
||||
// Just in case, but should already be nulled when Mobile.NetState is set to null and CancelAllTrades is called.
|
||||
Trades?.Clear();
|
||||
Trades = null;
|
||||
|
||||
Account = null;
|
||||
ServerInfo = null;
|
||||
CityInfo = null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue