Skip to content

Commit e1a5578

Browse files
driesengdrieseng
committed
Correctly define the FEATURE_SOCKET_SETSOCKETOPTION symbol.
Use Socket.NoDelay property instead of the NoDelay option. No longer use the DontLinger option as this is the default anyway.
1 parent 23bb333 commit e1a5578

File tree

8 files changed

+28
-41
lines changed

8 files changed

+28
-41
lines changed

‎src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
21+
<DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -28,7 +28,7 @@
2828
<DebugType>none</DebugType>
2929
<Optimize>true</Optimize>
3030
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
31+
<DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
<DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
@@ -919,7 +919,7 @@
919919
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
920920
<ProjectExtensions>
921921
<VisualStudio>
922-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
922+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
923923
</VisualStudio>
924924
</ProjectExtensions>
925925
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.NETCore/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@
6565
"FEATURE_RNG_CREATE",
6666
"FEATURE_SOCKET_TAP",
6767
"FEATURE_SOCKET_EAP",
68-
"FEATURE_SOCKET_POLL",
6968
"FEATURE_SOCKET_SYNC",
69+
"FEATURE_SOCKET_SETSOCKETOPTION",
70+
"FEATURE_SOCKET_POLL",
7071
"FEATURE_DNS_TAP",
7172
"FEATURE_STREAM_TAP",
7273
"FEATURE_THREAD_COUNTDOWNEVENT",

‎src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<DebugType>full</DebugType>
3030
<Optimize>false</Optimize>
3131
<OutputPath>Bin\Debug</OutputPath>
32-
<DefineConstants>TRACE;DEBUG;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
32+
<DefineConstants>TRACE;DEBUG;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
3333
<NoStdLib>true</NoStdLib>
3434
<NoConfig>true</NoConfig>
3535
<ErrorReport>prompt</ErrorReport>
@@ -42,7 +42,7 @@
4242
<DebugType>none</DebugType>
4343
<Optimize>true</Optimize>
4444
<OutputPath>Bin\Release</OutputPath>
45-
<DefineConstants>TRACE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
45+
<DefineConstants>TRACE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
4646
<NoStdLib>true</NoStdLib>
4747
<NoConfig>true</NoConfig>
4848
<ErrorReport>prompt</ErrorReport>
@@ -923,7 +923,7 @@
923923
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
924924
<SilverlightProjectProperties />
925925
</FlavorProperties>
926-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
926+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
927927
</VisualStudio>
928928
</ProjectExtensions>
929929
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<DebugType>full</DebugType>
2424
<Optimize>false</Optimize>
2525
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
26+
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>4</WarningLevel>
2929
<DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
@@ -34,7 +34,7 @@
3434
<DebugType>pdbonly</DebugType>
3535
<Optimize>true</Optimize>
3636
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
37+
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
4040
<DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
@@ -44,7 +44,7 @@
4444
<PlatformTarget>x86</PlatformTarget>
4545
<DebugSymbols>true</DebugSymbols>
4646
<OutputPath>bin\x86\Debug\</OutputPath>
47-
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
47+
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
4848
<NoWarn>;2008</NoWarn>
4949
<DebugType>full</DebugType>
5050
<PlatformTarget>x86</PlatformTarget>
@@ -54,7 +54,7 @@
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
5555
<PlatformTarget>x86</PlatformTarget>
5656
<OutputPath>bin\x86\Release\</OutputPath>
57-
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
57+
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
5858
<Optimize>true</Optimize>
5959
<NoWarn>;2008</NoWarn>
6060
<DebugType>pdbonly</DebugType>
@@ -66,7 +66,7 @@
6666
<PlatformTarget>ARM</PlatformTarget>
6767
<DebugSymbols>true</DebugSymbols>
6868
<OutputPath>bin\ARM\Debug\</OutputPath>
69-
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
69+
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
7070
<NoWarn>;2008</NoWarn>
7171
<DebugType>full</DebugType>
7272
<PlatformTarget>ARM</PlatformTarget>
@@ -76,7 +76,7 @@
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
7777
<PlatformTarget>ARM</PlatformTarget>
7878
<OutputPath>bin\ARM\Release\</OutputPath>
79-
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
79+
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
8080
<Optimize>true</Optimize>
8181
<NoWarn>;2008</NoWarn>
8282
<DebugType>pdbonly</DebugType>
@@ -88,7 +88,7 @@
8888
<PlatformTarget>x64</PlatformTarget>
8989
<DebugSymbols>true</DebugSymbols>
9090
<OutputPath>bin\x64\Debug\</OutputPath>
91-
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
91+
<DefineConstants>TRACE;DEBUG;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
9292
<NoWarn>;2008</NoWarn>
9393
<DebugType>full</DebugType>
9494
<PlatformTarget>x64</PlatformTarget>
@@ -98,7 +98,7 @@
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
9999
<PlatformTarget>x64</PlatformTarget>
100100
<OutputPath>bin\x64\Release\</OutputPath>
101-
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
101+
<DefineConstants>TRACE;FEATURE_DATAGRAMSOCKET;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_ENCODING_ASCII</DefineConstants>
102102
<Optimize>true</Optimize>
103103
<NoWarn>;2008</NoWarn>
104104
<DebugType>pdbonly</DebugType>

