Skip to content

Commit c96e132

Browse files
mus65Rob-Hague
andauthored
Remove some dead internal code (#1824)
* Drop some dead internal code * remove some more unused events and their callbacks * more --------- Co-authored-by: Robert Hague <rh@johnstreetcapital.com>
1 parent 5e71944 commit c96e132

27 files changed

Lines changed: 3 additions & 1572 deletions

‎src/Renci.SshNet/Abstractions/SocketAbstraction.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -88,40 +88,6 @@ private static void ConnectCore(Socket socket, EndPoint remoteEndpoint, TimeSpan
8888
args.Dispose();
8989
}
9090

91-
public static void ClearReadBuffer(Socket socket)
92-
{
93-
var timeout = TimeSpan.FromMilliseconds(500);
94-
var buffer = new byte[256];
95-
int bytesReceived;
96-
97-
do
98-
{
99-
bytesReceived = ReadPartial(socket, buffer, 0, buffer.Length, timeout);
100-
}
101-
while (bytesReceived > 0);
102-
}
103-
104-
public static int ReadPartial(Socket socket, byte[] buffer, int offset, int size, TimeSpan timeout)
105-
{
106-
socket.ReceiveTimeout = timeout.AsTimeout();
107-
108-
try
109-
{
110-
return socket.Receive(buffer, offset, size, SocketFlags.None);
111-
}
112-
catch (SocketException ex)
113-
{
114-
if (ex.SocketErrorCode == SocketError.TimedOut)
115-
{
116-
throw new SshOperationTimeoutException(string.Format(CultureInfo.InvariantCulture,
117-
"Socket read operation has timed out after {0:F0} milliseconds.",
118-
timeout.TotalMilliseconds));
119-
}
120-
121-
throw;
122-
}
123-
}
124-
12591
public static void ReadContinuous(Socket socket, byte[] buffer, int offset, int size, Action<byte[], int, int> processReceivedBytesAction)
12692
{
12793
// do not time-out receive

‎src/Renci.SshNet/Channels/ChannelDirectTcpip.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ protected override void OnOpenConfirmation(uint remoteChannelNumber, uint initia
225225

226226
protected override void OnOpenFailure(uint reasonCode, string description, string language)
227227
{
228-
base.OnOpenFailure(reasonCode, description, language);
229-
230228
_ = _channelOpen.Set();
231229
}
232230

‎src/Renci.SshNet/Channels/ClientChannel.cs‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ protected ClientChannel(ISession session, uint localChannelNumber, uint localWin
2121
session.ChannelOpenFailureReceived += OnChannelOpenFailure;
2222
}
2323

24-
/// <summary>
25-
/// Occurs when <see cref="ChannelOpenConfirmationMessage"/> is received.
26-
/// </summary>
27-
public event EventHandler<ChannelOpenConfirmedEventArgs> OpenConfirmed;
28-
29-
/// <summary>
30-
/// Occurs when <see cref="ChannelOpenFailureMessage"/> is received.
31-
/// </summary>
32-
public event EventHandler<ChannelOpenFailedEventArgs> OpenFailed;
33-
3424
/// <summary>
3525
/// Called when channel is opened by the server.
3626
/// </summary>
@@ -43,8 +33,6 @@ protected virtual void OnOpenConfirmation(uint remoteChannelNumber, uint initial
4333

4434
// Channel is consider to be open when confirmation message was received
4535
IsOpen = true;
46-
47-
OpenConfirmed?.Invoke(this, new ChannelOpenConfirmedEventArgs(remoteChannelNumber, initialWindowSize, maximumPacketSize));
4836
}
4937

5038
/// <summary>
@@ -65,10 +53,7 @@ protected void SendMessage(ChannelOpenMessage message)
6553
/// <param name="reasonCode">The reason code.</param>
6654
/// <param name="description">The description.</param>
6755
/// <param name="language">The language.</param>
68-
protected virtual void OnOpenFailure(uint reasonCode, string description, string language)
69-
{
70-
OpenFailed?.Invoke(this, new ChannelOpenFailedEventArgs(LocalChannelNumber, reasonCode, description, language));
71-
}
56+
protected abstract void OnOpenFailure(uint reasonCode, string description, string language);
7257

7358
private void OnChannelOpenConfirmation(object sender, MessageEventArgs<ChannelOpenConfirmationMessage> e)
7459
{

‎src/Renci.SshNet/Common/ChannelOpenConfirmedEventArgs.cs‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/Renci.SshNet/Common/ChannelOpenFailedEventArgs.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎src/Renci.SshNet/Messages/Transport/DebugMessage.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ protected override void SaveData()
9292

9393
internal override void Process(Session session)
9494
{
95-
session.OnDebugReceived(this);
9695
}
9796
}
9897
}

‎src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ protected override void SaveData()
8585

8686
internal override void Process(Session session)
8787
{
88-
session.OnIgnoreReceived(this);
8988
}
9089
}
9190
}

‎src/Renci.SshNet/Messages/Transport/ServiceAcceptMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override void SaveData()
5353

5454
internal override void Process(Session session)
5555
{
56-
session.OnServiceAcceptReceived(this);
56+
session.OnServiceAcceptReceived();
5757
}
5858
}
5959
}

‎src/Renci.SshNet/Messages/Transport/ServiceRequestMessage.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ protected override void SaveData()
8484

8585
internal override void Process(Session session)
8686
{
87-
session.OnServiceRequestReceived(this);
8887
}
8988
}
9089
}

0 commit comments

Comments
 (0)