New test.

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Tcp / TcpServerChannel.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
index c5a87259c2c51463e2b316c89ea2911ad1e0cafb..300954769ed8d3d11ccbeaf0f8d816e32c297989 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
@@ -62,7 +62,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
 
                void Init (IServerChannelSinkProvider serverSinkProvider) 
                {
-                       if (serverSinkProvider == null) \r
+                       if (serverSinkProvider == null) 
                        {
                                serverSinkProvider = new BinaryServerFormatterSinkProvider ();
                        }
@@ -84,16 +84,16 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        // Gets channel data from the chain of channel providers
 
                        channel_data = new ChannelDataStore (null);
-                       IServerChannelSinkProvider provider = serverSinkProvider;\r
-                       while (provider != null)\r
-                       {\r
-                               provider.GetChannelData(channel_data);\r
-                               provider = provider.Next;\r
-                       }\r
+                       IServerChannelSinkProvider provider = serverSinkProvider;
+                       while (provider != null)
+                       {
+                               provider.GetChannelData(channel_data);
+                               provider = provider.Next;
+                       }
 
                        // Creates the sink chain that will process all incoming messages
 
-                       IServerChannelSink next_sink = ChannelServices.CreateServerChannelSinkChain (serverSinkProvider, this);\r
+                       IServerChannelSink next_sink = ChannelServices.CreateServerChannelSinkChain (serverSinkProvider, this);
                        sink = new TcpServerTransportSink (next_sink);
                }
                
@@ -107,35 +107,35 @@ namespace System.Runtime.Remoting.Channels.Tcp
                                         IServerChannelSinkProvider serverSinkProvider)
                {
                        foreach(DictionaryEntry property in properties)
-                       {\r
-                               switch((string)property.Key)\r
-                               {\r
+                       {
+                               switch((string)property.Key)
+                               {
                                        case "name":
                                                name = property.Value.ToString();
                                                break;
-                                       case "port":\r
+                                       case "port":
                                                port = Convert.ToInt32(property.Value);
-                                               break;\r
-                                       case "priority":\r
+                                               break;
+                                       case "priority":
                                                priority = Convert.ToInt32(property.Value);
-                                               break;\r
-                                       case "bindTo":\r
+                                               break;
+                                       case "bindTo":
                                                bindAddress = IPAddress.Parse((string)property.Value);
-                                               break;\r
-                                       case "rejectRemoteRequests":\r
+                                               break;
+                                       case "rejectRemoteRequests":
                                                if(Convert.ToBoolean(properties["rejectRemoteRequests"]))
                                                        bindAddress = IPAddress.Loopback;
                                                break;
                                        case "supressChannelData":
                                                supressChannelData = Convert.ToBoolean (property.Value);
-                                               break;\r
+                                               break;
                                        case "useIpAddress":
                                                useIpAddress = Convert.ToBoolean (property.Value);
                                                break;
                                        case "machineName":
                                                host = property.Value as string;
                                                break;
-                               }\r
+                               }
                        }                       
                        Init (serverSinkProvider);
                }
@@ -182,18 +182,18 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        return "tcp://" + host + ":" + port;
                }
                
-               public string[] GetUrlsForUri (string uri)\r
-               {\r
+               public virtual string[] GetUrlsForUri (string uri)
+               {
                        if (!uri.StartsWith ("/")) uri = "/" + uri;
-\r
-                       string [] chnl_uris = channel_data.ChannelUris;\r
-                       string [] result = new String [chnl_uris.Length];\r
-\r
-                       for (int i = 0; i < chnl_uris.Length; i++) \r
-                               result [i] = chnl_uris [i] + uri;\r
-                       \r
-                       return result;\r
-               }\r
+
+                       string [] chnl_uris = channel_data.ChannelUris;
+                       string [] result = new String [chnl_uris.Length];
+
+                       for (int i = 0; i < chnl_uris.Length; i++) 
+                               result [i] = chnl_uris [i] + uri;
+                       
+                       return result;
+               }
 
                public string Parse (string url, out string objectURI)
                {
@@ -237,7 +237,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        stopped = false;
 #endif 
                        listener = new TcpListener (bindAddress, port);
-                       if (server_thread == null) \r
+                       if (server_thread == null) 
                        {
                                threadPool = RemotingThreadPool.GetSharedPool ();
                                listener.Start ();
@@ -270,8 +270,8 @@ namespace System.Runtime.Remoting.Channels.Tcp
 #endif
                        listener.Stop ();
                        threadPool.Free ();
-                       server_thread.Join ();\r
-                       server_thread = null;                   \r
+                       server_thread.Join ();
+                       server_thread = null;                   
                }
        }
 
@@ -292,9 +292,8 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        _id = _count++;
                }
 
-               public Stream Stream
-               {
-                       get { return _stream; }
+               public Socket Socket {
+                       get { return _socket; }
                }
 
                public byte[] Buffer
@@ -318,7 +317,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
                                        switch (type)
                                        {
                                                case MessageStatus.MethodMessage:
-                                                       _sink.InternalProcessMessage (this);
+                                                       _sink.InternalProcessMessage (this, _stream);
                                                        break;
 
                                                case MessageStatus.Unknown: