Skip to content

Merge | TdsParserStateObject packet handling #3603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 22, 2025
Merged

Merge | TdsParserStateObject packet handling #3603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dcd231e
netcore: teach TdsParserStateObject to clear the buffer after a passw…
edwardneal Sep 5, 2025
6eee2fc
Port SetPacketData
edwardneal Sep 5, 2025
484fde8
Port references to SetPacketData, cleanup reference to SniPacketSetDa…
edwardneal Sep 5, 2025
dfd030c
Port CreateAndSetAttentionPacket
edwardneal Sep 5, 2025
eae83d2
Port CheckConnection
edwardneal Sep 5, 2025
0ca01b8
Port EnableSSL
edwardneal Sep 5, 2025
d7d4ed4
Port Handle property and remaining variables
edwardneal Sep 5, 2025
4b8c093
Remove remnants of CERs and tidy usings
edwardneal Sep 5, 2025
849acf4
Final cleanup - reference to SessionHandle, already-merged CER
edwardneal Sep 5, 2025
98aa20d
Merge branch 'main' into merge/tdsparserstateobject-packets-and-cleanup
edwardneal Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions ...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ namespace Microsoft.Data.SqlClient
{
internal partial class TdsParserStateObject
{
protected SNIHandle _sessionHandle = null; // the SNI handle we're to work on

// SNI variables // multiple resultsets in one batch.
protected SNIPacket _sniPacket = null; // Will have to re-vamp this for MARS
internal SNIPacket _sniAsyncAttnPacket = null; // Packet to use to send Attn

// Used for blanking out password in trace.
internal int _tracePasswordOffset = 0;
internal int _tracePasswordLength = 0;
Expand Down Expand Up @@ -68,17 +62,6 @@ protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCo
_lastSuccessfulIOTimer = parser._physicalStateObj._lastSuccessfulIOTimer;
}

////////////////
// Properties //
////////////////
internal SNIHandle Handle
{
get
{
return _sessionHandle;
}
}

/////////////////////
// General methods //
/////////////////////
Expand All @@ -92,7 +75,7 @@ internal int DecrementPendingCallbacks(bool release)

// NOTE: TdsParserSessionPool may call DecrementPendingCallbacks on a TdsParserStateObject which is already disposed
// This is not dangerous (since the stateObj is no longer in use), but we need to add a workaround in the assert for it
Debug.Assert((remaining == -1 && _sessionHandle == null) || (0 <= remaining && remaining < 3), $"_pendingCallbacks values is invalid after decrementing: {remaining}");
Debug.Assert((remaining == -1 && SessionHandle.IsNull) || (0 <= remaining && remaining < 3), $"_pendingCallbacks values is invalid after decrementing: {remaining}");
return remaining;
}

Expand Down
6 changes: 6 additions & 0 deletions ...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ namespace Microsoft.Data.SqlClient
{
internal class TdsParserStateObjectNative : TdsParserStateObject
{
private SNIHandle _sessionHandle = null; // the SNI handle we're to work on

private SNIPacket _sniPacket = null; // Will have to re-vamp this for MARS
internal SNIPacket _sniAsyncAttnPacket = null; // Packet to use to send Attn
private readonly WritePacketCache _writePacketCache = new WritePacketCache(); // Store write packets that are ready to be re-used

private GCHandle _gcHandle; // keeps this object alive until we're closed.
Expand All @@ -37,6 +41,8 @@ internal TdsParserStateObjectNative(TdsParser parser)

#region Properties

internal SNIHandle Handle => _sessionHandle;

internal override uint Status => _sessionHandle != null ? _sessionHandle.Status : TdsEnums.SNI_UNINITIALIZED;

internal override SessionHandle SessionHandle => SessionHandle.FromNativeHandle(_sessionHandle);
Expand Down