‎src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,15 @@
319319
<Compile Include="..\Renci.SshNet\ForwardedPortDynamic.cs">
320320
<Link>ForwardedPortDynamic.cs</Link>
321321
</Compile>
322+
<Compile Include="..\Renci.SshNet\ForwardedPortDynamic.NET.cs">
323+
<Link>ForwardedPortDynamic.NET.cs</Link>
324+
</Compile>
322325
<Compile Include="..\Renci.SshNet\ForwardedPortLocal.cs">
323326
<Link>ForwardedPortLocal.cs</Link>
324327
</Compile>
328+
<Compile Include="..\Renci.SshNet\ForwardedPortLocal.NET.cs">
329+
<Link>ForwardedPortLocal.NET.cs</Link>
330+
</Compile>
325331
<Compile Include="..\Renci.SshNet\ForwardedPortRemote.cs">
326332
<Link>ForwardedPortRemote.cs</Link>
327333
</Compile>
@@ -943,7 +949,7 @@
943949
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
944950
<ProjectExtensions>
945951
<VisualStudio>
946-
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
952+
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
947953
</VisualStudio>
948954
</ProjectExtensions>
949955
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet/ForwardedPortDynamic.NET.cs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ partial void InternalStart()
2525

2626
var ep = new IPEndPoint(ip, (int) BoundPort);
2727

28-
_listener = new Socket(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
29-
// TODO: decide if we want to have blocking socket
30-
#if FEATURE_SOCKET_SETSOCKETOPTION
31-
_listener.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger, true);
32-
_listener.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
33-
#endif // FEATURE_SOCKET_SETSOCKETOPTION
28+
_listener = new Socket(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp) {NoDelay = true};
3429
_listener.Bind(ep);
3530
_listener.Listen(5);
3631

@@ -142,11 +137,6 @@ private void ProcessAccept(Socket clientSocket)
142137

143138
try
144139
{
145-
#if FEATURE_SOCKET_SETSOCKETOPTION
146-
remoteSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger, true);
147-
remoteSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
148-
#endif //FEATURE_SOCKET_SETSOCKETOPTION
149-
150140
using (var channel = Session.CreateChannelDirectTcpip())
151141
{
152142
channel.Exception += Channel_Exception;
@@ -500,7 +490,7 @@ private bool HandleSocks5(Socket socket, IChannelDirectTcpip channel, TimeSpan t
500490
return false;
501491
}
502492

503-
ipAddress = IPAddress.Parse(SshData.Ascii.GetString(addressBuffer));
493+
ipAddress = IPAddress.Parse(SshData.Ascii.GetString(addressBuffer, 0, addressBuffer.Length));
504494

505495
//var hostName = new Common.ASCIIEncoding().GetString(addressBuffer);
506496

‎src/Renci.SshNet/ForwardedPortLocal.NET.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ partial void InternalStart()
1717
var addr = DnsAbstraction.GetHostAddresses(BoundHost)[0];
1818
var ep = new IPEndPoint(addr, (int) BoundPort);
1919

20-
_listener = new Socket(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
21-
// TODO: decide if we want to have blocking socket
22-
#if FEATURE_SOCKET_SETSOCKETOPTION
23-
_listener.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger, true);
24-
_listener.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
25-
#endif // FEATURE_SOCKET_SETSOCKETOPTION
20+
_listener = new Socket(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp) {NoDelay = true};
2621
_listener.Bind(ep);
2722
_listener.Listen(5);
2823

@@ -137,11 +132,6 @@ private void ProcessAccept(Socket clientSocket)
137132

138133
try
139134
{
140-
#if FEATURE_SOCKET_SETSOCKETOPTION
141-
clientSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger, true);
142-
clientSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
143-
#endif //FEATURE_SOCKET_SETSOCKETOPTION
144-
145135
var originatorEndPoint = (IPEndPoint) clientSocket.RemoteEndPoint;
146136

147137
RaiseRequestReceived(originatorEndPoint.Address.ToString(),

0 commit comments

Comments
 (0)