X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Runtime.Remoting%2FSystem.Runtime.Remoting.Channels.Tcp%2FTcpChannel.cs;h=de8d9a692fcb357239ea3b46c9c8d9c29fed43a1;hb=07ec1253c277856bdbb74213e2defc8ed23cf8e3;hp=d9f6b62865ef306c736b8675bb143782bd944c15;hpb=948dbf8d4581ac17f5420cc4f7dc375e3c502576;p=mono.git 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 d9f6b62865e..de8d9a692fc 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 @@ -36,37 +36,37 @@ namespace System.Runtime.Remoting.Channels.Tcp { public class TcpChannel : IChannelReceiver, IChannel, IChannelSender { - private TcpClientChannel _clientChannel; - private TcpServerChannel _serverChannel = null; - private string _name = "tcp"; + private TcpClientChannel _clientChannel; + private TcpServerChannel _serverChannel = null; + private string _name = "tcp"; private int _priority = 1; public TcpChannel () { - Init (new Hashtable(), null, null); + Init (new Hashtable(), null, null); } public TcpChannel (int port) { - Hashtable ht = new Hashtable(); - ht["port"] = port.ToString(); - Init(ht, null, null); + Hashtable ht = new Hashtable(); + ht["port"] = port.ToString(); + Init(ht, null, null); } - void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink) - { - _clientChannel = new TcpClientChannel (properties,clientSink); + void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink) + { + _clientChannel = new TcpClientChannel (properties,clientSink); + + if(properties["port"] != null) + _serverChannel = new TcpServerChannel(properties, serverSink); - if(properties["port"] != null) - _serverChannel = new TcpServerChannel(properties, serverSink); - object val = properties ["name"]; if (val != null) _name = val as string; val = properties ["priority"]; if (val != null) _priority = Convert.ToInt32 (val); - } - + } + public TcpChannel (IDictionary properties, IClientChannelSinkProvider clientSinkProvider, @@ -75,46 +75,46 @@ namespace System.Runtime.Remoting.Channels.Tcp Init (properties, clientSinkProvider, serverSinkProvider); } - public IMessageSink CreateMessageSink(string url, object remoteChannelData, out string objectURI) - { - return _clientChannel.CreateMessageSink(url, remoteChannelData, out objectURI); - } - - public string ChannelName - { - get { return _name; } - } - - public int ChannelPriority - { - get { return _priority; } - } - - public void StartListening (object data) - { - if (_serverChannel != null) _serverChannel.StartListening (data); - } - - public void StopListening (object data) - { - if (_serverChannel != null) _serverChannel.StopListening(data); - TcpConnectionPool.Shutdown (); - } - - public string[] GetUrlsForUri (string uri) - { - if (_serverChannel != null) return _serverChannel.GetUrlsForUri(uri); - else return null; - } - - public object ChannelData - { - get - { - if (_serverChannel != null) return _serverChannel.ChannelData; - else return null; - } - } + public IMessageSink CreateMessageSink(string url, object remoteChannelData, out string objectURI) + { + return _clientChannel.CreateMessageSink(url, remoteChannelData, out objectURI); + } + + public string ChannelName + { + get { return _name; } + } + + public int ChannelPriority + { + get { return _priority; } + } + + public void StartListening (object data) + { + if (_serverChannel != null) _serverChannel.StartListening (data); + } + + public void StopListening (object data) + { + if (_serverChannel != null) _serverChannel.StopListening(data); + TcpConnectionPool.Shutdown (); + } + + public string[] GetUrlsForUri (string uri) + { + if (_serverChannel != null) return _serverChannel.GetUrlsForUri(uri); + else return null; + } + + public object ChannelData + { + get + { + if (_serverChannel != null) return _serverChannel.ChannelData; + else return null; + } + } public string Parse (string url, out string objectURI) {