Ongoing WCF discovery configuration implementation.

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/AnnouncementEndpointElement.cs

@@ -116,12 +116,12 @@ namespace System.ServiceModel.Discovery.Configuration
 		
 		protected override void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
 		}
 		
 		protected override void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
 		}
 	}
 }

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs

@@ -101,12 +101,12 @@ namespace System.ServiceModel.Discovery.Configuration
 		
 		protected override void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
 		}
 		
 		protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
 		}
 	}
 }

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/EndpointDiscoveryElement.cs

@@ -27,6 +27,8 @@ using System;
 using System.ComponentModel;
 using System.Configuration;
 using System.ServiceModel.Configuration;
+using System.Xml;
+using System.Xml.Linq;
 
 namespace System.ServiceModel.Discovery.Configuration
 {
@@ -83,7 +85,14 @@ namespace System.ServiceModel.Discovery.Configuration
 		
 		protected override object CreateBehavior ()
 		{
-			throw new NotImplementedException ();
+			var ret = new EndpointDiscoveryBehavior () { Enabled = this.Enabled };
+			foreach (ContractTypeNameElement ctn in ContractTypeNames)
+				ret.ContractTypeNames.Add (new XmlQualifiedName (ctn.Name, ctn.Namespace));
+			foreach (XmlElementElement xee in Extensions)
+				ret.Extensions.Add (XElement.Load (new XmlNodeReader (xee.XmlElement)));
+			foreach (ScopeElement se in Scopes)
+				ret.Scopes.Add (se.Scope);
+			return ret;
 		}
 	}
 }

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs

@@ -26,6 +26,7 @@
 using System;
 using System.ComponentModel;
 using System.Configuration;
+using System.Linq;
 using System.ServiceModel.Configuration;
 using System.ServiceModel.Description;
 
@@ -79,32 +80,72 @@ namespace System.ServiceModel.Discovery.Configuration
 
 		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
-			throw new NotImplementedException ();
+			if (contractDescription == null)
+				throw new ArgumentNullException ("contractDescription");
+			DiscoveryVersion ver = null;
+			switch (contractDescription.ContractType.Namespace) {
+			case DiscoveryVersion.Namespace11:
+				ver = DiscoveryVersion.WSDiscovery11;
+				break;
+			case DiscoveryVersion.NamespaceApril2005:
+				ver = DiscoveryVersion.WSDiscoveryApril2005;
+				break;
+			case DiscoveryVersion.NamespaceCD1:
+				ver = DiscoveryVersion.WSDiscoveryCD1;
+				break;
+			}
+			var ret = new UdpAnnouncementEndpoint (ver, MulticastAddress);
+			ret.MaxAnnouncementDelay = MaxAnnouncementDelay;
+			TransportSettings.ApplyConfiguration (ret.TransportSettings);
+			return ret;
 		}
 
 		protected override void InitializeFrom (ServiceEndpoint endpoint)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var e = (UdpAnnouncementEndpoint) endpoint;
+			MaxAnnouncementDelay = e.MaxAnnouncementDelay;
+			MulticastAddress = e.MulticastAddress;
+			TransportSettings.InitializeFrom (e.TransportSettings);
 		}
-		
+
 		protected override void OnApplyConfiguration (ServiceEndpoint endpoint, ChannelEndpointElement serviceEndpointElement)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var de = (AnnouncementEndpoint) endpoint;
+			if (!de.DiscoveryVersion.Equals (DiscoveryVersion))
+				throw new ArgumentException ("Argument AnnouncementEndpoint is initialized with different DiscoveryVersion");
+			de.MaxAnnouncementDelay = MaxAnnouncementDelay;
+			de.Address = serviceEndpointElement.CreateEndpointAddress (); // it depends on InternalVisibleTo(System.ServiceModel)
+			var be = (UdpTransportBindingElement) de.Binding.CreateBindingElements ().First (b => b is UdpTransportBindingElement);
+			TransportSettings.ApplyConfiguration (be.TransportSettings);
 		}
