2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Simple / SimpleClientChannel.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleClientChannel.cs
index fb76ad3d540b59a327baabf7897d5f9f93fe4dd1..5747bb697a85811e8cda1469dcde1f5b2cea96e2 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleClientChannel.cs
@@ -6,6 +6,27 @@
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.IO;
 using System.Net.Sockets;
@@ -17,7 +38,7 @@ namespace System.Runtime.Remoting.Channels.Simple
        public class SimpleClientChannel : IChannelSender, IChannel
        {
                int priority = 1;                                       
-               string name = "tcp";
+               string name = "simple";
                IClientChannelSinkProvider sink_provider;
                
                public SimpleClientChannel ()
@@ -67,16 +88,27 @@ namespace System.Runtime.Remoting.Channels.Simple
                                                       object remoteChannelData,
                                                       out string objectURI)
                {
-                       if (url == null && remoteChannelData != null) {
+                       objectURI = null;
+
+                       if (url != null) {
+                               if (Parse (url, out objectURI) != null)
+                                       return (IMessageSink) sink_provider.CreateSink (this, url,
+                                                                                       remoteChannelData);
+                       }
+                       
+                       if (remoteChannelData != null) {
                                IChannelDataStore ds = remoteChannelData as IChannelDataStore;
-                               if (ds != null)
-                                       url = ds.ChannelUris [0];
+                               if (ds != null) {
+                                       foreach (string chnl_uri in ds.ChannelUris) {
+                                               if (Parse (chnl_uri, out objectURI) == null)
+                                                       continue;
+                                               return (IMessageSink) sink_provider.CreateSink (this, chnl_uri,
+                                                                                               remoteChannelData);
+                                       }
+                               }
                        }
                        
-                       if (Parse (url, out objectURI) == null)
-                               return null;
-
-                       return (IMessageSink) sink_provider.CreateSink (this, url, remoteChannelData);
+                       return null;                    
                }
 
                public string Parse (string url, out string objectURI)
@@ -85,7 +117,7 @@ namespace System.Runtime.Remoting.Channels.Simple
                        
                        string host = SimpleChannel.ParseSimpleURL (url, out objectURI, out port);
 
-                       return "tcp://" + host + ":" + port;
+                       return "simple://" + host + ":" + port;
                }
        }
 }