diff options
Diffstat (limited to 'mcs/class')
5 files changed, 16 insertions, 8 deletions
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/ChangeLog index 671d7fa1bd3..42d69cb17d6 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/ChangeLog +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/ChangeLog @@ -1,3 +1,9 @@ +2004-05-13 Lluis Sanchez Gual <lluis@ximian.com> + + * TcpChannel.cs: Made Init private. + * TcpClientTransportSink.cs, TcpClientTransportSinkProvider.cs, + TcpServerTransportSink.cs: Made internal. + 2004-04-16 Lluis Sanchez Gual <lluis@ximian.com> * TcpClientChannel.cs: Initialize the sink provider in the default diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs index 03890c1b9e7..928dd8d4239 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs @@ -31,7 +31,7 @@ namespace System.Runtime.Remoting.Channels.Tcp Init(ht, null, null);
} - public void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink)
+ void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink)
{
_clientChannel = new TcpClientChannel (properties,clientSink);
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSink.cs index 000113afe47..9ec243f7369 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSink.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSink.cs @@ -16,15 +16,17 @@ using System.Threading; namespace System.Runtime.Remoting.Channels.Tcp
{
- public class TcpClientTransportSink : IClientChannelSink + internal class TcpClientTransportSink : IClientChannelSink { string _host; - string _objectUri; + string _url; int _port; public TcpClientTransportSink (string url) { - _host = TcpChannel.ParseTcpURL (url, out _objectUri, out _port); + string objectUri; + _host = TcpChannel.ParseTcpURL (url, out objectUri, out _port); + _url = url; } public IDictionary Properties @@ -53,7 +55,7 @@ namespace System.Runtime.Remoting.Channels.Tcp try { if (headers == null) headers = new TransportHeaders(); - headers [CommonTransportKeys.RequestUri] = ((IMethodCallMessage)msg).Uri; + headers [CommonTransportKeys.RequestUri] = ((IMethodMessage)msg).Uri; // Sends the stream using a connection from the pool // and creates a WorkItem that will wait for the @@ -139,7 +141,7 @@ namespace System.Runtime.Remoting.Channels.Tcp try { if (requestHeaders == null) requestHeaders = new TransportHeaders(); - requestHeaders [CommonTransportKeys.RequestUri] = ((IMethodCallMessage)msg).Uri; + requestHeaders [CommonTransportKeys.RequestUri] = ((IMethodMessage)msg).Uri; // Sends the message connection = TcpConnectionPool.GetConnection (_host, _port); diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSinkProvider.cs index bacdfd5576a..84413db0497 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSinkProvider.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientTransportSinkProvider.cs @@ -12,7 +12,7 @@ using System.Runtime.Remoting.Channels; namespace System.Runtime.Remoting.Channels.Tcp
{
- public class TcpClientTransportSinkProvider : IClientChannelSinkProvider + internal class TcpClientTransportSinkProvider : IClientChannelSinkProvider { public TcpClientTransportSinkProvider () { diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerTransportSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerTransportSink.cs index d6fac7d45a9..de170d823cd 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerTransportSink.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerTransportSink.cs @@ -14,7 +14,7 @@ using System.IO; namespace System.Runtime.Remoting.Channels.Tcp
{
- public class TcpServerTransportSink : IServerChannelSink, IChannelSinkBase + internal class TcpServerTransportSink : IServerChannelSink, IChannelSinkBase { IServerChannelSink next_sink; |