-		
+
 		protected override void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement serviceEndpointElement)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var de = (AnnouncementEndpoint) endpoint;
+			if (!de.DiscoveryVersion.Equals (DiscoveryVersion))
+				throw new ArgumentException ("Argument AnnouncementEndpoint is initialized with different DiscoveryVersion");
+			de.MaxAnnouncementDelay = MaxAnnouncementDelay;
+			de.Address = serviceEndpointElement.CreateEndpointAddress (); // it depends on InternalVisibleTo(System.ServiceModel)
+			var be = (UdpTransportBindingElement) de.Binding.CreateBindingElements ().First (b => b is UdpTransportBindingElement);
+			TransportSettings.ApplyConfiguration (be.TransportSettings);
 		}
-		
+
 		protected override void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
+			base.OnInitializeAndValidate (channelEndpointElement);
 		}
-		
+
 		protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
+			base.OnInitializeAndValidate (channelEndpointElement);
 		}
 	}
 }

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs

@@ -26,6 +26,7 @@
 using System;
 using System.ComponentModel;
 using System.Configuration;
+using System.Linq;
 using System.ServiceModel.Configuration;
 using System.ServiceModel.Description;
 
@@ -54,7 +55,7 @@ namespace System.ServiceModel.Discovery.Configuration
 		}
 
 		[ConfigurationProperty ("discoveryMode", DefaultValue = ServiceDiscoveryMode.Adhoc)]
-		public ServiceDiscoveryMode DiscoveryMode {
+		public new ServiceDiscoveryMode DiscoveryMode {
 			get { return (ServiceDiscoveryMode) base [discovery_mode]; }
 			set { base [discovery_mode] = value; }
 		}
@@ -65,7 +66,7 @@ namespace System.ServiceModel.Discovery.Configuration
 
 		[TypeConverter (typeof (TimeSpanConverter))]
 		[ConfigurationProperty ("maxResponseDelay", DefaultValue = "00:00:00.500")]
-		public TimeSpan MaxResponseDelay {
+		public new TimeSpan MaxResponseDelay {
 			get { return (TimeSpan) base [max_response_delay]; }
 			set { base [max_response_delay] = value; }
 		}
@@ -87,27 +88,72 @@ namespace System.ServiceModel.Discovery.Configuration
 		
 		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
-			throw new NotImplementedException ();
+			if (contractDescription == null)
+				throw new ArgumentNullException ("contractDescription");
+			DiscoveryVersion ver = null;
+			switch (contractDescription.ContractType.Namespace) {
+			case DiscoveryVersion.Namespace11:
+				ver = DiscoveryVersion.WSDiscovery11;
+				break;
+			case DiscoveryVersion.NamespaceApril2005:
+				ver = DiscoveryVersion.WSDiscoveryApril2005;
+				break;
+			case DiscoveryVersion.NamespaceCD1:
+				ver = DiscoveryVersion.WSDiscoveryCD1;
+				break;
+			}
+			var ret = new UdpDiscoveryEndpoint (ver, MulticastAddress);
+			ret.MaxResponseDelay = MaxResponseDelay;
+			TransportSettings.ApplyConfiguration (ret.TransportSettings);
+			return ret;
 		}
+
 		protected override void InitializeFrom (ServiceEndpoint endpoint)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var e = (UdpDiscoveryEndpoint) endpoint;
+			MaxResponseDelay = e.MaxResponseDelay;
+			MulticastAddress = e.MulticastAddress;
+			TransportSettings.InitializeFrom (e.TransportSettings);
 		}
+
 		protected override void OnApplyConfiguration (ServiceEndpoint endpoint, ChannelEndpointElement serviceEndpointElement)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var de = (DiscoveryEndpoint) endpoint;
