You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/04/23 23:03:15 UTC
thrift git commit: Revert "THRIFT-3000 .NET implementation has
trouble with mixed IP modes"
Repository: thrift
Updated Branches:
refs/heads/master 3b99c970a -> 95717c92d
Revert "THRIFT-3000 .NET implementation has trouble with mixed IP modes"
This reverts commit 018c1b8f77e7d69da61014437d5f04fedbaad81d.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/95717c92
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/95717c92
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/95717c92
Branch: refs/heads/master
Commit: 95717c92d8b9f0e081caaca5c67b6ba14a2f4052
Parents: 3b99c97
Author: Jens Geyer <je...@apache.org>
Authored: Thu Apr 23 22:48:13 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Thu Apr 23 22:48:13 2015 +0200
----------------------------------------------------------------------
configure.ac | 2 -
lib/csharp/Makefile.am | 5 --
.../ThriftMSBuildTask/ThriftMSBuildTask.csproj | 2 +-
lib/csharp/src/Thrift.csproj | 5 +-
lib/csharp/src/Transport/TServerSocket.cs | 9 +-
lib/csharp/src/Transport/TServerTransport.cs | 9 +-
lib/csharp/src/Transport/TSocket.cs | 54 ++++++------
lib/csharp/src/Transport/TSocketVersionizer.cs | 92 --------------------
lib/csharp/src/Transport/TTLSServerSocket.cs | 4 +-
lib/csharp/src/Transport/TTLSSocket.cs | 6 +-
lib/csharp/src/Transport/TTransport.cs | 2 +-
.../Multiplex/Client/MultiplexClient.csproj | 2 +-
.../Multiplex/Server/MultiplexServer.csproj | 2 +-
lib/csharp/test/ThriftTest/TestClient.cs | 8 +-
lib/csharp/test/ThriftTest/ThriftTest.csproj | 4 +-
15 files changed, 49 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index aae784a..0032354 100755
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,6 @@ AM_CONDITIONAL(WITH_C_GLIB, [test "$have_glib2" = "yes" -a "$have_gobject2" = "y
AX_THRIFT_LIB(csharp, [C#], yes)
if test "$with_csharp" = "yes"; then
- PKG_CHECK_MODULES(MONO, mono >= 3.0.0, net_4_5=yes, net_4_5=no)
PKG_CHECK_MODULES(MONO, mono >= 2.0.0, net_3_5=yes, net_3_5=no)
PKG_CHECK_MODULES(MONO, mono >= 1.2.4, have_mono=yes, have_mono=no)
if test "$have_mono" = "yes" ; then
@@ -203,7 +202,6 @@ if test "$with_csharp" = "yes"; then
fi
AM_CONDITIONAL(WITH_MONO, [test "$have_csharp" = "yes"])
AM_CONDITIONAL(NET_2_0, [test "$net_3_5" = "no"])
-AM_CONDITIONAL(NET_4_5, [test "$net_4_5" = "yes"])
AX_THRIFT_LIB(java, [Java], yes)
if test "$with_java" = "yes"; then
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am
index 7cdec05..5ce4276 100644
--- a/lib/csharp/Makefile.am
+++ b/lib/csharp/Makefile.am
@@ -52,7 +52,6 @@ THRIFTCODE= \
src/Transport/TBufferedTransport.cs \
src/Transport/TTransport.cs \
src/Transport/TSocket.cs \
- src/Transport/TSocketVersionizer.cs \
src/Transport/TTransportException.cs \
src/Transport/TStreamTransport.cs \
src/Transport/TFramedTransport.cs \
@@ -76,10 +75,6 @@ if NET_2_0
MONO_DEFINES=/d:NET_2_0
endif
-if NET_4_5
-MONO_DEFINES=/d:NET_4_5 -sdk:4.5
-endif
-
all-local: Thrift.dll
Thrift.dll: $(THRIFTCODE)
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
----------------------------------------------------------------------
diff --git a/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj b/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
index 1148eaa..ae86081 100644
--- a/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
+++ b/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
@@ -28,7 +28,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ThriftMSBuildTask</RootNamespace>
<AssemblyName>ThriftMSBuildTask</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Thrift.csproj
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Thrift.csproj b/lib/csharp/src/Thrift.csproj
index dc0aa6d..195005a 100644
--- a/lib/csharp/src/Thrift.csproj
+++ b/lib/csharp/src/Thrift.csproj
@@ -27,7 +27,7 @@
<OutputType>Library</OutputType>
<NoStandardLibraries>false</NoStandardLibraries>
<AssemblyName>Thrift</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RootNamespace>Thrift</RootNamespace>
<FileUpgradeFlags>
@@ -109,7 +109,6 @@
<Compile Include="TException.cs" />
<Compile Include="TApplicationException.cs" />
<Compile Include="TProcessor.cs" />
- <Compile Include="Transport\TSocketVersionizer.cs" />
<Compile Include="Transport\TBufferedTransport.cs" />
<Compile Include="Transport\TFramedTransport.cs" />
<Compile Include="Transport\THttpClient.cs" />
@@ -148,4 +147,4 @@
<ProjectExtensions>
<VisualStudio AllowExistingFolder="true" />
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TServerSocket.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TServerSocket.cs b/lib/csharp/src/Transport/TServerSocket.cs
index 524003e..82a367c 100644
--- a/lib/csharp/src/Transport/TServerSocket.cs
+++ b/lib/csharp/src/Transport/TServerSocket.cs
@@ -23,7 +23,6 @@
using System;
using System.Net.Sockets;
-using System.Reflection;
namespace Thrift.Transport
@@ -54,7 +53,7 @@ namespace Thrift.Transport
* Creates a server socket from underlying socket object
*/
public TServerSocket(TcpListener listener)
- : this(listener, 0)
+ :this(listener, 0)
{
}
@@ -79,7 +78,7 @@ namespace Thrift.Transport
* Creates just a port listening server socket
*/
public TServerSocket(int port, int clientTimeout)
- : this(port, clientTimeout, false)
+ :this(port, clientTimeout, false)
{
}
@@ -91,8 +90,8 @@ namespace Thrift.Transport
try
{
// Make server socket
- this.server = TSocketVersionizer.CreateTcpListener(port);
- this.server.Server.NoDelay = true;
+ server = new TcpListener(System.Net.IPAddress.Any, this.port);
+ server.Server.NoDelay = true;
}
catch (Exception)
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TServerTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TServerTransport.cs b/lib/csharp/src/Transport/TServerTransport.cs
index 8e84323..05d7d0f 100644
--- a/lib/csharp/src/Transport/TServerTransport.cs
+++ b/lib/csharp/src/Transport/TServerTransport.cs
@@ -22,8 +22,6 @@
*/
using System;
-using System.Net.Sockets;
-using System.Reflection;
namespace Thrift.Transport
{
@@ -36,11 +34,10 @@ namespace Thrift.Transport
public TTransport Accept()
{
TTransport transport = AcceptImpl();
- if (transport == null)
- {
- throw new TTransportException("accept() may not return NULL");
+ if (transport == null) {
+ throw new TTransportException("accept() may not return NULL");
}
return transport;
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TSocket.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TSocket.cs b/lib/csharp/src/Transport/TSocket.cs
index 0b47572..cf1a440 100644
--- a/lib/csharp/src/Transport/TSocket.cs
+++ b/lib/csharp/src/Transport/TSocket.cs
@@ -60,9 +60,9 @@ namespace Thrift.Transport
private void InitSocket()
{
- this.client = TSocketVersionizer.CreateTcpClient();
- this.client.ReceiveTimeout = client.SendTimeout = timeout;
- this.client.Client.NoDelay = true;
+ client = new TcpClient();
+ client.ReceiveTimeout = client.SendTimeout = timeout;
+ client.Client.NoDelay = true;
}
public int Timeout
@@ -132,7 +132,7 @@ namespace Thrift.Transport
InitSocket();
}
- if (timeout == 0) // no timeout -> infinite
+ if( timeout == 0) // no timeout -> infinite
{
client.Connect(host, port);
}
@@ -145,7 +145,7 @@ namespace Thrift.Transport
{
lock (hlp.Mutex)
{
- if (hlp.CallbackDone)
+ if( hlp.CallbackDone)
{
asyncres.AsyncWaitHandle.Close();
client.Close();
@@ -174,7 +174,7 @@ namespace Thrift.Transport
try
{
- if (hlp.Client.Client != null)
+ if( hlp.Client.Client != null)
hlp.Client.EndConnect(asyncres);
}
catch (Exception)
@@ -184,18 +184,14 @@ namespace Thrift.Transport
if (hlp.DoCleanup)
{
- try
- {
+ try {
asyncres.AsyncWaitHandle.Close();
- }
- catch (Exception) { }
+ } catch (Exception) {}
- try
- {
+ try {
if (hlp.Client is IDisposable)
((IDisposable)hlp.Client).Dispose();
- }
- catch (Exception) { }
+ } catch (Exception) {}
hlp.Client = null;
}
}
@@ -223,23 +219,23 @@ namespace Thrift.Transport
}
}
- #region " IDisposable Support "
- private bool _IsDisposed;
+ #region " IDisposable Support "
+ private bool _IsDisposed;
- // IDisposable
- protected override void Dispose(bool disposing)
+ // IDisposable
+ protected override void Dispose(bool disposing)
+ {
+ if (!_IsDisposed)
+ {
+ if (disposing)
{
- if (!_IsDisposed)
- {
- if (disposing)
- {
- if (client != null)
- ((IDisposable)client).Dispose();
- base.Dispose(disposing);
- }
- }
- _IsDisposed = true;
+ if (client != null)
+ ((IDisposable)client).Dispose();
+ base.Dispose(disposing);
}
- #endregion
+ }
+ _IsDisposed = true;
}
+ #endregion
+ }
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TSocketVersionizer.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TSocketVersionizer.cs b/lib/csharp/src/Transport/TSocketVersionizer.cs
deleted file mode 100644
index 1928fac..0000000
--- a/lib/csharp/src/Transport/TSocketVersionizer.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Text;
-
-namespace Thrift.Transport
-{
- /**
- * PropertyInfo for the DualMode property of the System.Net.Sockets.Socket class. Used to determine if the sockets are capable of
- * automatic IPv4 and IPv6 handling. If DualMode is present the sockets automatically handle IPv4 and IPv6 connections.
- * If the DualMode is not available the system configuration determines whether IPv4 or IPv6 is used.
- */
- internal static class TSocketVersionizer
- {
- /*
- * PropertyInfo for the DualMode property of System.Net.Sockets.Socket.
- */
- private static PropertyInfo DualModeProperty = typeof(Socket).GetProperty("DualMode");
-
- /*
- * Indicates whether the used framework supports DualMode on sockets or not.
- */
- internal static Boolean SupportsDualMode
- {
- get
- {
- return TSocketVersionizer.DualModeProperty != null;
- }
- }
-
- /*
- * Creates a TcpClient according to the capabilitites of the used framework
- */
- internal static TcpClient CreateTcpClient()
- {
- TcpClient client = null;
-
- if (TSocketVersionizer.SupportsDualMode)
- {
- client = new TcpClient(AddressFamily.InterNetworkV6);
- TSocketVersionizer.DualModeProperty.SetValue(client.Client, true);
- }
- else
- {
- client = new TcpClient(AddressFamily.InterNetwork);
- }
-
- return client;
- }
-
- /*
- * Creates a TcpListener according to the capabilitites of the used framework
- */
- internal static TcpListener CreateTcpListener(Int32 port)
- {
- TcpListener listener = null;
-
- if (TSocketVersionizer.SupportsDualMode)
- {
- listener = new TcpListener(System.Net.IPAddress.IPv6Any, port);
- TSocketVersionizer.DualModeProperty.SetValue(listener.Server, true);
- }
- else
- {
- listener = new TcpListener(System.Net.IPAddress.Any, port);
- }
-
- return listener;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TTLSServerSocket.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TTLSServerSocket.cs b/lib/csharp/src/Transport/TTLSServerSocket.cs
index e56c66c..631a593 100644
--- a/lib/csharp/src/Transport/TTLSServerSocket.cs
+++ b/lib/csharp/src/Transport/TTLSServerSocket.cs
@@ -115,8 +115,8 @@ namespace Thrift.Transport
try
{
// Create server socket
- this.server = TSocketVersionizer.CreateTcpListener(port);
- this.server.Server.NoDelay = true;
+ server = new TcpListener(System.Net.IPAddress.Any, this.port);
+ server.Server.NoDelay = true;
}
catch (Exception)
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TTLSSocket.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TTLSSocket.cs b/lib/csharp/src/Transport/TTLSSocket.cs
index d48b7d5..5652556 100644
--- a/lib/csharp/src/Transport/TTLSSocket.cs
+++ b/lib/csharp/src/Transport/TTLSSocket.cs
@@ -172,7 +172,7 @@ namespace Thrift.Transport
/// </summary>
private void InitSocket()
{
- this.client = TSocketVersionizer.CreateTcpClient();
+ this.client = new TcpClient();
client.ReceiveTimeout = client.SendTimeout = timeout;
client.Client.NoDelay = true;
}
@@ -286,7 +286,7 @@ namespace Thrift.Transport
public void setupTLS()
{
RemoteCertificateValidationCallback validator = this.certValidator ?? DefaultCertificateValidator;
-
+
if( this.localCertificateSelectionCallback != null)
{
this.secureStream = new SslStream(
@@ -304,7 +304,7 @@ namespace Thrift.Transport
validator
);
}
-
+
try
{
if (isServer)
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/src/Transport/TTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TTransport.cs b/lib/csharp/src/Transport/TTransport.cs
index d4977f1..2811399 100644
--- a/lib/csharp/src/Transport/TTransport.cs
+++ b/lib/csharp/src/Transport/TTransport.cs
@@ -55,7 +55,7 @@ namespace Thrift.Transport
}
catch( IOException)
{
- return false;
+ return false;
}
_hasPeekByte = true;
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
----------------------------------------------------------------------
diff --git a/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj b/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
index ff78723..6221e14 100644
--- a/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
+++ b/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
@@ -28,7 +28,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MultiplexClient</RootNamespace>
<AssemblyName>MultiplexClient</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<FileUpgradeFlags>
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
----------------------------------------------------------------------
diff --git a/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj b/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
index 6a8177e..dc1d123 100644
--- a/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
+++ b/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
@@ -28,7 +28,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MultiplexServer</RootNamespace>
<AssemblyName>MultiplexServer</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<FileUpgradeFlags>
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/test/ThriftTest/TestClient.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/TestClient.cs b/lib/csharp/test/ThriftTest/TestClient.cs
index b54d09d..ec0696a 100644
--- a/lib/csharp/test/ThriftTest/TestClient.cs
+++ b/lib/csharp/test/ThriftTest/TestClient.cs
@@ -185,14 +185,14 @@ namespace Test
// linear distribution, unless random is requested
if (!randomDist) {
- for (var i = 0; i < initLen; ++i) {
+ for (var i = 0; i < initLen; ++i) {
retval[i] = (byte)i;
}
return retval;
}
// random distribution
- for (var i = 0; i < initLen; ++i) {
+ for (var i = 0; i < initLen; ++i) {
retval[i] = (byte)0;
}
var rnd = new Random();
@@ -270,13 +270,13 @@ namespace Test
if (binIn[ofs] != binOut[ofs])
throw new Exception("testBinary: content mismatch at offset " + ofs.ToString());
}
- catch (Thrift.TApplicationException e)
+ catch (Thrift.TApplicationException e)
{
Console.Write("testBinary(" + BytesToHex(binOut) + "): "+e.Message);
}
// binary equals? only with hashcode option enabled ...
- if( typeof(CrazyNesting).GetMethod("Equals").DeclaringType == typeof(CrazyNesting))
+ if( typeof(CrazyNesting).GetMethod("Equals").DeclaringType == typeof(CrazyNesting))
{
CrazyNesting one = new CrazyNesting();
CrazyNesting two = new CrazyNesting();
http://git-wip-us.apache.org/repos/asf/thrift/blob/95717c92/lib/csharp/test/ThriftTest/ThriftTest.csproj
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/ThriftTest.csproj b/lib/csharp/test/ThriftTest/ThriftTest.csproj
index 5f9f151..d671997 100644
--- a/lib/csharp/test/ThriftTest/ThriftTest.csproj
+++ b/lib/csharp/test/ThriftTest/ThriftTest.csproj
@@ -28,7 +28,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ThriftTest</RootNamespace>
<AssemblyName>ThriftTest</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<FileUpgradeFlags>
@@ -136,6 +136,6 @@ SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\test\ThriftTest.thrift
for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
"$(ProjectDir)\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-"$(MSBuildToolsPath)\Csc.exe" /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\src\bin\Debug\Thrift.dll"</PreBuildEvent>
+$(MSBuildToolsPath)\Csc.exe /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\src\bin\Debug\Thrift.dll"</PreBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file