+			if (!de.DiscoveryVersion.Equals (DiscoveryVersion))
+				throw new ArgumentException ("Argument AnnouncementEndpoint is initialized with different DiscoveryVersion");
+			de.MaxResponseDelay = MaxResponseDelay;
+			de.Address = serviceEndpointElement.CreateEndpointAddress (); // it depends on InternalVisibleTo(System.ServiceModel)
+			var be = (UdpTransportBindingElement) de.Binding.CreateBindingElements ().First (b => b is UdpTransportBindingElement);
+			TransportSettings.ApplyConfiguration (be.TransportSettings);
 		}
+
 		protected override void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement serviceEndpointElement)
 		{
-			throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			var de = (DiscoveryEndpoint) endpoint;
+			if (!de.DiscoveryVersion.Equals (DiscoveryVersion))
+				throw new ArgumentException ("Argument AnnouncementEndpoint is initialized with different DiscoveryVersion");
+			de.MaxResponseDelay = MaxResponseDelay;
+			de.Address = serviceEndpointElement.CreateEndpointAddress (); // it depends on InternalVisibleTo(System.ServiceModel)
+			var be = (UdpTransportBindingElement) de.Binding.CreateBindingElements ().First (b => b is UdpTransportBindingElement);
+			TransportSettings.ApplyConfiguration (be.TransportSettings);
 		}
+
 		protected override void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
+			base.OnInitializeAndValidate (channelEndpointElement);
 		}
+
 		protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement)
 		{
-			throw new NotImplementedException ();
+			// It seems to do nothing.
+			base.OnInitializeAndValidate (channelEndpointElement);
 		}
 	}
 }

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpTransportSettingsElement.cs

@@ -116,6 +116,36 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return (int) base [ttl]; }
 			set { base [ttl] = value; }
 		}
+
+		protected override ConfigurationPropertyCollection Properties {
+			get { return properties; }
+		}
+
+		internal void ApplyConfiguration (UdpTransportSettings t)
+		{
+			t.DuplicateMessageHistoryLength = DuplicateMessageHistoryLength;
+			t.MaxBufferPoolSize = MaxBufferPoolSize;
+			t.MaxMulticastRetransmitCount = MaxMulticastRetransmitCount;
+			t.MaxPendingMessageCount = MaxPendingMessageCount;
+			t.MaxReceivedMessageSize = MaxReceivedMessageSize;
+			t.MaxUnicastRetransmitCount = MaxUnicastRetransmitCount;
+			t.MulticastInterfaceId = MulticastInterfaceId;
+			t.SocketReceiveBufferSize = SocketReceiveBufferSize;
+			t.TimeToLive = TimeToLive;
+		}
+
+		internal void InitializeFrom (UdpTransportSettings t)
+		{
+			DuplicateMessageHistoryLength = t.DuplicateMessageHistoryLength;
+			MaxBufferPoolSize = t.MaxBufferPoolSize;
+			MaxMulticastRetransmitCount = t.MaxMulticastRetransmitCount;
+			MaxPendingMessageCount = t.MaxPendingMessageCount;
+			MaxReceivedMessageSize = t.MaxReceivedMessageSize;
+			MaxUnicastRetransmitCount = t.MaxUnicastRetransmitCount;
+			MulticastInterfaceId = t.MulticastInterfaceId;
+			SocketReceiveBufferSize = t.SocketReceiveBufferSize;
+			TimeToLive = t.TimeToLive;
+		}
 	}
 }
 

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Udp/UdpDuplexChannel.cs

@@ -99,7 +99,6 @@ namespace System.ServiceModel.Discovery
 			if (rmp == null)
 				throw new ArgumentException ("This duplex channel from the channel listener cannot send messages without RemoteEndpointMessageProperty");
 			var cli = new UdpClient ();
-Console.Error.WriteLine ("Target: " + rmp.Address + ":" + rmp.Port);
 			cli.Connect (IPAddress.Parse (rmp.Address), rmp.Port);
 			return cli;
 		}